From b6bcb31d77585390eabdba34859142190713b4cc Mon Sep 17 00:00:00 2001
From: Sam Hewitt <sam@snwh.org>
Date: Wed, 5 Jul 2023 14:13:39 -0230
Subject: [PATCH] style: Fix incorrect light scheme color issues in app folder
 and screenshot ui

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2823>
---
 data/theme/gnome-shell-sass/_drawing.scss                | 5 ++---
 data/theme/gnome-shell-sass/widgets/_app-grid.scss       | 5 +++--
 data/theme/gnome-shell-sass/widgets/_screenshot.scss     | 8 ++++----
 data/theme/gnome-shell-sass/widgets/_switcher-popup.scss | 2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/data/theme/gnome-shell-sass/_drawing.scss b/data/theme/gnome-shell-sass/_drawing.scss
index 2551d68ae..0e21551ac 100644
--- a/data/theme/gnome-shell-sass/_drawing.scss
+++ b/data/theme/gnome-shell-sass/_drawing.scss
@@ -210,8 +210,8 @@
 
   // insensitive button
   @else if $t==insensitive {
-    color: transparentize($tc, 0.5);
-    background-color: transparentize($tc, .95);
+    background-color: if($variant == 'light', transparentize($tc, .9), transparentize($tc, .95));
+    color: if($variant == 'light', transparentize($tc, .6), transparentize($tc, .5));
   }
 
   // default/suggested button
@@ -245,7 +245,6 @@
     &:insensitive {
       @include button(insensitive);
       background-color: transparent;
-      color: transparentize($selected_fg_color, .5);
     }
   }
 }
diff --git a/data/theme/gnome-shell-sass/widgets/_app-grid.scss b/data/theme/gnome-shell-sass/widgets/_app-grid.scss
index 740e90ce6..3c8eda411 100644
--- a/data/theme/gnome-shell-sass/widgets/_app-grid.scss
+++ b/data/theme/gnome-shell-sass/widgets/_app-grid.scss
@@ -40,9 +40,9 @@ $app_icon_size: 96px;
 // expanded folder
 .app-folder-dialog {
   border-radius: $modal_radius*4;
-  background-color: $bg_color;
+  background-color: $system_overlay_bg_color;
   padding: $base_padding*2;
-  box-shadow:inset 0 0 0 1px $outer_borders_color;
+  box-shadow:inset 0 0 0 1px $system_borders_color;
 
   @if $is_highcontrast {
     box-shadow:inset 0 0 0 2px $hc_inset_color;
@@ -59,6 +59,7 @@ $app_icon_size: 96px;
 
     & .folder-name-entry {
       width: 12em;
+      color: $system_fg_color !important;
     }
 
     /* FIXME: this is to keep the label in sync with the entry */
diff --git a/data/theme/gnome-shell-sass/widgets/_screenshot.scss b/data/theme/gnome-shell-sass/widgets/_screenshot.scss
index 7b490f166..69edb053b 100644
--- a/data/theme/gnome-shell-sass/widgets/_screenshot.scss
+++ b/data/theme/gnome-shell-sass/widgets/_screenshot.scss
@@ -83,7 +83,7 @@ $screenshot_ui_button_red: $error_color;
 }
 
 .screenshot-ui-shot-cast-container {
-  background-color: lighten($osd_bg_color,5%);
+  background-color: transparentize($osd_fg_color,0.9);
   border-radius: $modal_radius;
   padding: $screenshot_ui_shot_cast_spacing;
   spacing: $screenshot_ui_shot_cast_spacing;
@@ -95,9 +95,9 @@ $screenshot_ui_button_red: $error_color;
 .screenshot-ui-shot-cast-button {
   padding: $base_padding $base_padding*2;
   background-color: transparent;
-  &:hover, &:focus { background-color: lighten($osd_bg_color, 10%);}
-  &:active { background-color: lighten($active_bg_color,5%);}
-  &:checked { background-color: white;color: black;}
+  &:hover, &:focus { background-color: transparentize($osd_fg_color, 0.8);}
+  &:active { background-color: transparentize($osd_fg_color, .5);}
+  &:checked { background-color: $osd_fg_color; color: $osd_bg_color;}
   &:insensitive { color: transparentize($osd_fg_color, 0.5);}
 
   border-radius: $modal_radius - $screenshot_ui_shot_cast_spacing;
diff --git a/data/theme/gnome-shell-sass/widgets/_switcher-popup.scss b/data/theme/gnome-shell-sass/widgets/_switcher-popup.scss
index b7d8353e7..5136c3cfe 100644
--- a/data/theme/gnome-shell-sass/widgets/_switcher-popup.scss
+++ b/data/theme/gnome-shell-sass/widgets/_switcher-popup.scss
@@ -24,7 +24,7 @@ $switcher_padding: $base_padding*2;
 
   // each item in the list
   .item-box {
-    @include tile_button($fg_color);
+    @include tile_button($osd_fg_color);
     // override over style so mouse doesn't steal focus
     &:hover {background: none;}
     @if $is_highcontrast {