From cae6b8e00de091fda35df0dd8709e58f9fc4b687 Mon Sep 17 00:00:00 2001
From: didrocks <1823296+didrocks@users.noreply.github.com>
Date: Thu, 23 May 2024 01:31:01 +0000
Subject: [PATCH] New upstream snapshot for GNOME Shell

---
 .../theme/gnome-shell-sass/_colors.scss       |  2 +-
 .../theme/gnome-shell-sass/_common.scss       |  2 +-
 .../theme/gnome-shell-sass/_drawing.scss      |  2 +-
 .../gnome-shell-sass/widgets/_app-grid.scss   |  7 +-----
 .../theme/gnome-shell-sass/widgets/_base.scss |  5 -----
 .../gnome-shell-sass/widgets/_calendar.scss   |  7 +++---
 .../theme/gnome-shell-sass/widgets/_dash.scss | 10 +++++++--
 .../gnome-shell-sass/widgets/_login-lock.scss |  5 +++++
 .../widgets/_message-list.scss                |  8 +++----
 .../gnome-shell-sass/widgets/_overview.scss   |  6 +----
 .../widgets/_search-results.scss              |  1 -
 .../gnome-shell-sass/widgets/_slider.scss     | 22 +++++++++----------
 .../widgets/_window-picker.scss               | 13 +++++++++++
 .../widgets/_workspace-switcher.scss          |  2 +-
 14 files changed, 50 insertions(+), 42 deletions(-)

diff --git a/gnome-shell/upstream/theme/gnome-shell-sass/_colors.scss b/gnome-shell/upstream/theme/gnome-shell-sass/_colors.scss
index c96bcf4872..ffd4e9fc9c 100644
--- a/gnome-shell/upstream/theme/gnome-shell-sass/_colors.scss
+++ b/gnome-shell/upstream/theme/gnome-shell-sass/_colors.scss
@@ -66,4 +66,4 @@ $active_bg_color: if($variant=='light', darken($bg_color, 11%), lighten($bg_colo
 $active_fg_color: if($variant=='light', darken($fg_color, 11%), lighten($fg_color, 12%));
 
 // selection colors
-$selected_borders_color: if($variant== 'light', darken($selected_bg_color, 15%), lighten($selected_bg_color, 15%));
+$selected_borders_color: if($variant== 'light', darken($selected_bg_color, 15%), lighten($selected_bg_color, 15%));
\ No newline at end of file
diff --git a/gnome-shell/upstream/theme/gnome-shell-sass/_common.scss b/gnome-shell/upstream/theme/gnome-shell-sass/_common.scss
index adb8b70ef2..28a7a5c1c1 100644
--- a/gnome-shell/upstream/theme/gnome-shell-sass/_common.scss
+++ b/gnome-shell/upstream/theme/gnome-shell-sass/_common.scss
@@ -291,7 +291,7 @@ stage {
 
 %smaller {
   font-weight: 400;
-  @include fontsize(8pt);
+  @include fontsize(9pt);
 }
 
 %monospace {font-family: monospace;}
diff --git a/gnome-shell/upstream/theme/gnome-shell-sass/_drawing.scss b/gnome-shell/upstream/theme/gnome-shell-sass/_drawing.scss
index 5d56d4c17b..3f0259019c 100644
--- a/gnome-shell/upstream/theme/gnome-shell-sass/_drawing.scss
+++ b/gnome-shell/upstream/theme/gnome-shell-sass/_drawing.scss
@@ -376,11 +376,11 @@
   } @else {
     @include button(normal, $c:$bg);
   }
-  &:focus,
   &:hover {
     @include button(hover, $c:$bg);
   }
   &:active {@include button(active, $c:$bg);}
+  &:selected,
   &:checked {@include button(checked, $c:$bg);}
   &:insensitive {@include button(insensitive, $c:$bg);}
 }
diff --git a/gnome-shell/upstream/theme/gnome-shell-sass/widgets/_app-grid.scss b/gnome-shell/upstream/theme/gnome-shell-sass/widgets/_app-grid.scss
index fcada18a20..2fe110fe81 100644
--- a/gnome-shell/upstream/theme/gnome-shell-sass/widgets/_app-grid.scss
+++ b/gnome-shell/upstream/theme/gnome-shell-sass/widgets/_app-grid.scss
@@ -47,12 +47,7 @@ $app_folder_size: 720px;
   width: 5px;
   border-radius:5px;
   background-color: $system_fg_color;
-
-  @if $contrast == 'high' {
-    margin-bottom: 4px;
-  } @else {
-    margin-bottom: 2px;
-  }
+  offset-y: 6px;
 }
 
 .app-folder-dialog-container {
diff --git a/gnome-shell/upstream/theme/gnome-shell-sass/widgets/_base.scss b/gnome-shell/upstream/theme/gnome-shell-sass/widgets/_base.scss
index 7d6f2809e8..20a1666e2f 100644
--- a/gnome-shell/upstream/theme/gnome-shell-sass/widgets/_base.scss
+++ b/gnome-shell/upstream/theme/gnome-shell-sass/widgets/_base.scss
@@ -18,10 +18,5 @@
 
   @if $contrast == 'high' {
     icon-shadow: none;
-    background-color: $osd_bg_color;
-    padding: $base_padding * 2;
-    border-radius: $modal_radius;
-    border: 2px solid $hc_inset_color;
-    margin: $base_padding * 3;
   }
 }
diff --git a/gnome-shell/upstream/theme/gnome-shell-sass/widgets/_calendar.scss b/gnome-shell/upstream/theme/gnome-shell-sass/widgets/_calendar.scss
index f34e59110d..80b30dc930 100644
--- a/gnome-shell/upstream/theme/gnome-shell-sass/widgets/_calendar.scss
+++ b/gnome-shell/upstream/theme/gnome-shell-sass/widgets/_calendar.scss
@@ -268,10 +268,9 @@
       spacing-columns: $base_padding * 2;
 
       .weather-forecast-time {
-        @extend %numeric;
-        @include fontsize(10pt);
-        padding-top: 0.2em;
-        padding-bottom: 0.4em;
+        @extend %smaller;
+        padding-top: $base_padding;
+        padding-bottom: $base_padding;
       }
       .weather-forecast-icon {
         icon-size: $large_scalable_icon_size;
diff --git a/gnome-shell/upstream/theme/gnome-shell-sass/widgets/_dash.scss b/gnome-shell/upstream/theme/gnome-shell-sass/widgets/_dash.scss
index db378ca1e4..ef9e121c4f 100644
--- a/gnome-shell/upstream/theme/gnome-shell-sass/widgets/_dash.scss
+++ b/gnome-shell/upstream/theme/gnome-shell-sass/widgets/_dash.scss
@@ -11,7 +11,9 @@ $dash_spacing: $base_margin * 0.5;
 
 // container for the dash
 #dash {
-  margin-top: $dash_edge_offset;
+  // a bit of spacing so that dash doesn't touch the screen edges
+  padding-left: $base_padding;
+  padding-right: $base_padding;
 
   // background behind item container
   .dash-background {
@@ -69,7 +71,11 @@ $dash_spacing: $base_margin * 0.5;
     // running app dot
     .app-grid-running-dot {
       // manually position the dot within the dash item
-      margin-bottom: $dash_padding + $dash_edge_offset - 3px; // 3px = size of dot (5px) subtracted from its translationY from appDisplay.js
+      @if $contrast == 'high' {
+        offset-y: -$dash_padding - 1px; // don't draw dot directly on inset
+      } @else {
+        offset-y: -$dash_padding;
+      }
     }
   }
 
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
index 37f207cbee..07c5a9e766 100644
--- a/gnome-shell/upstream/theme/gnome-shell-sass/widgets/_login-lock.scss
+++ b/gnome-shell/upstream/theme/gnome-shell-sass/widgets/_login-lock.scss
@@ -108,6 +108,11 @@ $_gdm_dialog_width: 25em;
   text-align: center;
 }
 
+.login-dialog-message-hint, .login-dialog-message {
+  color: darken($_gdm_fg, 10%);
+  min-height: 2.75em;
+}
+
 .login-dialog-user-selection-box {
   // padding to ensure the box doesn't overlap the panel
   padding-top: 4em;
diff --git a/gnome-shell/upstream/theme/gnome-shell-sass/widgets/_message-list.scss b/gnome-shell/upstream/theme/gnome-shell-sass/widgets/_message-list.scss
index 2b3fd610f1..f07ac0e2ac 100644
--- a/gnome-shell/upstream/theme/gnome-shell-sass/widgets/_message-list.scss
+++ b/gnome-shell/upstream/theme/gnome-shell-sass/widgets/_message-list.scss
@@ -143,12 +143,12 @@
 
       // icon size and color
       icon-size: $base_icon_size * 3; // 48px
-      -st-icon-style: symbolic;
 
+      // a small symbolic icon on a circle background
       &.message-themed-icon {
-        border-radius: $forced_circular_radius; // is circular
-        background-color: transparentize($fg_color, 0.8);
-        icon-size: $base_icon_size;
+        border-radius: $forced_circular_radius;
+        background-color: transparentize($fg_color, .93);
+        icon-size: $scalable_icon_size;
         min-width: $base_icon_size * 3;
         min-height: $base_icon_size * 3;
       }
diff --git a/gnome-shell/upstream/theme/gnome-shell-sass/widgets/_overview.scss b/gnome-shell/upstream/theme/gnome-shell-sass/widgets/_overview.scss
index 117213e87c..1172c070e0 100644
--- a/gnome-shell/upstream/theme/gnome-shell-sass/widgets/_overview.scss
+++ b/gnome-shell/upstream/theme/gnome-shell-sass/widgets/_overview.scss
@@ -1,13 +1,9 @@
 /* OVERVIEW */
 
-.controls-manager, .secondary-monitor-workspaces {
+.secondary-monitor-workspaces {
   spacing: $base_padding * 2;
 }
 
 #overviewGroup {
   background-color: $system_base_color;
 }
-
-.overview-controls {
-  padding-bottom: $base_margin * 8;
-}
diff --git a/gnome-shell/upstream/theme/gnome-shell-sass/widgets/_search-results.scss b/gnome-shell/upstream/theme/gnome-shell-sass/widgets/_search-results.scss
index 568dbbd20b..b89205597a 100644
--- a/gnome-shell/upstream/theme/gnome-shell-sass/widgets/_search-results.scss
+++ b/gnome-shell/upstream/theme/gnome-shell-sass/widgets/_search-results.scss
@@ -48,7 +48,6 @@
 
 .grid-search-results {
   spacing: $base_padding * 5;
-  margin:0 $base_margin * 3;
 }
 
 // Search results with icons
diff --git a/gnome-shell/upstream/theme/gnome-shell-sass/widgets/_slider.scss b/gnome-shell/upstream/theme/gnome-shell-sass/widgets/_slider.scss
index f7085825fa..6ba104d6fc 100644
--- a/gnome-shell/upstream/theme/gnome-shell-sass/widgets/_slider.scss
+++ b/gnome-shell/upstream/theme/gnome-shell-sass/widgets/_slider.scss
@@ -3,25 +3,25 @@
 $slider_size: $scalable_icon_size;
 
 .slider {
+  color: if($variant == 'light', $fg_color, darken($fg_color, 9%));
+
   // slider trough
   -barlevel-height: 4px;
-  -barlevel-background-color: transparentize($fg_color, 0.8); //background of the trough
-  -barlevel-border-width: 2px;
-  -barlevel-border-color: transparent; // trough border color
+  -barlevel-background-color: transparentize($fg_color, 0.9);
   // fill style
   -barlevel-active-background-color: $selected_bg_color;
-  -barlevel-active-border-color: transparent;
   // overfill style (red in this case)
   -barlevel-overdrive-color: $destructive_color;
-  -barlevel-overdrive-border-color: transparent; //trough border when red;
   -barlevel-overdrive-separator-width:1px;
   // slider handler
   -slider-handle-radius: $slider_size * 0.5; // half the size of the size
-  -slider-handle-border-width: 0;
-  -slider-handle-border-color: transparent; // because 0 width
 
-    // hc style
-    @if $contrast == 'high' {
-      -barlevel-background-color: transparentize($fg_color, 0.6);
-    }
+  // hc style
+  @if $contrast == 'high' {
+    -barlevel-background-color: transparentize($fg_color, 0.6);
+  }
+
+  &:hover {
+    color: if($variant == 'light', lighten($fg_color, 7%), $fg_color);
+  }
 }
diff --git a/gnome-shell/upstream/theme/gnome-shell-sass/widgets/_window-picker.scss b/gnome-shell/upstream/theme/gnome-shell-sass/widgets/_window-picker.scss
index c500a0af74..75626633fa 100644
--- a/gnome-shell/upstream/theme/gnome-shell-sass/widgets/_window-picker.scss
+++ b/gnome-shell/upstream/theme/gnome-shell-sass/widgets/_window-picker.scss
@@ -7,6 +7,19 @@ $window_close_button_color: transparentize(lighten($system_bg_color, 7%), .02);
   spacing: $base_padding;
 }
 
+// Window icons
+.window-icon {
+  // styled only with .icon-dropshadow
+  // but has a different style in high-contrast
+  @if $contrast == 'high' {
+    background-color: $osd_bg_color;
+    padding: $base_padding * 2;
+    border-radius: $modal_radius;
+    border: 2px solid $hc_inset_color;
+    margin: $base_padding * 3;
+  }
+}
+
 // Window titles
 .window-caption {
   @extend %tooltip;
diff --git a/gnome-shell/upstream/theme/gnome-shell-sass/widgets/_workspace-switcher.scss b/gnome-shell/upstream/theme/gnome-shell-sass/widgets/_workspace-switcher.scss
index f3e069f787..da8d77fdeb 100644
--- a/gnome-shell/upstream/theme/gnome-shell-sass/widgets/_workspace-switcher.scss
+++ b/gnome-shell/upstream/theme/gnome-shell-sass/widgets/_workspace-switcher.scss
@@ -1,6 +1,6 @@
 /* Workspace Switcher */
 
-$ws_indicator_height: 48px;
+$ws_indicator_height: 32px;
 $ws_dot_active: $ws_indicator_height / 3;
 $ws_dot_inactive: $ws_indicator_height / 6;