[gtk+] Adwaita: flatten buttons slightly.

[Jakub Steiner <jimmac src gnome org>]

commit e3a40065cc9754bb7e1da47f8bc62c2eecfc60d1
Author: Jakub Steiner <jimmac gmail com>
Date:   Wed Jun 18 16:36:00 2014 +0200

    Adwaita: flatten buttons slightly.
    
    - gets rid of the specialcase for dark too.

 gtk/resources/theme/Adwaita/_drawing.scss     |   11 +---------
 gtk/resources/theme/Adwaita/gtk-contained.css |   26 ++++++++++++------------
 2 files changed, 14 insertions(+), 23 deletions(-)
---
diff --git a/gtk/resources/theme/Adwaita/_drawing.scss b/gtk/resources/theme/Adwaita/_drawing.scss
index a532051..17140c7 100644
--- a/gtk/resources/theme/Adwaita/_drawing.scss
+++ b/gtk/resources/theme/Adwaita/_drawing.scss
@@ -124,20 +124,11 @@ $widget_edge: 0 1px $borders_edge; //outer hilight "used" on
   // normal button
   //
     color: $tc;
-    @if lightness($c) < 50% { //darker buttons need a less contrasty gradient
-      background-image: linear-gradient(to bottom,
+    background-image: linear-gradient(to bottom,
                                   lighten($c,5%),
                                   $c 40%,
                                   darken($c,5%)
                                   );
-    }
-    @else {
-      background-image: linear-gradient(to bottom,
-                                  lighten($c,15%),
-                                  $c 40%,
-                                  darken($c,10%)
-                                  );
-    }
 
     @if $c!=$bg_color { @include _button_border_color($c); }
     @else { border-color: $borders_color; }
diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css
index 7554c65..161be73 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained.css
@@ -206,7 +206,7 @@
   border-width: 1px;
   border-style: solid;
   color: #2e3436;
-  background-image: linear-gradient(to bottom, white, #ededed 40%, lightgray);
+  background-image: linear-gradient(to bottom, #fafafa, #ededed 40%, #e0e0e0);
   border-color: #a1a1a1;
   text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
   icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
@@ -308,7 +308,7 @@
     border-width: 1px;
     border-style: solid;
     color: white;
-    background-image: linear-gradient(to bottom, #89b7e6, #4a90d9 40%, #2a76c6);
+    background-image: linear-gradient(to bottom, #5f9ddd, #4a90d9 40%, #3583d5);
     border-color: #1c5187;
     text-shadow: 0 -1px rgba(0, 0, 0, 0.54353);
     icon-shadow: 0 -1px rgba(0, 0, 0, 0.54353);
@@ -360,7 +360,7 @@
     border-width: 1px;
     border-style: solid;
     color: white;
-    background-image: linear-gradient(to bottom, #f47070, #ef2929 40%, #d51010);
+    background-image: linear-gradient(to bottom, #f14141, #ef2929 40%, #ed1212);
     border-color: #8e0b0b;
     text-shadow: 0 -1px rgba(0, 0, 0, 0.56078);
     icon-shadow: 0 -1px rgba(0, 0, 0, 0.56078);
@@ -469,7 +469,7 @@ GtkColorButton.button {
   border-width: 1px;
   border-style: solid;
   color: #2e3436;
-  background-image: linear-gradient(to bottom, white, #ededed 40%, lightgray);
+  background-image: linear-gradient(to bottom, #fafafa, #ededed 40%, #e0e0e0);
   border-color: #a1a1a1;
   text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
   icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
@@ -521,7 +521,7 @@ GtkColorButton.button {
   border-width: 1px;
   border-style: solid;
   color: #2e3436;
-  background-image: linear-gradient(to bottom, white, #ededed 40%, lightgray);
+  background-image: linear-gradient(to bottom, #fafafa, #ededed 40%, #e0e0e0);
   border-color: #a1a1a1;
   text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
   icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
@@ -566,7 +566,7 @@ GtkColorButton.button {
   border-width: 1px;
   border-style: solid;
   color: #2e3436;
-  background-image: linear-gradient(to bottom, white, #ededed 40%, lightgray);
+  background-image: linear-gradient(to bottom, #fafafa, #ededed 40%, #e0e0e0);
   border-color: #a1a1a1;
   text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
   icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
@@ -738,7 +738,7 @@ GtkComboBox {
       border-width: 1px;
       border-style: solid;
       color: white;
-      background-image: linear-gradient(to bottom, #89b7e6, #4a90d9 40%, #2a76c6);
+      background-image: linear-gradient(to bottom, #5f9ddd, #4a90d9 40%, #3583d5);
       border-color: #1c5187;
       text-shadow: 0 -1px rgba(0, 0, 0, 0.54353);
       icon-shadow: 0 -1px rgba(0, 0, 0, 0.54353);
@@ -797,7 +797,7 @@ GtkComboBox {
         border-width: 1px;
         border-style: solid;
         color: #2e3436;
-        background-image: linear-gradient(to bottom, white, #ededed 40%, lightgray);
+        background-image: linear-gradient(to bottom, #fafafa, #ededed 40%, #e0e0e0);
         border-color: #a1a1a1;
         text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
         icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
@@ -1306,7 +1306,7 @@ GtkSwitch {
     border-width: 1px;
     border-style: solid;
     color: #2e3436;
-    background-image: linear-gradient(to bottom, white, #ededed 40%, lightgray);
+    background-image: linear-gradient(to bottom, #fafafa, #ededed 40%, #e0e0e0);
     border-color: #a1a1a1;
     text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
     icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
@@ -1691,7 +1691,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
     border-width: 1px;
     border-style: solid;
     color: #2e3436;
-    background-image: linear-gradient(to bottom, white, #ededed 40%, lightgray);
+    background-image: linear-gradient(to bottom, #fafafa, #ededed 40%, #e0e0e0);
     border-color: #a1a1a1;
     text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
     icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
@@ -2220,7 +2220,7 @@ GtkMessageDialog .titlebar {
   border-width: 1px;
   border-style: solid;
   color: #2e3436;
-  background-image: linear-gradient(to bottom, white, #ededed 40%, lightgray);
+  background-image: linear-gradient(to bottom, #fafafa, #ededed 40%, #e0e0e0);
   border-color: #a1a1a1;
   text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
   icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
@@ -2340,7 +2340,7 @@ GtkInfoBar {
     border-width: 1px;
     border-style: solid;
     color: white;
-    background-image: linear-gradient(to bottom, #89b7e6, #4a90d9 40%, #2a76c6);
+    background-image: linear-gradient(to bottom, #5f9ddd, #4a90d9 40%, #3583d5);
     border-color: #1c5187;
     text-shadow: 0 -1px rgba(0, 0, 0, 0.54353);
     icon-shadow: 0 -1px rgba(0, 0, 0, 0.54353);
@@ -2506,7 +2506,7 @@ GtkColorChooserWidget #add-color-button {
     border-width: 1px;
     border-style: solid;
     color: #2e3436;
-    background-image: linear-gradient(to bottom, white, #ededed 40%, lightgray);
+    background-image: linear-gradient(to bottom, #fafafa, #ededed 40%, #e0e0e0);
     border-color: #a1a1a1;
     text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
     icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);