Adwaita: style updates for new window node hierarchy

diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 7d3a98fd4c20623673a2933a5290296b3f602d8a..93a23d27c5bcd7bf90fb1e6cc4e9754ba20dd58d 100644 (file)
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -4031,7 +4031,6 @@ colorchooser .popover.osd { border-radius: 5px; }
  * Window Decorations *
  *********************/
 window {
-  border-radius: $window_radius $window_radius 0 0;
   // lamefun trick to get rounded borders regardless of CSD use
   border-width: 0px;
 
@@ -4040,13 +4039,24 @@ window {
   $_wm_border: if($variant=='light', transparentize(black, 0.77), transparentize($borders_color, 0.1));
   $_wm_border_backdrop: if($variant=='light', transparentize(black, 0.82), transparentize($borders_color, 0.1));
 
-  box-shadow: 0 3px 9px 1px transparentize(black, 0.5),
-              0 0 0 1px $_wm_border; //doing borders with box-shadow
+  &.csd {
+    box-shadow: 0 3px 9px 1px transparentize(black, 0.5),
+                0 0 0 1px $_wm_border; //doing borders with box-shadow
+    margin: 0px;
+    border-radius: $window_radius $window_radius 0 0;
+  }
 
-  // FIXME rationalize shadows
+  &.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;
 
-  // this is used for the resize cursor area
-  //margin: 10px;
+    &:backdrop { box-shadow: inset 0 0 0 3px $backdrop_bg_color, inset 0 1px $top_hilight; }
+  }
+
+  // FIXME rationalize shadows
 
   &:backdrop {
     // the transparent shadow here is to enforce that the shadow extents don't
@@ -4059,46 +4069,36 @@ window {
     transition: $backdrop_transition;
   }
 
-  .maximized > &,
-  .fullscreen > &,
-  .tiled > &,
-  .tiled-top > &,
-  .tiled-left > &,
-  .tiled-right > &,
-  .tiled-bottom > & { border-radius: 0; }
+  &.maximized,
+  &.fullscreen,
+  &.tiled,
+  &.tiled-top,
+  &.tiled-left,
+  &.tiled-right,
+  &.tiled-bottom { border-radius: 0; }
 
-  .popup > & { box-shadow: none; }
+  &.popup { box-shadow: none; }
 
   // server-side decorations as used by mutter
-  .ssd > & { box-shadow: 0 0 0 1px $_wm_border; } //just doing borders, wm draws actual shadows
+  &.ssd { box-shadow: 0 0 0 1px $_wm_border; } //just doing borders, wm draws actual shadows
 
-  .csd.popup > & {
+  &.csd.popup {
     border-radius: $menu_radius;
     box-shadow: 0 1px 2px transparentize(black, 0.8),
                 0 0 0 1px transparentize($_wm_border, 0.1);
   }
 
-  tooltip.csd > & {
-    border-radius: 5px;
-    box-shadow: none;
-  }
-
-  messagedialog.csd > & {
+  &.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);
   }
 
-  .solid-csd > & {
-    margin: 0;
-    padding: 4px;
-    background-color: $borders_color;
-    border: solid 1px $borders_color;
-    border-radius: 0;
-    box-shadow: inset 0 0 0 3px $headerbar_color, inset 0 1px $top_hilight;
+}
 
-    &:backdrop { box-shadow: inset 0 0 0 3px $backdrop_bg_color, inset 0 1px $top_hilight; }
-  }
+tooltip.csd {
+  border-radius: 5px;
+  box-shadow: none;
 }
 
 // catch all extend :)