[gtk/wip/jimmac/push-my-buttons-too: 3/9] Adwaita: no special buttons

[Jakub Steiner <jimmac src gnome org>]

commit ed31912cce490eeb45f025a9f11771a256244ad2
Author: Jakub Steiner <jimmac gmail com>
Date:   Mon Oct 1 21:01:52 2018 +0200

    Adwaita: no special buttons

 gtk/theme/Adwaita/_common.scss           | 12 ++++----
 gtk/theme/Adwaita/_drawing.scss          | 49 --------------------------------
 gtk/theme/Adwaita/gtk-contained-dark.css | 12 ++++----
 gtk/theme/Adwaita/gtk-contained.css      | 12 ++++----
 4 files changed, 18 insertions(+), 67 deletions(-)
---
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index b19f0ae407..c5e245a4c4 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -2653,10 +2653,10 @@ switch {
     border-radius: 3px;
     transition: $button_transition;
 
-    @include button(normal-alt, $edge: $shadow_color);
+    @include button(normal, $edge: $shadow_color);
   }
 
-  &:hover slider { @include button(hover-alt, $edge: $shadow_color); }
+  &:hover slider { @include button(hover, $edge: $shadow_color); }
 
   &:checked slider { border: 1px solid $selected_borders_color; }
 
@@ -2755,9 +2755,9 @@ radio {
   border: 1px solid;
   -gtk-icon-source: none;
 
-  @include button(normal-alt, $edge: $shadow_color);
+  @include button(normal, $edge: $shadow_color);
 
-  &:hover { @include button(hover-alt, $edge: $shadow_color); }
+  &:hover { @include button(hover, $edge: $shadow_color); }
   &:active { @include button(active); }
   &:disabled { @include button(insensitive); }
   &:backdrop {
@@ -3016,14 +3016,14 @@ scale {
   }
 
   slider {
-    @include button(normal-alt, $edge: $shadow_color);
+    @include button(normal, $edge: $shadow_color);
 
     border: 1px solid darken($alt_borders_color, 3%);
     border-radius: 100%;
     transition: $button_transition;
     transition-property: background, border, box-shadow;
 
-    &:hover { @include button(hover-alt, $edge: $shadow_color); }
+    &:hover { @include button(hover, $edge: $shadow_color); }
 
     &:active { border-color: $selected_borders_color; }
 
diff --git a/gtk/theme/Adwaita/_drawing.scss b/gtk/theme/Adwaita/_drawing.scss
index bce1c35666..66f9a375ab 100644
--- a/gtk/theme/Adwaita/_drawing.scss
+++ b/gtk/theme/Adwaita/_drawing.scss
@@ -208,55 +208,6 @@
 
   }
 
-  
-@if $t==normal-alt {
-  //
-  // normal button alternative look
-  //
-    color: $tc;
-    outline-color: transparentize($tc, 0.7);
-    border-color: if($c != $bg_color, _border_color($c, true), $alt_borders_color);
-    @include _button_text_shadow($tc, $c);
-    @if $variant == 'light' {
-      background-image: linear-gradient(to bottom, lighten($c, 5%) 20%, $c 90%);
-      @include _shadows(inset 0 1px _button_hilight_color(lighten($c, 6%)),
-                        inset 0 -2px lighten($c, 2%),
-                        inset 0 -1px darken($c, 12%),
-                        $_button_edge);
-    }
-    @else {
-      background-image: linear-gradient(to bottom, darken($c, 3%) 20%, darken($c, 6%) 90%);
-      @include _shadows(inset 0 1px $_hilight_color,
-                        inset 0 -2px darken($c, 4%),
-                        inset 0 -1px darken($c, 9%),
-                        $_button_edge);
-    }
-  }
-
-  @else if $t==hover-alt {
-  //
-  // hovered button alternative look
-  //
-    color: $tc;
-    outline-color: transparentize($tc, 0.7);
-    border-color: if($c != $bg_color, _border_color($c, true), $alt_borders_color);
-    @if $variant == 'light' {
-      $button_fill: linear-gradient(to bottom, lighten($c, 9%) 10%, lighten($c, 4%) 90%) !global;
-      @include _shadows(inset 0 1px _button_hilight_color(lighten($c, 6%)),
-                        inset 0 -2px lighten($c, 5%),
-                        inset 0 -1px darken($c, 10%),
-                        $_button_edge);
-    }
-    @else {
-      $button_fill: linear-gradient(to bottom, $c 20%, darken($c, 4%) 90%) !global;
-      @include _shadows(inset 0 1px $_hilight_color,
-                        inset 0 -2px darken($c, 3%),
-                        inset 0 -1px darken($c, 6%),
-                        $_button_edge);
-    }
-    background-image: $button_fill;
-  }
-
   @else if $t==active {
   //
   // pushed button
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index ab4abb9388..3142a92e8b 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -1077,9 +1077,9 @@ switch:backdrop:checked { border-color: #0f2b48; background-color: #215d9c; }
 
 switch:backdrop:disabled { color: #566164; border-color: #202425; background-color: #2d3234; }
 
-switch slider { margin: -1px; min-width: 44px; min-height: 26px; border: 1px solid; border-radius: 3px; 
transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); color: #eeeeec; outline-color: rgba(238, 238, 
236, 0.3); border-color: #0b0c0c; text-shadow: 0 -1px rgba(0, 0, 0, 0.827451); -gtk-icon-shadow: 0 -1px 
rgba(0, 0, 0, 0.827451); background-image: linear-gradient(to bottom, #2c3133 20%, #25292b 90%); box-shadow: 
inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -2px #2a2e30, inset 0 -1px #1e2122, 0 1px rgba(0, 0, 0, 0.1); }
+switch slider { margin: -1px; min-width: 44px; min-height: 26px; border: 1px solid; border-radius: 3px; 
transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); color: #eeeeec; border-color: black; 
background-image: image(#2c3133); box-shadow: inset 0 -2px #212526; }
 
-switch:hover slider { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #0b0c0c; 
box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -2px #2c3133, inset 0 -1px #25292b, 0 1px rgba(0, 
0, 0, 0.1); background-image: linear-gradient(to bottom, #33393b 20%, #2a2e30 90%); }
+switch:hover slider { background-image: image(#383e40); box-shadow: inset 0 -2px #242829; }
 
 switch:checked slider { border: 1px solid #0f2b48; }
 
@@ -1120,7 +1120,7 @@ checkbutton.text-button label:not(:only-child):first-child, radiobutton.text-but
 
 checkbutton.text-button label:not(:only-child):last-child, radiobutton.text-button 
label:not(:only-child):last-child { margin-right: 4px; }
 
-check, radio { margin: 0 4px; min-height: 14px; min-width: 14px; border: 1px solid; -gtk-icon-source: none; 
color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #0b0c0c; text-shadow: 0 -1px rgba(0, 
0, 0, 0.827451); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.827451); background-image: linear-gradient(to 
bottom, #2c3133 20%, #25292b 90%); box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -2px #2a2e30, 
inset 0 -1px #1e2122, 0 1px rgba(0, 0, 0, 0.1); }
+check, radio { margin: 0 4px; min-height: 14px; min-width: 14px; border: 1px solid; -gtk-icon-source: none; 
color: #eeeeec; border-color: black; background-image: image(#2c3133); box-shadow: inset 0 -2px #212526; }
 
 check:only-child, radio:only-child { margin: 0; }
 
@@ -1128,7 +1128,7 @@ popover check.left:dir(rtl), popover radio.left:dir(rtl) { margin-left: 0; margi
 
 popover check.right:dir(ltr), popover radio.right:dir(ltr) { margin-left: 12px; margin-right: 0; }
 
-check:hover, radio:hover { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #0b0c0c; 
box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -2px #2c3133, inset 0 -1px #25292b, 0 1px rgba(0, 
0, 0, 0.1); background-image: linear-gradient(to bottom, #33393b 20%, #2a2e30 90%); }
+check:hover, radio:hover { background-image: image(#383e40); box-shadow: inset 0 -2px #242829; }
 
 check:active, radio:active { background-image: image(#1c1f20); box-shadow: none; }
 
@@ -1243,9 +1243,9 @@ scale fill:disabled:backdrop, scale fill:disabled { border-color: transparent; b
 
 .osd scale fill:disabled:backdrop, .osd scale fill:disabled { border-color: transparent; background-color: 
transparent; }
 
-scale slider { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #0b0c0c; text-shadow: 
0 -1px rgba(0, 0, 0, 0.827451); -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.827451); background-image: 
linear-gradient(to bottom, #2c3133 20%, #25292b 90%); box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), 
inset 0 -2px #2a2e30, inset 0 -1px #1e2122, 0 1px rgba(0, 0, 0, 0.1); border: 1px solid #040404; 
border-radius: 100%; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); transition-property: 
background, border, box-shadow; }
+scale slider { color: #eeeeec; border-color: black; background-image: image(#2c3133); box-shadow: inset 0 
-2px #212526; border: 1px solid #040404; border-radius: 100%; transition: all 200ms cubic-bezier(0.25, 0.46, 
0.45, 0.94); transition-property: background, border, box-shadow; }
 
-scale slider:hover { color: #eeeeec; outline-color: rgba(238, 238, 236, 0.3); border-color: #0b0c0c; 
box-shadow: inset 0 1px rgba(255, 255, 255, 0.05), inset 0 -2px #2c3133, inset 0 -1px #25292b, 0 1px rgba(0, 
0, 0, 0.1); background-image: linear-gradient(to bottom, #33393b 20%, #2a2e30 90%); }
+scale slider:hover { background-image: image(#383e40); box-shadow: inset 0 -2px #242829; }
 
 scale slider:active { border-color: #0f2b48; }
 
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index ad7d081d0c..108c542272 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -1085,9 +1085,9 @@ switch:backdrop:checked { color: #e8e8e7; border-color: #4a90d9; background-colo
 
 switch:backdrop:disabled { color: #c3c3c0; border-color: #c0c0bd; background-color: #f1f1f1; }
 
-switch slider { margin: -1px; min-width: 44px; min-height: 26px; border: 1px solid; border-radius: 3px; 
transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); color: #2e3436; outline-color: rgba(46, 52, 54, 
0.3); border-color: #91918c; text-shadow: 0 1px rgba(255, 255, 255, 0.769231); -gtk-icon-shadow: 0 1px 
rgba(255, 255, 255, 0.769231); background-image: linear-gradient(to bottom, #f4f4f4 20%, #e8e8e7 90%); 
box-shadow: inset 0 1px white, inset 0 -2px #ededec, inset 0 -1px #cacac8, 0 1px rgba(0, 0, 0, 0.1); }
+switch slider { margin: -1px; min-width: 44px; min-height: 26px; border: 1px solid; border-radius: 3px; 
transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); color: #2e3436; border-color: #aaaaa6; 
background-image: image(#e1e1df); box-shadow: inset 0 -2px #d2d2d0; }
 
-switch:hover slider { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); border-color: #91918c; 
box-shadow: inset 0 1px white, inset 0 -2px #f4f4f4, inset 0 -1px #cfcfcd, 0 1px rgba(0, 0, 0, 0.1); 
background-image: linear-gradient(to bottom, #fefefe 10%, #f2f2f1 90%); }
+switch:hover slider { background-image: image(#ededec); box-shadow: inset 0 -2px #d5d5d3; }
 
 switch:checked slider { border: 1px solid #184472; }
 
@@ -1138,7 +1138,7 @@ checkbutton.text-button label:not(:only-child):first-child, radiobutton.text-but
 
 checkbutton.text-button label:not(:only-child):last-child, radiobutton.text-button 
label:not(:only-child):last-child { margin-right: 4px; }
 
-check, radio { margin: 0 4px; min-height: 14px; min-width: 14px; border: 1px solid; -gtk-icon-source: none; 
color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); border-color: #91918c; text-shadow: 0 1px rgba(255, 
255, 255, 0.769231); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); background-image: 
linear-gradient(to bottom, #f4f4f4 20%, #e8e8e7 90%); box-shadow: inset 0 1px white, inset 0 -2px #ededec, 
inset 0 -1px #cacac8, 0 1px rgba(0, 0, 0, 0.1); }
+check, radio { margin: 0 4px; min-height: 14px; min-width: 14px; border: 1px solid; -gtk-icon-source: none; 
color: #2e3436; border-color: #aaaaa6; background-image: image(#e1e1df); box-shadow: inset 0 -2px #d2d2d0; }
 
 check:only-child, radio:only-child { margin: 0; }
 
@@ -1146,7 +1146,7 @@ popover check.left:dir(rtl), popover radio.left:dir(rtl) { margin-left: 0; margi
 
 popover check.right:dir(ltr), popover radio.right:dir(ltr) { margin-left: 12px; margin-right: 0; }
 
-check:hover, radio:hover { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); border-color: #91918c; 
box-shadow: inset 0 1px white, inset 0 -2px #f4f4f4, inset 0 -1px #cfcfcd, 0 1px rgba(0, 0, 0, 0.1); 
background-image: linear-gradient(to bottom, #fefefe 10%, #f2f2f1 90%); }
+check:hover, radio:hover { background-image: image(#ededec); box-shadow: inset 0 -2px #d5d5d3; }
 
 check:active, radio:active { background-image: image(#ccccca); box-shadow: none; }
 
@@ -1263,9 +1263,9 @@ scale fill:disabled:backdrop, scale fill:disabled { border-color: transparent; b
 
 .osd scale fill:disabled:backdrop, .osd scale fill:disabled { border-color: transparent; background-color: 
transparent; }
 
-scale slider { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); border-color: #91918c; text-shadow: 0 
1px rgba(255, 255, 255, 0.769231); -gtk-icon-shadow: 0 1px rgba(255, 255, 255, 0.769231); background-image: 
linear-gradient(to bottom, #f4f4f4 20%, #e8e8e7 90%); box-shadow: inset 0 1px white, inset 0 -2px #ededec, 
inset 0 -1px #cacac8, 0 1px rgba(0, 0, 0, 0.1); border: 1px solid #898984; border-radius: 100%; transition: 
all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); transition-property: background, border, box-shadow; }
+scale slider { color: #2e3436; border-color: #aaaaa6; background-image: image(#e1e1df); box-shadow: inset 0 
-2px #d2d2d0; border: 1px solid #898984; border-radius: 100%; transition: all 200ms cubic-bezier(0.25, 0.46, 
0.45, 0.94); transition-property: background, border, box-shadow; }
 
-scale slider:hover { color: #2e3436; outline-color: rgba(46, 52, 54, 0.3); border-color: #91918c; 
box-shadow: inset 0 1px white, inset 0 -2px #f4f4f4, inset 0 -1px #cfcfcd, 0 1px rgba(0, 0, 0, 0.1); 
background-image: linear-gradient(to bottom, #fefefe 10%, #f2f2f1 90%); }
+scale slider:hover { background-image: image(#ededec); box-shadow: inset 0 -2px #d5d5d3; }
 
 scale slider:active { border-color: #184472; }