Merge lp:~larsu/ubuntu-themes/overlay-scrollbars into lp:ubuntu-themes

[Iain Lane]

Theme GTK overlay-scrollbars to be more ubuntu-ish

[Sebastien Bacher (seb128)]

looks good to me, much nicer that what we currently have

review: Approve

=== removed file 'Ambiance/gtk-3.0/apps/california.css'
--- Ambiance/gtk-3.0/apps/california.css	2014-09-09 10:51:25 +0000
+++ Ambiance/gtk-3.0/apps/california.css	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-
-/* for overlay-scrollbars */
-CaliforniaViewWeekGrid {
-    background-color: @bg_color;
-}

=== removed file 'Ambiance/gtk-3.0/apps/geary.css'
--- Ambiance/gtk-3.0/apps/geary.css	2015-03-20 16:52:48 +0000
+++ Ambiance/gtk-3.0/apps/geary.css	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-
-/* for overlay-scrollbars */
-ComposerWidget {
-    background-color: @bg_color;
-}

=== removed file 'Ambiance/gtk-3.0/apps/software-center.css'
--- Ambiance/gtk-3.0/apps/software-center.css	2015-03-20 12:45:48 +0000
+++ Ambiance/gtk-3.0/apps/software-center.css	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-
-/* for overlay-scrollbars */
-.action-bar {
-    background-color: @bg_color;
-}

=== modified file 'Ambiance/gtk-3.0/gtk-main.css'
--- Ambiance/gtk-3.0/gtk-main.css	2015-04-10 10:57:46 +0000
+++ Ambiance/gtk-3.0/gtk-main.css	2015-07-21 08:54:26 +0000
@@ -53,7 +53,6 @@
 @import url("gtk-widgets-borders.css");
 @import url("gtk-widgets-assets.css");
 @import url("gtk-widgets.css");
-@import url("apps/geary.css");
 @import url("apps/unity.css");
 @import url("apps/baobab.css");
 @import url("apps/gedit.css");
@@ -63,6 +62,4 @@
 @import url("apps/gnome-system-log.css");
 @import url("apps/unity-greeter.css");
 @import url("apps/glade.css");
-@import url("apps/california.css");
-@import url("apps/software-center.css");
 @import url("public-colors.css");

=== modified file 'Ambiance/gtk-3.0/gtk-widgets-borders.css'
--- Ambiance/gtk-3.0/gtk-widgets-borders.css	2014-11-27 13:01:02 +0000
+++ Ambiance/gtk-3.0/gtk-widgets-borders.css	2015-07-21 08:54:26 +0000
@@ -171,14 +171,6 @@
     border-image: url("assets/progressbar-horizontal-trough.png") 6 7 6 7 / 6px 7px 6px 7px stretch;
 }
 
-.trough.vertical {
-    border-image: url("assets/progressbar-vertical-trough.png") 7 6 7 6 / 7px 6px 7px 6px stretch;
-}
-
-.trough.vertical {
-    border-image: url("assets/progressbar-vertical-trough.png") 7 6 7 6 / 7px 6px 7px 6px stretch;
-}
-
 GtkSwitch.trough {
     border-image: url("assets/switch-trough-off.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
 }

=== modified file 'Ambiance/gtk-3.0/gtk-widgets.css'
--- Ambiance/gtk-3.0/gtk-widgets.css	2015-05-29 09:06:29 +0000
+++ Ambiance/gtk-3.0/gtk-widgets.css	2015-07-21 08:54:26 +0000
@@ -27,9 +27,6 @@
     -GtkRange-trough-under-steppers: 1;
     -GtkRange-stepper-spacing: 0;
     -GtkScale-trough-border: 0;
-    -GtkScrollbar-activate-slider: 1;
-    -GtkScrollbar-trough-border: 0;
-    -GtkScrollbar-min-slider-length: 31;
     -GtkScrolledWindow-scrollbar-spacing: 0;
     -GtkScrolledWindow-scrollbars-within-bevel: 1;
     -GtkSeparatorMenuItem-horizontal-padding: 0;
@@ -60,48 +57,6 @@
 
 .background:backdrop {
     color: @backdrop_fg_color;
-}
-
-/* LP: #1285783 */
-GtkScrolledWindow {
-    background-color: @bg_color;
-}
-
-GtkPaned {
-    background-color: @bg_color;
-}
-
-/* Background hack to make DejaDup Assistant windows not turn black when
- * overlay scrollbars are enabled.
- */
-Assistant GtkEventBox {
-    background-color: @bg_color;
-}
-
-/* ... and for Evolution's mail preferences window */
-EPreferencesWindow GtkNotebook GtkAlignment GtkVBox {
-    background-color: @bg_color;
-}
-
-/*************
- * assistant *
- *************/
-GtkAssistant .sidebar .highlight {
-    color: @fg_color;
-    font: bold;
-}
-
-GtkAssistant .sidebar {
-    background-color: shade (@bg_color, 0.97);
-    border-right-color: shade (@bg_color, 0.8);
-    border-radius: 0;
-    border-style: solid;
-    border-width: 0 1px 0 0;
-    padding: 12px;
-
-    color: mix (@fg_color, @bg_color, 0.40);
-    text-shadow: 0 1px shade (@bg_color, 1.04);
-
     box-shadow: inset -1px 0 shade (@bg_color, 0.94);
 }
 
@@ -239,8 +194,7 @@
 
 .button.default:hover {
     border-image-source: url("assets/button-default-hover.png");
-}
-
+}.
 .button.default:focus {
     border-image-source: url("assets/button-default-focused.png");
 }
@@ -1181,74 +1135,31 @@
 /*************
  * scrollbar *
  *************/
-.scrollbar,
-.scrollbar.vertical {
+.scrollbar {
     -GtkScrollbar-has-backward-stepper: 0;
     -GtkScrollbar-has-forward-stepper: 0;
-    -GtkRange-slider-width: 14;
-
-    border-radius: 20px;
-
-    border-image: none;
-}
-
-.scrollbar.trough,
-.scrollbar.trough.vertical {
-    border-color: shade (@bg_color, 0.8);
-}
-
-.scrollbar.slider,
-.scrollbar.slider:hover,
-.scrollbar.button,
-.scrollbar.slider.vertical,
-.scrollbar.slider.vertical:hover,
-.scrollbar.button.vertical {
-    border-width: 1px;
-    border-style: solid;
-    border-color: shade (@bg_color, 0.86);
-    background-image: -gtk-gradient (linear, left top, right top,
-                                     from (shade (@button_bg_color, 1.08)),
-                                     color-stop (0.5, @button_bg_color),
-                                     to (shade (@button_bg_color, 0.94)));
-    box-shadow: inset 1px 0 shade (@bg_color, 1.1),
-                inset -1px 0 shade (@bg_color, 1.01),
-                inset 0 1px shade (@bg_color, 1.1),
-                inset 0 -1px shade (@bg_color, 1.1);
-}
-
-.scrollbar.slider.horizontal,
-.scrollbar.slider.horizontal:hover,
-.scrollbar.button.horizontal {
-    background-image: -gtk-gradient (linear, left top, left bottom,
-                                     from (shade (@button_bg_color, 1.08)),
-                                     color-stop (0.5, @button_bg_color),
-                                     to (shade (@button_bg_color, 0.94)));
-    box-shadow: inset 1px 0 shade (@bg_color, 1.1),
-                inset -1px 0 shade (@bg_color, 1.1),
-                inset 0 1px shade (@bg_color, 1.1),
-                inset 0 -1px shade (@bg_color, 1.01);
-}
-
-/* overlay scrollbar */
-OsThumb {
-    color: shade (@fg_color, 1.6);
-}
-
-OsThumb:selected,
-GtkScrollbar:selected {
+    -GtkScrollbar-trough-border: 0;
+    -GtkScrollbar-min-slider-length: 31;
+    -GtkRange-slider-width: 3;
+
+    border: none;
+}
+
+.scrollbar.hovering,
+.scrollbar.dragging {
+    -GtkRange-slider-width: 10;
+    background-color: alpha(@bg_color, 0.8);
+}
+
+.scrollbar.slider {
+    background-color: alpha(@selected_bg_color, 0.8);
+    border-radius: 8px;
+}
+
+.scrollbar.slider:active {
     background-color: @selected_bg_color;
 }
 
-OsThumb:active,
-GtkScrollbar:active {
-    background-color: shade (@bg_color, 0.6);
-}
-
-OsThumb:insensitive,
-GtkScrollbar:insensitive {
-    background-color: shade (@bg_color, 0.85);
-}
-
 /*******************
  * scrolled window *
  *******************/

=== removed file 'Radiance/gtk-3.0/apps/california.css'
--- Radiance/gtk-3.0/apps/california.css	2014-09-09 10:51:25 +0000
+++ Radiance/gtk-3.0/apps/california.css	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-
-/* for overlay-scrollbars */
-CaliforniaViewWeekGrid {
-    background-color: @bg_color;
-}

=== removed file 'Radiance/gtk-3.0/apps/geary.css'
--- Radiance/gtk-3.0/apps/geary.css	2015-03-20 16:52:48 +0000
+++ Radiance/gtk-3.0/apps/geary.css	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-
-/* for overlay-scrollbars */
-ComposerWidget {
-    background-color: @bg_color;
-}

=== removed file 'Radiance/gtk-3.0/apps/software-center.css'
--- Radiance/gtk-3.0/apps/software-center.css	2015-03-20 12:45:48 +0000
+++ Radiance/gtk-3.0/apps/software-center.css	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-
-/* for overlay-scrollbars */
-.action-bar {
-    background-color: @bg_color;
-}

=== modified file 'Radiance/gtk-3.0/gtk-main.css'
--- Radiance/gtk-3.0/gtk-main.css	2015-04-10 10:57:46 +0000
+++ Radiance/gtk-3.0/gtk-main.css	2015-07-21 08:54:26 +0000
@@ -55,7 +55,6 @@
 @import url("gtk-widgets-assets-radiance.css");
 @import url("gtk-widgets.css");
 @import url("gtk-widgets-radiance.css");
-@import url("apps/geary.css");
 @import url("apps/unity.css");
 @import url("apps/unity-greeter.css");
 @import url("apps/baobab.css");
@@ -65,6 +64,4 @@
 @import url("apps/gnome-terminal.css");
 @import url("apps/gnome-system-log.css");
 @import url("apps/glade.css");
-@import url("apps/california.css");
-@import url("apps/software-center.css");
 @import url("public-colors.css");

=== modified file 'Radiance/gtk-3.0/gtk-widgets-borders.css'
--- Radiance/gtk-3.0/gtk-widgets-borders.css	2014-11-27 13:01:02 +0000
+++ Radiance/gtk-3.0/gtk-widgets-borders.css	2015-07-21 08:54:26 +0000
@@ -180,17 +180,6 @@
     border-image: url("assets/progressbar-horizontal-trough.png") 6 7 6 7 / 6px 7px 6px 7px stretch;
 }
 
-.trough.vertical {
-    border-image: url("assets/progressbar-vertical-trough.png") 7 6 7 6 / 7px 6px 7px 6px stretch;
-}
-
-.trough row {
-}
-
-.trough.vertical {
-    border-image: url("assets/progressbar-vertical-trough.png") 7 6 7 6 / 7px 6px 7px 6px stretch;
-}
-
 GtkSwitch.trough {
     border-image: url("assets/switch-trough-off.png") 10 12 10 12 / 10px 12px 10px 12px stretch;
 }

=== modified file 'Radiance/gtk-3.0/gtk-widgets.css'
--- Radiance/gtk-3.0/gtk-widgets.css	2015-05-29 09:06:29 +0000
+++ Radiance/gtk-3.0/gtk-widgets.css	2015-07-21 08:54:26 +0000
@@ -27,9 +27,6 @@
     -GtkRange-trough-under-steppers: 1;
     -GtkRange-stepper-spacing: 0;
     -GtkScale-trough-border: 0;
-    -GtkScrollbar-activate-slider: 1;
-    -GtkScrollbar-trough-border: 0;
-    -GtkScrollbar-min-slider-length: 31;
     -GtkScrolledWindow-scrollbar-spacing: 0;
     -GtkScrolledWindow-scrollbars-within-bevel: 1;
     -GtkSeparatorMenuItem-horizontal-padding: 0;
@@ -61,27 +58,6 @@
     color: @backdrop_fg_color;
 }
 
-/* LP: #1285783 */
-GtkScrolledWindow {
-    background-color: @bg_color;
-}
-
-GtkPaned {
-    background-color: @bg_color;
-}
-
-/* Background hack to make DejaDup Assistant windows not turn black when
- * overlay scrollbars are enabled.
- */
-Assistant GtkEventBox {
-    background-color: @bg_color;
-}
-
-/* ... and for Evolution's mail preferences window */
-EPreferencesWindow GtkNotebook GtkAlignment GtkVBox {
-    background-color: @bg_color;
-}
-
 /*************
  * assistant *
  *************/
@@ -1181,74 +1157,31 @@
 /*************
  * scrollbar *
  *************/
-.scrollbar,
-.scrollbar.vertical {
+.scrollbar {
     -GtkScrollbar-has-backward-stepper: 0;
     -GtkScrollbar-has-forward-stepper: 0;
-    -GtkRange-slider-width: 14;
-
-    border-radius: 20px;
-
-    border-image: none;
-}
-
-.scrollbar.trough,
-.scrollbar.trough.vertical {
-    border-color: shade (@bg_color, 0.8);
-}
-
-.scrollbar.slider,
-.scrollbar.slider:hover,
-.scrollbar.button,
-.scrollbar.slider.vertical,
-.scrollbar.slider.vertical:hover,
-.scrollbar.button.vertical {
-    border-width: 1px;
-    border-style: solid;
-    border-color: shade (@bg_color, 0.86);
-    background-image: -gtk-gradient (linear, left top, right top,
-                                     from (shade (@button_bg_color, 1.08)),
-                                     color-stop (0.5, @button_bg_color),
-                                     to (shade (@button_bg_color, 0.94)));
-    box-shadow: inset 1px 0 shade (@bg_color, 1.1),
-                inset -1px 0 shade (@bg_color, 1.01),
-                inset 0 1px shade (@bg_color, 1.1),
-                inset 0 -1px shade (@bg_color, 1.1);
-}
-
-.scrollbar.slider.horizontal,
-.scrollbar.slider.horizontal:hover,
-.scrollbar.button.horizontal {
-    background-image: -gtk-gradient (linear, left top, left bottom,
-                                     from (shade (@button_bg_color, 1.08)),
-                                     color-stop (0.5, @button_bg_color),
-                                     to (shade (@button_bg_color, 0.94)));
-    box-shadow: inset 1px 0 shade (@bg_color, 1.1),
-                inset -1px 0 shade (@bg_color, 1.1),
-                inset 0 1px shade (@bg_color, 1.1),
-                inset 0 -1px shade (@bg_color, 1.01);
-}
-
-/* overlay scrollbar */
-OsThumb {
-    color: shade (@fg_color, 1.6);
-}
-
-OsThumb:selected,
-GtkScrollbar:selected {
+    -GtkScrollbar-trough-border: 0;
+    -GtkScrollbar-min-slider-length: 31;
+    -GtkRange-slider-width: 3;
+
+    border: none;
+}
+
+.scrollbar.hovering,
+.scrollbar.dragging {
+    -GtkRange-slider-width: 10;
+    background-color: alpha(@bg_color, 0.8);
+}
+
+.scrollbar.slider {
+    background-color: alpha(@selected_bg_color, 0.8);
+    border-radius: 8px;
+}
+
+.scrollbar.slider:active {
     background-color: @selected_bg_color;
 }
 
-OsThumb:active,
-GtkScrollbar:active {
-    background-color: shade (@bg_color, 0.6);
-}
-
-OsThumb:insensitive,
-GtkScrollbar:insensitive {
-    background-color: shade (@bg_color, 0.85);
-}
-
 /*******************
  * scrolled window *
  *******************/