[libadwaita/wip/exalm/recoloring-fixes: 9/32] stylesheet: Inline scrollbar colors




commit 4ccc4c716354387d1df7d29bd495343ba25bd3ab
Author: Alexander Mikhaylenko <alexm gnome org>
Date:   Wed Sep 1 12:51:55 2021 +0500

    stylesheet: Inline scrollbar colors

 src/stylesheet/_colors.scss            |  5 -----
 src/stylesheet/widgets/_scrolling.scss | 18 ++++++++++--------
 2 files changed, 10 insertions(+), 13 deletions(-)
---
diff --git a/src/stylesheet/_colors.scss b/src/stylesheet/_colors.scss
index f7fdaed5..f6d34e23 100644
--- a/src/stylesheet/_colors.scss
+++ b/src/stylesheet/_colors.scss
@@ -50,11 +50,6 @@ $fill_active_color: gtkmix($accent_bg_color, black, 80%);
 $slider_color: mix(white, $base_color, 80%);
 $slider_hover_color: white;
 
-$scrollbar_bg_color: gtkalpha(currentColor, .1);
-$scrollbar_slider_color: gtkalpha(currentColor, .6);
-$scrollbar_slider_hover_color: gtkalpha(currentColor, .8);
-$scrollbar_slider_active_color: $accent_bg_color;
-
 $osd_fg_color: $dark_fg;
 $osd_text_color: white;
 $osd_bg_color: if($variant == 'light', transparentize($dark_bg,0.3), 
transparentize(darken(desaturate($dark_3, 100%), 10%),0.3));
diff --git a/src/stylesheet/widgets/_scrolling.scss b/src/stylesheet/widgets/_scrolling.scss
index 172fee64..df05bd29 100644
--- a/src/stylesheet/widgets/_scrolling.scss
+++ b/src/stylesheet/widgets/_scrolling.scss
@@ -1,10 +1,12 @@
+$_scrollbar_bg_color: transparentize(black, .9);
+
 scrollbar {
   $_slider_min_length: 40px;
   $_slider_width: 8px;
   $_scrollbar_transition: all 300ms $ease-out-quad;
   $_fine-tune_slider_border: $_slider_width - 3; //#3672
 
-  background-color: $scrollbar_bg_color;
+  background-color: $_scrollbar_bg_color;
   transition: $_scrollbar_transition;
 
   // scrollbar border
@@ -20,12 +22,12 @@ scrollbar {
     border: 4px solid transparent;
     border-radius: 10px;
     background-clip: padding-box;
-    background-color: $scrollbar_slider_color;
+    background-color: gtkalpha(currentColor, .6);
     transition: $_scrollbar_transition;
 
-    &:hover { background-color: $scrollbar_slider_hover_color; }
+    &:hover { background-color: gtkalpha(currentColor, .8); }
 
-    &:hover:active { background-color: $scrollbar_slider_active_color; }
+    &:hover:active { background-color: $accent_bg_color; }
 
     &:disabled { background-color: transparent; }
   }
@@ -104,13 +106,13 @@ scrolledwindow {
     // the borders of the two scrollbars.
 
     background: $borders_color,
-                linear-gradient(to bottom, transparent 1px, $scrollbar_bg_color 1px),
-                linear-gradient(to right, transparent 1px, $scrollbar_bg_color 1px);
+                linear-gradient(to bottom, transparent 1px, $_scrollbar_bg_color 1px),
+                linear-gradient(to right, transparent 1px, $_scrollbar_bg_color 1px);
 
     &:dir(rtl) {
       background: $borders_color,
-                  linear-gradient(to bottom, transparent 1px, $scrollbar_bg_color 1px),
-                  linear-gradient(to left, transparent 1px, $scrollbar_bg_color 1px);
+                  linear-gradient(to bottom, transparent 1px, $_scrollbar_bg_color 1px),
+                  linear-gradient(to left, transparent 1px, $_scrollbar_bg_color 1px);
     }
   }
 }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]