[gnome-themes-standard/wip/sass] button sizing

[Jakub Steiner <jimmac src gnome org>]

commit a42508f265951ca70612fd3661d8a2379e7abe84
Author: Jakub Steiner <jimmac gmail com>
Date:   Wed May 14 13:25:32 2014 +0200

    button sizing

 themes/Adwaita/gtk-3.0/_common.scss |   22 +++++++++++++++++-----
 themes/Adwaita/gtk-3.0/gtk-dark.css |   33 ++++++++++++++++++++++-----------
 themes/Adwaita/gtk-3.0/gtk.css      |   33 ++++++++++++++++++++++-----------
 3 files changed, 61 insertions(+), 27 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/_common.scss b/themes/Adwaita/gtk-3.0/_common.scss
index a197e2c..623a432 100644
--- a/themes/Adwaita/gtk-3.0/_common.scss
+++ b/themes/Adwaita/gtk-3.0/_common.scss
@@ -221,6 +221,7 @@ GtkGrid:insensitive {
 
 .linked .button {
   @extend .button;
+  padding: 6px;
   &:first-child {
     border-top-right-radius: 0;
     border-bottom-right-radius: 0;
@@ -234,10 +235,10 @@ GtkGrid:insensitive {
 
 .header-bar .button {
   &.text-button {
-    padding: 2px 8px;
+    padding: 6px 8px 5px; /* due to font metrics the image buttons are 1px shorter */
   }
   &.image-button {
-    padding: 4px;
+    padding: 8px; 
   }
 }
 
@@ -271,9 +272,8 @@ GtkComboBox {
   }
   .button {
     @extend .button;
-    padding: 2px 4px;
+    padding: 4px 6px;
   }
-  
 }
 
 /***************
@@ -286,7 +286,7 @@ GtkComboBox {
     border-color: darken($theme_bg_color, 30%);
     border-radius: 5px 5px 0 0;
     
-    background-color: none;
+    background-color: transparent;
     background-image: linear-gradient(to bottom,
                                       lighten($theme_bg_color,2%),
                                       darken($theme_bg_color,5%));
@@ -302,4 +302,16 @@ GtkComboBox {
       font-size: 80%;
       padding: 0 12px;
     }
+    & > GtkBox > .separator.vertical {
+      -GtkWidget-wide-separators: 1;
+      -GtkWidget-separator-width: 2px;
+      background-color: transparent;
+      border-width: 0 1px;
+      border-style: solid;
+      border-color: transparent;
+      border-image: -gtk-scaled(url("assets/header-separator.png"),
+                    url("assets/header-separator 2 png")) 0 1 0 1 / 0 1px 0 1px stretch;
+  }
 }
+
+
diff --git a/themes/Adwaita/gtk-3.0/gtk-dark.css b/themes/Adwaita/gtk-3.0/gtk-dark.css
index a3dc007..ffedfa8 100644
--- a/themes/Adwaita/gtk-3.0/gtk-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-dark.css
@@ -240,18 +240,21 @@ GtkGrid:insensitive {
       background-image: linear-gradient(to bottom, #184472, #1c5187 5%, #215d9c);
       box-shadow: inset 0 1px 2px #0f2b48; }
 
-.linked .button:first-child {
-  border-top-right-radius: 0;
-  border-bottom-right-radius: 0;
-  border-right-width: 0; }
-.linked .button:last-child {
-  border-top-left-radius: 0;
-  border-bottom-left-radius: 0; }
+.linked .button {
+  padding: 6px; }
+  .linked .button:first-child {
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0;
+    border-right-width: 0; }
+  .linked .button:last-child {
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0; }
 
 .header-bar .button.text-button {
-  padding: 2px 8px; }
+  padding: 6px 8px 5px;
+  /* due to font metrics the image buttons are 1px shorter */ }
 .header-bar .button.image-button {
-  padding: 4px; }
+  padding: 8px; }
 
 /**************
  * ComboBoxes *
@@ -276,7 +279,7 @@ GtkComboBox {
   GtkComboBox.combobox-entry .button:last-child {
     border-radius: 0 3px 3px 0; }
   GtkComboBox .linked .button, .linked GtkComboBox .button, GtkComboBox .button {
-    padding: 2px 4px; }
+    padding: 4px 6px; }
 
 /***************
  * Header bars *
@@ -286,7 +289,7 @@ GtkComboBox {
   border-style: solid;
   border-color: black;
   border-radius: 5px 5px 0 0;
-  background-color: none;
+  background-color: transparent;
   background-image: linear-gradient(to bottom, #3e4444, #2d3232);
   box-shadow: inset 0 -1px rgba(0, 0, 0, 0.2), inset 0 1px rgba(51, 51, 51, 0.6);
   padding: 6px; }
@@ -296,3 +299,11 @@ GtkComboBox {
   .header-bar .subtitle {
     font-size: 80%;
     padding: 0 12px; }
+  .header-bar > GtkBox > .separator.vertical {
+    -GtkWidget-wide-separators: 1;
+    -GtkWidget-separator-width: 2px;
+    background-color: transparent;
+    border-width: 0 1px;
+    border-style: solid;
+    border-color: transparent;
+    border-image: -gtk-scaled(url("assets/header-separator.png"), url("assets/header-separator 2 png")) 0 1 
0 1/0 1px 0 1px stretch; }
diff --git a/themes/Adwaita/gtk-3.0/gtk.css b/themes/Adwaita/gtk-3.0/gtk.css
index 7c3f915..e4ec19b 100644
--- a/themes/Adwaita/gtk-3.0/gtk.css
+++ b/themes/Adwaita/gtk-3.0/gtk.css
@@ -240,18 +240,21 @@ GtkGrid:insensitive {
       background-image: linear-gradient(to bottom, #386ca3, #3e78b6 5%, #4c85c2);
       box-shadow: inset 0 1px 2px #2b537d; }
 
-.linked .button:first-child {
-  border-top-right-radius: 0;
-  border-bottom-right-radius: 0;
-  border-right-width: 0; }
-.linked .button:last-child {
-  border-top-left-radius: 0;
-  border-bottom-left-radius: 0; }
+.linked .button {
+  padding: 6px; }
+  .linked .button:first-child {
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0;
+    border-right-width: 0; }
+  .linked .button:last-child {
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0; }
 
 .header-bar .button.text-button {
-  padding: 2px 8px; }
+  padding: 6px 8px 5px;
+  /* due to font metrics the image buttons are 1px shorter */ }
 .header-bar .button.image-button {
-  padding: 4px; }
+  padding: 8px; }
 
 /**************
  * ComboBoxes *
@@ -276,7 +279,7 @@ GtkComboBox {
   GtkComboBox.combobox-entry .button:last-child {
     border-radius: 0 3px 3px 0; }
   GtkComboBox .linked .button, .linked GtkComboBox .button, GtkComboBox .button {
-    padding: 2px 4px; }
+    padding: 4px 6px; }
 
 /***************
  * Header bars *
@@ -286,7 +289,7 @@ GtkComboBox {
   border-style: solid;
   border-color: #a1a1a1;
   border-radius: 5px 5px 0 0;
-  background-color: none;
+  background-color: transparent;
   background-image: linear-gradient(to bottom, #f2f2f2, #e0e0e0);
   box-shadow: inset 0 -1px rgba(0, 0, 0, 0.1), inset 0 1px rgba(255, 255, 255, 0.1);
   padding: 6px; }
@@ -296,3 +299,11 @@ GtkComboBox {
   .header-bar .subtitle {
     font-size: 80%;
     padding: 0 12px; }
+  .header-bar > GtkBox > .separator.vertical {
+    -GtkWidget-wide-separators: 1;
+    -GtkWidget-separator-width: 2px;
+    background-color: transparent;
+    border-width: 0 1px;
+    border-style: solid;
+    border-color: transparent;
+    border-image: -gtk-scaled(url("assets/header-separator.png"), url("assets/header-separator 2 png")) 0 1 
0 1/0 1px 0 1px stretch; }