[gnome-themes-standard] comboboxes. slightly less obnoxious pushed state for buttons

[Jakub Steiner <jimmac src gnome org>]

commit c413aaa7e4a99f4001a8cf43a45f04f813b5d93c
Author: Jakub Steiner <jimmac gmail com>
Date:   Tue May 13 13:52:02 2014 +0200

    comboboxes. slightly less obnoxious pushed state for buttons

 themes/Adwaita/gtk-3.0/_common.scss  |   47 ++++++++++++++++++++++++++++++++-
 themes/Adwaita/gtk-3.0/gtk-dark.css  |   44 +++++++++++++++++++++++++++----
 themes/Adwaita/gtk-3.0/gtk-dark.scss |    3 +-
 themes/Adwaita/gtk-3.0/gtk.css       |   44 +++++++++++++++++++++++++++----
 themes/Adwaita/gtk-3.0/gtk.scss      |    4 ++-
 5 files changed, 126 insertions(+), 16 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/_common.scss b/themes/Adwaita/gtk-3.0/_common.scss
index fffdd43..880c700 100644
--- a/themes/Adwaita/gtk-3.0/_common.scss
+++ b/themes/Adwaita/gtk-3.0/_common.scss
@@ -153,11 +153,18 @@ GtkGrid:insensitive {
   @include draw_entry(null,null);
   &:insensitive, &:backdrop:insensitive {
     color: $insensitive_fg_color;
+    background-image: none;
+    background-color: $insensitive_bg_color;
+    box-shadow: inset 0 1px $borders_edge,
+                0 1px $borders_edge; /* doesn't have margin to paint on :( */
   }
   &:focus {
     border-color: $theme_selected_bg_color;
     box-shadow: inset 0 0 2px 1px transparentize($theme_selected_bg_color,.5);
   }
+  GtkLabel {
+    text-shadow: 0 1px red;
+  }  
 }
 
 .linked .entry {
@@ -195,9 +202,10 @@ GtkGrid:insensitive {
   &:active {
     $fill: linear-gradient(to bottom,
                                       darken($theme_bg_color,20%),
-                                      darken($theme_bg_color,10%),
-                                      darken($theme_bg_color,5%));
+                                      darken($theme_bg_color,15%) 5%,
+                                      darken($theme_bg_color,10%));
     @include draw_button(null,$fill);
+    box-shadow: inset 0 1px 2px $borders;
   }
   &:insensitive, &:backdrop:insensitive {
     $fill: linear-gradient(to bottom, transparent);
@@ -218,3 +226,38 @@ GtkGrid:insensitive {
     border-bottom-left-radius: 0;
   }
 }
+
+/**************
+ * ComboBoxes *
+ **************/
+GtkComboBox {
+  padding: 0;
+
+  -GtkComboBox-arrow-scaling: 0.5;
+  -GtkComboBox-shadow-type: none;
+  .separator {
+    /* always disable separators */
+    -GtkWidget-wide-separators: true;
+    -GtkWidget-horizontal-separator: 0;
+    -GtkWidget-vertical-separator: 0;
+  }
+  &.combobox-entry .entry:first-child {
+    border-radius: 3px 0 0 3px;
+    border-right: 0;
+  }
+  &.combobox-entry .button:first-child {
+    border-radius: 3px 0 0 3px;
+  }
+  &.combobox-entry .entry:last-child {
+    border-radius: 0 3px 3px 0;
+    border-left: 0;
+  }
+  &.combobox-entry .button:last-child {
+    border-radius: 0 3px 3px 0;
+  }
+  .button {
+    @extend .button;
+    padding: 2px 4px;
+  }
+  
+}
diff --git a/themes/Adwaita/gtk-3.0/gtk-dark.css b/themes/Adwaita/gtk-3.0/gtk-dark.css
index ee875c9..bcfcf3f 100644
--- a/themes/Adwaita/gtk-3.0/gtk-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-dark.css
@@ -56,7 +56,7 @@ debug {
   color: white; }
 
 *:insensitive {
-  background-color: #212424;
+  background-color: transparent;
   color: white;
   border-color: #181b1b; }
 
@@ -89,7 +89,7 @@ debug {
   color: #eeeeec; }
 
 .gtkstyle-fallback:insensitive {
-  background-color: #212424;
+  background-color: transparent;
   color: white; }
 
 .gtkstyle-fallback:selected {
@@ -163,10 +163,16 @@ GtkGrid:insensitive {
   background-image: linear-gradient(to bottom, black 1%, #1a1a1a 10%, #333333);
   background-color: transparent; }
   .entry:insensitive, .entry:backdrop:insensitive {
-    color: white; }
+    color: white;
+    background-image: none;
+    background-color: transparent;
+    box-shadow: inset 0 1px rgba(51, 51, 51, 0.6), 0 1px rgba(51, 51, 51, 0.6);
+    /* doesn't have margin to paint on :( */ }
   .entry:focus {
     border-color: #2a76c6;
     box-shadow: inset 0 0 2px 1px rgba(42, 118, 198, 0.5); }
+  .entry GtkLabel, .linked .entry GtkLabel {
+    text-shadow: 0 1px red; }
 
 .linked .entry:first-child {
   border-top-right-radius: 0;
@@ -179,7 +185,7 @@ GtkGrid:insensitive {
 /***********
  * Buttons *
  ***********/
-.button, .linked .button,
+.button, .linked .button, GtkComboBox .button,
 .toolbar .button.raised,
 .toolbar .raised .button,
 .toolbar GtkComboBox .button,
@@ -203,8 +209,9 @@ GtkGrid:insensitive {
   .toolbar GtkComboBox .button:active,
   .spinbutton.vertical .button:active {
     border: 1px solid black;
-    background-image: linear-gradient(to bottom, #090909, #212424, #2d3232);
-    background-color: transparent; }
+    background-image: linear-gradient(to bottom, #090909, #151717 5%, #212424);
+    background-color: transparent;
+    box-shadow: inset 0 1px 2px black; }
   .button:insensitive, .button:backdrop:insensitive,
   .toolbar .button.raised:insensitive,
   .toolbar .button.raised:backdrop:insensitive,
@@ -226,3 +233,28 @@ GtkGrid:insensitive {
 .linked .button:last-child {
   border-top-left-radius: 0;
   border-bottom-left-radius: 0; }
+
+/**************
+ * ComboBoxes *
+ **************/
+GtkComboBox {
+  padding: 0;
+  -GtkComboBox-arrow-scaling: 0.5;
+  -GtkComboBox-shadow-type: none; }
+  GtkComboBox .separator {
+    /* always disable separators */
+    -GtkWidget-wide-separators: true;
+    -GtkWidget-horizontal-separator: 0;
+    -GtkWidget-vertical-separator: 0; }
+  GtkComboBox.combobox-entry .entry:first-child {
+    border-radius: 3px 0 0 3px;
+    border-right: 0; }
+  GtkComboBox.combobox-entry .button:first-child {
+    border-radius: 3px 0 0 3px; }
+  GtkComboBox.combobox-entry .entry:last-child {
+    border-radius: 0 3px 3px 0;
+    border-left: 0; }
+  GtkComboBox.combobox-entry .button:last-child {
+    border-radius: 0 3px 3px 0; }
+  GtkComboBox .linked .button, .linked GtkComboBox .button, GtkComboBox .button {
+    padding: 2px 4px; }
diff --git a/themes/Adwaita/gtk-3.0/gtk-dark.scss b/themes/Adwaita/gtk-3.0/gtk-dark.scss
index 91d6523..c5a0320 100644
--- a/themes/Adwaita/gtk-3.0/gtk-dark.scss
+++ b/themes/Adwaita/gtk-3.0/gtk-dark.scss
@@ -7,6 +7,7 @@ $theme_fg_color: #eeeeec;
 $theme_selected_fg_color: lighten($theme_fg_color,10%);
 $theme_selected_bg_color: darken(#4a90d9,10%);
 $borders: darken($theme_bg_color,30%);
+$borders_edge: transparentize($theme_base_color,.4);
 
 $link_color: lighten($theme_selected_bg_color,10%);
 $warning_color: #f57900;
@@ -14,7 +15,7 @@ $error_color: #cc0000;
 $success_color: $theme_selected_bg_color;
 
 $insensitive_fg_color: lighten($theme_fg_color, 10%);
-$insensitive_bg_color: darken($theme_bg_color, 10%);
+$insensitive_bg_color: transparent;
 
 @import 'drawing';
 @import 'common';
diff --git a/themes/Adwaita/gtk-3.0/gtk.css b/themes/Adwaita/gtk-3.0/gtk.css
index f3ad157..543cdbc 100644
--- a/themes/Adwaita/gtk-3.0/gtk.css
+++ b/themes/Adwaita/gtk-3.0/gtk.css
@@ -56,7 +56,7 @@ debug {
   color: white; }
 
 *:insensitive {
-  background-color: white;
+  background-color: transparent;
   color: #748489;
   border-color: #bababa; }
 
@@ -89,7 +89,7 @@ debug {
   color: #2e3436; }
 
 .gtkstyle-fallback:insensitive {
-  background-color: white;
+  background-color: transparent;
   color: #748489; }
 
 .gtkstyle-fallback:selected {
@@ -163,10 +163,16 @@ GtkGrid:insensitive {
   background-image: linear-gradient(to bottom, #cccccc 1%, #e6e6e6 10%, white);
   background-color: transparent; }
   .entry:insensitive, .entry:backdrop:insensitive {
-    color: #748489; }
+    color: #748489;
+    background-image: none;
+    background-color: transparent;
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(255, 255, 255, 0.1);
+    /* doesn't have margin to paint on :( */ }
   .entry:focus {
     border-color: #729fcf;
     box-shadow: inset 0 0 2px 1px rgba(114, 159, 207, 0.5); }
+  .entry GtkLabel, .linked .entry GtkLabel {
+    text-shadow: 0 1px red; }
 
 .linked .entry:first-child {
   border-top-right-radius: 0;
@@ -179,7 +185,7 @@ GtkGrid:insensitive {
 /***********
  * Buttons *
  ***********/
-.button, .linked .button,
+.button, .linked .button, GtkComboBox .button,
 .toolbar .button.raised,
 .toolbar .raised .button,
 .toolbar GtkComboBox .button,
@@ -203,8 +209,9 @@ GtkGrid:insensitive {
   .toolbar GtkComboBox .button:active,
   .spinbutton.vertical .button:active {
     border: 1px solid #a1a1a1;
-    background-image: linear-gradient(to bottom, #bababa, lightgrey, #e0e0e0);
-    background-color: transparent; }
+    background-image: linear-gradient(to bottom, #bababa, #c7c7c7 5%, lightgrey);
+    background-color: transparent;
+    box-shadow: inset 0 1px 2px #a1a1a1; }
   .button:insensitive, .button:backdrop:insensitive,
   .toolbar .button.raised:insensitive,
   .toolbar .button.raised:backdrop:insensitive,
@@ -226,3 +233,28 @@ GtkGrid:insensitive {
 .linked .button:last-child {
   border-top-left-radius: 0;
   border-bottom-left-radius: 0; }
+
+/**************
+ * ComboBoxes *
+ **************/
+GtkComboBox {
+  padding: 0;
+  -GtkComboBox-arrow-scaling: 0.5;
+  -GtkComboBox-shadow-type: none; }
+  GtkComboBox .separator {
+    /* always disable separators */
+    -GtkWidget-wide-separators: true;
+    -GtkWidget-horizontal-separator: 0;
+    -GtkWidget-vertical-separator: 0; }
+  GtkComboBox.combobox-entry .entry:first-child {
+    border-radius: 3px 0 0 3px;
+    border-right: 0; }
+  GtkComboBox.combobox-entry .button:first-child {
+    border-radius: 3px 0 0 3px; }
+  GtkComboBox.combobox-entry .entry:last-child {
+    border-radius: 0 3px 3px 0;
+    border-left: 0; }
+  GtkComboBox.combobox-entry .button:last-child {
+    border-radius: 0 3px 3px 0; }
+  GtkComboBox .linked .button, .linked GtkComboBox .button, GtkComboBox .button {
+    padding: 2px 4px; }
diff --git a/themes/Adwaita/gtk-3.0/gtk.scss b/themes/Adwaita/gtk-3.0/gtk.scss
index 2f79088..d8b53af 100644
--- a/themes/Adwaita/gtk-3.0/gtk.scss
+++ b/themes/Adwaita/gtk-3.0/gtk.scss
@@ -13,6 +13,7 @@ $theme_fg_color: #2e3436;
 $theme_selected_fg_color: #ffffff;
 $theme_selected_bg_color: #729fcf;
 $borders: darken($theme_bg_color,30%);
+$borders_edge: transparentize($theme_base_color,.9);
 
 $link_color: lighten($theme_selected_bg_color,10%);
 $warning_color: #f57900;
@@ -20,8 +21,9 @@ $error_color: #cc0000;
 $success_color: $theme_selected_bg_color;
 
 $insensitive_fg_color: lighten($theme_fg_color, 30%);
-$insensitive_bg_color: lighten($theme_bg_color, 10%);
+$insensitive_bg_color: transparent;
 
 // common drawing routines
 @import 'drawing';
+// actual widget styling
 @import 'common';