summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2019-09-05 15:49:13 +0200
committerLinus Färnstrand <linus@mullvad.net>2019-09-05 15:49:13 +0200
commit91aec3796612bfe01fbd3cb737746ed0152a859a (patch)
tree4ec8722abd3e486f09a7a06c6d479b3bacdfaa6a
parentad06b311792aca229c1397873690e790a3895862 (diff)
downloadmullvadvpn-91aec3796612bfe01fbd3cb737746ed0152a859a.tar.xz
mullvadvpn-91aec3796612bfe01fbd3cb737746ed0152a859a.zip
Make cancel/disconnect button less transparent
-rw-r--r--android/src/main/res/drawable/transparent_red_button_background.xml4
-rw-r--r--android/src/main/res/values/colors.xml2
-rw-r--r--gui/src/config.json2
-rw-r--r--gui/src/renderer/components/AppButtonStyles.tsx4
4 files changed, 8 insertions, 4 deletions
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 58555c59af..fd9391fb72 100644
--- a/android/src/main/res/values/colors.xml
+++ b/android/src/main/res/values/colors.xml
@@ -15,6 +15,8 @@
<color name="green90">#E644AD4D</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>
diff --git a/gui/src/config.json b/gui/src/config.json
index f735175d36..95ed24c452 100644
--- a/gui/src/config.json
+++ b/gui/src/config.json
@@ -25,6 +25,8 @@
"blue60": "rgba(41, 77, 115, 0.6)",
"blue80": "rgba(41, 77, 115, 0.8)",
"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)",
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',