VPN-6700: fix color (#10059)

* VPN-6700 fix color * other fixes * housekeeping
mozilla-mobile · Nov 21, 2024 · 499d5aa · 499d5aa
1 parent d0884e2
commit 499d5aa
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/linters.yaml b/.github/workflows/linters.yaml
@@ -1,4 +1,4 @@
-name: Linters (clang, l10n)
+name: Linters (clang, l10n, colors)
 on:
   # Triggers the workflow on pull request events but only for the main branch
   pull_request:

diff --git a/README.md b/README.md
@@ -201,6 +201,6 @@ If you don't know the answers to these questions, reach out to Sarah Bird or the
 
 [![Unit Tests](https://github.com/mozilla-mobile/mozilla-vpn-client/actions/workflows/test_unit.yaml/badge.svg)](https://github.com/mozilla-mobile/mozilla-vpn-client/actions/workflows/test_unit.yaml)
 [![Lottie Tests](https://github.com/mozilla-mobile/mozilla-vpn-client/actions/workflows/test_lottie.yaml/badge.svg)](https://github.com/mozilla-mobile/mozilla-vpn-client/actions/workflows/test_lottie.yaml)
-[![Linters (clang, l10n)](https://github.com/mozilla-mobile/mozilla-vpn-client/actions/workflows/linters.yaml/badge.svg)](https://github.com/mozilla-mobile/mozilla-vpn-client/actions/workflows/linters.yaml)
+[![Linters (clang, l10n, colors)](https://github.com/mozilla-mobile/mozilla-vpn-client/actions/workflows/linters.yaml/badge.svg)](https://github.com/mozilla-mobile/mozilla-vpn-client/actions/workflows/linters.yaml)
 [![Linux Packages](https://github.com/mozilla-mobile/mozilla-vpn-client/actions/workflows/linux.yaml/badge.svg)](https://github.com/mozilla-mobile/mozilla-vpn-client/actions/workflows/linux.yaml)
 [![WebAssembly](https://github.com/mozilla-mobile/mozilla-vpn-client/actions/workflows/wasm.yaml/badge.svg)](https://github.com/mozilla-mobile/mozilla-vpn-client/actions/workflows/wasm.yaml)
diff --git a/nebula/ui/components/MZAlert.qml b/nebula/ui/components/MZAlert.qml
@@ -129,7 +129,7 @@ Rectangle {
             name: stateNames.warning
             PropertyChanges {
                 target: focusIndicators
-                colorScheme: MZTheme.theme.warningAlert
+                colorScheme: MZTheme.colors.warningAlert
             }
 
             PropertyChanges {

diff --git a/nebula/ui/components/MZPopupButton.qml b/nebula/ui/components/MZPopupButton.qml
@@ -12,7 +12,7 @@ MZButtonBase {
 
     property alias buttonText: buttonText.text
     property alias buttonTextColor: buttonText.color
-    property var colorScheme
+    property var colorScheme: MZTheme.colors.normalButton
     property var uiState:MZTheme.theme.uiState
     property bool isCancelBtn
 

diff --git a/nebula/ui/themes/main/theme.js b/nebula/ui/themes/main/theme.js
@@ -22,7 +22,7 @@ color.primaryPressed = color.dullPurple;
 color.bgColor = color.grey5;
 color.bgColorTransparent = addTransparency(color.bgColor, 0.0);
 color.bgColorStronger = color.white;
-color.overlayBackground = addTransparency(color.black, 0.0);
+color.overlayBackground = addTransparency(color.black, 0.3);
 
 // Fonts
 color.fontColor = color.grey40;

diff --git a/nebula/ui/themes/not-designer-approved/theme.js b/nebula/ui/themes/not-designer-approved/theme.js
@@ -22,7 +22,7 @@ color.primaryPressed = color.purple90;
 color.bgColor = color.grey60;
 color.bgColorTransparent = addTransparency(color.bgColor, 0.0);
 color.bgColorStronger = color.black;
-color.overlayBackground = addTransparency(color.white, 0.0);
+color.overlayBackground = addTransparency(color.white, 0.3);
 
 // Fonts
 color.fontColor = color.grey40;

diff --git a/nebula/ui/themes/theme-derived.js b/nebula/ui/themes/theme-derived.js
@@ -51,7 +51,7 @@ color.iconButtonDarkBackground = {
   buttonHovered: color.primaryHovered,
   buttonPressed: color.primaryPressed,
   buttonDisabled: addTransparency(color.primary, 0.0),
-  focusOutline: color.transparent,
+  focusOutline: addTransparency(color.primaryHovered, 0.0),
   focusBorder: color.lightFocusBorder,
 };