gtk3: Tweaked scrollbars

solus-project · Aug 30, 2017 · b463a53 · b463a53
1 parent 4b91f7e
commit b463a53
Show file tree

Hide file tree

Showing 7 changed files with 60 additions and 85 deletions.
diff --git a/EvoPop-Azure/gtk-3.0/gtk-dark.css b/EvoPop-Azure/gtk-3.0/gtk-dark.css
diff --git a/EvoPop-Azure/gtk-3.0/gtk.css b/EvoPop-Azure/gtk-3.0/gtk.css
diff --git a/EvoPop/gtk-3.0/gtk-dark.css b/EvoPop/gtk-3.0/gtk-dark.css
diff --git a/EvoPop/gtk-3.0/gtk.css b/EvoPop/gtk-3.0/gtk.css
diff --git a/sass/_colors.scss b/sass/_colors.scss
@@ -34,7 +34,7 @@ $menu_color: if($variant == 'light', $base_color, mix($bg_color, $base_color, 20
 $popover_bg_color: $base_color;
 $popover_hover_color: $selected_bg_color;
 
-$scrollbar_bg_color: mix($base_color, $bg_color, 50%);
+$scrollbar_bg_color: $base_color;
 $scrollbar_slider_color: mix($fg_color, $bg_color, 60%);
 $scrollbar_slider_hover_color: mix($fg_color, $bg_color, 80%);
 $scrollbar_slider_active_color: if($variant=='light', darken($selected_bg_color, 10%), lighten($selected_bg_color, 10%));
@@ -94,7 +94,7 @@ $backdrop_borders_color: mix($borders_color, $bg_color, 90%);
 $backdrop_dark_fill: mix($backdrop_borders_color, $backdrop_bg_color, 35%);
 $backdrop_sidebar_bg_color: if($subtheme == 'azure', $bg_color, mix($backdrop_bg_color, $backdrop_base_color, 50%));
 
-$backdrop_scrollbar_bg_color: darken($backdrop_bg_color, 3%);
+$backdrop_scrollbar_bg_color: $backdrop_base_color;
 $backdrop_scrollbar_slider_color: mix($backdrop_fg_color, $backdrop_bg_color, 40%);
 
 $backdrop_menu_color: if($variant == 'light', $backdrop_base_color, mix($backdrop_bg_color, $backdrop_base_color, 20%));
diff --git a/sass/widgets/_infobars.scss b/sass/widgets/_infobars.scss
@@ -68,10 +68,17 @@ infobar {
           background: transparentize($base_color, 0.4);
           color: transparentize($fg_color, 0.5);
         }
+
+        label {
+          color: transparentize($fg_color, 0.5);
+          &:backdrop {
+            color: transparentize($fg_color, 0.5);
+          }
+        }
     }
 
     &:backdrop {
-      background: transparentize($base_color, 0.2);
+      background: transparentize($base_color, 0.1);
       color: transparentize($fg_color, 0.5);
       @include _shadows($depth);
     }

diff --git a/sass/widgets/_scrollbars.scss b/sass/widgets/_scrollbars.scss
@@ -13,12 +13,6 @@ scrollbar {
   background-color: $scrollbar_bg_color;
   transition: 300ms $ease-out-quad;
 
-  // scrollbar border
-  &.top { border-bottom: 1px solid $borders_color; }
-  &.bottom { border-top: 1px solid $borders_color; }
-  &.left { border-right: 1px solid $borders_color; }
-  &.right { border-left: 1px solid $borders_color; }
-
   &:backdrop {
     background-color: $backdrop_scrollbar_bg_color;
     border-color: $backdrop_borders_color;
@@ -62,10 +56,9 @@ scrollbar {
 
       slider {
         margin: 0;
-        min-width: 3px;
-        min-height: 3px;
+        min-width: 4px;
+        min-height: 10px;
         background-color: $fg_color;
-        border: 1px solid if($variant == 'light', white, black);
       }
 
       button {
@@ -74,7 +67,6 @@ scrollbar {
         background-color: $fg_color;
         background-clip: padding-box;
         border-radius: 100%;
-        border: 1px solid if($variant == 'light', white, black);
         -gtk-icon-source: none;
       }