Merge branch 'wip/exalm/revert-decoration' into 'gtk-3-24'

Adwaita: Revert black decoration background

See merge request GNOME/gtk!1985
This commit is contained in:
Matthias Clasen 2020-05-30 14:41:29 +00:00
commit 2b96159c9d
3 changed files with 6 additions and 8 deletions

View File

@ -4574,8 +4574,6 @@ decoration {
.popup & { box-shadow: none; }
.csd & { background-color: black; } // transparent makes gtk3 leak light on the corners #2537
// server-side decorations as used by mutter
.ssd & { box-shadow: 0 0 0 1px $_wm_border; } //just doing borders, wm draws actual shadows

View File

@ -1826,15 +1826,15 @@ colorchooser .popover.osd { border-radius: 5px; }
.scale-popup button:hover { background-color: rgba(238, 238, 236, 0.1); border-radius: 5px; }
/********************** Window Decorations * */
decoration { border-radius: 8px 8px 0 0; border-width: 0px; background-color: black; /* transparent makes gtk3 leak light on the corners #2537 */ box-shadow: 0 3px 9px 1px rgba(0, 0, 0, 0.5), 0 0 0 1px rgba(27, 27, 27, 0.9); margin: 10px; }
decoration { border-radius: 8px 8px 0 0; border-width: 0px; box-shadow: 0 3px 9px 1px rgba(0, 0, 0, 0.5), 0 0 0 1px rgba(27, 27, 27, 0.9); margin: 10px; }
decoration:backdrop { box-shadow: 0 3px 9px 1px transparent, 0 2px 6px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(27, 27, 27, 0.9); transition: 200ms ease-out; }
.maximized decoration, .fullscreen decoration, .tiled decoration, .tiled-top decoration, .tiled-right decoration, .tiled-bottom decoration, .tiled-left decoration { border-radius: 0; }
.popup decoration { box-shadow: none; background: none; }
.popup decoration { box-shadow: none; }
.ssd decoration { background: none; box-shadow: 0 0 0 1px rgba(27, 27, 27, 0.9); }
.ssd decoration { box-shadow: 0 0 0 1px rgba(27, 27, 27, 0.9); }
.csd.popup decoration { border-radius: 5px; box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(27, 27, 27, 0.8); }

View File

@ -1842,15 +1842,15 @@ colorchooser .popover.osd { border-radius: 5px; }
.scale-popup button:hover { background-color: rgba(46, 52, 54, 0.1); border-radius: 5px; }
/********************** Window Decorations * */
decoration { border-radius: 8px 8px 0 0; border-width: 0px; background-color: black; /* transparent makes gtk3 leak light on the corners #2537 */ box-shadow: 0 3px 9px 1px rgba(0, 0, 0, 0.5), 0 0 0 1px rgba(0, 0, 0, 0.23); margin: 10px; }
decoration { border-radius: 8px 8px 0 0; border-width: 0px; box-shadow: 0 3px 9px 1px rgba(0, 0, 0, 0.5), 0 0 0 1px rgba(0, 0, 0, 0.23); margin: 10px; }
decoration:backdrop { box-shadow: 0 3px 9px 1px transparent, 0 2px 6px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 0.18); transition: 200ms ease-out; }
.maximized decoration, .fullscreen decoration, .tiled decoration, .tiled-top decoration, .tiled-right decoration, .tiled-bottom decoration, .tiled-left decoration { border-radius: 0; }
.popup decoration { box-shadow: none; background: none; }
.popup decoration { box-shadow: none; }
.ssd decoration { background: none; box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.23); }
.ssd decoration { box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.23); }
.csd.popup decoration { border-radius: 5px; box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 0.13); }