[gtk/matthiasc/for-master: 5/9] Adwaita: Drop scrollbar stepper button theming

[Matthias Clasen <matthiasc src gnome org>]

commit de14fc74c77e8444349c6e5fbf568e55a5127a7c
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu Jan 23 20:53:09 2020 -0500

    Adwaita: Drop scrollbar stepper button theming
    
    Scrollbar stepper buttons no longer exist.

 gtk/theme/Adwaita/_common.scss           | 98 +-------------------------------
 gtk/theme/Adwaita/gtk-contained-dark.css | 36 +-----------
 gtk/theme/Adwaita/gtk-contained.css      | 36 +-----------
 3 files changed, 9 insertions(+), 161 deletions(-)
---
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 61b4de7822..e23daa1e0a 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -2531,13 +2531,13 @@ scrollbar {
   }
 
   > range.fine-tune {
-    slider {
+    > trough > slider {
       min-width: 4px;
       min-height: 4px;
     }
 
-    &.horizontal slider { border-width: 5px 4px; }
-    &.vertical slider { border-width: 4px 5px; }
+    &.horizontal > trough > slider { border-width: 5px 4px; }
+    &.vertical > trough > slider { border-width: 4px 5px; }
   }
 
   &.overlay-indicator {
@@ -2553,40 +2553,6 @@ scrollbar {
         background-color: $fg_color;
         border: 1px solid if($variant == 'light', white, black);
       }
-
-      > button {
-        min-width: 5px;
-        min-height: 5px;
-        background-color: $fg_color;
-        background-clip: padding-box;
-        border-radius: 100%;
-        border: 1px solid if($variant == 'light', white, black);
-        -gtk-icon-source: none;
-      }
-
-      &.horizontal {
-        > slider {
-          margin: 0 2px;
-          min-width: $_slider_min_length;
-        }
-
-        > button {
-          margin: 1px 2px;
-          min-width: 5px;
-        }
-      }
-
-      &.vertical {
-        > slider {
-          margin: 2px 0;
-          min-height: $_slider_min_length;
-        }
-
-        > button {
-          margin: 2px 1px;
-          min-height: 5px;
-        }
-      }
     }
 
     &.dragging,
@@ -2596,63 +2562,6 @@ scrollbar {
   &.horizontal > range > trough > slider { min-width: $_slider_min_length; }
 
   &.vertical > range > trough > slider { min-height: $_slider_min_length; }
-
-  > button {
-    padding: 0;
-    min-width: 12px;
-    min-height: 12px;
-    border-style: none;
-    border-radius: 0;
-    transition-property: min-height, min-width, color;
-
-    @include button(undecorated);
-
-    color: $scrollbar_slider_color;
-
-    &:hover {
-      @include button(undecorated);
-
-      color: $scrollbar_slider_hover_color;
-    }
-    &:active, &:checked {
-      @include button(undecorated);
-
-      color: $scrollbar_slider_active_color;
-    }
-    &:disabled {
-      @include button(undecorated);
-
-      color: transparentize($scrollbar_slider_color, 0.8);
-    }
-    &:backdrop {
-      @include button(undecorated);
-
-      color: $backdrop_scrollbar_slider_color;
-
-      &:disabled {
-        @include button(undecorated);
-
-        color: transparentize($backdrop_scrollbar_slider_color, 0.8);
-      }
-    }
-  }
-
-  // button icons
-  &.vertical {
-    button {
-      &.down { -gtk-icon-source: -gtk-icontheme('pan-down-symbolic'); }
-
-      &.up { -gtk-icon-source: -gtk-icontheme('pan-up-symbolic'); }
-    }
-  }
-
-  &.horizontal {
-    button {
-      &.down { -gtk-icon-source: -gtk-icontheme('pan-end-symbolic'); }
-
-      &.up { -gtk-icon-source: -gtk-icontheme('pan-start-symbolic'); }
-    }
-  }
 }
 
 treeview ~ scrollbar.vertical {
@@ -3688,7 +3597,6 @@ scrolledwindow {
     }
   }
 
-
   > junction { // the small square between two scrollbars
     // Only color the top-left (or top right in RTL) pixel, to visually connect
     // the borders of the two scrollbars.
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index e5967d01a3..d89fae6c19 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -978,52 +978,22 @@ scrollbar > range > trough > slider:backdrop { background-color: #5a5a59; }
 
 scrollbar > range > trough > slider:disabled { background-color: transparent; }
 
-scrollbar > range.fine-tune slider { min-width: 4px; min-height: 4px; }
+scrollbar > range.fine-tune > trough > slider { min-width: 4px; min-height: 4px; }
 
-scrollbar > range.fine-tune.horizontal slider { border-width: 5px 4px; }
+scrollbar > range.fine-tune.horizontal > trough > slider { border-width: 5px 4px; }
 
-scrollbar > range.fine-tune.vertical slider { border-width: 4px 5px; }
+scrollbar > range.fine-tune.vertical > trough > slider { border-width: 4px 5px; }
 
 scrollbar.overlay-indicator:not(.dragging):not(.hovering) { border-color: transparent; opacity: 0.4; 
background-color: transparent; }
 
 scrollbar.overlay-indicator:not(.dragging):not(.hovering) > range > trough > slider { margin: 0; min-width: 
3px; min-height: 3px; background-color: #eeeeec; border: 1px solid black; }
 
-scrollbar.overlay-indicator:not(.dragging):not(.hovering) > button { min-width: 5px; min-height: 5px; 
background-color: #eeeeec; background-clip: padding-box; border-radius: 100%; border: 1px solid black; 
-gtk-icon-source: none; }
-
-scrollbar.overlay-indicator:not(.dragging):not(.hovering).horizontal > slider { margin: 0 2px; min-width: 
40px; }
-
-scrollbar.overlay-indicator:not(.dragging):not(.hovering).horizontal > button { margin: 1px 2px; min-width: 
5px; }
-
-scrollbar.overlay-indicator:not(.dragging):not(.hovering).vertical > slider { margin: 2px 0; min-height: 
40px; }
-
-scrollbar.overlay-indicator:not(.dragging):not(.hovering).vertical > button { margin: 2px 1px; min-height: 
5px; }
-
 scrollbar.overlay-indicator.dragging, scrollbar.overlay-indicator.hovering { opacity: 0.8; }
 
 scrollbar.horizontal > range > trough > slider { min-width: 40px; }
 
 scrollbar.vertical > range > trough > slider { min-height: 40px; }
 
-scrollbar > button { padding: 0; min-width: 12px; min-height: 12px; border-style: none; border-radius: 0; 
transition-property: min-height, min-width, color; border-color: transparent; background-color: transparent; 
background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: 
none; color: #a4a4a3; }
-
-scrollbar > button:hover { border-color: transparent; background-color: transparent; background-image: none; 
box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; color: #c9c9c7; }
-
-scrollbar > button:active, scrollbar > button:checked { border-color: transparent; background-color: 
transparent; background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; 
-gtk-icon-shadow: none; color: #1b6acb; }
-
-scrollbar > button:disabled { border-color: transparent; background-color: transparent; background-image: 
none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; color: 
rgba(164, 164, 163, 0.2); }
-
-scrollbar > button:backdrop { border-color: transparent; background-color: transparent; background-image: 
none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; color: 
#5a5a59; }
-
-scrollbar > button:backdrop:disabled { border-color: transparent; background-color: transparent; 
background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: 
none; color: rgba(90, 90, 89, 0.2); }
-
-scrollbar.vertical button.down { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); }
-
-scrollbar.vertical button.up { -gtk-icon-source: -gtk-icontheme("pan-up-symbolic"); }
-
-scrollbar.horizontal button.down { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); }
-
-scrollbar.horizontal button.up { -gtk-icon-source: -gtk-icontheme("pan-start-symbolic"); }
-
 treeview ~ scrollbar.vertical { border-top: 1px solid #1b1b1b; margin-top: -1px; }
 
 /********** Switch * */
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index c2b34c3827..16c5291d33 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -986,52 +986,22 @@ scrollbar > range > trough > slider:backdrop { background-color: #cecfce; }
 
 scrollbar > range > trough > slider:disabled { background-color: transparent; }
 
-scrollbar > range.fine-tune slider { min-width: 4px; min-height: 4px; }
+scrollbar > range.fine-tune > trough > slider { min-width: 4px; min-height: 4px; }
 
-scrollbar > range.fine-tune.horizontal slider { border-width: 5px 4px; }
+scrollbar > range.fine-tune.horizontal > trough > slider { border-width: 5px 4px; }
 
-scrollbar > range.fine-tune.vertical slider { border-width: 4px 5px; }
+scrollbar > range.fine-tune.vertical > trough > slider { border-width: 4px 5px; }
 
 scrollbar.overlay-indicator:not(.dragging):not(.hovering) { border-color: transparent; opacity: 0.4; 
background-color: transparent; }
 
 scrollbar.overlay-indicator:not(.dragging):not(.hovering) > range > trough > slider { margin: 0; min-width: 
3px; min-height: 3px; background-color: #2e3436; border: 1px solid white; }
 
-scrollbar.overlay-indicator:not(.dragging):not(.hovering) > button { min-width: 5px; min-height: 5px; 
background-color: #2e3436; background-clip: padding-box; border-radius: 100%; border: 1px solid white; 
-gtk-icon-source: none; }
-
-scrollbar.overlay-indicator:not(.dragging):not(.hovering).horizontal > slider { margin: 0 2px; min-width: 
40px; }
-
-scrollbar.overlay-indicator:not(.dragging):not(.hovering).horizontal > button { margin: 1px 2px; min-width: 
5px; }
-
-scrollbar.overlay-indicator:not(.dragging):not(.hovering).vertical > slider { margin: 2px 0; min-height: 
40px; }
-
-scrollbar.overlay-indicator:not(.dragging):not(.hovering).vertical > button { margin: 2px 1px; min-height: 
5px; }
-
 scrollbar.overlay-indicator.dragging, scrollbar.overlay-indicator.hovering { opacity: 0.8; }
 
 scrollbar.horizontal > range > trough > slider { min-width: 40px; }
 
 scrollbar.vertical > range > trough > slider { min-height: 40px; }
 
-scrollbar > button { padding: 0; min-width: 12px; min-height: 12px; border-style: none; border-radius: 0; 
transition-property: min-height, min-width, color; border-color: transparent; background-color: transparent; 
background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: 
none; color: #7e8182; }
-
-scrollbar > button:hover { border-color: transparent; background-color: transparent; background-image: none; 
box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; color: #565b5c; }
-
-scrollbar > button:active, scrollbar > button:checked { border-color: transparent; background-color: 
transparent; background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; 
-gtk-icon-shadow: none; color: #1b6acb; }
-
-scrollbar > button:disabled { border-color: transparent; background-color: transparent; background-image: 
none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; color: 
rgba(126, 129, 130, 0.2); }
-
-scrollbar > button:backdrop { border-color: transparent; background-color: transparent; background-image: 
none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: none; color: 
#cecfce; }
-
-scrollbar > button:backdrop:disabled { border-color: transparent; background-color: transparent; 
background-image: none; box-shadow: inset 0 1px rgba(255, 255, 255, 0); text-shadow: none; -gtk-icon-shadow: 
none; color: rgba(206, 207, 206, 0.2); }
-
-scrollbar.vertical button.down { -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); }
-
-scrollbar.vertical button.up { -gtk-icon-source: -gtk-icontheme("pan-up-symbolic"); }
-
-scrollbar.horizontal button.down { -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); }
-
-scrollbar.horizontal button.up { -gtk-icon-source: -gtk-icontheme("pan-start-symbolic"); }
-
 treeview ~ scrollbar.vertical { border-top: 1px solid #cdc7c2; margin-top: -1px; }
 
 /********** Switch * */