[gtk/wip/exalm/window: 1/2] theme: Restructure window style

[Alexander Mikhaylenko <alexm src gnome org>]

commit b981ac6e9eb2ff95778a33054b3440cebff9659b
Author: Alexander Mikhaylenko <alexm gnome org>
Date:   Thu May 21 18:21:23 2020 +0500

    theme: Restructure window style

 gtk/theme/Adwaita/_common.scss | 64 +++++++++++++++++++++---------------------
 1 file changed, 32 insertions(+), 32 deletions(-)
---
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 93a23d27c5..35362835c0 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -4042,31 +4042,44 @@ window {
   &.csd {
     box-shadow: 0 3px 9px 1px transparentize(black, 0.5),
                 0 0 0 1px $_wm_border; //doing borders with box-shadow
+
+    // FIXME rationalize shadows
+
     margin: 0px;
     border-radius: $window_radius $window_radius 0 0;
-  }
 
-  &.solid-csd {
-    margin: 0;
-    padding: 0;
-    border: solid 14px $borders_color;
-    border-radius: 0;
-    box-shadow: inset 0 0 0 3px $headerbar_color, inset 0 1px $top_hilight;
+    &:backdrop {
+      // the transparent shadow here is to enforce that the shadow extents don't
+      // change when we go to backdrop, to prevent jumping windows.
+      // The biggest shadow should be in the same order then in the active state
+      // or the jumping will happen during the transition.
+      box-shadow: 0 3px 9px 1px transparent,
+                  0 2px 6px 2px transparentize(black, 0.8),
+                  0 0 0 1px $_wm_border_backdrop;
+      transition: $backdrop_transition;
+    }
 
-    &:backdrop { box-shadow: inset 0 0 0 3px $backdrop_bg_color, inset 0 1px $top_hilight; }
-  }
+    &.popup {
+      border-radius: $menu_radius;
+      box-shadow: 0 1px 2px transparentize(black, 0.8),
+                  0 0 0 1px transparentize($_wm_border, 0.1);
+    }
+
+    &.dialog.message {
+      border-radius: $window_radius;
+      box-shadow: 0 1px 2px transparentize(black, 0.8),
+                  0 0 0 1px transparentize($_wm_border, 0.1);
+    }
 
-  // FIXME rationalize shadows
+    &.solid-csd {
+      margin: 0;
+      padding: 0;
+      border: solid 1px $borders_color;
+      border-radius: 0;
+      box-shadow: 0 0 0 5px $borders_color, 0 0 0 4px $headerbar_color, inset 0 1px $top_hilight;
 
-  &:backdrop {
-    // the transparent shadow here is to enforce that the shadow extents don't
-    // change when we go to backdrop, to prevent jumping windows.
-    // The biggest shadow should be in the same order then in the active state
-    // or the jumping will happen during the transition.
-    box-shadow: 0 3px 9px 1px transparent,
-                0 2px 6px 2px transparentize(black, 0.8),
-                0 0 0 1px $_wm_border_backdrop;
-    transition: $backdrop_transition;
+      &:backdrop { box-shadow: 0 0 0 5px $borders_color, 0 0 0 4px $backdrop_bg_color, inset 0 1px 
$top_hilight; }
+    }
   }
 
   &.maximized,
@@ -4081,19 +4094,6 @@ window {
 
   // server-side decorations as used by mutter
   &.ssd { box-shadow: 0 0 0 1px $_wm_border; } //just doing borders, wm draws actual shadows
-
-  &.csd.popup {
-    border-radius: $menu_radius;
-    box-shadow: 0 1px 2px transparentize(black, 0.8),
-                0 0 0 1px transparentize($_wm_border, 0.1);
-  }
-
-  &.dialog.message.csd {
-    border-radius: $window_radius;
-    box-shadow: 0 1px 2px transparentize(black, 0.8),
-                0 0 0 1px transparentize($_wm_border, 0.1);
-  }
-
 }
 
 tooltip.csd {