[gnome-themes-standard/lapo-work] Widget theme: some more styling fixes to the new spinbuttons, added a new css file for experimenting

[Lapo Calamandrei <lapo src gnome org>]

commit c402dc577d425adc155378040bdfe6b3ab3f973a
Author: Lapo Calamandrei <calamandrei gmail com>
Date:   Wed Nov 30 17:01:37 2011 +0100

    Widget theme: some more styling fixes to the new spinbuttons, added a new css file for experimenting with the scrollbars.

 themes/Adwaita/gtk-3.0/Makefile.am                 |    1 +
 themes/Adwaita/gtk-3.0/gtk-dark.css                |    1 +
 .../Adwaita/gtk-3.0/gtk-scrollbar-experiments.css  |   46 ++++++++++++++++++++
 themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css |   10 ++--
 .../Adwaita/gtk-3.0/gtk-widgets-borders-dark.css   |    9 ++++
 themes/Adwaita/gtk-3.0/gtk-widgets.css             |   25 ++++++++---
 themes/Adwaita/gtk-3.0/gtk.css                     |    3 +-
 7 files changed, 82 insertions(+), 13 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/Makefile.am b/themes/Adwaita/gtk-3.0/Makefile.am
index 81ff87a..f5def06 100644
--- a/themes/Adwaita/gtk-3.0/Makefile.am
+++ b/themes/Adwaita/gtk-3.0/Makefile.am
@@ -5,6 +5,7 @@ theme_DATA = 		\
 	gnome-applications.css \
 	gtk.css 	\
 	gtk-dark.css	\
+	gtk-scrollbar-experiments.css	\
 	gtk-widgets.css \
 	gtk-widgets-backgrounds.css \
 	gtk-widgets-borders.css \
diff --git a/themes/Adwaita/gtk-3.0/gtk-dark.css b/themes/Adwaita/gtk-3.0/gtk-dark.css
index b46c81c..689c0c1 100644
--- a/themes/Adwaita/gtk-3.0/gtk-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-dark.css
@@ -162,4 +162,5 @@
 @import url("gtk-widgets-assets-dark.css");
 @import url("gnome-applications.css");
 @import url("gtk-widgets.css");
+ import url("gtk-scrollbar-experiments.css");
 @import url("gtk-widgets-dark-overrides.css");
diff --git a/themes/Adwaita/gtk-3.0/gtk-scrollbar-experiments.css b/themes/Adwaita/gtk-3.0/gtk-scrollbar-experiments.css
new file mode 100644
index 0000000..d3d3a76
--- /dev/null
+++ b/themes/Adwaita/gtk-3.0/gtk-scrollbar-experiments.css
@@ -0,0 +1,46 @@
+.scrollbar {
+    background-image: none;
+    border-style: solid;
+    -GtkRange-trough-border: 2;
+    -GtkScrollbar-has-backward-stepper: false;
+    -GtkScrollbar-has-forward-stepper: false;
+    -GtkRange-slider-width: 7;
+    -GtkScrollbar-min-slider-length: 30; /* minimum size for the slider. sadly can't be in '.slider' where it belongs */
+
+    -GtkRange-stepper-spacing: 1;
+    -GtkRange-trough-under-steppers: 1;
+}
+
+.scrollbar.trough {
+    background-image: none;
+    background-color: shade (@theme_bg_color, 0.882);
+    border-width: 0;
+    border-radius: 0;
+    border-image: none;
+}
+
+.scrollbar.slider {
+    background-image: none;
+    background-color: alpha(@theme_text_color, 0.3);
+    border-radius: 3;
+    border-style: none;
+    border-image: none;
+}
+
+.scrollbar.slider:prelight {
+    background-image: none;
+    background-color: alpha(@theme_text_color, 0.4);
+}
+
+.scrollbar.slider:prelight:active {
+    background-image: none;
+    background-color: @theme_selected_bg_color;
+}
+
+.scrollbar.slider:insensitive {
+    background-color: alpha(@theme_base_color, 0.2)
+}
+
+.scrollbar.trough:insensitive {
+    background-color: shade (@theme_bg_color, 0.882);
+}
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css b/themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css
index 1f009a5..8a56a31 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets-backgrounds.css
@@ -99,13 +99,13 @@ GtkComboBox.combobox-entry .button:focus,
 .primary-toolbar GtkComboBox.combobox-entry .button:active,
 .primary-toolbar GtkComboBox.combobox-entry .button:hover:active,
 GtkComboBox.combobox-entry .button:active,
-GtkComboBox.combobox-entry .button:hover:active {
+GtkComboBox.combobox-entry .button:hover:active,
+.spinbutton .button:active,
+.spinbutton .button:active:hover {
     background-image: -gtk-gradient(linear,
                                     left top, left bottom,
-                                    from(shade(@entry_background_a, 0.95)),
-                                    color-stop(0.20, shade(@entry_background_b, 0.95)),
-                                    color-stop(0.85, shade(@entry_background_c, 0.95)),
-                                    to(shade(@entry_background_d, 0.95)));
+                                    from(shade(@entry_background_a, 0.9)),
+                                    to(@entry_background_d));
 }
 
 /* Insensitive entry background */
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets-borders-dark.css b/themes/Adwaita/gtk-3.0/gtk-widgets-borders-dark.css
index cc4567a..e8f13bc 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets-borders-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets-borders-dark.css
@@ -106,6 +106,15 @@ GtkSwitch.trough:active {
     border-width: 2;
 }
 
+/* Remove borders from primary toolbar buttons*/
+.primary-toolbar .button,
+.primary-toolbar .button:hover,
+.primary-toolbar .button:focus,
+.primary-toolbar .button:insensitive {
+    border-image: none;
+    border-style: none;
+}
+
 /* column-headers borders */
 column-header.button,
 column-header .button,
diff --git a/themes/Adwaita/gtk-3.0/gtk-widgets.css b/themes/Adwaita/gtk-3.0/gtk-widgets.css
index aa9845e..68dc933 100644
--- a/themes/Adwaita/gtk-3.0/gtk-widgets.css
+++ b/themes/Adwaita/gtk-3.0/gtk-widgets.css
@@ -38,7 +38,7 @@
 
     -GtkWidget-focus-padding: 2;
     -GtkWidget-focus-line-width: 1;
-    -adwaita-focus-border-color: alpha(@theme_text_color, 0.4);
+    -adwaita-focus-border-color: alpha(@theme_text_color, 0.3);
     -adwaita-focus-border-radius: 2;
     -adwaita-focus-fill-color: alpha(@theme_base_color, 0.0);
     -adwaita-focus-border-gradient: none;
@@ -205,14 +205,19 @@ GtkTreeView .separator,
     border-radius: 0;
     border-style: solid;
     border-image: none;
-    border-color: alpha(@internal_element_color, 0.15);
-
-    background-image: none;
-    background-color: none;
+    border-color: @inset_dark_color;
 
     box-shadow: none;
 }
 
+.spinbutton .button,
+.spinbutton .button:prelight,
+.spinbutton .button:focus,
+.spinbutton .button:insensitive {
+    background-color: none;
+    background-image: none;
+}
+
 .spinbutton .button:insensitive {
     color: @internal_element_insensitive;
 }
@@ -228,6 +233,7 @@ GtkTreeView .separator,
 .spinbutton .button:first-child:focus,
 .spinbutton .button:first-child:insensitive {
     border-left-width: 0;
+    border-radius: 2 0 0 2;
 }
 
 .spinbutton .button:last-child,
@@ -236,6 +242,7 @@ GtkTreeView .separator,
 .spinbutton .button:last-child:focus,
 .spinbutton .button:last-child:insensitive {
     border-width: 0;
+    border-radius: 0 2 2 0;
 }
 
 
@@ -316,7 +323,7 @@ GtkScale.slider:insensitive {
     border-style: none;
 
     color: alpha(@theme_base_color, 0.0); /* FIXME */
-    background-color: transparent;
+    background-color: none;
 
     /* background-image in -assets variant */
 }
@@ -837,9 +844,13 @@ GtkComboBox.combobox-entry .button:hover:active:first-child {
     box-shadow: -1 0 inset @inset_dark_color;
 }
 
+GtkComboBox.combobox-entry .button *:active,
+GtkComboBox.combobox-entry .button *:active:hover {
+    color: @theme_text_color;
+}
+
 GtkComboBox .button {
     color: @internal_element_color;
-    padding: 2 3 2 6; /* FIXME */
 }
 
 GtkComboBox .button *:prelight {
diff --git a/themes/Adwaita/gtk-3.0/gtk.css b/themes/Adwaita/gtk-3.0/gtk.css
index 2d7a7ab..7f2c7e3 100644
--- a/themes/Adwaita/gtk-3.0/gtk.css
+++ b/themes/Adwaita/gtk-3.0/gtk.css
@@ -147,7 +147,7 @@
 @define-color expander_row_selected_color #acccee;
 
 @define-color inset_light_color alpha(white, 0.45);
- define-color inset_dark_color alpha(black, 0.10);
+ define-color inset_dark_color alpha(black, 0.07);
 
 @define-color wm_highlight #ffffff;
 @define-color wm_title_highlight #ffffff;
@@ -175,3 +175,4 @@
 @import url("gnome-applications.css");
 @import url("gtk-widgets.css");
 /* @import url("gtk-widgets-window-unfocused.css"); */
+ import url("gtk-scrollbar-experiments.css");