[gnome-themes-standard/wip/sass] inline-toolbar: sync bg color with notebook header bg

[Jakub Steiner <jimmac src gnome org>]

commit a7133fd69797251166b823c22beb034e1d07e131
Author: Jakub Steiner <jimmac gmail com>
Date:   Thu Jun 5 16:15:11 2014 +0200

    inline-toolbar: sync bg color with notebook header bg

 themes/Adwaita/gtk-3.0/_common.scss           |   19 +++++++++++++------
 themes/Adwaita/gtk-3.0/gtk-contained-dark.css |   14 +++++++++-----
 themes/Adwaita/gtk-3.0/gtk-contained.css      |   14 +++++++++-----
 3 files changed, 31 insertions(+), 16 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/_common.scss b/themes/Adwaita/gtk-3.0/_common.scss
index 9333b2c..b8b19a3 100644
--- a/themes/Adwaita/gtk-3.0/_common.scss
+++ b/themes/Adwaita/gtk-3.0/_common.scss
@@ -282,7 +282,13 @@
       padding: 8px;
     }
   }
-
+  
+  //inline-toolbar buttons
+  .inline-toolbar & {
+    border-radius: 2px;
+    border-width: 1px;
+  }
+  
   .primary-toolbar & { icon-shadow: none; } // tango icons don't need added shadows
 }
 
@@ -476,22 +482,23 @@ GtkComboBox {
   //searchbar & inline-toolbar
   &.inline-toolbar {
     @extend %inset-bar;
-    border-width: 1px 0 0 0;
-    padding: 6px;
+    border-width: 0 1px 1px;
+    padding: 3px;
+    border-radius: 0  0 4px 4px;
   }
   &.search-bar {
     @extend %inset-bar;
     border-width: 0 0 1px;
-    padding: 4px;
+    padding: 3px;
   }
 }
 
 %inset-bar {
   border-style: solid;
   border-color: $borders_color;
-  $_bg: mix(black, $bg_color, 4%);
+  $_bg: mix($bg_color, $borders_color, 70%);
   background-color: $_bg;
-  box-shadow: inset 0 1px 3px -2px mix($borders_color, $_bg, 60%);
+  box-shadow: inset 0 2px 3px -1px mix($borders_color, $_bg, 60%); //FIXME edge would be nice, but doesn't 
work
 }
 
 .action-bar {
diff --git a/themes/Adwaita/gtk-3.0/gtk-contained-dark.css b/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
index cc8452e..dbce444 100644
--- a/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
@@ -385,6 +385,9 @@
     padding: 6px 8px 5px; }
   .header-bar .button.image-button {
     padding: 8px; }
+  .inline-toolbar .button {
+    border-radius: 2px;
+    border-width: 1px; }
   .primary-toolbar .button {
     icon-shadow: none; }
 
@@ -580,17 +583,18 @@ GtkComboBox {
     border-radius: 6px;
     padding: 12px; }
   .toolbar.inline-toolbar {
-    border-width: 1px 0 0 0;
-    padding: 6px; }
+    border-width: 0 1px 1px;
+    padding: 3px;
+    border-radius: 0  0 4px 4px; }
   .toolbar.search-bar {
     border-width: 0 0 1px;
-    padding: 4px; }
+    padding: 3px; }
 
 .toolbar.inline-toolbar, .toolbar.search-bar {
   border-style: solid;
   border-color: #1c1f1f;
-  background-color: #363c3c;
-  box-shadow: inset 0 1px 3px -2px #262a2a; }
+  background-color: #303535;
+  box-shadow: inset 0 2px 3px -1px #242727; }
 
 .action-bar {
   padding: 4px; }
diff --git a/themes/Adwaita/gtk-3.0/gtk-contained.css b/themes/Adwaita/gtk-3.0/gtk-contained.css
index 73ec14f..d61beb3 100644
--- a/themes/Adwaita/gtk-3.0/gtk-contained.css
+++ b/themes/Adwaita/gtk-3.0/gtk-contained.css
@@ -385,6 +385,9 @@
     padding: 6px 8px 5px; }
   .header-bar .button.image-button {
     padding: 8px; }
+  .inline-toolbar .button {
+    border-radius: 2px;
+    border-width: 1px; }
   .primary-toolbar .button {
     icon-shadow: none; }
 
@@ -580,17 +583,18 @@ GtkComboBox {
     border-radius: 6px;
     padding: 12px; }
   .toolbar.inline-toolbar {
-    border-width: 1px 0 0 0;
-    padding: 6px; }
+    border-width: 0 1px 1px;
+    padding: 3px;
+    border-radius: 0  0 4px 4px; }
   .toolbar.search-bar {
     border-width: 0 0 1px;
-    padding: 4px; }
+    padding: 3px; }
 
 .toolbar.inline-toolbar, .toolbar.search-bar {
   border-style: solid;
   border-color: #a1a1a1;
-  background-color: #e3e3e3;
-  box-shadow: inset 0 1px 3px -2px #bbbbbb; }
+  background-color: #d6d6d6;
+  box-shadow: inset 0 2px 3px -1px #b6b6b6; }
 
 .action-bar {
   padding: 4px; }