From 12793e3100adef214cb7ec7ce220ff64f43f407b Mon Sep 17 00:00:00 2001 From: vinceliuice Date: Wed, 21 Sep 2022 23:55:09 +0800 Subject: [PATCH] update --- src/sass/gtk/_common-3.0.scss | 1 + src/sass/gtk/_common-4.0.scss | 98 +++++++++++++++++------------------ 2 files changed, 49 insertions(+), 50 deletions(-) diff --git a/src/sass/gtk/_common-3.0.scss b/src/sass/gtk/_common-3.0.scss index bf810d8a..0509f87a 100644 --- a/src/sass/gtk/_common-3.0.scss +++ b/src/sass/gtk/_common-3.0.scss @@ -3680,6 +3680,7 @@ decoration { .background.csd & { border: 1px solid highlight($background); background-clip: border-box; + background-color: $background; } } } diff --git a/src/sass/gtk/_common-4.0.scss b/src/sass/gtk/_common-4.0.scss index 1c5ddb3c..3caad69a 100644 --- a/src/sass/gtk/_common-4.0.scss +++ b/src/sass/gtk/_common-4.0.scss @@ -4351,58 +4351,56 @@ colorchooser .popover.osd { * Window Decorations * **********************/ window { - &.csd { - transition: $transition-shadow; - border-radius: $window-radius; - outline-color: highlight($background); - outline-offset: -1px; - outline-style: solid; - outline-width: 1px; + transition: $transition-shadow; + border-radius: $window-radius; + outline-color: highlight($background); + outline-offset: -1px; + outline-style: solid; + outline-width: 1px; - @if $rimless == 'true' { - box-shadow: $shadow-z16, 0 0 36px transparent; - } @else { - box-shadow: $shadow-z16, 0 0 0 1px $window-border, 0 0 36px transparent; - } - - &: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. - @if $rimless == 'true' { - box-shadow: $shadow-z4, 0 0 36px transparent; - } @else { - box-shadow: $shadow-z4, 0 0 0 1px $window-border, 0 0 36px transparent; - } - } - - &.popup { - border-radius: $menu-radius; - } - - &.dialog.message { - border-radius: $window-radius; - } - - .solid-csd & { - margin: 0; - padding: 2px; - border-radius: 0; - background-color: $titlebar; - border: 1px solid $solid-border; - - &:backdrop { background-color: $titlebar-backdrop; } - } - - &.maximized, - &.fullscreen, - &.tiled, - &.tiled-top, - &.tiled-right, - &.tiled-bottom, - &.tiled-left { border-radius: 0; } + @if $rimless == 'true' { + box-shadow: $shadow-z16, 0 0 36px transparent; + } @else { + box-shadow: $shadow-z16, 0 0 0 1px $window-border, 0 0 36px transparent; } + + &: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. + @if $rimless == 'true' { + box-shadow: $shadow-z4, 0 0 36px transparent; + } @else { + box-shadow: $shadow-z4, 0 0 0 1px $window-border, 0 0 36px transparent; + } + } + + &.popup { + border-radius: $menu-radius; + } + + &.dialog.message { + border-radius: $window-radius; + } + + .solid-csd & { + margin: 0; + padding: 2px; + border-radius: 0; + background-color: $titlebar; + border: 1px solid $solid-border; + + &:backdrop { background-color: $titlebar-backdrop; } + } + + &.maximized, + &.fullscreen, + &.tiled, + &.tiled-top, + &.tiled-right, + &.tiled-bottom, + &.tiled-left { border-radius: 0; } } // Windows button