[gnome-themes-standard] switch: flatter

[Jakub Steiner <jimmac src gnome org>]

commit 7bb7521d281302731b93440f87627942705f6120
Author: Jakub Steiner <jimmac gmail com>
Date:   Tue May 27 19:50:21 2014 +0200

    switch: flatter
    
    - insensitive, backdrop button: use backrgound-image to avoid flickering transition

 themes/Adwaita/gtk-3.0/_drawing.scss          |   13 +++----
 themes/Adwaita/gtk-3.0/gtk-contained-dark.css |   43 +++++++++----------------
 themes/Adwaita/gtk-3.0/gtk-contained.css      |   43 +++++++++----------------
 3 files changed, 36 insertions(+), 63 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/_drawing.scss b/themes/Adwaita/gtk-3.0/_drawing.scss
index 1bb8fca..3c2faf4 100644
--- a/themes/Adwaita/gtk-3.0/_drawing.scss
+++ b/themes/Adwaita/gtk-3.0/_drawing.scss
@@ -136,8 +136,7 @@ $widget_edge: 0 1px $borders_edge; //outer hilight "used" on
   //
     color: $insensitive_fg_color;
     border-color: $insensitive_borders_color;
-    background-image: none;
-    background-color: $c;
+    background-image: linear-gradient(to bottom, $c);
     text-shadow: none;
     icon-shadow: none;
     @if $noedge {
@@ -173,8 +172,7 @@ $widget_edge: 0 1px $borders_edge; //outer hilight "used" on
   @else if $t==backdrop { // backdrop button
     color: $backdrop_fg_color;
     border-color: $backdrop_borders_color;
-    background-image: none;
-    background-color: $c;
+    background-image: linear-gradient(to bottom, $c);
     text-shadow: none;
     icon-shadow: none;
     @include _shadows(inset 0 1px transparentize(white,1),
@@ -212,9 +210,10 @@ $widget_edge: 0 1px $borders_edge; //outer hilight "used" on
   @if $flat { background-image: linear-gradient(to bottom,$c); }
   @else {
     background-image: linear-gradient(to bottom,
-                                  mix(black,$c,20%),
-                                  mix(black,$c,15%) 40%,
-                                  mix(black,$c,5%)
+                                  mix(black,$c,15%) 5%,
+                                  mix(black,$c,10%) 20%,
+                                  mix(black,$c,10%) 90%,
+                                  $c
                                   );
   }
 
diff --git a/themes/Adwaita/gtk-3.0/gtk-contained-dark.css b/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
index 30c534e..5099527 100644
--- a/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
@@ -192,8 +192,7 @@ GtkGrid:insensitive {
     border-style: solid;
     color: #eeeeec;
     border-color: #1c1f1f;
-    background-image: none;
-    background-color: #393f3f;
+    background-image: linear-gradient(to bottom, #393f3f);
     text-shadow: none;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
@@ -222,8 +221,7 @@ GtkGrid:insensitive {
     border-style: solid;
     color: white;
     border-color: #1c1f1f;
-    background-image: none;
-    background-color: #393f3f;
+    background-image: linear-gradient(to bottom, #393f3f);
     text-shadow: none;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); }
@@ -266,8 +264,7 @@ GtkGrid:insensitive {
       border-style: solid;
       color: #eeeeec;
       border-color: #1c1f1f;
-      background-image: none;
-      background-color: #2a76c6;
+      background-image: linear-gradient(to bottom, #2a76c6);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
@@ -282,8 +279,7 @@ GtkGrid:insensitive {
       border-style: solid;
       color: white;
       border-color: #1c1f1f;
-      background-image: none;
-      background-color: #393f3f;
+      background-image: linear-gradient(to bottom, #393f3f);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); }
@@ -319,8 +315,7 @@ GtkGrid:insensitive {
       border-style: solid;
       color: #eeeeec;
       border-color: #1c1f1f;
-      background-image: none;
-      background-color: #d51010;
+      background-image: linear-gradient(to bottom, #d51010);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
@@ -335,8 +330,7 @@ GtkGrid:insensitive {
       border-style: solid;
       color: white;
       border-color: #1c1f1f;
-      background-image: none;
-      background-color: #393f3f;
+      background-image: linear-gradient(to bottom, #393f3f);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); }
@@ -423,8 +417,7 @@ GtkColorButton.button {
       border-style: solid;
       color: white;
       border-color: #1c1f1f;
-      background-image: none;
-      background-color: #393f3f;
+      background-image: linear-gradient(to bottom, #393f3f);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
@@ -442,8 +435,7 @@ GtkColorButton.button {
       border-style: solid;
       color: #eeeeec;
       border-color: #1c1f1f;
-      background-image: none;
-      background-color: #393f3f;
+      background-image: linear-gradient(to bottom, #393f3f);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
@@ -477,8 +469,7 @@ GtkColorButton.button {
       border-style: solid;
       color: white;
       border-color: #1c1f1f;
-      background-image: none;
-      background-color: #393f3f;
+      background-image: linear-gradient(to bottom, #393f3f);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); }
@@ -496,8 +487,7 @@ GtkColorButton.button {
       border-style: solid;
       color: #eeeeec;
       border-color: #1c1f1f;
-      background-image: none;
-      background-color: #393f3f;
+      background-image: linear-gradient(to bottom, #393f3f);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
@@ -774,11 +764,11 @@ GtkSwitch {
     border-radius: 3px;
     padding: 1px;
     color: #eeeeec;
-    background-image: linear-gradient(to bottom, #2d3232, #303535 40%, #363b3b);
+    background-image: linear-gradient(to bottom, #303535 5%, #333838 20%, #333838 90%, #393f3f);
     border-color: #1c1f1f; }
     GtkSwitch.trough:active {
       color: white;
-      background-image: linear-gradient(to bottom, #215e9e, #2364a8 40%, #2770bc);
+      background-image: linear-gradient(to bottom, #2364a8 5%, #256ab2 20%, #256ab2 90%, #2a76c6);
       border-color: #215d9c; }
     GtkSwitch.trough:insensitive {
       color: #eeeeec;
@@ -809,8 +799,7 @@ GtkSwitch {
       border-style: solid;
       color: white;
       border-color: #1c1f1f;
-      background-image: none;
-      background-color: #393f3f;
+      background-image: linear-gradient(to bottom, #393f3f);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); }
@@ -819,8 +808,7 @@ GtkSwitch {
       border-style: solid;
       color: #eeeeec;
       border-color: #1c1f1f;
-      background-image: none;
-      background-color: #393f3f;
+      background-image: linear-gradient(to bottom, #393f3f);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
@@ -891,8 +879,7 @@ GtkScrolledWindow GtkViewport.frame {
     border-style: solid;
     color: #eeeeec;
     border-color: #1c1f1f;
-    background-image: none;
-    background-color: #393f3f;
+    background-image: linear-gradient(to bottom, #393f3f);
     text-shadow: none;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0);
diff --git a/themes/Adwaita/gtk-3.0/gtk-contained.css b/themes/Adwaita/gtk-3.0/gtk-contained.css
index 779c1fc..65140bd 100644
--- a/themes/Adwaita/gtk-3.0/gtk-contained.css
+++ b/themes/Adwaita/gtk-3.0/gtk-contained.css
@@ -192,8 +192,7 @@ GtkGrid:insensitive {
     border-style: solid;
     color: #454f52;
     border-color: #a1a1a1;
-    background-image: none;
-    background-color: #ededed;
+    background-image: linear-gradient(to bottom, #ededed);
     text-shadow: none;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
@@ -222,8 +221,7 @@ GtkGrid:insensitive {
     border-style: solid;
     color: #748489;
     border-color: #a1a1a1;
-    background-image: none;
-    background-color: #ededed;
+    background-image: linear-gradient(to bottom, #ededed);
     text-shadow: none;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; }
@@ -266,8 +264,7 @@ GtkGrid:insensitive {
       border-style: solid;
       color: #454f52;
       border-color: #a1a1a1;
-      background-image: none;
-      background-color: #4a90d9;
+      background-image: linear-gradient(to bottom, #4a90d9);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
@@ -282,8 +279,7 @@ GtkGrid:insensitive {
       border-style: solid;
       color: #748489;
       border-color: #a1a1a1;
-      background-image: none;
-      background-color: #ededed;
+      background-image: linear-gradient(to bottom, #ededed);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; }
@@ -319,8 +315,7 @@ GtkGrid:insensitive {
       border-style: solid;
       color: #454f52;
       border-color: #a1a1a1;
-      background-image: none;
-      background-color: #ef2929;
+      background-image: linear-gradient(to bottom, #ef2929);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
@@ -335,8 +330,7 @@ GtkGrid:insensitive {
       border-style: solid;
       color: #748489;
       border-color: #a1a1a1;
-      background-image: none;
-      background-color: #ededed;
+      background-image: linear-gradient(to bottom, #ededed);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; }
@@ -423,8 +417,7 @@ GtkColorButton.button {
       border-style: solid;
       color: #748489;
       border-color: #a1a1a1;
-      background-image: none;
-      background-color: #ededed;
+      background-image: linear-gradient(to bottom, #ededed);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
@@ -442,8 +435,7 @@ GtkColorButton.button {
       border-style: solid;
       color: #454f52;
       border-color: #a1a1a1;
-      background-image: none;
-      background-color: #ededed;
+      background-image: linear-gradient(to bottom, #ededed);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
@@ -477,8 +469,7 @@ GtkColorButton.button {
       border-style: solid;
       color: #748489;
       border-color: #a1a1a1;
-      background-image: none;
-      background-color: #ededed;
+      background-image: linear-gradient(to bottom, #ededed);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; }
@@ -496,8 +487,7 @@ GtkColorButton.button {
       border-style: solid;
       color: #454f52;
       border-color: #a1a1a1;
-      background-image: none;
-      background-color: #ededed;
+      background-image: linear-gradient(to bottom, #ededed);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
@@ -774,11 +764,11 @@ GtkSwitch {
     border-radius: 3px;
     padding: 1px;
     color: #2e3436;
-    background-image: linear-gradient(to bottom, #bdbdbd, #c9c9c9 40%, #e1e1e1);
+    background-image: linear-gradient(to bottom, #c9c9c9 5%, #d5d5d5 20%, #d5d5d5 90%, #ededed);
     border-color: #a1a1a1; }
     GtkSwitch.trough:active {
       color: white;
-      background-image: linear-gradient(to bottom, #3b73ad, #3e7ab8 40%, #4688ce);
+      background-image: linear-gradient(to bottom, #3e7ab8 5%, #4281c3 20%, #4281c3 90%, #4a90d9);
       border-color: #184472; }
     GtkSwitch.trough:insensitive {
       color: #2e3436;
@@ -809,8 +799,7 @@ GtkSwitch {
       border-style: solid;
       color: #748489;
       border-color: #a1a1a1;
-      background-image: none;
-      background-color: #ededed;
+      background-image: linear-gradient(to bottom, #ededed);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; }
@@ -819,8 +808,7 @@ GtkSwitch {
       border-style: solid;
       color: #454f52;
       border-color: #a1a1a1;
-      background-image: none;
-      background-color: #ededed;
+      background-image: linear-gradient(to bottom, #ededed);
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
@@ -891,8 +879,7 @@ GtkScrolledWindow GtkViewport.frame {
     border-style: solid;
     color: #454f52;
     border-color: #a1a1a1;
-    background-image: none;
-    background-color: #ededed;
+    background-image: linear-gradient(to bottom, #ededed);
     text-shadow: none;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0);