Merge lp:~danrabbit/egtk/bottom-toolbar into lp:egtk/1.0

[Danielle Foré]

This adjust toolbar and button padding for the bottom-toolbar style.

[Cassidy James Blaede (cassidyjames)]

Looks better than before. Approved for merging!

review: Approve

=== modified file 'gtk-3.0/content-view.css'
--- gtk-3.0/content-view.css	2012-06-13 21:52:27 +0000
+++ gtk-3.0/content-view.css	2012-06-19 19:39:39 +0000
@@ -37,6 +37,28 @@
 
 }
 
+.content-view column-header .button {
+	border-width: 0 0 1px 1px;
+
+    -unico-outer-stroke-style: none;
+
+    background-image: -gtk-gradient (linear,
+                    left top,
+                    left bottom,
+                    from (shade (@base_color, 0.98)),
+                    to (shade (@base_color, 0.92)));
+
+        -unico-border-gradient: -gtk-gradient (linear,
+        left top, left bottom,
+        from (shade (@base_color, 0.86)),
+        to (shade (@base_color, 0.70)));
+
+}
+
+.content-view column-header .button * {
+    color: #666;
+}
+
 .content-view .entry {
 
     background-image: -gtk-gradient (linear,
 
=== modified file 'gtk-3.0/gtk-widgets.css'
--- gtk-3.0/gtk-widgets.css	2012-06-13 21:52:27 +0000
+++ gtk-3.0/gtk-widgets.css	2012-06-19 19:39:39 +0000
@@ -162,7 +162,8 @@
 .spinbutton .button:focus,
 .view,
 GtkTreeView .entry,
-column-header .button {
+column-header .button,
+.content-view column-header .button {
     border-radius: 0;
 }
 
@@ -207,6 +208,8 @@
 .sidebar,
 .sidebar.view,
 .toolbar,
+.trough row:selected,
+.trough row:selected:focused,
 GraniteWidgetsStatusBar,
 GtkSwitch {
     text-shadow: 0 1 alpha (#fff, 0.4);
@@ -224,6 +227,8 @@
 .menubar *:prelight,
 .menu *:active,
 .menu *:prelight,
+.progressbar row:selected,
+.progressbar row:selected:focused,
 .sidebar.view:selected,
 .tooltip *,
 GtkInfoBar *,
@@ -236,6 +241,8 @@
 .menubar.menuitem:prelight,
 .menu *:active,
 .menu *:prelight,
+.progressbar row:selected,
+.progressbar row:selected:focused,
 .sidebar.view:selected,
 .tooltip,
 GtkInfoBar,
@@ -1171,7 +1178,8 @@
 column-header {
 }
 
-column-header:nth-child(first) .button {
+column-header:nth-child(first) .button,
+.content-view column-header:nth-child(first) .button {
     border-width: 0 0 1px 0;
 }
 
 
=== modified file 'gtk-3.0/progressbar.css'
--- gtk-3.0/progressbar.css	2012-06-13 21:52:27 +0000
+++ gtk-3.0/progressbar.css	2012-06-19 19:39:39 +0000
@@ -135,6 +135,8 @@
 .trough row:selected,
 .trough row:selected:focused  {
 
+    color: @text_color;
+
     -unico-border-gradient: -gtk-gradient (linear,
                     left top, left bottom,
                     from (shade (@selected_bg_color, 0.87)),
 
=== modified file 'gtk-3.0/toolbar.css'
--- gtk-3.0/toolbar.css	2012-06-13 21:52:27 +0000
+++ gtk-3.0/toolbar.css	2012-06-19 19:39:39 +0000
@@ -76,7 +76,7 @@
 ******************/
 
 .bottom-toolbar.toolbar {
-    padding: 10px;
+    padding: 8px;
     border-style: solid;
     border-width: 1px 0 0 0;
     -unico-inner-stroke-width: 1px;
@@ -90,7 +90,7 @@
 }
 
 .bottom-toolbar.toolbar .button {
-    padding: 1px 3px 1px 3px;
+    padding: 2px 3px 2px 3px;
 }