Merge remote-tracking branch 'ajay/0.97.6-as-base' into devel

2 files changed, 11 insertions, 7 deletions

diff --git a/configure.ac b/configure.ac
index 27942e3..a8d9493 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ(2.53)
 
-AC_INIT([sugar-artwork],[0.97.10],[],[sugar-artwork])
+AC_INIT([sugar-artwork],[0.97.11],[],[sugar-artwork])
 
 AM_CONFIG_HEADER(config.h)
 
diff --git a/gtk3/theme/gtk-widgets.css.em b/gtk3/theme/gtk-widgets.css.em
index 7928f2b..1996034 100644
--- a/gtk3/theme/gtk-widgets.css.em
+++ b/gtk3/theme/gtk-widgets.css.em
@@ -147,11 +147,6 @@ GtkLabel, GtkLabel:insensitive {
     background-color: transparent;
 }
 
-/* Handle this differently? */
-.window *:insensitive {
-    background-color: @panel_grey;
-}
-
 /* Buttons */
 
 .button {
@@ -179,6 +174,10 @@ GtkLabel, GtkLabel:insensitive {
     background-color: @white;
 }
 
+.button:insensitive {
+    background-color: transparent;
+}
+
 .button:active:focused {
     color: @black;
     border-color: @button_grey;
@@ -334,6 +333,7 @@ GtkComboBox .separator {
 /* sure the buttons get black color in the next two rules: */
 .notebook tab GtkLabel {
     color: @white;
+    padding: $(subcell_size)px 0;
 }
 
 .notebook tab .button GtkLabel {
@@ -540,7 +540,7 @@ GtkProgressBar.trough {
 .separator {
     border-style: solid;
     border-color: @button_grey;
-    border-width: $thickness;
+    border-width: $(thickness)px;
 }
 
 /* Tool buttons */
@@ -558,6 +558,10 @@ SugarPaletteWindowWidget SugarRadioToolButton .button {
     border-style: none;
 }
 
+.toolbar .button #gtk-toolbar-arrow {
+    padding: 0 $(subcell_size + default_padding)px;
+}
+
 .toolbar GtkToolButton .button,
 .toolbar SugarRadioToolButton *,
 SugarPaletteWindowWidget SugarRadioToolButton *,