diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2019-09-05 12:26:16 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2019-09-05 15:09:56 +0200 |
| commit | 230c85bafb25ff05cb2271c08cdfc17775b98ff9 (patch) | |
| tree | d52b6bfd83980a1a472e632e622f9358557b9d6f | |
| parent | 0bccc7ec2d619c6133e78465bc4c1a9afffb7638 (diff) | |
| download | mullvadvpn-230c85bafb25ff05cb2271c08cdfc17775b98ff9.tar.xz mullvadvpn-230c85bafb25ff05cb2271c08cdfc17775b98ff9.zip | |
Update red to 227, 64, 57 / #E34039
| -rw-r--r-- | android/src/main/res/drawable/icon_alert.xml | 2 | ||||
| -rw-r--r-- | android/src/main/res/drawable/icon_fail.xml | 2 | ||||
| -rw-r--r-- | android/src/main/res/values/colors.xml | 8 | ||||
| -rwxr-xr-x | gui/assets/images/icon-fail.svg | 2 | ||||
| -rwxr-xr-x | gui/assets/images/location-marker-unsecure.svg | 4 | ||||
| -rw-r--r-- | gui/src/config.json | 8 | ||||
| -rw-r--r-- | gui/src/renderer/components/HeaderBar.tsx | 2 | ||||
| -rw-r--r-- | gui/src/renderer/components/SecuredLabel.tsx | 2 | ||||
| -rw-r--r-- | ios/AdditionalAssets/DangerButton.svg | 2 | ||||
| -rw-r--r-- | ios/AdditionalAssets/TranslucentDangerButton.svg | 2 |
10 files changed, 17 insertions, 17 deletions
diff --git a/android/src/main/res/drawable/icon_alert.xml b/android/src/main/res/drawable/icon_alert.xml index d07f49427b..f0641cc57d 100644 --- a/android/src/main/res/drawable/icon_alert.xml +++ b/android/src/main/res/drawable/icon_alert.xml @@ -6,7 +6,7 @@ android:viewportWidth="24.0" android:viewportHeight="24.0" > - <path android:fillColor="#D0021B" + <path android:fillColor="#E34039" android:pathData="m12 24c-6.627417 0-12-5.372583-12-12s5.372583-12 12-12 12 5.372583 12 12-5.372583 12-12 12zm0-19.5c-.8284271 0-1.5.67157288-1.5 1.5v7.5c0 .8284271.6715729 1.5 1.5 1.5s1.5-.6715729 1.5-1.5v-7.5c0-.82842712-.6715729-1.5-1.5-1.5zm0 12c-.8284271 0-1.5.6715729-1.5 1.5s.6715729 1.5 1.5 1.5 1.5-.6715729 1.5-1.5-.6715729-1.5-1.5-1.5z" /> </vector> diff --git a/android/src/main/res/drawable/icon_fail.xml b/android/src/main/res/drawable/icon_fail.xml index 61d9ad79d8..cd0d9d5caf 100644 --- a/android/src/main/res/drawable/icon_fail.xml +++ b/android/src/main/res/drawable/icon_fail.xml @@ -10,7 +10,7 @@ <path android:fillColor="#FFFFFF" android:pathData="M8 30 a 22,22 0 1,0 44,0 a 22,22 0 1,0 -44,0 Z" /> - <path android:fillColor="#D0021B" + <path android:fillColor="#E34039" android:pathData="M33.2371523,30 L41.337119,21.9033278 C42.2203329,21.020473 42.223948,19.5681264 41.3300331,18.6745751 C40.429886,17.774794 38.9899682,17.7778525 38.0999667,18.6674921 L30,26.7641643 L21.9000333,18.6674921 C21.0100318,17.7778525 19.570114,17.774794 18.6699669,18.6745751 C17.776052,19.5681264 17.7796671,21.020473 18.662881,21.9033278 L26.7628477,30 L18.662881,38.0966722 C17.7796671,38.979527 17.776052,40.4318736 18.6699669,41.3254249 C19.570114,42.225206 21.0100318,42.2221475 21.9000333,41.3325079 L30,33.2358357 L38.0999667,41.3325079 C38.9899682,42.2221475 40.429886,42.225206 41.3300331,41.3254249 C42.223948,40.4318736 42.2203329,38.979527 41.337119,38.0966722 L33.2371523,30 Z" /> </group> diff --git a/android/src/main/res/values/colors.xml b/android/src/main/res/values/colors.xml index 44b8896a0a..58555c59af 100644 --- a/android/src/main/res/values/colors.xml +++ b/android/src/main/res/values/colors.xml @@ -13,10 +13,10 @@ <color name="white20">#33FFFFFF</color> <color name="green">#44AD4D</color> <color name="green90">#E644AD4D</color> - <color name="red">#D0021B</color> - <color name="red95">#C6021A</color> - <color name="red45">#73021B</color> - <color name="red40">#66021B</color> + <color name="red">#FFE34039</color> + <color name="red95">#F2E34039</color> + <color name="red45">#72E34039</color> + <color name="red40">#66E34039</color> <color name="yellow">#FFD323</color> <color name="textInputBorder">#234161</color> diff --git a/gui/assets/images/icon-fail.svg b/gui/assets/images/icon-fail.svg index 3467374198..544d0d4ed7 100755 --- a/gui/assets/images/icon-fail.svg +++ b/gui/assets/images/icon-fail.svg @@ -4,5 +4,5 @@ <desc>Mullvad VPN app</desc> <defs></defs> <circle id="bg-circle" fill="#FFFFFF" fill-rule="nonzero" cx="30" cy="30" r="22"></circle> - <path d="M33.2371523,30 L41.337119,21.9033278 C42.2203329,21.020473 42.223948,19.5681264 41.3300331,18.6745751 C40.429886,17.774794 38.9899682,17.7778525 38.0999667,18.6674921 L30,26.7641643 L21.9000333,18.6674921 C21.0100318,17.7778525 19.570114,17.774794 18.6699669,18.6745751 C17.776052,19.5681264 17.7796671,21.020473 18.662881,21.9033278 L26.7628477,30 L18.662881,38.0966722 C17.7796671,38.979527 17.776052,40.4318736 18.6699669,41.3254249 C19.570114,42.225206 21.0100318,42.2221475 21.9000333,41.3325079 L30,33.2358357 L38.0999667,41.3325079 C38.9899682,42.2221475 40.429886,42.225206 41.3300331,41.3254249 C42.223948,40.4318736 42.2203329,38.979527 41.337119,38.0966722 L33.2371523,30 Z" id="icon" fill="#D0021B" fill-rule="nonzero"></path> + <path d="M33.2371523,30 L41.337119,21.9033278 C42.2203329,21.020473 42.223948,19.5681264 41.3300331,18.6745751 C40.429886,17.774794 38.9899682,17.7778525 38.0999667,18.6674921 L30,26.7641643 L21.9000333,18.6674921 C21.0100318,17.7778525 19.570114,17.774794 18.6699669,18.6745751 C17.776052,19.5681264 17.7796671,21.020473 18.662881,21.9033278 L26.7628477,30 L18.662881,38.0966722 C17.7796671,38.979527 17.776052,40.4318736 18.6699669,41.3254249 C19.570114,42.225206 21.0100318,42.2221475 21.9000333,41.3325079 L30,33.2358357 L38.0999667,41.3325079 C38.9899682,42.2221475 40.429886,42.225206 41.3300331,41.3254249 C42.223948,40.4318736 42.2203329,38.979527 41.337119,38.0966722 L33.2371523,30 Z" id="icon" fill="#E34039" fill-rule="nonzero"></path> </svg>
\ No newline at end of file diff --git a/gui/assets/images/location-marker-unsecure.svg b/gui/assets/images/location-marker-unsecure.svg index 509b8022f2..c46bdde2d7 100755 --- a/gui/assets/images/location-marker-unsecure.svg +++ b/gui/assets/images/location-marker-unsecure.svg @@ -11,9 +11,9 @@ <feColorMatrix values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.5 0" type="matrix" in="shadowBlurOuter1"></feColorMatrix> </filter> </defs> - <circle id="outer-circle" fill-opacity="0.4" fill="#D0021B" cx="30" cy="30" r="30"></circle> + <circle id="outer-circle" fill-opacity="0.4" fill="#E34039" cx="30" cy="30" r="30"></circle> <g id="inner-circle"> <use fill="black" fill-opacity="1" filter="url(#shadow)" xlink:href="#shadow-path"></use> - <use stroke="#FFFFFF" stroke-width="2" fill="#D0021B" fill-rule="evenodd" xlink:href="#shadow-path"></use> + <use stroke="#FFFFFF" stroke-width="2" fill="#E34039" fill-rule="evenodd" xlink:href="#shadow-path"></use> </g> </svg>
\ No newline at end of file diff --git a/gui/src/config.json b/gui/src/config.json index 9e11eea254..f735175d36 100644 --- a/gui/src/config.json +++ b/gui/src/config.json @@ -12,7 +12,7 @@ "blue": "rgb(41, 77, 115)", "green": "rgb(68, 173, 77)", "darkGreen": "rgb(32, 84, 37)", - "red": "rgb(208, 2, 27)", + "red": "rgb(227, 64, 57)", "darkYellow": "rgb(142, 78, 19)", "yellow": "rgb(255, 213, 36)", "white": "rgb(255, 255, 255)", @@ -24,9 +24,9 @@ "blue40": "rgba(41, 77, 115, 0.4)", "blue60": "rgba(41, 77, 115, 0.6)", "blue80": "rgba(41, 77, 115, 0.8)", - "red95": "rgba(208, 2, 27, 0.95)", - "red40": "rgba(208, 2, 27, 0.40)", - "red45": "rgba(208, 2, 27, 0.45)", + "red95": "rgba(227, 64, 57, 0.95)", + "red40": "rgba(227, 64, 57, 0.40)", + "red45": "rgba(227, 64, 57, 0.45)", "green90": "rgba(68, 173, 77, 0.9)", "green40": "rgba(68, 173, 77, 0.4)" } diff --git a/gui/src/renderer/components/HeaderBar.tsx b/gui/src/renderer/components/HeaderBar.tsx index 71ef37186b..d2dc116dfb 100644 --- a/gui/src/renderer/components/HeaderBar.tsx +++ b/gui/src/renderer/components/HeaderBar.tsx @@ -42,7 +42,7 @@ const headerBarStyles = { backgroundColor: 'rgb(25, 46, 69)', // colors.darkBlue }), error: Styles.createViewStyle({ - backgroundColor: 'rgb(208, 2, 27)', // colors.red + backgroundColor: 'rgb(227, 64, 57)', // colors.red }), success: Styles.createViewStyle({ backgroundColor: 'rgb(68, 173, 77)', // colors.green diff --git a/gui/src/renderer/components/SecuredLabel.tsx b/gui/src/renderer/components/SecuredLabel.tsx index dbe1791305..fc91a97773 100644 --- a/gui/src/renderer/components/SecuredLabel.tsx +++ b/gui/src/renderer/components/SecuredLabel.tsx @@ -22,7 +22,7 @@ const styles = { color: 'rgb(68, 173, 77)', // green }), unsecured: Styles.createTextStyle({ - color: 'rgb(208, 2, 27)', // red + color: 'rgb(227, 64, 57)', // red }), }; diff --git a/ios/AdditionalAssets/DangerButton.svg b/ios/AdditionalAssets/DangerButton.svg index 3230578e05..3cee301988 100644 --- a/ios/AdditionalAssets/DangerButton.svg +++ b/ios/AdditionalAssets/DangerButton.svg @@ -1,3 +1,3 @@ <svg viewBox="0 0 44 44" xmlns="http://www.w3.org/2000/svg"> - <rect x="0" y="0" width="44" height="44" rx="4" ry="4" fill="rgb(208, 2, 27)" /> + <rect x="0" y="0" width="44" height="44" rx="4" ry="4" fill="rgb(227, 64, 57)" /> </svg> diff --git a/ios/AdditionalAssets/TranslucentDangerButton.svg b/ios/AdditionalAssets/TranslucentDangerButton.svg index 9ad8a9171b..a6028b0fc4 100644 --- a/ios/AdditionalAssets/TranslucentDangerButton.svg +++ b/ios/AdditionalAssets/TranslucentDangerButton.svg @@ -1,3 +1,3 @@ <svg viewBox="0 0 44 44" xmlns="http://www.w3.org/2000/svg"> - <rect x="0" y="0" width="44" height="44" rx="4" ry="4" fill="rgba(208, 2, 27, 0.40)" /> + <rect x="0" y="0" width="44" height="44" rx="4" ry="4" fill="rgba(227, 64, 57, 0.40)" /> </svg> |
