[gnome-themes-standard] toolbar, searchbar, actionbar: put these guys together

[Jakub Steiner <jimmac src gnome org>]

commit 431298f1758811a800d1d9a58950ab52dc77694d
Author: Jakub Steiner <jimmac gmail com>
Date:   Mon Jun 2 19:17:07 2014 +0200

    toolbar, searchbar, actionbar: put these guys together

 themes/Adwaita/gtk-3.0/_common.scss           |   75 +++++++++++++------------
 themes/Adwaita/gtk-3.0/gtk-contained-dark.css |   55 ++++++++++---------
 themes/Adwaita/gtk-3.0/gtk-contained.css      |   55 ++++++++++---------
 3 files changed, 97 insertions(+), 88 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/_common.scss b/themes/Adwaita/gtk-3.0/_common.scss
index d139de7..9907f73 100644
--- a/themes/Adwaita/gtk-3.0/_common.scss
+++ b/themes/Adwaita/gtk-3.0/_common.scss
@@ -411,7 +411,7 @@ GtkComboBox {
   &:backdrop:insensitive {
     color: $backdrop_insensitive_color;
   }
-
+  .menuitem:active { text-shadow: none; }
   .separator {
     // always disable separators
     -GtkWidget-wide-separators: true;
@@ -434,6 +434,44 @@ GtkComboBox {
   }
 }
 
+/************
+ * Toolbars *
+ ************/
+.toolbar { //FIXME: why is all this being ignored?
+    padding: 6px;
+    background-color: $bg_color;
+}
+
+//searchbar & actionbar
+
+%inset-bar {
+  border-style: solid;
+  border-color: $borders_color;
+  $_bg: mix(black, $bg_color, 4%);
+  background-color: $_bg;
+  box-shadow: inset 0 1px 3px -2px mix($borders_color, $_bg, 60%);
+}
+
+.search-bar {
+  @extend %inset-bar;
+  border-width: 0 0 1px;
+  padding: 4px;
+}
+
+.action-bar {
+  @extend %inset-bar;
+  border-width: 1px 0 0 0;
+  padding: 6px;
+  .title {
+    font: Bold 11;
+    padding: 0 12px;
+  }
+  .subtitle {
+    font: 9;
+    padding: 0 12px;
+  }
+}
+
 /***************
  * Header bars *
  ***************/
@@ -500,41 +538,6 @@ GtkComboBox {
   }
 }
 
-/************
- * Searbars *
- ************/
-%inset-bar {
-  border-style: solid;
-  border-color: $borders_color;
-  $_bg: mix(black, $bg_color, 4%);
-  background-color: $_bg;
-  box-shadow: inset 0 1px 3px -2px mix($borders_color, $_bg, 60%);
-}
-
-.search-bar {
-  @extend %inset-bar;
-  border-width: 0 0 1px;
-  padding: 4px;
-}
-
-/***************
- * Action bars *
- ***************/
-
-.action-bar {
-  @extend %inset-bar;
-  border-width: 1px 0 0 0;
-  padding: 6px;
-  .title {
-    font: Bold 11;
-    padding: 0 12px;
-  }
-  .subtitle {
-    font: 9;
-    padding: 0 12px;
-  }
-}
-
 /**************
  * Tree Views *
  **************/
diff --git a/themes/Adwaita/gtk-3.0/gtk-contained-dark.css b/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
index a43453a..cb6fd80 100644
--- a/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
@@ -515,6 +515,8 @@ GtkComboBox {
     icon-shadow: none; }
   GtkComboBox:backdrop:insensitive {
     color: #a0a3a2; }
+  GtkComboBox .menuitem:active {
+    text-shadow: none; }
   GtkComboBox .separator {
     -GtkWidget-wide-separators: true;
     -GtkWidget-horizontal-separator: 0;
@@ -530,6 +532,33 @@ GtkComboBox {
   GtkComboBox.combobox-entry .button:last-child {
     border-radius: 0 3px 3px 0; }
 
+/************
+ * Toolbars *
+ ************/
+.toolbar {
+  padding: 6px;
+  background-color: #393f3f; }
+
+.search-bar, .action-bar {
+  border-style: solid;
+  border-color: #1c1f1f;
+  background-color: #363c3c;
+  box-shadow: inset 0 1px 3px -2px #262a2a; }
+
+.search-bar {
+  border-width: 0 0 1px;
+  padding: 4px; }
+
+.action-bar {
+  border-width: 1px 0 0 0;
+  padding: 6px; }
+  .action-bar .title {
+    font: Bold 11;
+    padding: 0 12px; }
+  .action-bar .subtitle {
+    font: 9;
+    padding: 0 12px; }
+
 /***************
  * Header bars *
  ***************/
@@ -577,32 +606,6 @@ GtkComboBox {
   .header-bar {
     border-radius: 0; }
 
-/************
- * Searbars *
- ************/
-.search-bar, .action-bar {
-  border-style: solid;
-  border-color: #1c1f1f;
-  background-color: #363c3c;
-  box-shadow: inset 0 1px 3px -2px #262a2a; }
-
-.search-bar {
-  border-width: 0 0 1px;
-  padding: 4px; }
-
-/***************
- * Action bars *
- ***************/
-.action-bar {
-  border-width: 1px 0 0 0;
-  padding: 6px; }
-  .action-bar .title {
-    font: Bold 11;
-    padding: 0 12px; }
-  .action-bar .subtitle {
-    font: 9;
-    padding: 0 12px; }
-
 /**************
  * Tree Views *
  **************/
diff --git a/themes/Adwaita/gtk-3.0/gtk-contained.css b/themes/Adwaita/gtk-3.0/gtk-contained.css
index 8fc86f9..008255b 100644
--- a/themes/Adwaita/gtk-3.0/gtk-contained.css
+++ b/themes/Adwaita/gtk-3.0/gtk-contained.css
@@ -515,6 +515,8 @@ GtkComboBox {
     icon-shadow: none; }
   GtkComboBox:backdrop:insensitive {
     color: #c7c7c7; }
+  GtkComboBox .menuitem:active {
+    text-shadow: none; }
   GtkComboBox .separator {
     -GtkWidget-wide-separators: true;
     -GtkWidget-horizontal-separator: 0;
@@ -530,6 +532,33 @@ GtkComboBox {
   GtkComboBox.combobox-entry .button:last-child {
     border-radius: 0 3px 3px 0; }
 
+/************
+ * Toolbars *
+ ************/
+.toolbar {
+  padding: 6px;
+  background-color: #ededed; }
+
+.search-bar, .action-bar {
+  border-style: solid;
+  border-color: #a1a1a1;
+  background-color: #e3e3e3;
+  box-shadow: inset 0 1px 3px -2px #bbbbbb; }
+
+.search-bar {
+  border-width: 0 0 1px;
+  padding: 4px; }
+
+.action-bar {
+  border-width: 1px 0 0 0;
+  padding: 6px; }
+  .action-bar .title {
+    font: Bold 11;
+    padding: 0 12px; }
+  .action-bar .subtitle {
+    font: 9;
+    padding: 0 12px; }
+
 /***************
  * Header bars *
  ***************/
@@ -577,32 +606,6 @@ GtkComboBox {
   .header-bar {
     border-radius: 0; }
 
-/************
- * Searbars *
- ************/
-.search-bar, .action-bar {
-  border-style: solid;
-  border-color: #a1a1a1;
-  background-color: #e3e3e3;
-  box-shadow: inset 0 1px 3px -2px #bbbbbb; }
-
-.search-bar {
-  border-width: 0 0 1px;
-  padding: 4px; }
-
-/***************
- * Action bars *
- ***************/
-.action-bar {
-  border-width: 1px 0 0 0;
-  padding: 6px; }
-  .action-bar .title {
-    font: Bold 11;
-    padding: 0 12px; }
-  .action-bar .subtitle {
-    font: 9;
-    padding: 0 12px; }
-
 /**************
  * Tree Views *
  **************/