summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--android/src/main/res/drawable/icon_alert.xml2
-rw-r--r--android/src/main/res/drawable/icon_fail.xml2
-rw-r--r--android/src/main/res/drawable/transparent_red_button_background.xml4
-rw-r--r--android/src/main/res/values/colors.xml10
-rwxr-xr-xgui/assets/images/icon-fail.svg2
-rwxr-xr-xgui/assets/images/icon-settings.svg2
-rwxr-xr-xgui/assets/images/location-marker-unsecure.svg4
-rw-r--r--gui/src/config.json10
-rw-r--r--gui/src/renderer/components/AppButtonStyles.tsx4
-rw-r--r--gui/src/renderer/components/HeaderBar.tsx15
-rw-r--r--gui/src/renderer/components/SecuredLabel.tsx2
-rw-r--r--gui/src/renderer/components/SettingsHeader.tsx5
-rw-r--r--ios/AdditionalAssets/DangerButton.svg2
-rw-r--r--ios/AdditionalAssets/TranslucentDangerButton.svg2
14 files changed, 36 insertions, 30 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/drawable/transparent_red_button_background.xml b/android/src/main/res/drawable/transparent_red_button_background.xml
index 6f5a86b205..9fca107061 100644
--- a/android/src/main/res/drawable/transparent_red_button_background.xml
+++ b/android/src/main/res/drawable/transparent_red_button_background.xml
@@ -3,14 +3,14 @@
<item android:state_pressed="false">
<shape android:shape="rectangle">
<corners android:radius="4dp"/>
- <solid android:color="@color/red40"/>
+ <solid android:color="@color/red60"/>
</shape>
</item>
<item android:state_pressed="true">
<shape android:shape="rectangle">
<corners android:radius="4dp"/>
- <solid android:color="@color/red45"/>
+ <solid android:color="@color/red80"/>
</shape>
</item>
</selector>
diff --git a/android/src/main/res/values/colors.xml b/android/src/main/res/values/colors.xml
index 44b8896a0a..fd9391fb72 100644
--- a/android/src/main/res/values/colors.xml
+++ b/android/src/main/res/values/colors.xml
@@ -13,10 +13,12 @@
<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="red80">#CCE34039</color>
+ <color name="red60">#99E34039</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/icon-settings.svg b/gui/assets/images/icon-settings.svg
index fbaec4e52c..6b31b51979 100755
--- a/gui/assets/images/icon-settings.svg
+++ b/gui/assets/images/icon-settings.svg
@@ -3,7 +3,7 @@
<title>icon-settings</title>
<desc>Mullvad VPN app</desc>
<defs></defs>
- <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" fill-opacity="0.6">
+ <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" fill-opacity="0.8">
<path d="M21.2552027,12.0000012 C21.2552027,12.4080002 21.2181943,12.792001 21.1688441,13.1760007 L23.7718756,15.1560004 C24.0062723,15.3360012 24.0679568,15.6600006 23.9199162,15.924001 L21.4525887,20.0760014 C21.304548,20.3400006 20.9837951,20.4480008 20.700053,20.3400006 L17.6282305,19.1400005 C16.9867248,19.6079998 16.2958725,20.016 15.5433381,20.316 L15.0745457,23.4959999 C15.037536,23.7839996 14.7784667,24 14.4700507,24 L9.53539566,24 C9.22697972,24 8.96791028,23.7839996 8.9309007,23.4959999 L8.46210833,20.316 C7.70957385,20.016 7.01872221,19.62 6.37721707,19.1400005 L3.30539454,20.3400006 C3.03398819,20.4360005 2.700899,20.3400006 2.55285948,20.0760014 L0.0855319329,15.924001 C-0.062507572,15.6600006 -0.000824444944,15.336 0.233571734,15.1560004 L2.83660217,13.1760007 C2.78725567,12.792001 2.7502455,12.3960011 2.7502455,12.0000012 C2.7502455,11.6040012 2.78725567,11.2080012 2.83660217,10.8240016 L0.23357145,8.84400074 C-0.000824444944,8.66400004 -0.0748444934,8.34000059 0.0855319329,8.07600026 L2.55285948,3.92400037 C2.70089958,3.66000059 3.02165186,3.55200039 3.30539454,3.66000059 L6.37721765,4.86000071 C7.01872279,4.39200082 7.70957502,3.9840006 8.4621095,3.68400057 L8.93090187,0.504000134 C8.96791146,0.216000094 9.2269809,0 9.53539685,0 L14.4700519,0 C14.7784679,0 15.0375373,0.216000094 15.0745481,0.50400071 L15.5433404,3.68400114 C16.2958761,3.98400117 16.9867272,4.38000112 17.6282328,4.86000128 L20.7000554,3.66000116 C20.9714629,3.56400067 21.3045504,3.66000116 21.452591,3.92400093 L23.9199186,8.0760014 C24.0679568,8.34000175 24.0062746,8.66400233 23.7718779,8.84400188 L21.1688466,10.8240016 C21.2181919,11.2080012 21.2552027,11.5920021 21.2552027,12.0000012 Z M12,17 C14.7571433,17 17,14.7571433 17,12 C17,9.24285657 14.7571433,7 12,7 C9.24285657,7 7,9.24285657 7,12 C7,14.7571433 9.24285657,17 12,17 Z" id="icon" fill="#FFFFFF"></path>
</g>
</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..95ed24c452 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,11 @@
"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)",
+ "red80": "rgba(227, 64, 57, 0.80)",
+ "red60": "rgba(227, 64, 57, 0.60)",
+ "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/AppButtonStyles.tsx b/gui/src/renderer/components/AppButtonStyles.tsx
index 055ce9b031..e9594e3994 100644
--- a/gui/src/renderer/components/AppButtonStyles.tsx
+++ b/gui/src/renderer/components/AppButtonStyles.tsx
@@ -27,10 +27,10 @@ export default {
backgroundColor: colors.white40,
}),
redTransparent: Styles.createButtonStyle({
- backgroundColor: colors.red40,
+ backgroundColor: colors.red60,
}),
redTransparentHover: Styles.createButtonStyle({
- backgroundColor: colors.red45,
+ backgroundColor: colors.red80,
}),
common: Styles.createViewStyle({
cursor: 'default',
diff --git a/gui/src/renderer/components/HeaderBar.tsx b/gui/src/renderer/components/HeaderBar.tsx
index 71ef37186b..1da3fd77c8 100644
--- a/gui/src/renderer/components/HeaderBar.tsx
+++ b/gui/src/renderer/components/HeaderBar.tsx
@@ -1,5 +1,6 @@
import * as React from 'react';
import { Button, Component, Styles, Text, Types, View } from 'reactxp';
+import { colors } from '../../config.json';
import { messages } from '../../shared/gettext';
import ImageView from './ImageView';
@@ -36,16 +37,16 @@ const headerBarStyles = {
}),
barStyle: {
default: Styles.createViewStyle({
- backgroundColor: 'rgb(41, 77, 115)', // colors.blue
+ backgroundColor: colors.blue,
}),
defaultDark: Styles.createViewStyle({
- backgroundColor: 'rgb(25, 46, 69)', // colors.darkBlue
+ backgroundColor: colors.darkBlue,
}),
error: Styles.createViewStyle({
- backgroundColor: 'rgb(208, 2, 27)', // colors.red
+ backgroundColor: colors.red,
}),
success: Styles.createViewStyle({
- backgroundColor: 'rgb(68, 173, 77)', // colors.green
+ backgroundColor: colors.green,
}),
},
};
@@ -83,7 +84,7 @@ const brandStyles = {
fontWeight: '900',
lineHeight: 30,
letterSpacing: -0.5,
- color: 'rgba(255, 255, 255, 0.6)', // colors.white60
+ color: colors.white80,
marginLeft: 8,
}),
};
@@ -117,8 +118,8 @@ export class SettingsBarButton extends Component<ISettingsButtonProps> {
height={24}
width={24}
source="icon-settings"
- tintColor={'rgba(255, 255, 255, 0.6)'}
- tintHoverColor={'rgba(255, 255, 255, 0.8)'}
+ tintColor={'rgba(255, 255, 255, 0.8)'}
+ tintHoverColor={'rgba(255, 255, 255, 1.0)'}
/>
</Button>
);
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/gui/src/renderer/components/SettingsHeader.tsx b/gui/src/renderer/components/SettingsHeader.tsx
index d7af1f9023..57be8653c4 100644
--- a/gui/src/renderer/components/SettingsHeader.tsx
+++ b/gui/src/renderer/components/SettingsHeader.tsx
@@ -1,5 +1,6 @@
import * as React from 'react';
import { Component, Styles, Text, Types, View } from 'reactxp';
+import { colors } from '../../config.json';
const styles = {
header: {
@@ -16,7 +17,7 @@ const styles = {
fontSize: 32,
fontWeight: '900',
lineHeight: 36,
- color: 'rgb(255, 255, 255)',
+ color: colors.white,
}),
subtitle: Styles.createTextStyle({
marginTop: 8,
@@ -24,7 +25,7 @@ const styles = {
fontSize: 13,
fontWeight: '600',
overflow: 'visible',
- color: 'rgba(255, 255, 255, 0.8)', // colors.white80
+ color: colors.white80,
lineHeight: 20,
letterSpacing: -0.2,
}),
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>
Copyright © 2025 - 2026 Wayne Cole. WTFPL. Attribution appreciated. No warranty. Not liable for bodily damages.