gnome-shell/login-lock: Use proper background qrcode colors in light …

…mode LP: #2067661
ubuntu · May 31, 2024 · 3c1e507 · 3c1e507
1 parent d843566
commit 3c1e507
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/gnome-shell/src/gnome-shell-sass/widgets/_login-lock.scss b/gnome-shell/src/gnome-shell-sass/widgets/_login-lock.scss
@@ -196,7 +196,6 @@ $_gdm_dialog_width: 25em;
       }
 
       &:logged-in {
-        // color border for logged-in user
         .user-icon {
           border-color: $selected_bg_color;
           StIcon {
@@ -503,8 +502,16 @@ $_gdm_dialog_width: 25em;
 
 // QR Code
 .qr-code {
-  background: black;
+  @if ($variant == 'light') {
+    $qrcode_bg_color: mix($fg_color, $bg_color, $background_mix_factor);
+    background-color: $qrcode_bg_color;
+    border-color: $qrcode_bg_color;
+    color: $fg_color;
+  } @else {
+    background-color: $_gdm_fg;
+    border-color: $_gdm_fg;
+    color: $_gdm_bg;
+  }
   border-radius: $base_border_radius * .5;
-  border-color: white;
   border-width: 1em;
 }
diff --git a/gnome-shell/upstream/theme/gnome-shell-sass/widgets/_login-lock.scss b/gnome-shell/upstream/theme/gnome-shell-sass/widgets/_login-lock.scss
@@ -444,8 +444,16 @@ $_gdm_dialog_width: 25em;
 
 // QR Code
 .qr-code {
-  background: black;
+  @if ($variant == 'light') {
+    $qrcode_bg_color: mix($fg_color, $bg_color, $background_mix_factor);
+    background-color: $qrcode_bg_color;
+    border-color: $qrcode_bg_color;
+    color: $fg_color;
+  } @else {
+    background-color: $_gdm_fg;
+    border-color: $_gdm_fg;
+    color: $_gdm_bg;
+  }
   border-radius: $base_border_radius * .5;
-  border-color: white;
   border-width: 1em;
 }