From: Daniel Boles <dboles@src.gnome.org>
Date: Sun, 3 Sep 2017 12:53:48 +0000 (+0100)
Subject: Adwaita: Fix ineffective theming of switch slider
X-Git-Tag: archive/raspbian/3.24.39-1+rpi1~1^2~65^2~39^2~228
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=56027e079dd077a535818f9dd72dc27789b76f9c;p=gtk%2B3.0.git

Adwaita: Fix ineffective theming of switch slider

in a specific case, which was applying .slider as a class on the parent
switch, instead of correctly selecting on its child node named slider.

This makes the border on the outside of a switch in a selected listbox
row look better in the light variant. Since the code was never removed,
it was clearly meant to work, and making it work is a clear improvement.
---

diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index d86eea49b4..041a60bcce 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -2642,10 +2642,10 @@ switch {
 
       &:backdrop { border-color: $selected_borders_color; }
 
-      &.slider:dir(rtl) { border-left-color: $borders_color; }
-      &.slider:dir(ltr) { border-right-color: $borders_color; }
+      slider:dir(rtl) { border-left-color: $borders_color; }
+      slider:dir(ltr) { border-right-color: $borders_color; }
 
-      &.slider { &:checked, & { border-color: $selected_borders_color; } }
+      slider { &:checked, & { border-color: $selected_borders_color; } }
     }
   }
 }
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index e2fdc5d631..df03679afd 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -1085,11 +1085,11 @@ row:selected switch { box-shadow: none; border-color: #184472; }
 
 row:selected switch:backdrop { border-color: #184472; }
 
-row:selected switch.slider:dir(rtl) { border-left-color: #b6b6b3; }
+row:selected switch slider:dir(rtl) { border-left-color: #b6b6b3; }
 
-row:selected switch.slider:dir(ltr) { border-right-color: #b6b6b3; }
+row:selected switch slider:dir(ltr) { border-right-color: #b6b6b3; }
 
-row:selected switch.slider:checked, row:selected switch.slider { border-color: #184472; }
+row:selected switch slider:checked, row:selected switch slider { border-color: #184472; }
 
 /************************* Check and Radio items * */
 .view.content-view.check:not(list), iconview.content-view.check:not(list), .content-view .tile check:not(list) { -gtk-icon-shadow: none; -gtk-icon-source: -gtk-scaled(url("assets/checkbox-selectionmode.png"), url("assets/checkbox-selectionmode@2.png")); background-color: transparent; min-width: 40px; min-height: 40px; background-image: none; transition: none; box-shadow: none; border-width: 0; }