[gnome-themes-standard] sidebar: improve theming for sidebar scrollbars

[Cosimo Cecchi <cosimoc src gnome org>]

commit 1d030c57a44ea9d4771484b8f6b1ead27fb9d68f
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Thu Sep 20 16:15:03 2012 -0400

    sidebar: improve theming for sidebar scrollbars
    
    They didn't have an active state, were inconsistent in the dark variant
    and had a stray white border around the trough.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=684491

 themes/Adwaita/gtk-3.0/gtk-main-dark.css |    3 +++
 themes/Adwaita/gtk-3.0/gtk-main.css      |    3 +++
 themes/Adwaita/gtk-3.0/gtk-widgets.css   |   14 ++++++++++----
 3 files changed, 16 insertions(+), 4 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/gtk-main-dark.css b/themes/Adwaita/gtk-3.0/gtk-main-dark.css
index 35f5ff3..ba0f667 100644
--- a/themes/Adwaita/gtk-3.0/gtk-main-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-main-dark.css
@@ -34,6 +34,9 @@
 @define-color sidebar_bg shade (@theme_bg_color, 1.02);
 @define-color sidebar_bg_unfocused mix(@sidebar_bg, @theme_unfocused_base_color, 0.5);
 
+ define-color sidebar_scrollbar_trough shade(@sidebar_bg, 1.25);
+ define-color sidebar_scrollbar_trough_backdrop shade(@sidebar_bg_unfocused, 1.2);
+
 @define-color button_gradient_color_a shade (@theme_bg_color, 1.15);
 @define-color button_gradient_color_b @theme_bg_color;
 @define-color button_gradient_color_c shade (@theme_bg_color, 0.8);
diff --git a/themes/Adwaita/gtk-3.0/gtk-main.css b/themes/Adwaita/gtk-3.0/gtk-main.css
index c536c16..d17a8b9 100644
--- a/themes/Adwaita/gtk-3.0/gtk-main.css
+++ b/themes/Adwaita/gtk-3.0/gtk-main.css
@@ -34,6 +34,9 @@
 @define-color sidebar_bg shade (@theme_bg_color, 1.025);
 @define-color sidebar_bg_unfocused mix(@sidebar_bg, @theme_unfocused_base_color, 0.5);
 
+ define-color sidebar_scrollbar_trough shade(@sidebar_bg, 0.8);
+ define-color sidebar_scrollbar_trough_backdrop shade(@sidebar_bg_unfocused, 0.8);
+
 @define-color button_gradient_color_a shade(@theme_bg_color, 1.05);
 @define-color button_gradient_color_b @theme_bg_color;
 @define-color button_gradient_color_c shade(@theme_bg_color, 0.92);
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets.css b/themes/Adwaita/gtk-3.0/gtk-widgets.css
index e40a6fb..9a8dfd3 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets.css
@@ -2338,12 +2338,14 @@ GtkCheckButton:selected:focus {
  * Sidebar *
  ***********/
 .sidebar,
-.sidebar .view {
+.sidebar .view,
+.sidebar GtkScrolledWindow {
     background-color: @sidebar_bg;
 }
 
 .sidebar:backdrop,
-.sidebar .view:backdrop {
+.sidebar .view:backdrop,
+.sidebar GtkScrolledWindow:backdrop {
     background-color: @sidebar_bg_unfocused;
 }
 
@@ -2357,11 +2359,11 @@ GtkCheckButton:selected:focus {
 }
 
 .sidebar .scrollbar.trough {
-    background-color: shade(@sidebar_bg, 0.8);
+    background-color: @sidebar_scrollbar_trough;
 }
 
 .sidebar .scrollbar.trough:backdrop {
-    background-color: shade(@sidebar_bg_unfocused, 0.8);
+    background-color: @sidebar_scrollbar_trough_backdrop;
 }
 
 .sidebar .scrollbar.slider {
@@ -2373,6 +2375,10 @@ GtkCheckButton:selected:focus {
 }
 
 .sidebar .scrollbar.slider:hover {
+    background-color: mix (@sidebar_bg, @theme_base_color, 0.35);
+}
+
+.sidebar .scrollbar.slider:hover:active {
     background-color: @theme_base_color;
 }