[gnome-themes-standard] experimental gtkscale

[Jakub Steiner <jimmac src gnome org>]

commit 8e8dc0a9ff14166287958165e7fe7330cbef7227
Author: Lapo Calamandrei <calamandrei gmail com>
Date:   Wed May 28 19:29:06 2014 +0200

    experimental gtkscale

 themes/Adwaita/gtk-3.0/_common.scss           |   59 ++++++++++++++++++-----
 themes/Adwaita/gtk-3.0/gtk-contained-dark.css |   63 ++++++++++++-------------
 themes/Adwaita/gtk-3.0/gtk-contained.css      |   63 ++++++++++++-------------
 3 files changed, 107 insertions(+), 78 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/_common.scss b/themes/Adwaita/gtk-3.0/_common.scss
index fb14237..ce5e7d1 100644
--- a/themes/Adwaita/gtk-3.0/_common.scss
+++ b/themes/Adwaita/gtk-3.0/_common.scss
@@ -760,27 +760,62 @@ GtkSwitch {
   outline-offset: -9px;
   margin: 10px;
   &.slider {
-    @include button(normal,$noedge:true);
+    @include button(normal);
     border-radius: 50%;
-    &:insensitive { @include button(insensitive); }
-    &:backdrop { @include button(backdrop); }
-    &:backdrop:insensitive { @include button(backdrop-insensitive); }
-    &:active { border: 1px solid $selected_bg_color; }
-    &.fine-tune:active {
-      border: 4px solid transparent; //margin
-      box-shadow: inset 0 0 0 1px $selected_bg_color; //border
+    border-color: darken($borders_color,3%);
+    box-shadow: inset 0 1px if($variant=='light', white,
+                               transparentize(white,0.85)),
+                inset 0 #{-2px} $bg_color,
+                inset 0 #{-1px} mix($bg_color,$borders_color,50%);
+    &:insensitive { 
+      background-image: linear-gradient(to bottom, $insensitive_bg_color);
+      box-shadow: none;
     }
+    &:backdrop {
+      border-color: darken($backdrop_borders_color,3%);
+      background-image: linear-gradient(to bottom, $backdrop_bg_color);
+      box-shadow: none;
+    }
+    &:backdrop:insensitive { @include button(backdrop-insensitive); }
+    &:active { border: 1px solid darken($selected_bg_color,33%); }
+    //&.fine-tune:active { WHAT SHALL WE DO HERE?
+    //  border: 4px solid transparent; //margin
+    //  box-shadow: inset 0 2px white,
+    //              inset 0 0 0 1px $selected_bg_color; //border
+    //}
   }
   &.trough {
-    @include trough();
     border-width: 1px;
     border-style: solid;
     border-radius: 3px;
+    border-color: $borders_color;
+    background-color: mix($bg_color,$borders_color,60%);
+    box-shadow: inset 1px 1px transparentize(black, 0.9),
+                $widget_edge;
     &.highlight {
-      @include trough($c:$selected_bg_color);
+      border-color: darken($selected_bg_color,30%);
+      background-color: $selected_bg_color; 
+      box-shadow: $widget_edge;
+      &:backdrop {
+         border-color: $selected_bg_color;
+         background-color: $selected_bg_color;
+         box-shadow: none;
+      }
+    }
+    &:insensitive, &.hilight:insensitive { 
+      border-color: $insensitive_borders_color;
+      background-color: $insensitive_bg_color;
+      box-shadow: $widget_edge;
+    }
+    &:backdrop {
+      border-color: $backdrop_borders_color;
+      background-color: mix($backdrop_bg_color,$borders_color); 
+      box-shadow: none;
+    }
+    &:backdrop:insensitive, .hilight:backdrop:insensitive {
+      border-color: $backdrop_insensitive_color;
+      background-color: $backdrop_bg_color;
     }
-    &:backdrop { }
-    &:insensitive { @include trough($flat:true, $c:$insensitive_bg_color, $noedge:true); }
   }
 }
 
diff --git a/themes/Adwaita/gtk-3.0/gtk-contained-dark.css b/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
index 2100b27..b4cc5ec 100644
--- a/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
@@ -898,26 +898,17 @@ GtkSwitch {
     border-color: #1c1f1f;
     text-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
     icon-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
-    border-radius: 50%; }
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(238, 238, 236, 0.1);
+    border-radius: 50%;
+    border-color: #151717;
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.15), inset 0 -2px #393f3f, inset 0 -1px #2a2f2f; }
     .scale.slider:insensitive {
-      border-width: 1px;
-      border-style: solid;
-      color: white;
-      border-color: #1c1f1f;
       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); }
+      box-shadow: none; }
     .scale.slider:backdrop {
-      border-width: 1px;
-      border-style: solid;
-      color: #eeeeec;
-      border-color: #1c1f1f;
+      border-color: #151717;
       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); }
+      box-shadow: none; }
     .scale.slider:backdrop:insensitive {
       border-width: 1px;
       border-style: solid;
@@ -925,27 +916,33 @@ GtkSwitch {
       border-color: #1c1f1f;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
     .scale.slider:active {
-      border: 1px solid #215d9c; }
-    .scale.slider.fine-tune:active {
-      border: 4px solid transparent;
-      box-shadow: inset 0 0 0 1px #215d9c; }
+      border: 1px solid #040a11; }
   .scale.trough {
-    color: #c9cbc9;
-    background-image: linear-gradient(to bottom, #303535 5%, #333838 20%, #333838 90%, #393f3f);
-    border-color: #1c1f1f;
-    box-shadow: inset 0 -1px 0 rgba(238, 238, 236, 0), 0 1px 0 rgba(238, 238, 236, 0);
     border-width: 1px;
     border-style: solid;
-    border-radius: 3px; }
+    border-radius: 3px;
+    border-color: #1c1f1f;
+    background-color: #2d3232;
+    box-shadow: inset 1px 1px rgba(0, 0, 0, 0.1), 0 1px rgba(238, 238, 236, 0.1); }
     .scale.trough.highlight {
-      color: #c9cbc9;
-      background-image: linear-gradient(to bottom, #1c4f84 5%, #1d538c 20%, #1d538c 90%, #215d9c);
-      border-color: #0b1e33;
-      box-shadow: inset 0 -1px 0 rgba(238, 238, 236, 0), 0 1px 0 rgba(238, 238, 236, 0); }
-    .scale.trough:insensitive {
-      color: #c9cbc9;
-      background-image: linear-gradient(to bottom, #393f3f);
-      border-color: #1c1f1f; }
+      border-color: #06121e;
+      background-color: #215d9c;
+      box-shadow: 0 1px rgba(238, 238, 236, 0.1); }
+      .scale.trough.highlight:backdrop {
+        border-color: #215d9c;
+        background-color: #215d9c;
+        box-shadow: none; }
+    .scale.trough:insensitive, .scale.trough.hilight:insensitive {
+      border-color: #1c1f1f;
+      background-color: #393f3f;
+      box-shadow: 0 1px rgba(238, 238, 236, 0.1); }
+    .scale.trough:backdrop {
+      border-color: #1c1f1f;
+      background-color: #2a2f2f;
+      box-shadow: none; }
+    .scale.trough:backdrop:insensitive, .scale.trough .hilight:backdrop:insensitive {
+      border-color: white;
+      background-color: #393f3f; }
 
 /**********
  * Frames *
diff --git a/themes/Adwaita/gtk-3.0/gtk-contained.css b/themes/Adwaita/gtk-3.0/gtk-contained.css
index 42b9231..ca223d2 100644
--- a/themes/Adwaita/gtk-3.0/gtk-contained.css
+++ b/themes/Adwaita/gtk-3.0/gtk-contained.css
@@ -898,26 +898,17 @@ GtkSwitch {
     border-color: #a1a1a1;
     text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
     icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
-    box-shadow: inset 0 1px white;
-    border-radius: 50%; }
+    box-shadow: inset 0 1px white, 0 1px white;
+    border-radius: 50%;
+    border-color: #999999;
+    box-shadow: inset 0 1px white, inset 0 -2px #ededed, inset 0 -1px #c7c7c7; }
     .scale.slider:insensitive {
-      border-width: 1px;
-      border-style: solid;
-      color: #748489;
-      border-color: #a1a1a1;
       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; }
+      box-shadow: none; }
     .scale.slider:backdrop {
-      border-width: 1px;
-      border-style: solid;
-      color: #454f52;
-      border-color: #a1a1a1;
+      border-color: #999999;
       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); }
+      box-shadow: none; }
     .scale.slider:backdrop:insensitive {
       border-width: 1px;
       border-style: solid;
@@ -925,27 +916,33 @@ GtkSwitch {
       border-color: #a1a1a1;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
     .scale.slider:active {
-      border: 1px solid #4a90d9; }
-    .scale.slider.fine-tune:active {
-      border: 4px solid transparent;
-      box-shadow: inset 0 0 0 1px #4a90d9; }
+      border: 1px solid #153d65; }
   .scale.trough {
-    color: #54595a;
-    background-image: linear-gradient(to bottom, #c9c9c9 5%, #d5d5d5 20%, #d5d5d5 90%, #ededed);
-    border-color: #a1a1a1;
-    box-shadow: inset 0 -1px 0 white, 0 1px 0 white;
     border-width: 1px;
     border-style: solid;
-    border-radius: 3px; }
+    border-radius: 3px;
+    border-color: #a1a1a1;
+    background-color: #cecece;
+    box-shadow: inset 1px 1px rgba(0, 0, 0, 0.1), 0 1px white; }
     .scale.trough.highlight {
-      color: #54595a;
-      background-image: linear-gradient(to bottom, #3e7ab8 5%, #4281c3 20%, #4281c3 90%, #4a90d9);
-      border-color: #1c5187;
-      box-shadow: inset 0 -1px 0 rgba(255, 255, 255, 0.5), 0 1px 0 rgba(255, 255, 255, 0.5); }
-    .scale.trough:insensitive {
-      color: #54595a;
-      background-image: linear-gradient(to bottom, #ededed);
-      border-color: #a1a1a1; }
+      border-color: #184472;
+      background-color: #4a90d9;
+      box-shadow: 0 1px white; }
+      .scale.trough.highlight:backdrop {
+        border-color: #4a90d9;
+        background-color: #4a90d9;
+        box-shadow: none; }
+    .scale.trough:insensitive, .scale.trough.hilight:insensitive {
+      border-color: #a1a1a1;
+      background-color: #ededed;
+      box-shadow: 0 1px white; }
+    .scale.trough:backdrop {
+      border-color: #a1a1a1;
+      background-color: #c7c7c7;
+      box-shadow: none; }
+    .scale.trough:backdrop:insensitive, .scale.trough .hilight:backdrop:insensitive {
+      border-color: #c7c7c7;
+      background-color: #ededed; }
 
 /**********
  * Frames *