From a5ecc62985da26fada83f3c1e93463d0db60f0fe Mon Sep 17 00:00:00 2001 From: Vince Date: Tue, 29 Jun 2021 18:12:41 +0800 Subject: [PATCH] update --- src/sass/_colors.scss | 2 +- src/sass/gtk/_common-3.0.scss | 6 ++++-- src/sass/gtk/apps/_gnome-3.22.scss | 26 +++++++++++++++++++++++++- 3 files changed, 30 insertions(+), 4 deletions(-) diff --git a/src/sass/_colors.scss b/src/sass/_colors.scss index 0bd717d..0d6d560 100644 --- a/src/sass/_colors.scss +++ b/src/sass/_colors.scss @@ -72,7 +72,7 @@ $light_borders_color: if($variant == 'light', rgba(black, 0.08), r $dark_borders_color: if($variant == 'light', rgba(black, 0.08), rgba(black, 0.15)); $solid_borders_color: if($variant == 'light', darken($bg_color, 12%), lighten($bg_color, 8%)); $dark_solid_borders_color: if($variant == 'light', darken($bg_color, 12%), darken($bg_color, 5%)); -$highlight_color: if($variant == 'light', rgba(white, 0.65), rgba(white, 0.1)); +$highlight_color: if($variant == 'light', rgba(white, 0.65), rgba(white, 0.08)); // Background colors $dark_bg_color: rgba(black, 0.6); diff --git a/src/sass/gtk/_common-3.0.scss b/src/sass/gtk/_common-3.0.scss index 9f59dea..a429611 100644 --- a/src/sass/gtk/_common-3.0.scss +++ b/src/sass/gtk/_common-3.0.scss @@ -1848,8 +1848,6 @@ actionbar { } &, & headerbar { - box-shadow: inset 0 1px $highlight_color; - .tiled &, .maximized &, .fullscreen & { @@ -1868,6 +1866,10 @@ actionbar { } } +.background:not(.unified) .titlebar { + &, & headerbar { box-shadow: inset 0 1px $highlight_color; } +} + window.background.csd.unified { > deck > box.vertical > stack > headerbar.titlebar.windowhandle { > box > separator { background: none; } diff --git a/src/sass/gtk/apps/_gnome-3.22.scss b/src/sass/gtk/apps/_gnome-3.22.scss index b603b07..cbcfa90 100644 --- a/src/sass/gtk/apps/_gnome-3.22.scss +++ b/src/sass/gtk/apps/_gnome-3.22.scss @@ -111,7 +111,6 @@ $nautilus_sidebar_image: image($dark_sidebar_bg); > headerbar.titlebar, > deck > box.vertical > headerbar.titlebar { background-color: transparent; - box-shadow: inset 0 1px rgba(white, 0.1); background-image: $nautilus_header_image; border: none; background-clip: padding-box; @@ -2962,3 +2961,28 @@ window.background.csd { } } } + +// +// Unified window (> = Gnome 40) +// + +window.background.csd.unified { + headerbar { + box-shadow: none; + + &.selection-mode { + box-shadow: none; + } + } + + // ...and add it on the window itself + > decoration-overlay { + box-shadow: inset 0 0 0 1px $highlight_color; + } + + &, + > decoration, + > decoration-overlay { + border-radius: $wm_radius; + } +}