Merge pull request #6993 from JDonadio/ref/app-global-style

Ref/app global style
This commit is contained in:
Gustavo Maximiliano Cortez 2017-10-30 09:57:48 -03:00 committed by GitHub
commit 3897ec92d8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
24 changed files with 269 additions and 48 deletions

2
.gitignore vendored
View File

@ -31,7 +31,7 @@ src/assets/externalServices.json
src/assets/img/app
src/index.html
src/manifest.json
src/theme/overrides.scss
src/theme/_overrides.scss
.sourcemaps/
.idea/

View File

@ -0,0 +1,46 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="247px" height="248px" viewBox="0 0 247 248" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 42 (36781) - http://www.bohemiancoding.com/sketch -->
<title>push-notifications</title>
<desc>Created with Sketch.</desc>
<defs>
<linearGradient x1="50%" y1="0%" x2="50%" y2="89.4673583%" id="linearGradient-1">
<stop stop-color="#192C3A" offset="0%"></stop>
<stop stop-color="#192C3A" offset="100%"></stop>
</linearGradient>
<rect id="path-2" x="0" y="0" width="122" height="34"></rect>
</defs>
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="push-notifications" transform="translate(0.000000, 1.000000)">
<g id="Onboarding">
<g id="0.4---Allow-Push-Notifications">
<g id="Group-7">
<path d="M123.5,247 C191.707167,247 247,191.707167 247,123.5 C247,55.2928334 191.707167,1.42108547e-14 123.5,1.42108547e-14 C55.2928334,1.42108547e-14 1.42108547e-14,55.2928334 1.42108547e-14,123.5 C1.42108547e-14,191.707167 55.2928334,247 123.5,247 Z" id="Oval-2" fill="url(#linearGradient-1)" fill-rule="nonzero" opacity="0.300000012"></path>
<g id="Phone" transform="translate(62.000000, 0.000000)" stroke="#707D89" stroke-width="2">
<rect id="Combined-Shape" fill-opacity="0.65" fill="#192C3A" fill-rule="nonzero" x="0" y="0" width="122.16932" height="220.464844" rx="8"></rect>
<path d="M0.636298539,187 L121.533021,187" id="Line" stroke-linecap="square"></path>
<path d="M50.2675846,203 L73.174332,203" id="Line" stroke-linecap="square"></path>
</g>
<ellipse id="Oval-2" stroke="#707D89" stroke-width="2" fill-opacity="0.41907269" fill="#192C3A" fill-rule="nonzero" opacity="0.945615695" cx="169" cy="57.4884375" rx="47" ry="44.4884375"></ellipse>
<g id="Group-3" transform="translate(62.000000, 33.000000)">
<path d="M12.7105489,19.5 L50.4911698,19.5" id="Line" stroke="#12E5B6" stroke-width="3" stroke-linecap="square"></path>
<path d="M21.96,10.4166666 L43.0026407,10.4166666" id="Line" stroke="#12E5B6" stroke-width="3" stroke-linecap="square"></path>
<g id="Rectangle-3">
<g id="path-2-Clipped">
<mask id="mask-3" fill="white">
<use xlink:href="#path-2"></use>
</mask>
<g id="path-2"></g>
<rect id="path-2" stroke="#707D89" stroke-width="2" mask="url(#mask-3)" x="0" y="0" width="122" height="34"></rect>
</g>
</g>
</g>
<g id="android-notifications-none" opacity="0.900000036" transform="translate(144.642407, 28.000000)" fill-rule="nonzero" fill="#FFFFFF">
<path d="M24.5218837,9.5815024 C25.5031747,9.5815024 27.8345547,10.1736779 27.8345547,10.1736779 C34.1505329,11.5548918 38.5961981,17.1067187 38.5961981,23.375 L38.5961981,38.5 L38.5961981,40.2467788 L39.8875454,41.4848077 L40.9665083,42.5190986 L7.80017568,42.5190986 L8.87913857,41.4848077 L10.1704859,40.2467788 L10.1704859,38.5 L10.1704859,23.375 C10.1704859,17.106851 14.616151,11.5548918 20.9321293,10.1736779 C20.9321293,10.1736779 23.4318375,9.5815024 24.2448003,9.5815024 L24.5218837,9.5815024 Z M24.383342,0 C21.9447307,0 20.0803748,1.78723558 20.0803748,4.125 L20.0803748,6.04986779 C11.9043355,7.83776442 5.73715099,14.9875 5.73715099,23.375 L5.73715099,38.5 L-6.82121026e-13,44 L-6.82121026e-13,46.75 L48.766684,46.75 L48.766684,44 L43.029533,38.5 L43.029533,23.375 C43.029533,14.9875 36.8622099,7.83776442 28.6863091,6.04986779 L28.6863091,4.125 C28.6863091,1.78723558 26.8219533,0 24.383342,0 L24.383342,0 L24.383342,0 Z M30.120493,49.5 L18.6460524,49.5 C18.6460524,52.5251322 21.2275002,55 24.383342,55 C27.5391837,55 30.120493,52.5251322 30.120493,49.5 L30.120493,49.5 L30.120493,49.5 Z" id="Shape"></path>
</g>
</g>
</g>
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 4.4 KiB

View File

@ -0,0 +1,47 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="247px" height="247px" viewBox="0 0 247 247" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 42 (36781) - http://www.bohemiancoding.com/sketch -->
<title>tour-control</title>
<desc>Created with Sketch.</desc>
<defs>
<linearGradient x1="50%" y1="0%" x2="50%" y2="89.4673583%" id="linearGradient-1">
<stop stop-color="#192C3A" offset="0%"></stop>
<stop stop-color="#192C3A" offset="100%"></stop>
</linearGradient>
</defs>
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="tour-control">
<g id="Onboarding">
<g id="0.2.3---Tour-3">
<g id="bg-3">
<path d="M123.5,247 C191.707167,247 247,191.707167 247,123.5 C247,55.2928334 191.707167,1.42108547e-14 123.5,1.42108547e-14 C55.2928334,1.42108547e-14 1.42108547e-14,55.2928334 1.42108547e-14,123.5 C1.42108547e-14,191.707167 55.2928334,247 123.5,247 Z" id="Oval-2" fill="url(#linearGradient-1)" fill-rule="nonzero" opacity="0.300000012"></path>
<rect id="Combined-Shape" stroke="#707D89" stroke-width="2" fill-opacity="0.65" fill="#192C3A" fill-rule="nonzero" x="63" y="24" width="99.8310062" height="183.875349" rx="8"></rect>
<path d="M63.5199532,180.634556 L162.311053,180.634556" id="Line" stroke="#707D89" stroke-width="2" stroke-linecap="square"></path>
<path d="M104.076299,194.254952 L122.794613,194.254952" id="Line" stroke="#707D89" stroke-width="2" stroke-linecap="square"></path>
<g id="Group-4" transform="translate(98.000000, 79.000000)" stroke="#FFFFFF">
<g id="top-up">
<g id="shopping-48px-outline_bitcoin" transform="translate(0.666667, 0.180606)">
<g id="Group" transform="translate(0.619048, 0.627502)">
<path d="M12.3809524,0 L12.3809524,7.5300202" id="Shape"></path>
<path d="M17.3333333,0 L17.3333333,7.5300202" id="Shape"></path>
<path d="M12.3809524,47.6901279 L12.3809524,55.2201481" id="Shape"></path>
<path d="M17.3333333,47.6901279 L17.3333333,55.2201481" id="Shape"></path>
<path d="M0,47.6901279 L7.42857143,47.6901279" id="Shape-Copy"></path>
<path d="M0,7.5300202 L7.42857143,7.5300202" id="Shape-Copy-2"></path>
<path d="M7.42857143,25.1000673 L7.42857143,7.5300202 L21.8042328,7.5300202 C26.9010582,7.5300202 30.952381,11.4205306 30.952381,16.3150438 C30.952381,21.2095569 26.9010582,25.1000673 21.8042328,25.1000673" id="Shape"></path>
<path d="M7.42857143,47.6901279 L7.42857143,25.1000673 L23.6785714,25.1000673 C29.0952381,25.1000673 33.4285714,30.1200808 33.4285714,36.3950976 C33.4285714,42.6701145 29.0952381,47.6901279 23.6785714,47.6901279 L7.42857143,47.6901279 Z" id="Shape"></path>
</g>
</g>
</g>
</g>
<g id="Group-3" transform="translate(125.000000, 122.000000)" stroke="#677AE7" stroke-width="2">
<rect id="Rectangle-path" fill="#192C3A" fill-rule="nonzero" x="0.00547760651" y="37.6483369" width="74.7600358" height="65.7214967" rx="4"></rect>
<path d="M18.6954866,37.6483369 L18.6954866,18.8707664 C18.6954866,8.54310266 27.1059906,0.0931959432 37.3854955,0.0931959432 L37.3854955,0.0931959432 C47.6650004,0.0931959432 56.0755044,8.54310266 56.0755044,18.8707664 L56.0755044,37.6483369" id="Shape"></path>
<path d="M36.6300769,65.8146926 L36.6300769,75.2034779" id="Shape" fill="#F9F9F9" fill-rule="nonzero"></path>
</g>
</g>
</g>
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 4.2 KiB

View File

@ -0,0 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="377px" height="247px" viewBox="0 0 377 247" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 42 (36781) - http://www.bohemiancoding.com/sketch -->
<title>tour-currency</title>
<desc>Created with Sketch.</desc>
<defs>
<linearGradient x1="50.0034413%" y1="0.00943319838%" x2="50.0034413%" y2="89.4694332%" id="linearGradient-1">
<stop stop-color="#192C3A" offset="0%"></stop>
<stop stop-color="#192C3A" offset="100%"></stop>
</linearGradient>
<linearGradient x1="50%" y1="100.020333%" x2="50%" y2="0.0203333333%" id="linearGradient-2">
<stop stop-color="#192C3A" offset="0%"></stop>
<stop stop-color="#192C3A" offset="100%"></stop>
</linearGradient>
</defs>
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="tour-currency" transform="translate(-1.000000, 0.000000)">
<path d="M189.5,247 C257.7,247 313,191.7 313,123.5 C313,55.3 257.7,0 189.5,0 C121.3,0 66,55.3 66,123.5 C66,191.7 121.3,247 189.5,247 Z" id="Shape" fill="url(#linearGradient-1)" fill-rule="nonzero" opacity="0.3"></path>
<polygon id="Shape" fill="url(#linearGradient-2)" fill-rule="nonzero" opacity="0.3" points="56.3 127.3 99.7 97.8 142.1 119.9 186.6 80.7 224.9 80.7 249.7 47.5 282.8 67.2 323.2 56.1 377 35 377 185 152.1 185 2.4 185 2 133.5"></polygon>
<g id="Group" opacity="0.3" transform="translate(76.000000, 61.000000)" fill-rule="nonzero" fill="#677AE7">
<path d="M226.2,124 L225.7,124 L225.7,120 L226.2,120 L226.2,124 Z M226.2,116 L225.7,116 L225.7,112 L226.2,112 L226.2,116 Z M226.2,108 L225.7,108 L225.7,104 L226.2,104 L226.2,108 Z M226.2,100 L225.7,100 L225.7,96 L226.2,96 L226.2,100 Z M226.2,92 L225.7,92 L225.7,88 L226.2,88 L226.2,92 Z M226.2,84 L225.7,84 L225.7,80 L226.2,80 L226.2,84 Z M226.2,76 L225.7,76 L225.7,72 L226.2,72 L226.2,76 Z M226.2,68 L225.7,68 L225.7,64 L226.2,64 L226.2,68 Z M226.2,60 L225.7,60 L225.7,56 L226.2,56 L226.2,60 Z M226.2,52 L225.7,52 L225.7,48 L226.2,48 L226.2,52 Z M226.2,44 L225.7,44 L225.7,40 L226.2,40 L226.2,44 Z M226.2,36 L225.7,36 L225.7,32 L226.2,32 L226.2,36 Z M226.2,28 L225.7,28 L225.7,24 L226.2,24 L226.2,28 Z M226.2,20 L225.7,20 L225.7,16 L226.2,16 L226.2,20 Z M226.2,12 L225.7,12 L225.7,8 L226.2,8 L226.2,12 Z M226.2,4 L225.7,4 L225.7,0 L226.2,0 L226.2,4 Z" id="Shape"></path>
<path d="M151.2,124 L150.7,124 L150.7,120 L151.2,120 L151.2,124 Z M151.2,116 L150.7,116 L150.7,112 L151.2,112 L151.2,116 Z M151.2,108 L150.7,108 L150.7,104 L151.2,104 L151.2,108 Z M151.2,100 L150.7,100 L150.7,96 L151.2,96 L151.2,100 Z M151.2,92 L150.7,92 L150.7,88 L151.2,88 L151.2,92 Z M151.2,84 L150.7,84 L150.7,80 L151.2,80 L151.2,84 Z M151.2,76 L150.7,76 L150.7,72 L151.2,72 L151.2,76 Z M151.2,68 L150.7,68 L150.7,64 L151.2,64 L151.2,68 Z M151.2,60 L150.7,60 L150.7,56 L151.2,56 L151.2,60 Z M151.2,52 L150.7,52 L150.7,48 L151.2,48 L151.2,52 Z M151.2,44 L150.7,44 L150.7,40 L151.2,40 L151.2,44 Z M151.2,36 L150.7,36 L150.7,32 L151.2,32 L151.2,36 Z M151.2,28 L150.7,28 L150.7,24 L151.2,24 L151.2,28 Z M151.2,20 L150.7,20 L150.7,16.8 L151.2,16.8 L151.2,20 Z" id="Shape"></path>
<path d="M76.2,124 L75.7,124 L75.7,120 L76.2,120 L76.2,124 Z M76.2,116 L75.7,116 L75.7,112 L76.2,112 L76.2,116 Z M76.2,108 L75.7,108 L75.7,104 L76.2,104 L76.2,108 Z M76.2,100 L75.7,100 L75.7,96 L76.2,96 L76.2,100 Z M76.2,92 L75.7,92 L75.7,88 L76.2,88 L76.2,92 Z M76.2,84 L75.7,84 L75.7,80 L76.2,80 L76.2,84 Z M76.2,76 L75.7,76 L75.7,72 L76.2,72 L76.2,76 Z M76.2,68 L75.7,68 L75.7,64 L76.2,64 L76.2,68 Z M76.2,60 L75.7,60 L75.7,56 L76.2,56 L76.2,60 Z M76.2,52 L75.7,52 L75.7,50 L76.2,50 L76.2,52 Z" id="Shape"></path>
<path d="M1.2,124 L0.7,124 L0.7,120 L1.2,120 L1.2,124 Z M1.2,116 L0.7,116 L0.7,112 L1.2,112 L1.2,116 Z M1.2,108 L0.7,108 L0.7,104 L1.2,104 L1.2,108 Z M1.2,100 L0.7,100 L0.7,96 L1.2,96 L1.2,100 Z M1.2,92 L0.7,92 L0.7,88 L1.2,88 L1.2,92 Z M1.2,84 L0.7,84 L0.7,80 L1.2,80 L1.2,84 Z M1.2,76 L0.7,76 L0.7,72 L1.2,72 L1.2,76 Z M1.2,68 L0.7,68 L0.7,64 L1.2,64 L1.2,68 Z M1.2,60 L0.7,60 L0.7,56 L1.2,56 L1.2,60 Z" id="Shape"></path>
</g>
<path d="M2,134.5 C1.5,134.5 1.1,134.1 1,133.6 C0.9,133.1 1.3,132.6 1.9,132.5 L56,126.3 L99.1,97 C99.4,96.8 99.8,96.8 100.1,96.9 L141.9,118.7 L185.9,80 C186.1,79.8 186.3,79.8 186.6,79.8 L224.4,79.8 L248.9,47 C249.2,46.6 249.8,46.5 250.2,46.7 L282.9,66.2 L322.8,55.2 L376.6,34.1 C377.1,33.9 377.7,34.2 377.9,34.7 C378.1,35.2 377.8,35.8 377.3,36 L323.5,57.1 L323.4,57.1 L283,68.2 C282.7,68.3 282.5,68.2 282.2,68.1 L250,48.9 L225.7,81.4 C225.5,81.7 225.2,81.8 224.9,81.8 L187,81.8 L142.8,120.8 C142.5,121.1 142,121.1 141.7,120.9 L99.8,99 L56.9,128.2 C56.8,128.3 56.6,128.3 56.5,128.4 L2.2,134.6 C2.1,134.5 2,134.5 2,134.5 Z" id="Shape" fill="#677AE7" fill-rule="nonzero"></path>
<g id="Group" transform="translate(185.000000, 38.000000)">
<path d="M4.5,0.5 L4.5,146.5" id="Line_1_" stroke="#0085FF" stroke-width="2" stroke-linecap="square" opacity="0.64"></path>
<circle id="dot" stroke="#FFFFFF" stroke-width="3" fill="#1A2A71" fill-rule="nonzero" cx="4.5" cy="41.5" r="4.5"></circle>
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 5.3 KiB

View File

@ -0,0 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="247px" height="247px" viewBox="0 0 247 247" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 42 (36781) - http://www.bohemiancoding.com/sketch -->
<title>onboarding-tour-phone</title>
<desc>Created with Sketch.</desc>
<defs>
<linearGradient x1="50.0034413%" y1="-0.00291497976%" x2="50.0034413%" y2="75.267085%" id="linearGradient-1">
<stop stop-color="#192C3A" offset="0%"></stop>
<stop stop-color="#192C3A" offset="100%"></stop>
</linearGradient>
</defs>
<g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="onboarding-tour-phone">
<path d="M123.5,247 C191.7,247 247,191.7 247,123.5 C247,55.3 191.7,0 123.5,0 C55.3,0 0,55.3 0,123.5 C0,191.7 55.3,247 123.5,247 Z" id="Shape" fill="url(#linearGradient-1)" fill-rule="nonzero" opacity="0.3"></path>
<g id="Group" transform="translate(69.000000, 32.000000)" stroke="#707D89" stroke-width="2">
<path d="M8,0 L91.8,0 C96.2,0 99.8,3.6 99.8,8 L99.8,175.9 C99.8,180.3 96.2,183.9 91.8,183.9 L8,183.9 C3.6,183.9 0,180.3 0,175.9 L0,8 C0,3.6 3.6,0 8,0 Z" id="Shape" fill-opacity="0.6548" fill="#192C3A" fill-rule="nonzero"></path>
<path d="M0.5,156 L99.3,156" id="Shape" stroke-linecap="square"></path>
<path d="M44.1,170.3 L62.8,170.3" id="Shape" stroke-linecap="square"></path>
</g>
<g id="Group" transform="translate(102.000000, 66.000000)" fill-rule="nonzero" fill="#677AE7">
<path d="M31.8,0 L0,0 L0,31.8 L31.8,31.8 L31.8,0 L31.8,0 Z M27.3,27.3 L4.6,27.3 L4.6,4.5 L27.3,4.5 L27.3,27.3 L27.3,27.3 Z" id="Shape"></path>
<polygon id="Shape" points="65.9 90.9 61.4 90.9 61.4 100 100 100 100 95.5 65.9 95.5"></polygon>
<rect id="Rectangle-path" x="9.1" y="9.1" width="13.6" height="13.6"></rect>
<path d="M0,100 L31.8,100 L31.8,68.2 L0,68.2 L0,100 L0,100 Z M4.5,72.7 L27.2,72.7 L27.2,95.4 L4.5,95.4 L4.5,72.7 L4.5,72.7 Z" id="Shape"></path>
<rect id="Rectangle-path" x="9.1" y="77.3" width="13.6" height="13.6"></rect>
<path d="M68.2,0 L68.2,31.8 L100,31.8 L100,0 L68.2,0 L68.2,0 Z M95.5,27.3 L72.8,27.3 L72.8,4.5 L95.5,4.5 L95.5,27.3 L95.5,27.3 Z" id="Shape"></path>
<rect id="Rectangle-path" x="77.3" y="9.1" width="13.6" height="13.6"></rect>
<rect id="Rectangle-path" x="90.9" y="36.4" width="9.1" height="9.1"></rect>
<rect id="Rectangle-path" x="0" y="54.5" width="9.1" height="9.1"></rect>
<polygon id="Shape" points="47.7 36.4 29.5 36.4 29.5 40.9 52.3 40.9 52.3 31.8 52.3 27.3 56.8 27.3 56.8 18.2 52.3 18.2 47.7 18.2 43.2 18.2 43.2 9.1 47.7 9.1 47.7 13.6 63.6 13.6 63.6 0 59.1 0 59.1 9.1 52.3 9.1 52.3 0 50 0 40.9 0 38.6 0 38.6 22.7 47.7 22.7 47.7 27.3 38.6 27.3 38.6 31.8 47.7 31.8"></polygon>
<polygon id="Shape" points="6.8 50 15.9 50 20.5 50 22.7 50 22.7 54.5 13.6 54.5 13.6 59.1 22.7 59.1 22.7 63.6 40.9 63.6 40.9 59.1 27.3 59.1 27.3 54.5 27.3 45.5 20.5 45.5 20.5 38.6 15.9 38.6 15.9 45.5 11.4 45.5 11.4 36.4 0 36.4 0 40.9 6.8 40.9"></polygon>
<polygon id="Shape" points="50 90.9 50 79.5 40.9 79.5 40.9 70.5 36.4 70.5 36.4 84.1 45.5 84.1 45.5 90.9 36.4 90.9 36.4 95.5 45.5 95.5 45.5 100 56.8 100 56.8 95.5 50 95.5"></polygon>
<polygon id="Shape" points="72.7 45.5 63.6 45.5 63.6 34.1 59.1 34.1 59.1 50 81.8 50 81.8 45.5 77.3 45.5 77.3 40.9 84.1 40.9 84.1 36.4 77.3 36.4 72.7 36.4 68.2 36.4 68.2 40.9 72.7 40.9"></polygon>
<polygon id="Shape" points="68.2 86.4 75 86.4 75 90.9 84.1 90.9 84.1 86.4 84.1 81.8 84.1 75 75 75 75 81.8 68.2 81.8 68.2 75 63.6 75 63.6 81.8 59.1 81.8 59.1 63.6 54.5 63.6 54.5 59.1 50 59.1 50 45.5 34.1 45.5 34.1 54.5 38.6 54.5 38.6 50 45.5 50 45.5 59.1 45.5 68.2 54.5 68.2 54.5 81.8 54.5 86.4 59.1 86.4 63.6 86.4"></polygon>
<polygon id="Shape" points="95.5 56.8 88.6 56.8 84.1 56.8 72.7 56.8 72.7 65.9 68.2 65.9 68.2 56.8 63.6 56.8 63.6 70.5 77.3 70.5 77.3 61.4 84.1 61.4 84.1 68.2 88.6 68.2 88.6 61.4 95.5 61.4 95.5 75 88.6 75 88.6 88.6 100 88.6 100 84.1 93.2 84.1 93.2 79.5 100 79.5 100 61.4 100 56.8 100 50 95.5 50"></polygon>
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 4.3 KiB

View File

Before

Width:  |  Height:  |  Size: 1006 B

After

Width:  |  Height:  |  Size: 1006 B

View File

@ -13,9 +13,12 @@
$colors: (
primary: #1e3186,
secondary: #111b49,
danger: #ffa500,
accent: #647ce8,
warning: #EBA133,
danger: #bb331a,
success: #7BC94D,
light: #f4f4f4,
dark: #222
dark: #222,
);
$text-color: #1e3186;

View File

@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg width="155px" height="155px" viewBox="0 0 155 155" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
<title>warning</title>
<desc>Created with Sketch.</desc>
<defs></defs>
<g id="Onboarding" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.699999988">
<g id="0.5--Request-Backup" transform="translate(-112.000000, -63.000000)" stroke-width="5" stroke="#1abb9b">
<g id="warning" transform="translate(115.000000, 66.000000)">
<g id="Group">
<circle id="Oval" cx="74.5" cy="74.5" r="74.5"></circle>
<path d="M74,40.6363636 L74,81.2727273" id="Shape"></path>
<path d="M74,101.590909 L74,108.363636" id="Shape"></path>
</g>
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1006 B

View File

@ -13,9 +13,12 @@
$colors: (
primary: #192c3a,
secondary: #31465b,
accent: #1abb9b,
warning: #EBA133,
danger: #bb331a,
success: #7BC94D,
light: #f4f4f4,
dark: #222
dark: #222,
);
$text-color: #192c3a;

View File

@ -178,7 +178,13 @@ export function providersComponents() {
@NgModule({
declarations: declarationsComponents(),
imports: [
IonicModule.forRoot(CopayApp, { tabsHideOnSubPages: true }),
IonicModule.forRoot(CopayApp, {
tabsHideOnSubPages: true,
modalEnter: 'modal-slide-in',
modalLeave: 'modal-slide-out',
tabsPlacement: 'bottom',
pageTransition: 'ios-transition'
}),
BrowserModule,
HttpModule,
NgLoggerModule.forRoot(Level.LOG),

View File

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

View File

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

View File

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 11 KiB

View File

@ -5,7 +5,7 @@
</ion-header>
<ion-content>
<ion-segment [(ngModel)]="selectedTab" color="primary" (ionChange)="selectTab(selectedTab)">
<ion-segment [(ngModel)]="selectedTab" color="accent" (ionChange)="selectTab(selectedTab)">
<ion-segment-button value="words" translate>
Words
</ion-segment-button>
@ -53,7 +53,7 @@
<ion-item>
<ion-label stacked>Testnet</ion-label>
<ion-toggle [(ngModel)]="formData.testnet" formControlName="testnet" (ionChange)="setDerivationPath()"></ion-toggle>
<ion-toggle [(ngModel)]="formData.testnet" color="accent" formControlName="testnet" (ionChange)="setDerivationPath()"></ion-toggle>
</ion-item>
</div>

View File

@ -1,8 +1,6 @@
<ion-content>
<div class="confirm-modal-header">
<div>
<img src='assets/img/onboarding-success.svg'/>
</div>
<img src='assets/img/backup/success.svg'/>
</div>
<div class="confirm-modal-content">
<div>
@ -12,7 +10,7 @@
<div class="confirm-modal-message">
<span translate>Be sure to store your recovery phrase in a secure place. If this app is deleted, your money cannot be recovered without it.</span>
</div>
<button (click)="closeBackupResultModal()" translate>Got it</button>
<button ion-button clear (click)="closeBackupResultModal()" translate>Got it</button>
</div>
</div>
</ion-content>

View File

@ -1,5 +1,5 @@
.confirm-modal-header {
background: green;
background: color($colors, success);
padding: 1rem;
border-radius: 12px 12px 0 0;
min-height: 120px;
@ -21,7 +21,6 @@
font-size: 1.6rem;
}
button {
padding-top: 2rem;
background: none;
font-size: 1.6rem;
}

View File

@ -26,7 +26,7 @@
<div class="buttons">
<div class="tldr" translate>We'll confirm on the next screen.</div>
<button [disabled]="wallet.credentials.mnemonicEncrypted || error" (click)="slideNext()" translate>I've written it down</button>
<button ion-button block [disabled]="wallet.credentials.mnemonicEncrypted || error" (click)="slideNext()" translate>I've written it down</button>
</div>
</div>
</ion-slide>
@ -35,13 +35,13 @@
<div>
<div translate>Let's verify your backup phrase.</div>
<div class="phrase">
<button *ngFor="let customWord of customWords; let i = index" (click)="removeButton(i, customWord)">{{customWord.word}}</button>
<button ion-button outline *ngFor="let customWord of customWords; let i = index" (click)="removeButton(i, customWord)">{{customWord.word}}</button>
</div>
<div class="buttons">
<div *ngIf="!selectComplete">
<div class="tldr" translate>Please tap each word in the correct order.</div>
<div>
<button *ngFor="let shuffledWord of shuffledMnemonicWords; let i = index"
<button ion-button *ngFor="let shuffledWord of shuffledMnemonicWords; let i = index"
(click)="addButton(i, shuffledWord)"
[disabled]="shuffledWord.selected">{{shuffledWord.word}}
</button>
@ -51,8 +51,8 @@
<div *ngIf="selectComplete">
<div class="tldr" translate>Is this correct?</div>
<div>
<button (click)="slideNext();" translate>Confirm</button>
<button (click)="initFlow();" translate>Clear</button>
<button ion-button block (click)="slideNext();" translate>Confirm</button>
<button ion-button block outline (click)="initFlow();" translate>Clear</button>
</div>
</div>
</div>
@ -75,7 +75,7 @@
</div>
<div class="buttons">
<button [disabled]="!passphrase" (click)="finalStep();" translate>Confirm</button>
<button ion-button block [disabled]="!passphrase" (click)="finalStep();" translate>Confirm</button>
</div>
</ion-slide>
</ion-slides>

View File

@ -9,18 +9,18 @@
.password-required {
padding: 2rem;
font-size: 14px;
color: #DB5B44;
color: color($colors, danger);
}
.password {
background-color: #f2f2f2;
background-color: color($colors, light);
padding: 2rem;
}
.phrase {
display: -webkit-box;
background: #f2f2f2;
background: color($colors, light);
border: 2px dashed #d9d9d9;
border-radius: 3px;
color: #445;
color: color($colors, secondary);
text-align: center;
max-width: 500px;
min-height: 12rem;

View File

@ -1,6 +1,6 @@
<ion-content>
<div class="warning-modal-header">
<img src='assets/img/no-screenshot.svg'/>
<img src='assets/img/backup/no-screenshot.svg'/>
</div>
<div class="warning-modal-content">
<div>
@ -10,7 +10,7 @@
<div class="warning-modal-message">
<span translate>If you take a screenshot, your backup may be viewed by other apps. You can make a safe backup with physical paper and a pen.</span>
</div>
<button (click)="close()" translate>I understand</button>
<button ion-button clear (click)="close()" translate>I understand</button>
</div>
</div>
</ion-content>

View File

@ -1,5 +1,5 @@
.warning-modal-header {
background: orange;
background: color($colors, warning);
padding: 1rem;
border-radius: 12px 12px 0 0;
min-height: 120px;
@ -21,7 +21,6 @@
font-size: 1.6rem;
}
button {
padding-top: 2rem;
background: none;
font-size: 1.6rem;
}

View File

@ -10,7 +10,7 @@
<div translate>Are you being watched?</div>
<div translate>Now is a perfect time to assess your surroundings. Nearby windows? Hidden cameras? Shoulder-spies?</div>
<div>
<img src='assets/img/backup-warning.svg'/>
<img src='assets/img/backup/backup-warning.svg'/>
</div>
<div class="buttons">
<div translate>Anyone with your backup phrase can access or spend your bitcoin.</div>

View File

@ -1,6 +1,6 @@
<ion-content>
<div class="header">
<img src="assets/img/warning.svg" />
<img src="assets/img/app/onboarding/warning.svg" />
<p translate>No backup, no bitcoin.</p>
<p translate>Since only you control your money, youll need to save your backup phrase in case this app is deleted.</p>
</div>

View File

@ -19,8 +19,56 @@ $app-direction: ltr;
// To view all the possible Ionic variables, see:
// http://ionicframework.com/docs/theming/overriding-ionic-variables/
// TODO: Custom variables (backward compatibilities). Will be REMOVED
// Override - Homogenized ionic component styles
@import 'overrides';
/* filled button */
$button-ios-background-color: color($colors, accent);
$button-md-background-color: color($colors, accent);
$button-wp-background-color: color($colors, accent);
/* outline button */
$button-ios-outline-text-color: color($colors, accent) !important;
$button-md-outline-text-color: color($colors, accent) !important;
$button-wp-outline-text-color: color($colors, accent) !important;
/* pagination bullets */
.swiper-pagination-bullet-active {
background: color($colors, accent) !important;
}
/* checkbox */
$checkbox-ios-icon-border-color-off: color($colors, accent);
$checkbox-md-icon-border-color-off: color($colors, accent);
$checkbox-wp-icon-border-color-off: color($colors, accent);
$checkbox-ios-icon-border-color-on: color($colors, accent);
$checkbox-md-icon-border-color-on: color($colors, accent);
$checkbox-wp-icon-border-color-on: color($colors, accent);
$checkbox-ios-background-color-on: color($colors, accent);
$checkbox-md-icon-background-color-on: color($colors, accent);
$checkbox-wp-icon-background-color-on: color($colors, accent);
$checkbox-md-icon-border-radius: 50%;
$checkbox-wp-icon-border-radius: 50%;
$checkbox-md-icon-size: 21px;
$checkbox-wp-icon-size: 21px;
$checkbox-md-item-start-margin-end: 20px;
.checkbox-md, .checkbox-wp {
.checkbox-checked .checkbox-inner {
margin-top: 2px;
margin-left: 2px;
}
}
/* alert buttons */
$alert-ios-button-text-color: color($colors, accent);
$alert-md-button-text-color: color($colors, accent);
// App iOS Variables
// --------------------------------------------------