[gnome-themes-standard/wip/sass] switch: gapless design

[Jakub Steiner <jimmac src gnome org>]

commit 026e80ffddfbee4dc4c554e8d9252b26cdb884f0
Author: Jakub Steiner <jimmac gmail com>
Date:   Tue May 27 20:30:50 2014 +0200

    switch: gapless design
    
    - I wish I could enlarge the slider though.

 themes/Adwaita/gtk-3.0/_common.scss           |   15 +++++++--------
 themes/Adwaita/gtk-3.0/_drawing.scss          |    2 +-
 themes/Adwaita/gtk-3.0/gtk-contained-dark.css |   15 +++++++--------
 themes/Adwaita/gtk-3.0/gtk-contained.css      |   15 +++++++--------
 4 files changed, 22 insertions(+), 25 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/_common.scss b/themes/Adwaita/gtk-3.0/_common.scss
index 765a3ba..8b19065 100644
--- a/themes/Adwaita/gtk-3.0/_common.scss
+++ b/themes/Adwaita/gtk-3.0/_common.scss
@@ -744,13 +744,12 @@ GtkPopover {
 GtkSwitch {
     font: bold condensed 9;
     outline-offset: -4px;
-    padding: 2px;
+    padding: 0;
     
     &.trough {
       border-width: 1px;
       border-style: solid;
       border-radius: 3px;
-      padding: 1px;
       @include trough();
       &:active { @include trough($c:$selected_bg_color, $tc:$selected_fg_color, $noedge:true); }
       &:insensitive { include trough($flat:true);}
@@ -758,12 +757,12 @@ GtkSwitch {
       &:backdrop:insensitive { include trough($flat:true, $c:$bg_color);}
     }
     &.slider { 
-      border-radius: 2px;
-        @include button(normal, $noedge:true);
-        &:active { border: 1px solid darken($selected_bg_color, 20%); }
-        &:insensitive { @include button(insensitive); }
-        &:backdrop { @include button(backdrop); }
-        &:backdrop:insensitive { @include button(backdrop-insensitive); }
+      border-radius: 3px;
+      @include button(normal, $noedge:true);
+      &:active { border: 1px solid darken($selected_bg_color, 20%); }
+      &:insensitive { @include button(insensitive); }
+      &:backdrop { @include button(backdrop); }
+      &:backdrop:insensitive { @include button(backdrop-insensitive); }
     }
 }
 
diff --git a/themes/Adwaita/gtk-3.0/_drawing.scss b/themes/Adwaita/gtk-3.0/_drawing.scss
index 3c2faf4..7244548 100644
--- a/themes/Adwaita/gtk-3.0/_drawing.scss
+++ b/themes/Adwaita/gtk-3.0/_drawing.scss
@@ -206,7 +206,7 @@ $widget_edge: 0 1px $borders_edge; //outer hilight "used" on
 }
 
 @mixin trough($flat:false, $c:$bg_color, $tc:$fg_color, $noedge:false) {
-  color: $tc;
+  color: mix($tc,$bg_color,80%);
   @if $flat { background-image: linear-gradient(to bottom,$c); }
   @else {
     background-image: linear-gradient(to bottom,
diff --git a/themes/Adwaita/gtk-3.0/gtk-contained-dark.css b/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
index 5373c0d..ed44177 100644
--- a/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
@@ -768,33 +768,32 @@ GtkPopover {
 GtkSwitch {
   font: bold condensed 9;
   outline-offset: -4px;
-  padding: 2px; }
+  padding: 0; }
   GtkSwitch.trough {
     border-width: 1px;
     border-style: solid;
     border-radius: 3px;
-    padding: 1px;
-    color: #eeeeec;
+    color: #c9cbc9;
     background-image: linear-gradient(to bottom, #303535 5%, #333838 20%, #333838 90%, #393f3f);
     border-color: #1c1f1f; }
     GtkSwitch.trough:active {
-      color: white;
+      color: #d7d8d8;
       background-image: linear-gradient(to bottom, #2364a8 5%, #256ab2 20%, #256ab2 90%, #2a76c6);
       border-color: #215d9c; }
     GtkSwitch.trough:insensitive {
-      color: #eeeeec;
+      color: #c9cbc9;
       background-image: linear-gradient(to bottom, #393f3f);
       border-color: #1c1f1f; }
     GtkSwitch.trough:backdrop {
-      color: #eeeeec;
+      color: #c9cbc9;
       background-image: linear-gradient(to bottom, #212424);
       border-color: #090909; }
     GtkSwitch.trough:backdrop:insensitive {
-      color: #eeeeec;
+      color: #c9cbc9;
       background-image: linear-gradient(to bottom, #393f3f);
       border-color: #1c1f1f; }
   GtkSwitch.slider {
-    border-radius: 2px;
+    border-radius: 3px;
     border-width: 1px;
     border-style: solid;
     color: #eeeeec;
diff --git a/themes/Adwaita/gtk-3.0/gtk-contained.css b/themes/Adwaita/gtk-3.0/gtk-contained.css
index 87a4870..b640254 100644
--- a/themes/Adwaita/gtk-3.0/gtk-contained.css
+++ b/themes/Adwaita/gtk-3.0/gtk-contained.css
@@ -768,33 +768,32 @@ GtkPopover {
 GtkSwitch {
   font: bold condensed 9;
   outline-offset: -4px;
-  padding: 2px; }
+  padding: 0; }
   GtkSwitch.trough {
     border-width: 1px;
     border-style: solid;
     border-radius: 3px;
-    padding: 1px;
-    color: #2e3436;
+    color: #54595a;
     background-image: linear-gradient(to bottom, #c9c9c9 5%, #d5d5d5 20%, #d5d5d5 90%, #ededed);
     border-color: #a1a1a1; }
     GtkSwitch.trough:active {
-      color: white;
+      color: #fbfbfb;
       background-image: linear-gradient(to bottom, #3e7ab8 5%, #4281c3 20%, #4281c3 90%, #4a90d9);
       border-color: #184472; }
     GtkSwitch.trough:insensitive {
-      color: #2e3436;
+      color: #54595a;
       background-image: linear-gradient(to bottom, #ededed);
       border-color: #a1a1a1; }
     GtkSwitch.trough:backdrop {
-      color: #2e3436;
+      color: #54595a;
       background-image: linear-gradient(to bottom, lightgray);
       border-color: #878787; }
     GtkSwitch.trough:backdrop:insensitive {
-      color: #2e3436;
+      color: #54595a;
       background-image: linear-gradient(to bottom, #ededed);
       border-color: #a1a1a1; }
   GtkSwitch.slider {
-    border-radius: 2px;
+    border-radius: 3px;
     border-width: 1px;
     border-style: solid;
     color: #2e3436;