New upstream snapshot for GTK3 (mamolinux#43)

Co-authored-by: hsbasu <[email protected]>
hsbasu · May 11, 2023 · 71dd1e1 · 71dd1e1
1 parent 4682116
commit 71dd1e1
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 19 deletions.
diff --git a/gtk/upstream/gtk-3.0/Mint-Y/sass/_common.scss b/gtk/upstream/gtk-3.0/Mint-Y/sass/_common.scss
@@ -2087,8 +2087,9 @@ radio {
 // GtkScale
 //
 scale {
-  $_marks_length: 3px;
+  $_marks_length: 7px;
   $_marks_distance: 1px;
+  $_value_distance: 3px;
 
   min-height: 15px;
   min-width: 15px;
@@ -2232,7 +2233,18 @@ scale {
     &:disabled { background-color: transparent; }
   }
 
-  value { color: gtkalpha(currentColor, 0.4); }
+  value {
+    color: gtkalpha(currentColor, 0.4);
+
+    @each $value_class, $value_margin in (top, bottom),
+                                         (bottom, top),
+                                         (left, right),
+                                         (right, left) {
+      &.#{$value_class} {
+        margin-#{$value_margin}: $_value_distance;
+      }
+    }
+  }
 
   marks {
     color: gtkalpha(currentColor, 0.4);
@@ -2812,9 +2824,11 @@ infobar {
   &.question,
   &.warning,
   &.error {
-    background-color: $selected_bg_color;
-    color: $selected_fg_color;
-    caret-color: currentColor;
+    & > revealer > box {
+      background-color: $selected_bg_color;
+      color: $selected_fg_color;
+      caret-color: currentColor;
+    }
 
     button { @extend %selected_button }
 
@@ -2830,9 +2844,9 @@ infobar {
     }
   }
 
-  &.warning { background-color: $warning_color; }
-  &.error { background-color: $destructive_color; }
-  &.question { background-color: $question_color; }
+  &.warning > revealer > box { background-color: $warning_color; }
+  &.error > revealer > box { background-color: $destructive_color; }
+  &.question > revealer > box { background-color: $question_color; }
 }
 
 //
@@ -3200,24 +3214,25 @@ headerbar,
       color: $selected_fg_color;
       @include draw_circle($selected_bg_color);
 
+      &:backdrop { @include draw-circle($_wm_backdrop_icon_color); }
       &:hover { @include draw-circle(lighten($selected_bg_color, 5%)); }
       &:active { @include draw-circle(darken($selected_bg_color, 5%)); }
-      &:backdrop { @include draw-circle($_wm_backdrop_icon_color); }
     }
 
     &.maximize,
     &.minimize {
+      &:backdrop {
+        color: $_wm_backdrop_icon_color;
+      }
       &:hover,
       &:hover:backdrop {
+        color: $fg_color;
         @include draw-circle($wm_button_hover_bg);
       }
       &:active,
       &:active:backdrop {
         @include draw-circle($wm_button_active_bg);
       }
-      &:backdrop {
-        color: $_wm_backdrop_icon_color;
-      }
     }
   }
 }

diff --git a/gtk/upstream/gtk-3.0/Mint-Y/sass/_lightdm.scss b/gtk/upstream/gtk-3.0/Mint-Y/sass/_lightdm.scss
@@ -155,15 +155,32 @@ window.background.lightdm {
     }
   }
 
-  entry,
-  .lightdm-combo entry {
-    background: transparentize(black, 0.5);
+ entry {
+    background-image: none;
+    border-image: none;
+    background-color: transparentize(black, 0.7);
+    border-color: transparentize(white, 0.4);
+    border-radius: 5px;
+    padding: 7px;
     color: white;
-  }
+    text-shadow: none;
+    caret-color: white;
+
+    &:focus {
+      border-color: transparentize(white, 0.1);
+      border-width: 1px;
+      border-style: solid;
+      color: white;
+    }
+
+    &:selected {background-color: transparentize(white, 0.8); }
+
+    &:active {
+      -gtk-icon-source: -gtk-icontheme('process-working-symbolic');
+      animation: dashentry_spinner 1s infinite linear;
+    }
 
-  entry:active { // for spinner
-    -gtk-icon-source: -gtk-icontheme('process-working-symbolic');
-    animation: spinner 1s linear infinite;
+    image { color: white; }
   }
 
   .lightdm-combo {