[gnome-themes-standard/wip/sass] switch, scale: draw no edges at places

[Jakub Steiner <jimmac src gnome org>]

commit b8d698500c5412600e308f002ad85b2095114505
Author: Jakub Steiner <jimmac gmail com>
Date:   Wed May 28 13:34:35 2014 +0200

    switch, scale: draw no edges at places

 themes/Adwaita/gtk-3.0/_common.scss           |    8 ++++----
 themes/Adwaita/gtk-3.0/_drawing.scss          |    6 ++++--
 themes/Adwaita/gtk-3.0/gtk-contained-dark.css |   16 ++++++----------
 themes/Adwaita/gtk-3.0/gtk-contained.css      |   16 ++++++----------
 4 files changed, 20 insertions(+), 26 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/_common.scss b/themes/Adwaita/gtk-3.0/_common.scss
index a20cf6b..b7af275 100644
--- a/themes/Adwaita/gtk-3.0/_common.scss
+++ b/themes/Adwaita/gtk-3.0/_common.scss
@@ -720,11 +720,11 @@ GtkSwitch {
       border-width: 1px;
       border-style: solid;
       border-radius: 3px;
-      @include trough();
+      @include trough($noedge:true);
       &:active { @include trough($c:$selected_bg_color, $tc:$selected_fg_color, $noedge:true); }
-      &:insensitive { include trough($flat:true);}
-      &:backdrop { include trough($flat:true, $c:darken($bg_color, 10%));}
-      &:backdrop:insensitive { include trough($flat:true, $c:$bg_color);}
+      &:insensitive { include trough($flat:true, $noedge:true);}
+      &:backdrop { include trough($flat:true, $c:darken($bg_color, 10%), $noedge: true);}
+      &:backdrop:insensitive { include trough($flat:true, $c:$bg_color, $noedge:true);}
     }
     &.slider {
       border-radius: 3px;
diff --git a/themes/Adwaita/gtk-3.0/_drawing.scss b/themes/Adwaita/gtk-3.0/_drawing.scss
index c97dfe1..53b1c9e 100644
--- a/themes/Adwaita/gtk-3.0/_drawing.scss
+++ b/themes/Adwaita/gtk-3.0/_drawing.scss
@@ -292,10 +292,12 @@ $widget_edge: 0 1px $borders_edge; //outer hilight "used" on
   
   @if $noedge==false { 
     @if lightness($c) > 60% {
-      box-shadow: inset 0 -1px 0 $borders_edge;
+      box-shadow: inset 0 -1px 0 $borders_edge,
+                  0 1px 0 $borders_edge;
     }
     @else {
-      box-shadow: inset 0 -1px 0 transparentize($borders_edge,0.5);
+      box-shadow: inset 0 -1px 0 transparentize($borders_edge,0.5),
+                  0 1px 0 transparentize($borders_edge,0.5);
     }
   }
 
diff --git a/themes/Adwaita/gtk-3.0/gtk-contained-dark.css b/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
index c2a3e1c..6dac86d 100644
--- a/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
@@ -799,8 +799,7 @@ GtkSwitch {
     border-radius: 3px;
     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); }
+    border-color: #1c1f1f; }
     GtkSwitch.trough:active {
       color: #d7d8d8;
       background-image: linear-gradient(to bottom, #2364a8 5%, #256ab2 20%, #256ab2 90%, #2a76c6);
@@ -808,18 +807,15 @@ GtkSwitch {
     GtkSwitch.trough:insensitive {
       color: #c9cbc9;
       background-image: linear-gradient(to bottom, #393f3f);
-      border-color: #1c1f1f;
-      box-shadow: inset 0 -1px 0 rgba(238, 238, 236, 0); }
+      border-color: #1c1f1f; }
     GtkSwitch.trough:backdrop {
       color: #c9cbc9;
       background-image: linear-gradient(to bottom, #212424);
-      border-color: #090909;
-      box-shadow: inset 0 -1px 0 rgba(238, 238, 236, 0); }
+      border-color: #090909; }
     GtkSwitch.trough:backdrop:insensitive {
       color: #c9cbc9;
       background-image: linear-gradient(to bottom, #393f3f);
-      border-color: #1c1f1f;
-      box-shadow: inset 0 -1px 0 rgba(238, 238, 236, 0); }
+      border-color: #1c1f1f; }
   GtkSwitch.slider {
     border-radius: 3px;
     border-width: 1px;
@@ -907,7 +903,7 @@ GtkSwitch {
     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);
+    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; }
@@ -915,7 +911,7 @@ GtkSwitch {
       color: #c9cbc9;
       background-image: linear-gradient(to bottom, #2364a8 5%, #256ab2 20%, #256ab2 90%, #2a76c6);
       border-color: #215d9c;
-      box-shadow: inset 0 -1px 0 rgba(238, 238, 236, 0); }
+      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);
diff --git a/themes/Adwaita/gtk-3.0/gtk-contained.css b/themes/Adwaita/gtk-3.0/gtk-contained.css
index 49fb1e6..a712c47 100644
--- a/themes/Adwaita/gtk-3.0/gtk-contained.css
+++ b/themes/Adwaita/gtk-3.0/gtk-contained.css
@@ -799,8 +799,7 @@ GtkSwitch {
     border-radius: 3px;
     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; }
+    border-color: #a1a1a1; }
     GtkSwitch.trough:active {
       color: #fbfbfb;
       background-image: linear-gradient(to bottom, #3e7ab8 5%, #4281c3 20%, #4281c3 90%, #4a90d9);
@@ -808,18 +807,15 @@ GtkSwitch {
     GtkSwitch.trough:insensitive {
       color: #54595a;
       background-image: linear-gradient(to bottom, #ededed);
-      border-color: #a1a1a1;
-      box-shadow: inset 0 -1px 0 white; }
+      border-color: #a1a1a1; }
     GtkSwitch.trough:backdrop {
       color: #54595a;
       background-image: linear-gradient(to bottom, lightgray);
-      border-color: #878787;
-      box-shadow: inset 0 -1px 0 white; }
+      border-color: #878787; }
     GtkSwitch.trough:backdrop:insensitive {
       color: #54595a;
       background-image: linear-gradient(to bottom, #ededed);
-      border-color: #a1a1a1;
-      box-shadow: inset 0 -1px 0 white; }
+      border-color: #a1a1a1; }
   GtkSwitch.slider {
     border-radius: 3px;
     border-width: 1px;
@@ -907,7 +903,7 @@ GtkSwitch {
     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;
+    box-shadow: inset 0 -1px 0 white, 0 1px 0 white;
     border-width: 1px;
     border-style: solid;
     border-radius: 3px; }
@@ -915,7 +911,7 @@ GtkSwitch {
       color: #54595a;
       background-image: linear-gradient(to bottom, #3e7ab8 5%, #4281c3 20%, #4281c3 90%, #4a90d9);
       border-color: #184472;
-      box-shadow: inset 0 -1px 0 rgba(255, 255, 255, 0.5); }
+      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);