[gnome-themes-standard] more notebook work and switch restyle

[Jakub Steiner <jimmac src gnome org>]

commit f3c7157ff72b0d5d8074f30740efbeb355a8e8b7
Author: Lapo Calamandrei <calamandrei gmail com>
Date:   Fri May 30 19:56:43 2014 +0200

    more notebook work and switch restyle

 themes/Adwaita/gtk-3.0/_common.scss           |   59 +++++++++++++++++++++---
 themes/Adwaita/gtk-3.0/gtk-contained-dark.css |   56 +++++++++++++++--------
 themes/Adwaita/gtk-3.0/gtk-contained.css      |   56 +++++++++++++++--------
 3 files changed, 123 insertions(+), 48 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/_common.scss b/themes/Adwaita/gtk-3.0/_common.scss
index 64c87ff..6cc6c18 100644
--- a/themes/Adwaita/gtk-3.0/_common.scss
+++ b/themes/Adwaita/gtk-3.0/_common.scss
@@ -642,6 +642,7 @@ GtkPopover {
   }
   &.frame {
     border: 1px solid $borders_color;
+    // FIXME doesn't work
     &.top { border-top-width: 0; }
     &.bottom { border-bottom-width: 0; }
     &.right { border-right-width: 0; }
@@ -758,14 +759,19 @@ GtkPopover {
       font-weight: bold;
       color: $insensitive_fg_color;
       // prelight tab text
-      &.prelight-page { color: mix($fg_color, $insensitive_fg_color, 50%); }
+      &.prelight-page {
+        color: mix($fg_color, $insensitive_fg_color, 50%);
+        text-shadow: 0 1px transparentize(black,0.9);
+      }
       // active tab text
       &.active-page {
         color: $fg_color;
+        text-shadow: 0 1px transparentize(black,0.9);
         &:backdrop { color: $backdrop_fg_color; }
       }
       &:backdrop {
         color: mix($backdrop_fg_color, $backdrop_insensitive_color, 50%);
+        text-shadow: none;
       }
     }
     .button { //tab close button
@@ -839,23 +845,59 @@ GtkSwitch {
     -GtkSwitch-slider-width: 47px;
     font: bold condensed 9;
     outline-offset: -4px;
-    @include _shadows(0 1px 0 $borders_edge); // FIXME doesn't seem to draw the edge highlight outside the 
box
     &.trough {
+      // similar to the .scale
       border-width: 1px;
       border-style: solid;
       border-radius: 3px;
-      @include trough($noedge:true);
-      &:active { @include trough($c:$selected_bg_color, $tc:$selected_fg_color, $noedge:true); }
-      &: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);}
+      border-color: $borders_color;
+      background-color: mix($bg_color,$borders_color,60%);
+      box-shadow: inset 0 1px transparentize(black, 0.9),
+                  $widget_edge;
+      text-shadow: 0 1px transparentize(black, 0.9);
+      &:active {
+        color: white;
+        border-color: darken($selected_bg_color, 30%); // FIXME it needs a var
+        background-color: $selected_bg_color;
+        box-shadow: $widget_edge;
+        text-shadow: 0 0 2px 1px white;
+      }
+      &:insensitive {
+        color: $insensitive_fg_color;
+        border-color: $borders_color;
+        background-color: $insensitive_bg_color;
+        box-shadow: $widget_edge;
+        text-shadow: none;
+      }
+      &:backdrop {
+        color: $backdrop_fg_color;
+        border-color: $backdrop_borders_color;
+        background-color: $backdrop_bg_color;
+        box-shadow: none;
+        text-shadow: none;
+      }
+      &:backdrop:active {
+        color: $backdrop_bg_color;
+        border-color: $selected_bg_color;
+        background-color: $selected_bg_color;
+        box-shadow: none;
+      }
+      &:backdrop:insensitive {
+        color: $backdrop_insensitive_color;
+        border-color: $backdrop_insensitive_color;
+      }
     }
     &.slider {
       border-radius: 3px;
-      @include button(normal, $noedge:true);
+      @include button(normal, $noedge: true);
+      box-shadow: inset 0 1px if($variant=='light', white,
+                                 transparentize(white,0.85)),
+                  inset 0 -2px transparentize($bg_color,0.4),
+                  inset 0 -1px mix($bg_color,$borders_color,50%);
       &:active { border: 1px solid darken($selected_bg_color, 30%); }
       &:insensitive { @include button(insensitive); }
       &:backdrop { @include button(backdrop); }
+      &:backdrop:active{ border-color: $selected_bg_color; }
       &:backdrop:insensitive { @include button(backdrop-insensitive); }
     }
 }
@@ -929,6 +971,7 @@ $asset_suffix: if($variant=='dark', '-dark', '');
       box-shadow: none;
     }
     &:backdrop:insensitive { @include button(backdrop-insensitive); }
+    //FIXME we need a better color for the dark variant
     &:active { border: 1px solid darken($selected_bg_color,33%); }
     &.fine-tune:active { //FIXME: Lapo doesn;t like this
       border: 4px solid transparent; //margin
diff --git a/themes/Adwaita/gtk-3.0/gtk-contained-dark.css b/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
index cf439c6..e782702 100644
--- a/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
@@ -767,13 +767,16 @@ GtkPopover {
       font-weight: bold;
       color: #939695; }
       .notebook tab GtkLabel.prelight-page {
-        color: #c0c2c0; }
+        color: #c0c2c0;
+        text-shadow: 0 1px rgba(0, 0, 0, 0.1); }
       .notebook tab GtkLabel.active-page {
-        color: #eeeeec; }
+        color: #eeeeec;
+        text-shadow: 0 1px rgba(0, 0, 0, 0.1); }
         .notebook tab GtkLabel.active-page:backdrop {
           color: #c9cbc9; }
       .notebook tab GtkLabel:backdrop {
-        color: #b4b7b5; }
+        color: #b4b7b5;
+        text-shadow: none; }
     .notebook tab .button {
       border: 1px solid transparent;
       box-shadow: none;
@@ -845,31 +848,41 @@ GtkPopover {
 GtkSwitch {
   -GtkSwitch-slider-width: 47px;
   font: bold condensed 9;
-  outline-offset: -4px;
-  box-shadow: 0 1px 0 rgba(238, 238, 236, 0.1); }
+  outline-offset: -4px; }
   GtkSwitch.trough {
     border-width: 1px;
     border-style: solid;
     border-radius: 3px;
-    color: #c9cbc9;
-    background-image: linear-gradient(to bottom, #303535 5%, #333838 20%, #333838 90%, #393f3f);
-    border-color: #1c1f1f; }
+    border-color: #1c1f1f;
+    background-color: #2d3232;
+    box-shadow: inset 0 1px rgba(0, 0, 0, 0.1), 0 1px rgba(238, 238, 236, 0.1);
+    text-shadow: 0 1px rgba(0, 0, 0, 0.1); }
     GtkSwitch.trough:active {
-      color: #d7d8d8;
-      background-image: linear-gradient(to bottom, #1c4f84 5%, #1d538c 20%, #1d538c 90%, #215d9c);
-      border-color: #0b1e33; }
+      color: white;
+      border-color: #06121e;
+      background-color: #215d9c;
+      box-shadow: 0 1px rgba(238, 238, 236, 0.1);
+      text-shadow: 0 0 2px 1px white; }
     GtkSwitch.trough:insensitive {
-      color: #c9cbc9;
-      background-image: linear-gradient(to bottom, #393f3f);
-      border-color: #1c1f1f; }
+      color: #939695;
+      border-color: #1c1f1f;
+      background-color: #393f3f;
+      box-shadow: 0 1px rgba(238, 238, 236, 0.1);
+      text-shadow: none; }
     GtkSwitch.trough:backdrop {
       color: #c9cbc9;
-      background-image: linear-gradient(to bottom, #212424);
-      border-color: black; }
+      border-color: #1c1f1f;
+      background-color: #393f3f;
+      box-shadow: none;
+      text-shadow: none; }
+    GtkSwitch.trough:backdrop:active {
+      color: #393f3f;
+      border-color: #215d9c;
+      background-color: #215d9c;
+      box-shadow: none; }
     GtkSwitch.trough:backdrop:insensitive {
-      color: #c9cbc9;
-      background-image: linear-gradient(to bottom, #393f3f);
-      border-color: #1c1f1f; }
+      color: #a0a3a2;
+      border-color: #a0a3a2; }
   GtkSwitch.slider {
     border-radius: 3px;
     border-width: 1px;
@@ -879,7 +892,8 @@ 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); }
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.15), inset 0 -2px rgba(57, 63, 63, 0.6), inset 0 -1px 
#2a2f2f; }
     GtkSwitch.slider:active {
       border: 1px solid #06121e; }
     GtkSwitch.slider:insensitive {
@@ -900,6 +914,8 @@ GtkSwitch {
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+    GtkSwitch.slider:backdrop:active {
+      border-color: #215d9c; }
     GtkSwitch.slider:backdrop:insensitive {
       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 d5cdc66..17ae4f0 100644
--- a/themes/Adwaita/gtk-3.0/gtk-contained.css
+++ b/themes/Adwaita/gtk-3.0/gtk-contained.css
@@ -767,13 +767,16 @@ GtkPopover {
       font-weight: bold;
       color: #8d9091; }
       .notebook tab GtkLabel.prelight-page {
-        color: #5d6263; }
+        color: #5d6263;
+        text-shadow: 0 1px rgba(0, 0, 0, 0.1); }
       .notebook tab GtkLabel.active-page {
-        color: #2e3436; }
+        color: #2e3436;
+        text-shadow: 0 1px rgba(0, 0, 0, 0.1); }
         .notebook tab GtkLabel.active-page:backdrop {
           color: #54595a; }
       .notebook tab GtkLabel:backdrop {
-        color: #8d9090; }
+        color: #8d9090;
+        text-shadow: none; }
     .notebook tab .button {
       border: 1px solid transparent;
       box-shadow: none;
@@ -845,31 +848,41 @@ GtkPopover {
 GtkSwitch {
   -GtkSwitch-slider-width: 47px;
   font: bold condensed 9;
-  outline-offset: -4px;
-  box-shadow: 0 1px 0 white; }
+  outline-offset: -4px; }
   GtkSwitch.trough {
     border-width: 1px;
     border-style: solid;
     border-radius: 3px;
-    color: #54595a;
-    background-image: linear-gradient(to bottom, #c9c9c9 5%, #d5d5d5 20%, #d5d5d5 90%, #ededed);
-    border-color: #a1a1a1; }
+    border-color: #a1a1a1;
+    background-color: #cecece;
+    box-shadow: inset 0 1px rgba(0, 0, 0, 0.1), 0 1px white;
+    text-shadow: 0 1px rgba(0, 0, 0, 0.1); }
     GtkSwitch.trough:active {
-      color: #fbfbfb;
-      background-image: linear-gradient(to bottom, #3e7ab8 5%, #4281c3 20%, #4281c3 90%, #4a90d9);
-      border-color: #1c5187; }
+      color: white;
+      border-color: #184472;
+      background-color: #4a90d9;
+      box-shadow: 0 1px white;
+      text-shadow: 0 0 2px 1px white; }
     GtkSwitch.trough:insensitive {
-      color: #54595a;
-      background-image: linear-gradient(to bottom, #ededed);
-      border-color: #a1a1a1; }
+      color: #8d9091;
+      border-color: #a1a1a1;
+      background-color: #ededed;
+      box-shadow: 0 1px white;
+      text-shadow: none; }
     GtkSwitch.trough:backdrop {
       color: #54595a;
-      background-image: linear-gradient(to bottom, lightgray);
-      border-color: #949494; }
+      border-color: #a1a1a1;
+      background-color: #ededed;
+      box-shadow: none;
+      text-shadow: none; }
+    GtkSwitch.trough:backdrop:active {
+      color: #ededed;
+      border-color: #4a90d9;
+      background-color: #4a90d9;
+      box-shadow: none; }
     GtkSwitch.trough:backdrop:insensitive {
-      color: #54595a;
-      background-image: linear-gradient(to bottom, #ededed);
-      border-color: #a1a1a1; }
+      color: #c7c7c7;
+      border-color: #c7c7c7; }
   GtkSwitch.slider {
     border-radius: 3px;
     border-width: 1px;
@@ -879,7 +892,8 @@ 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; }
+    box-shadow: inset 0 1px white;
+    box-shadow: inset 0 1px white, inset 0 -2px rgba(237, 237, 237, 0.6), inset 0 -1px #c7c7c7; }
     GtkSwitch.slider:active {
       border: 1px solid #184472; }
     GtkSwitch.slider:insensitive {
@@ -900,6 +914,8 @@ GtkSwitch {
       text-shadow: none;
       icon-shadow: none;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+    GtkSwitch.slider:backdrop:active {
+      border-color: #4a90d9; }
     GtkSwitch.slider:backdrop:insensitive {
       border-width: 1px;
       border-style: solid;