[gtk+/gtk-3-22] HighContrast: Correctly select window decoration

[Daniel Boles <dboles src gnome org>]

commit b0e18d676ead753a50cbe1c22060007cd04d0ea2
Author: Daniel Boles <dboles src gmail com>
Date:   Thu Oct 5 00:24:26 2017 +0100

    HighContrast: Correctly select window decoration
    
    We need
    
        .window-classes decoration
    
    but within the decoration parent selector, we were doing
    &.window-classes, which gave us
    
        decoration.window classes
    
    We need to fix this by selecting on .window-classes &
    
    https://bugzilla.gnome.org/show_bug.cgi?id=788496

 gtk/theme/HighContrast/_common.scss              |   26 +++++++++++----------
 gtk/theme/HighContrast/gtk-contained-inverse.css |    8 +++---
 gtk/theme/HighContrast/gtk-contained.css         |    8 +++---
 3 files changed, 22 insertions(+), 20 deletions(-)
---
diff --git a/gtk/theme/HighContrast/_common.scss b/gtk/theme/HighContrast/_common.scss
index e1e3e9b..294d10f 100644
--- a/gtk/theme/HighContrast/_common.scss
+++ b/gtk/theme/HighContrast/_common.scss
@@ -3267,21 +3267,23 @@ decoration {
                 0 3px 9px 1px transparent,
                 0 0 0 1px $_wm_border_backdrop;
   }
-  &.tiled {
+
+  .tiled & {
     border-radius: 0;
   }
-  &.csd {
-    &.popup {
-      border-radius: 0;
-      box-shadow: 0 1px 2px transparentize(black, 0.8),
-                  0 0 0 1px transparentize($_wm_border,0.1);
-    }
-    &.tooltip {
-      border-radius: 5px;
-      box-shadow: none;
-    }
+
+  .csd.popup & {
+    border-radius: 0;
+    box-shadow: 0 1px 2px transparentize(black, 0.8),
+                0 0 0 1px transparentize($_wm_border,0.1);
+  }
+
+  .tooltip & {
+    border-radius: 5px;
+    box-shadow: none;
   }
-  &.solid-csd {
+
+  .solid-csd & {
     border-radius: 0;
     margin: 4px;
     background-color: $backdrop_bg_color;
diff --git a/gtk/theme/HighContrast/gtk-contained-inverse.css 
b/gtk/theme/HighContrast/gtk-contained-inverse.css
index 5804ffe..72d088d 100644
--- a/gtk/theme/HighContrast/gtk-contained-inverse.css
+++ b/gtk/theme/HighContrast/gtk-contained-inverse.css
@@ -1467,13 +1467,13 @@ decoration { border-radius: 7px 7px 0 0; border-width: 0px; box-shadow: 0 3px 9p
 
 decoration:backdrop { box-shadow: 0 2px 6px 2px rgba(0, 0, 0, 0.2), 0 3px 9px 1px transparent, 0 0 0 1px 
rgba(0, 0, 0, 0.18); }
 
-decoration.tiled { border-radius: 0; }
+.tiled decoration { border-radius: 0; }
 
-decoration.csd.popup { border-radius: 0; box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 
0.13); }
+.csd.popup decoration { border-radius: 0; box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 
0.13); }
 
-decoration.csd.tooltip { border-radius: 5px; box-shadow: none; }
+.tooltip decoration { border-radius: 5px; box-shadow: none; }
 
-decoration.solid-csd { border-radius: 0; margin: 4px; background-color: #000; border: solid 1px #737373; 
box-shadow: none; }
+.solid-csd decoration { border-radius: 0; margin: 4px; background-color: #000; border: solid 1px #737373; 
box-shadow: none; }
 
 /********************** Touch Copy & Paste * */
 cursor-handle { background-color: #000; background-image: none; -gtk-icon-source: none; box-shadow: none; 
outline-style: none; outline-color: transparent; border: 2px solid #fff; }
diff --git a/gtk/theme/HighContrast/gtk-contained.css b/gtk/theme/HighContrast/gtk-contained.css
index e2bd15f..ed1d0c6 100644
--- a/gtk/theme/HighContrast/gtk-contained.css
+++ b/gtk/theme/HighContrast/gtk-contained.css
@@ -1473,13 +1473,13 @@ decoration { border-radius: 7px 7px 0 0; border-width: 0px; box-shadow: 0 3px 9p
 
 decoration:backdrop { box-shadow: 0 2px 6px 2px rgba(0, 0, 0, 0.2), 0 3px 9px 1px transparent, 0 0 0 1px 
rgba(0, 0, 0, 0.18); }
 
-decoration.tiled { border-radius: 0; }
+.tiled decoration { border-radius: 0; }
 
-decoration.csd.popup { border-radius: 0; box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 
0.13); }
+.csd.popup decoration { border-radius: 0; box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 
0.13); }
 
-decoration.csd.tooltip { border-radius: 5px; box-shadow: none; }
+.tooltip decoration { border-radius: 5px; box-shadow: none; }
 
-decoration.solid-csd { border-radius: 0; margin: 4px; background-color: #fff; border: solid 1px #8d8d8d; 
box-shadow: none; }
+.solid-csd decoration { border-radius: 0; margin: 4px; background-color: #fff; border: solid 1px #8d8d8d; 
box-shadow: none; }
 
 /********************** Touch Copy & Paste * */
 cursor-handle { background-color: #fff; background-image: none; -gtk-icon-source: none; box-shadow: none; 
outline-style: none; outline-color: transparent; border: 2px solid #000; }