[gnome-themes-standard/wip/sass] make sure $borders_color is respected in button drawing.

[Jakub Steiner <jimmac src gnome org>]

commit b9eb2179b3552d65ff6d052337cddb15fee39745
Author: Jakub Steiner <jimmac gmail com>
Date:   Tue May 20 21:38:19 2014 +0200

    make sure $borders_color is respected in button
    drawing.
    
    - i believe that's what Lapo has been trying to
      tell me all of today.

 themes/Adwaita/gtk-3.0/_drawing.scss          |   12 +++++++-----
 themes/Adwaita/gtk-3.0/gtk-contained-dark.css |   16 ++++++++--------
 themes/Adwaita/gtk-3.0/gtk-contained.css      |   12 ++++++------
 3 files changed, 21 insertions(+), 19 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/_drawing.scss b/themes/Adwaita/gtk-3.0/_drawing.scss
index 3b60950..808307d 100644
--- a/themes/Adwaita/gtk-3.0/_drawing.scss
+++ b/themes/Adwaita/gtk-3.0/_drawing.scss
@@ -12,7 +12,7 @@ $widget_bottom_hilight: 0 1px $borders_edge; //outer hilight "used" on
 
 @mixin _button_border_color ($c) {
 //
-// helper function to draw borders for colored buttons
+// helper function to draw borders
 //
   @if $variant=='light' {
     border-color: darken($c,30%);
@@ -61,7 +61,7 @@ $widget_bottom_hilight: 0 1px $borders_edge; //outer hilight "used" on
   @else { box-shadow: $shadow1; }
 }
 
- mixin button($t, $c:$theme_bg_color, $tc:$theme_fg_color ) {
+ mixin button($t, $c:$theme_bg_color, $tc:$theme_fg_color, $colored_button:false ) {
 //
 // Button drawing function
 // 
@@ -79,15 +79,16 @@ $widget_bottom_hilight: 0 1px $borders_edge; //outer hilight "used" on
 
   @if $t==normal { // normal button
     color: $tc;
-    @include _button_border_color($c);
     background-image: linear-gradient(to bottom,
                                       lighten($c,10%),
                                       $c 40%,
                                       darken($c,10%)
                                       );
 
-    @include _button_text_shadow($tc);
+    @if $colored_button { @include _button_border_color($c); }
+    @else { border-color: $borders_color; }
 
+    @include _button_text_shadow($tc);
     @include _button_box_shadow(inset 0 1px $borders_edge, 
                                 $widget_bottom_hilight);
   }
@@ -107,7 +108,8 @@ $widget_bottom_hilight: 0 1px $borders_edge; //outer hilight "used" on
 
   @else if $t==active { // pushed button
     color: $tc;
-    @include _button_border_color($c);
+    @if $colored_button { @include _button_border_color($c); }
+    @else { border-color: $borders_color; }
     background-image: linear-gradient(to bottom,
                                       darken($c,20%),
                                       darken($c,15%) 5%,
diff --git a/themes/Adwaita/gtk-3.0/gtk-contained-dark.css b/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
index 16b24a5..8a43588 100644
--- a/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
@@ -161,8 +161,8 @@ GtkGrid:insensitive {
   border-width: 1px;
   border-style: solid;
   color: #eeeeec;
-  border-color: #212424;
   background-image: linear-gradient(to bottom, #515a5a, #393f3f 40%, #212424);
+  border-color: #090909;
   text-shadow: 0 -1px rgba(17, 17, 19, 0.5);
   icon-shadow: 0 -1px rgba(17, 17, 19, 0.5);
   box-shadow: inset 0 1px rgba(238, 238, 236, 0.1), 0 1px rgba(238, 238, 236, 0.1);
@@ -188,7 +188,7 @@ GtkGrid:insensitive {
     border-width: 1px;
     border-style: solid;
     color: #eeeeec;
-    border-color: #212424;
+    border-color: #090909;
     background-image: linear-gradient(to bottom, #090909, #151717 5%, #212424);
     text-shadow: 0 -1px rgba(17, 17, 19, 0.5);
     icon-shadow: 0 -1px rgba(17, 17, 19, 0.5);
@@ -267,8 +267,8 @@ GtkGrid:insensitive {
     border-width: 1px;
     border-style: solid;
     color: white;
-    border-color: #215d9c;
     background-image: linear-gradient(to bottom, #4a90d9, #2a76c6 40%, #215d9c);
+    border-color: #090909;
     text-shadow: 0 -1px rgba(0, 0, 0, 0.5);
     icon-shadow: 0 -1px rgba(0, 0, 0, 0.5);
     box-shadow: inset 0 1px rgba(238, 238, 236, 0.1), 0 1px rgba(238, 238, 236, 0.1); }
@@ -293,7 +293,7 @@ GtkGrid:insensitive {
       border-width: 1px;
       border-style: solid;
       color: white;
-      border-color: #215d9c;
+      border-color: #090909;
       background-image: linear-gradient(to bottom, #184472, #1c5187 5%, #215d9c);
       text-shadow: 0 -1px rgba(0, 0, 0, 0.5);
       icon-shadow: 0 -1px rgba(0, 0, 0, 0.5);
@@ -341,8 +341,8 @@ GtkGrid:insensitive {
     border-width: 1px;
     border-style: solid;
     color: white;
-    border-color: #a60c0c;
     background-image: linear-gradient(to bottom, #ef2929, #d51010 40%, #a60c0c);
+    border-color: #090909;
     text-shadow: 0 -1px rgba(0, 0, 0, 0.5);
     icon-shadow: 0 -1px rgba(0, 0, 0, 0.5);
     box-shadow: inset 0 1px rgba(238, 238, 236, 0.1), 0 1px rgba(238, 238, 236, 0.1); }
@@ -367,7 +367,7 @@ GtkGrid:insensitive {
       border-width: 1px;
       border-style: solid;
       color: white;
-      border-color: #a60c0c;
+      border-color: #090909;
       background-image: linear-gradient(to bottom, #760909, #8e0b0b 5%, #a60c0c);
       text-shadow: 0 -1px rgba(0, 0, 0, 0.5);
       icon-shadow: 0 -1px rgba(0, 0, 0, 0.5);
@@ -646,8 +646,8 @@ GtkPopover {
     border-width: 1px;
     border-style: solid;
     color: #eeeeec;
-    border-color: #212424;
     background-image: linear-gradient(to bottom, #515a5a, #393f3f 40%, #212424);
+    border-color: #090909;
     text-shadow: 0 -1px rgba(17, 17, 19, 0.5);
     icon-shadow: 0 -1px rgba(17, 17, 19, 0.5);
     box-shadow: inset 0 1px rgba(238, 238, 236, 0.1), 0 1px rgba(238, 238, 236, 0.1); }
@@ -655,7 +655,7 @@ GtkPopover {
     border-width: 1px;
     border-style: solid;
     color: #eeeeec;
-    border-color: #212424;
+    border-color: #090909;
     background-image: linear-gradient(to bottom, #090909, #151717 5%, #212424);
     text-shadow: 0 -1px rgba(17, 17, 19, 0.5);
     icon-shadow: 0 -1px rgba(17, 17, 19, 0.5);
diff --git a/themes/Adwaita/gtk-3.0/gtk-contained.css b/themes/Adwaita/gtk-3.0/gtk-contained.css
index 8d4d868..35c48a9 100644
--- a/themes/Adwaita/gtk-3.0/gtk-contained.css
+++ b/themes/Adwaita/gtk-3.0/gtk-contained.css
@@ -161,8 +161,8 @@ GtkGrid:insensitive {
   border-width: 1px;
   border-style: solid;
   color: #2e3436;
-  border-color: #a1a1a1;
   background-image: linear-gradient(to bottom, white, #ededed 40%, lightgray);
+  border-color: #a1a1a1;
   text-shadow: 0 1px white;
   icon-shadow: 0 1px white;
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), 0 1px rgba(255, 255, 255, 0.05);
@@ -267,8 +267,8 @@ GtkGrid:insensitive {
     border-width: 1px;
     border-style: solid;
     color: white;
-    border-color: #2b537d;
     background-image: linear-gradient(to bottom, #98b9dc, #729fcf 40%, #4c85c2);
+    border-color: #a1a1a1;
     text-shadow: 0 -1px rgba(0, 0, 0, 0.5);
     icon-shadow: 0 -1px rgba(0, 0, 0, 0.5);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), 0 1px rgba(255, 255, 255, 0.05); }
@@ -293,7 +293,7 @@ GtkGrid:insensitive {
       border-width: 1px;
       border-style: solid;
       color: white;
-      border-color: #2b537d;
+      border-color: #a1a1a1;
       background-image: linear-gradient(to bottom, #386ca3, #3e78b6 5%, #4c85c2);
       text-shadow: 0 -1px rgba(0, 0, 0, 0.5);
       icon-shadow: 0 -1px rgba(0, 0, 0, 0.5);
@@ -341,8 +341,8 @@ GtkGrid:insensitive {
     border-width: 1px;
     border-style: solid;
     color: white;
-    border-color: #760909;
     background-image: linear-gradient(to bottom, #f35858, #ef2929 40%, #d51010);
+    border-color: #a1a1a1;
     text-shadow: 0 -1px rgba(0, 0, 0, 0.5);
     icon-shadow: 0 -1px rgba(0, 0, 0, 0.5);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), 0 1px rgba(255, 255, 255, 0.05); }
@@ -367,7 +367,7 @@ GtkGrid:insensitive {
       border-width: 1px;
       border-style: solid;
       color: white;
-      border-color: #760909;
+      border-color: #a1a1a1;
       background-image: linear-gradient(to bottom, #a60c0c, #bd0e0e 5%, #d51010);
       text-shadow: 0 -1px rgba(0, 0, 0, 0.5);
       icon-shadow: 0 -1px rgba(0, 0, 0, 0.5);
@@ -646,8 +646,8 @@ GtkPopover {
     border-width: 1px;
     border-style: solid;
     color: #2e3436;
-    border-color: #a1a1a1;
     background-image: linear-gradient(to bottom, white, #ededed 40%, lightgray);
+    border-color: #a1a1a1;
     text-shadow: 0 1px white;
     icon-shadow: 0 1px white;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), 0 1px rgba(255, 255, 255, 0.05); }