[gnome-themes-standard/wip/sass] use $borders_edge for widget bottom hilight color

[Lapo Calamandrei <lapo src gnome org>]

commit f304b30b91432d55afaf1034bf6b170eb0a09033
Author: Lapo Calamandrei <calamandrei gmail com>
Date:   Fri May 23 20:31:37 2014 +0200

    use $borders_edge for widget bottom hilight color

 themes/Adwaita/gtk-3.0/_common.scss           |    7 +++-
 themes/Adwaita/gtk-3.0/_drawing.scss          |   14 +++---
 themes/Adwaita/gtk-3.0/gtk-contained-dark.css |   29 +++++++------
 themes/Adwaita/gtk-3.0/gtk-contained.css      |   55 +++++++++++++------------
 themes/Adwaita/gtk-3.0/gtk-contained.scss     |    3 +-
 5 files changed, 60 insertions(+), 48 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/_common.scss b/themes/Adwaita/gtk-3.0/_common.scss
index 650395f..f31d07e 100644
--- a/themes/Adwaita/gtk-3.0/_common.scss
+++ b/themes/Adwaita/gtk-3.0/_common.scss
@@ -390,6 +390,8 @@ GtkColorButton.button { // Uniform padding on the GtkColorButton.button
  * ComboBoxes *
  **************/
 GtkComboBox {
+
+  //FIXME padding and box-shadow outset issue
   padding: 0;
 
   -GtkComboBox-arrow-scaling: 0.5;
@@ -443,12 +445,15 @@ GtkComboBox {
   border-color: $borders_color;
   border-radius: 7px 7px 0 0;
   
+  $_top_hilight: white; //FIXME?
+  @if $variant == 'dark' { $_top_hilight: transparentize(white,0.9); }
+
   background-color: transparent;
   background-image: linear-gradient(to bottom,
                                     lighten($theme_bg_color,2%),
                                     darken($theme_bg_color,5%));
   box-shadow: inset 0 -1px transparentize($borders_color,0.6),
-              inset 0 1px $borders_edge;
+              inset 0 1px $_top_hilight;
   padding: 6px;
 
   &:backdrop {
diff --git a/themes/Adwaita/gtk-3.0/_drawing.scss b/themes/Adwaita/gtk-3.0/_drawing.scss
index 81865f5..658ae3d 100644
--- a/themes/Adwaita/gtk-3.0/_drawing.scss
+++ b/themes/Adwaita/gtk-3.0/_drawing.scss
@@ -3,11 +3,7 @@
 // generic drawing of more complex things
 
 $widget_bottom_hilight: 0 1px $borders_edge; //outer hilight "used" on 
-                                             //most widgets, not working
-                                             //since gtk doesn't draw (yet?)
-                                             //outside the widget itself.
-
-
+                                             //most widgets, FIXME 1px
 // buttons
 
 @mixin _button_border_color ($c) {
@@ -70,6 +66,9 @@ $widget_bottom_hilight: 0 1px $borders_edge; //outer hilight "used" on
 // 
   border-width: 1px;
   border-style: solid;
+  
+  $_top_hilight: white;
+  @if $variant == 'dark' { $_top_hilight: transparentize(white,0.9); }
 
   @if $t==normal { // normal button
     color: $tc;
@@ -92,7 +91,7 @@ $widget_bottom_hilight: 0 1px $borders_edge; //outer hilight "used" on
     @else { border-color: $borders_color; }
 
     @include _button_text_shadow($tc,$c);
-    @include _button_box_shadow(inset 0 1px $borders_edge, 
+    @include _button_box_shadow(inset 0 1px $_top_hilight, 
                                 $widget_bottom_hilight);
   }
 
@@ -105,7 +104,7 @@ $widget_bottom_hilight: 0 1px $borders_edge; //outer hilight "used" on
                                       $c);
 
     @include _button_text_shadow($tc,lighten($c,4%));
-    @include _button_box_shadow(inset 0 1px $borders_edge, 
+    @include _button_box_shadow(inset 0 1px $_top_hilight,
                                 $widget_bottom_hilight);
   }
 
@@ -167,6 +166,7 @@ $widget_bottom_hilight: 0 1px $borders_edge; //outer hilight "used" on
   @else if $t==backdrop-insensitive { // backdrop insensitive button
     color: $_backdrop_insensitive_color;
     border-color: $_backdrop_borders_color;
+    box-shadow: none;
   }
 
   @else if $t==backdrop-insensitive-active { // backdrop insensitive 
diff --git a/themes/Adwaita/gtk-3.0/gtk-contained-dark.css b/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
index 79b9451..21204c3 100644
--- a/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
@@ -170,7 +170,7 @@ GtkGrid:insensitive {
   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(238, 238, 236, 0.1), 0 1px rgba(238, 238, 236, 0.1); }
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(238, 238, 236, 0.1); }
   .button:hover {
     border-width: 1px;
     border-style: solid;
@@ -179,7 +179,7 @@ GtkGrid:insensitive {
     background-image: linear-gradient(to bottom, #5b6464, #434a4a 40%, #393f3f);
     text-shadow: 0 -1px rgba(0, 0, 0, 0.77976);
     icon-shadow: 0 -1px rgba(0, 0, 0, 0.77976);
-    box-shadow: inset 0 1px rgba(238, 238, 236, 0.1), 0 1px rgba(238, 238, 236, 0.1); }
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(238, 238, 236, 0.1); }
   .button:active {
     border-width: 1px;
     border-style: solid;
@@ -208,7 +208,8 @@ GtkGrid:insensitive {
       border-width: 1px;
       border-style: solid;
       color: white;
-      border-color: #1c1f1f; }
+      border-color: #1c1f1f;
+      box-shadow: none; }
     .button:backdrop:insensitive:active {
       border-width: 1px;
       border-style: solid;
@@ -240,7 +241,7 @@ GtkGrid:insensitive {
     border-color: #215d9c;
     text-shadow: 0 -1px rgba(0, 0, 0, 0.62353);
     icon-shadow: 0 -1px rgba(0, 0, 0, 0.62353);
-    box-shadow: inset 0 1px rgba(238, 238, 236, 0.1), 0 1px rgba(238, 238, 236, 0.1); }
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(238, 238, 236, 0.1); }
     .button.suggested-action:hover {
       border-width: 1px;
       border-style: solid;
@@ -249,7 +250,7 @@ GtkGrid:insensitive {
       background-image: linear-gradient(to bottom, #5b9add, #3180d4 40%, #2a76c6);
       text-shadow: 0 -1px rgba(0, 0, 0, 0.59153);
       icon-shadow: 0 -1px rgba(0, 0, 0, 0.59153);
-      box-shadow: inset 0 1px rgba(238, 238, 236, 0.1), 0 1px rgba(238, 238, 236, 0.1); }
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(238, 238, 236, 0.1); }
     .button.suggested-action:active {
       border-width: 1px;
       border-style: solid;
@@ -272,7 +273,8 @@ GtkGrid:insensitive {
         border-width: 1px;
         border-style: solid;
         color: white;
-        border-color: #1c1f1f; }
+        border-color: #1c1f1f;
+        box-shadow: none; }
     .button.suggested-action:insensitive {
       border-width: 1px;
       border-style: solid;
@@ -290,7 +292,7 @@ GtkGrid:insensitive {
     border-color: #a60c0c;
     text-shadow: 0 -1px rgba(0, 0, 0, 0.64078);
     icon-shadow: 0 -1px rgba(0, 0, 0, 0.64078);
-    box-shadow: inset 0 1px rgba(238, 238, 236, 0.1), 0 1px rgba(238, 238, 236, 0.1); }
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(238, 238, 236, 0.1); }
     .button.destructive-action:hover {
       border-width: 1px;
       border-style: solid;
@@ -299,7 +301,7 @@ GtkGrid:insensitive {
       background-image: linear-gradient(to bottom, #f03c3c, #e81111 40%, #d51010);
       text-shadow: 0 -1px rgba(0, 0, 0, 0.60878);
       icon-shadow: 0 -1px rgba(0, 0, 0, 0.60878);
-      box-shadow: inset 0 1px rgba(238, 238, 236, 0.1), 0 1px rgba(238, 238, 236, 0.1); }
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(238, 238, 236, 0.1); }
     .button.destructive-action:active {
       border-width: 1px;
       border-style: solid;
@@ -322,7 +324,8 @@ GtkGrid:insensitive {
         border-width: 1px;
         border-style: solid;
         color: white;
-        border-color: #1c1f1f; }
+        border-color: #1c1f1f;
+        box-shadow: none; }
     .button.destructive-action:insensitive {
       border-width: 1px;
       border-style: solid;
@@ -397,7 +400,7 @@ GtkColorButton.button {
   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(238, 238, 236, 0.1), 0 1px rgba(238, 238, 236, 0.1); }
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(238, 238, 236, 0.1); }
   .spinbutton.vertical .button:first-child {
     border-radius: 3px 3px 0 0; }
   .spinbutton.vertical .button:last-child {
@@ -437,7 +440,7 @@ GtkColorButton.button {
     background-image: linear-gradient(to bottom, #5b6464, #434a4a 40%, #393f3f);
     text-shadow: 0 -1px rgba(0, 0, 0, 0.77976);
     icon-shadow: 0 -1px rgba(0, 0, 0, 0.77976);
-    box-shadow: inset 0 1px rgba(238, 238, 236, 0.1), 0 1px rgba(238, 238, 236, 0.1); }
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(238, 238, 236, 0.1); }
 .spinbutton.vertical.entry {
   border-radius: 0;
   border-width: 0 1px 0 1px; }
@@ -486,7 +489,7 @@ GtkComboBox {
   border-radius: 7px 7px 0 0;
   background-color: transparent;
   background-image: linear-gradient(to bottom, #3e4444, #2d3232);
-  box-shadow: inset 0 -1px rgba(28, 31, 31, 0.4), inset 0 1px rgba(238, 238, 236, 0.1);
+  box-shadow: inset 0 -1px rgba(28, 31, 31, 0.4), inset 0 1px rgba(255, 255, 255, 0.1);
   padding: 6px; }
   .header-bar:backdrop {
     border-color: #1c1f1f;
@@ -681,7 +684,7 @@ GtkScrolledWindow.frame {
     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(238, 238, 236, 0.1), 0 1px rgba(238, 238, 236, 0.1); }
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(238, 238, 236, 0.1); }
   .button.titlebutton:active {
     border-width: 1px;
     border-style: solid;
diff --git a/themes/Adwaita/gtk-3.0/gtk-contained.css b/themes/Adwaita/gtk-3.0/gtk-contained.css
index 25c126b..49e3e09 100644
--- a/themes/Adwaita/gtk-3.0/gtk-contained.css
+++ b/themes/Adwaita/gtk-3.0/gtk-contained.css
@@ -115,18 +115,18 @@ GtkGrid:insensitive {
   transition: all 200ms ease-out;
   border: 1px solid #a1a1a1;
   background-image: linear-gradient(to bottom, #f7f7f7 0%, white 90%);
-  box-shadow: inset 0 2px 2px -2px rgba(0, 0, 0, 0.5), 0 1px rgba(255, 255, 255, 0.05);
+  box-shadow: inset 0 2px 2px -2px rgba(0, 0, 0, 0.5), 0 1px white;
   /* not working */
   background-color: transparent; }
   .entry:insensitive {
     color: #748489;
     background-image: none;
     background-color: transparent;
-    box-shadow: 0 1px rgba(255, 255, 255, 0.05);
+    box-shadow: 0 1px white;
     /* not working */ }
   .entry:focus {
     border-color: #729fcf;
-    box-shadow: inset 0 2px 2px -2px rgba(0, 0, 0, 0.4), inset 0 0 2px 1px rgba(114, 159, 207, 0.5), 0 1px 
rgba(255, 255, 255, 0.05);
+    box-shadow: inset 0 2px 2px -2px rgba(0, 0, 0, 0.4), inset 0 0 2px 1px rgba(114, 159, 207, 0.5), 0 1px 
white;
     /* not working */ }
   .entry:selected, .entry:backdrop:selected {
     color: white;
@@ -170,7 +170,7 @@ GtkGrid:insensitive {
   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 rgba(255, 255, 255, 0.05), 0 1px rgba(255, 255, 255, 0.05); }
+  box-shadow: inset 0 1px white, 0 1px white; }
   .button:hover {
     border-width: 1px;
     border-style: solid;
@@ -179,7 +179,7 @@ GtkGrid:insensitive {
     background-image: linear-gradient(to bottom, white, #f7f7f7 40%, #ededed);
     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 rgba(255, 255, 255, 0.05), 0 1px rgba(255, 255, 255, 0.05); }
+    box-shadow: inset 0 1px white, 0 1px white; }
   .button:active {
     border-width: 1px;
     border-style: solid;
@@ -188,7 +188,7 @@ GtkGrid:insensitive {
     background-image: linear-gradient(to bottom, #c7c7c7, #d1d1d1 3%, lightgray);
     text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
     icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
-    box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.3), 0 1px rgba(255, 255, 255, 0.05); }
+    box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.3), 0 1px white; }
   .button:backdrop {
     border-width: 1px;
     border-style: solid;
@@ -208,7 +208,8 @@ GtkGrid:insensitive {
       border-width: 1px;
       border-style: solid;
       color: #c7c7c7;
-      border-color: #a1a1a1; }
+      border-color: #a1a1a1;
+      box-shadow: none; }
     .button:backdrop:insensitive:active {
       border-width: 1px;
       border-style: solid;
@@ -224,13 +225,13 @@ GtkGrid:insensitive {
     background-image: none;
     text-shadow: none;
     icon-shadow: none;
-    box-shadow: 0 1px rgba(255, 255, 255, 0.05); }
+    box-shadow: 0 1px white; }
     .button:insensitive:active {
       border-width: 1px;
       border-style: solid;
       color: #748489;
       border-color: #a1a1a1;
-      box-shadow: 0 1px rgba(255, 255, 255, 0.05);
+      box-shadow: 0 1px white;
       background-image: linear-gradient(to bottom, rgba(161, 161, 161, 0.2)); }
   .button.suggested-action {
     border-width: 1px;
@@ -240,7 +241,7 @@ GtkGrid:insensitive {
     border-color: #2b537d;
     text-shadow: 0 -1px rgba(0, 0, 0, 0.49647);
     icon-shadow: 0 -1px rgba(0, 0, 0, 0.49647);
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), 0 1px rgba(255, 255, 255, 0.05); }
+    box-shadow: inset 0 1px white, 0 1px white; }
     .button.suggested-action:hover {
       border-width: 1px;
       border-style: solid;
@@ -249,7 +250,7 @@ GtkGrid:insensitive {
       background-image: linear-gradient(to bottom, #a7c3e1, #81a9d4 40%, #729fcf);
       text-shadow: 0 -1px rgba(0, 0, 0, 0.46447);
       icon-shadow: 0 -1px rgba(0, 0, 0, 0.46447);
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), 0 1px rgba(255, 255, 255, 0.05); }
+      box-shadow: inset 0 1px white, 0 1px white; }
     .button.suggested-action:active {
       border-width: 1px;
       border-style: solid;
@@ -258,7 +259,7 @@ GtkGrid:insensitive {
       background-image: linear-gradient(to bottom, #3e78b6, #4883c1 3%, #4c85c2);
       text-shadow: 0 -1px rgba(0, 0, 0, 0.57647);
       icon-shadow: 0 -1px rgba(0, 0, 0, 0.57647);
-      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.3), 0 1px rgba(255, 255, 255, 0.05); }
+      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.3), 0 1px white; }
     .button.suggested-action:backdrop {
       border-width: 1px;
       border-style: solid;
@@ -272,7 +273,8 @@ GtkGrid:insensitive {
         border-width: 1px;
         border-style: solid;
         color: #c7c7c7;
-        border-color: #a1a1a1; }
+        border-color: #a1a1a1;
+        box-shadow: none; }
     .button.suggested-action:insensitive {
       border-width: 1px;
       border-style: solid;
@@ -281,7 +283,7 @@ GtkGrid:insensitive {
       background-image: none;
       text-shadow: none;
       icon-shadow: none;
-      box-shadow: 0 1px rgba(255, 255, 255, 0.05); }
+      box-shadow: 0 1px white; }
   .button.destructive-action {
     border-width: 1px;
     border-style: solid;
@@ -290,7 +292,7 @@ GtkGrid:insensitive {
     border-color: #760909;
     text-shadow: 0 -1px rgba(0, 0, 0, 0.56078);
     icon-shadow: 0 -1px rgba(0, 0, 0, 0.56078);
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), 0 1px rgba(255, 255, 255, 0.05); }
+    box-shadow: inset 0 1px white, 0 1px white; }
     .button.destructive-action:hover {
       border-width: 1px;
       border-style: solid;
@@ -299,7 +301,7 @@ GtkGrid:insensitive {
       background-image: linear-gradient(to bottom, #f46b6b, #f03c3c 40%, #ef2929);
       text-shadow: 0 -1px rgba(0, 0, 0, 0.52878);
       icon-shadow: 0 -1px rgba(0, 0, 0, 0.52878);
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), 0 1px rgba(255, 255, 255, 0.05); }
+      box-shadow: inset 0 1px white, 0 1px white; }
     .button.destructive-action:active {
       border-width: 1px;
       border-style: solid;
@@ -308,7 +310,7 @@ GtkGrid:insensitive {
       background-image: linear-gradient(to bottom, #bd0e0e, #d01010 3%, #d51010);
       text-shadow: 0 -1px rgba(0, 0, 0, 0.64078);
       icon-shadow: 0 -1px rgba(0, 0, 0, 0.64078);
-      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.3), 0 1px rgba(255, 255, 255, 0.05); }
+      box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.3), 0 1px white; }
     .button.destructive-action:backdrop {
       border-width: 1px;
       border-style: solid;
@@ -322,7 +324,8 @@ GtkGrid:insensitive {
         border-width: 1px;
         border-style: solid;
         color: #c7c7c7;
-        border-color: #a1a1a1; }
+        border-color: #a1a1a1;
+        box-shadow: none; }
     .button.destructive-action:insensitive {
       border-width: 1px;
       border-style: solid;
@@ -331,7 +334,7 @@ GtkGrid:insensitive {
       background-image: none;
       text-shadow: none;
       icon-shadow: none;
-      box-shadow: 0 1px rgba(255, 255, 255, 0.05); }
+      box-shadow: 0 1px white; }
 
 GtkColorButton.button {
   padding: 4px; }
@@ -397,7 +400,7 @@ GtkColorButton.button {
   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 rgba(255, 255, 255, 0.05), 0 1px rgba(255, 255, 255, 0.05); }
+  box-shadow: inset 0 1px white, 0 1px white; }
   .spinbutton.vertical .button:first-child {
     border-radius: 3px 3px 0 0; }
   .spinbutton.vertical .button:last-child {
@@ -410,7 +413,7 @@ GtkColorButton.button {
     background-image: linear-gradient(to bottom, #c7c7c7, #d1d1d1 3%, lightgray);
     text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
     icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
-    box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.3), 0 1px rgba(255, 255, 255, 0.05); }
+    box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.3), 0 1px white; }
   .spinbutton.vertical .button:insensitive {
     border-width: 1px;
     border-style: solid;
@@ -419,7 +422,7 @@ GtkColorButton.button {
     background-image: none;
     text-shadow: none;
     icon-shadow: none;
-    box-shadow: 0 1px rgba(255, 255, 255, 0.05); }
+    box-shadow: 0 1px white; }
   .spinbutton.vertical .button:backdrop {
     border-width: 1px;
     border-style: solid;
@@ -437,7 +440,7 @@ GtkColorButton.button {
     background-image: linear-gradient(to bottom, white, #f7f7f7 40%, #ededed);
     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 rgba(255, 255, 255, 0.05), 0 1px rgba(255, 255, 255, 0.05); }
+    box-shadow: inset 0 1px white, 0 1px white; }
 .spinbutton.vertical.entry {
   border-radius: 0;
   border-width: 0 1px 0 1px; }
@@ -486,7 +489,7 @@ GtkComboBox {
   border-radius: 7px 7px 0 0;
   background-color: transparent;
   background-image: linear-gradient(to bottom, #f2f2f2, #e0e0e0);
-  box-shadow: inset 0 -1px rgba(161, 161, 161, 0.4), inset 0 1px rgba(255, 255, 255, 0.05);
+  box-shadow: inset 0 -1px rgba(161, 161, 161, 0.4), inset 0 1px white;
   padding: 6px; }
   .header-bar:backdrop {
     border-color: #a1a1a1;
@@ -681,7 +684,7 @@ GtkScrolledWindow.frame {
     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 rgba(255, 255, 255, 0.05), 0 1px rgba(255, 255, 255, 0.05); }
+    box-shadow: inset 0 1px white, 0 1px white; }
   .button.titlebutton:active {
     border-width: 1px;
     border-style: solid;
@@ -690,7 +693,7 @@ GtkScrolledWindow.frame {
     background-image: linear-gradient(to bottom, #c7c7c7, #d1d1d1 3%, lightgray);
     text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
     icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
-    box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.3), 0 1px rgba(255, 255, 255, 0.05); }
+    box-shadow: inset 0 2px 3px -1px rgba(0, 0, 0, 0.3), 0 1px white; }
   .button.titlebutton:backdrop {
     border-width: 1px;
     border-style: solid;
diff --git a/themes/Adwaita/gtk-3.0/gtk-contained.scss b/themes/Adwaita/gtk-3.0/gtk-contained.scss
index b9a6369..1df0c61 100644
--- a/themes/Adwaita/gtk-3.0/gtk-contained.scss
+++ b/themes/Adwaita/gtk-3.0/gtk-contained.scss
@@ -15,7 +15,8 @@ $selected_fg_color: #ffffff;
 $selected_bg_color: #729fcf;
 
 $borders_color: darken($theme_bg_color,30%);
-$borders_edge: transparentize($theme_base_color,0.95);
+//$borders_edge: transparentize(white,0.5);
+$borders_edge: white; //FIXME
 
 $link_color: lighten($selected_bg_color,10%);