From a4fda9953975d288ba3786e96a74f6a64715e590 Mon Sep 17 00:00:00 2001
From: Daniel Boles <dboles.src@gmail.com>
Date: Thu, 5 Oct 2017 01:39:39 +0100
Subject: [PATCH] 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 ++++++++++---------
 .../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 ff64bda862..4b8be0a2d6 100644
--- a/gtk/theme/HighContrast/_common.scss
+++ b/gtk/theme/HighContrast/_common.scss
@@ -3238,21 +3238,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);
   }
-  &.solid-csd {
+
+  .tooltip & {
+    border-radius: 5px;
+    box-shadow: none;
+  }
+
+  .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 2aae8bd12c..17ce53ec4f 100644
--- a/gtk/theme/HighContrast/gtk-contained-inverse.css
+++ b/gtk/theme/HighContrast/gtk-contained-inverse.css
@@ -1463,13 +1463,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 5dc11e541c..ad15af2f89 100644
--- a/gtk/theme/HighContrast/gtk-contained.css
+++ b/gtk/theme/HighContrast/gtk-contained.css
@@ -1469,13 +1469,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; }