From 921ec3941fa661525619f5ad5a42cdc24ff057d7 Mon Sep 17 00:00:00 2001 From: vinceliuice Date: Fri, 2 Feb 2018 00:36:03 +0800 Subject: [PATCH] update --- src/gtk-3.0/gtk-dark.css | 16 ++++++++++------ src/gtk-3.0/gtk-light.css | 16 ++++++++++------ src/gtk-3.0/sass/_common.scss | 12 ++++++------ 3 files changed, 26 insertions(+), 18 deletions(-) diff --git a/src/gtk-3.0/gtk-dark.css b/src/gtk-3.0/gtk-dark.css index 9d4340d..e01606d 100644 --- a/src/gtk-3.0/gtk-dark.css +++ b/src/gtk-3.0/gtk-dark.css @@ -1123,7 +1123,9 @@ headerbar button, border: none; } headerbar button:backdrop, .nemo-window .primary-toolbar button:backdrop { - opacity: 0.7; } + opacity: 0.7; + box-shadow: none; + background-image: none; } headerbar button:hover, .nemo-window .primary-toolbar button:hover { color: rgba(225, 219, 219, 0.8); @@ -1247,7 +1249,9 @@ headerbar .linked:not(.vertical).path-bar > button, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:backdrop, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:backdrop, headerbar .linked:not(.vertical).path-bar > button:backdrop, .nemo-window .primary-toolbar .linked:not(.vertical).path-bar > button:backdrop { - opacity: 0.85; } + opacity: 0.7; + box-shadow: none; + background-image: none; } headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button + button, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button + button, headerbar .linked:not(.vertical).path-bar > button + button, .nemo-window .primary-toolbar .linked:not(.vertical).path-bar > button + button { @@ -3223,19 +3227,19 @@ decoration { transition: box-shadow 0.2s cubic-bezier(0, 0, 0.2, 1); border-radius: 5px 5px 0 0; border-width: 0; - box-shadow: 0 5px 5px 0 rgba(0, 0, 0, 0.3), 0 15px 15px 0 rgba(0, 0, 0, 0.3), 0 0 0 1px rgba(255, 255, 255, 0.12); + box-shadow: 0 5px 5px 0 rgba(0, 0, 0, 0.3), 0 8px 15px 0 rgba(0, 0, 0, 0.3), 0 0 0 1px rgba(255, 255, 255, 0.12); margin: 4px; } decoration:backdrop { - box-shadow: 0 5px 5px 0 transparent, 0 15px 15px 0 transparent, 0 3px 3px 0 rgba(0, 0, 0, 0.3), 0 0 0 1px rgba(255, 255, 255, 0.12); } + box-shadow: 0 5px 5px 0 transparent, 0 8px 15px 0 transparent, 0 3px 3px 0 rgba(0, 0, 0, 0.3), 0 0 0 1px rgba(255, 255, 255, 0.12); } .fullscreen decoration, .tiled decoration { border-radius: 0; box-shadow: 0 3px 3px 0 rgba(0, 0, 0, 0.3); } .popup decoration { border-radius: 5px; } .ssd decoration { - margin: -3px; + margin: -5px; border-radius: 5px 5px 0 0; - box-shadow: 0 0 3px 0 rgba(0, 0, 0, 0.3), 0 0 0 1px rgba(255, 255, 255, 0.12); } + box-shadow: 0 0 5px 0 rgba(0, 0, 0, 0.3), 0 0 0 1px rgba(255, 255, 255, 0.12); } .ssd decoration.maximized { border-radius: 0; } .csd.popup decoration { diff --git a/src/gtk-3.0/gtk-light.css b/src/gtk-3.0/gtk-light.css index 34c8e3c..9c8b88f 100644 --- a/src/gtk-3.0/gtk-light.css +++ b/src/gtk-3.0/gtk-light.css @@ -1123,7 +1123,9 @@ headerbar button, box-shadow: 0px 1px 1px 0px rgba(16, 16, 16, 0.04), 0px 1px 2px 0px rgba(16, 16, 16, 0.01); } headerbar button:backdrop, .nemo-window .primary-toolbar button:backdrop { - opacity: 0.7; } + opacity: 0.7; + box-shadow: none; + background-image: none; } headerbar button:hover, .nemo-window .primary-toolbar button:hover { color: rgba(40, 32, 32, 0.8); @@ -1247,7 +1249,9 @@ headerbar .linked:not(.vertical).path-bar > button, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:backdrop, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:backdrop, headerbar .linked:not(.vertical).path-bar > button:backdrop, .nemo-window .primary-toolbar .linked:not(.vertical).path-bar > button:backdrop { - opacity: 0.85; } + opacity: 0.7; + box-shadow: none; + background-image: none; } headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button + button, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button + button, headerbar .linked:not(.vertical).path-bar > button + button, .nemo-window .primary-toolbar .linked:not(.vertical).path-bar > button + button { @@ -3222,19 +3226,19 @@ decoration { transition: box-shadow 0.2s cubic-bezier(0, 0, 0.2, 1); border-radius: 5px 5px 0 0; border-width: 0; - box-shadow: 0 5px 5px 0 rgba(0, 0, 0, 0.25), 0 15px 15px 0 rgba(0, 0, 0, 0.25), 0 0 0 1px rgba(0, 0, 0, 0.11); + box-shadow: 0 5px 5px 0 rgba(0, 0, 0, 0.25), 0 8px 15px 0 rgba(0, 0, 0, 0.25), 0 0 0 1px rgba(0, 0, 0, 0.11); margin: 4px; } decoration:backdrop { - box-shadow: 0 5px 5px 0 transparent, 0 15px 15px 0 transparent, 0 3px 3px 0 rgba(0, 0, 0, 0.25), 0 0 0 1px rgba(0, 0, 0, 0.11); } + box-shadow: 0 5px 5px 0 transparent, 0 8px 15px 0 transparent, 0 3px 3px 0 rgba(0, 0, 0, 0.25), 0 0 0 1px rgba(0, 0, 0, 0.11); } .fullscreen decoration, .tiled decoration { border-radius: 0; box-shadow: 0 3px 3px 0 rgba(0, 0, 0, 0.25); } .popup decoration { border-radius: 5px; } .ssd decoration { - margin: -3px; + margin: -5px; border-radius: 5px 5px 0 0; - box-shadow: 0 0 3px 0 rgba(0, 0, 0, 0.25), 0 0 0 1px rgba(0, 0, 0, 0.11); } + box-shadow: 0 0 5px 0 rgba(0, 0, 0, 0.25), 0 0 0 1px rgba(0, 0, 0, 0.11); } .ssd decoration.maximized { border-radius: 0; } .csd.popup decoration { diff --git a/src/gtk-3.0/sass/_common.scss b/src/gtk-3.0/sass/_common.scss index 2662add..14e7e95 100644 --- a/src/gtk-3.0/sass/_common.scss +++ b/src/gtk-3.0/sass/_common.scss @@ -1285,7 +1285,7 @@ headerbar { button { min-width: 28px; @include button(header-normal); - &:backdrop { opacity: 0.7; } + &:backdrop { opacity: 0.7; box-shadow: none; background-image: none; } &:hover { @include button(header-hover); transition: $button_transition; @@ -1397,7 +1397,7 @@ headerbar { &:active { @include button(header-active); box-shadow: 1px 0 $header_button_active_bg; } &:checked { @include button(header-checked); box-shadow: 1px 0 $header_button_checked_bg; } &:disabled { color: transparentize($header_fg, 0.4); } - &:backdrop { opacity: 0.85; } + &:backdrop { opacity: 0.7; box-shadow: none; background-image: none; } &, &:hover, &:active, &:checked, &:disabled { @extend %linked; } } @@ -3443,7 +3443,7 @@ decoration { border-radius: if($darker=='false' and $variant=='light', $bt_radius $bt_radius 0 0, $bt_radius $bt_radius 0 0); border-width: 0; box-shadow: 0 5px 5px 0 if($variant == 'light', opacify($_wm_border, 0.15), opacify($_wm_border, 0.1)), - 0 15px 15px 0 if($variant == 'light', opacify($_wm_border, 0.15), opacify($_wm_border, 0.1)), + 0 8px 15px 0 if($variant == 'light', opacify($_wm_border, 0.15), opacify($_wm_border, 0.1)), 0 0 0 1px $borders_color; // this is used for the resize cursor area @@ -3452,7 +3452,7 @@ decoration { &:backdrop { // the transparent shadow here is to enforce that the shadow extents don't // change when we go to backdrop, to prevent jumping windows - box-shadow: 0 5px 5px 0 transparent, 0 15px 15px 0 transparent, + box-shadow: 0 5px 5px 0 transparent, 0 8px 15px 0 transparent, 0 3px 3px 0 if($variant == 'light', opacify($_wm_border, 0.15), opacify($_wm_border, 0.1)), 0 0 0 1px $borders_color; } @@ -3467,9 +3467,9 @@ decoration { } // server-side decorations as used by mutter .ssd & { - margin: -3px; + margin: -5px; border-radius: $bt_radius $bt_radius 0 0; - box-shadow: 0 0 3px 0 if($variant == 'light', opacify($_wm_border, 0.15), opacify($_wm_border, 0.1)), 0 0 0 1px $borders_color; + box-shadow: 0 0 5px 0 if($variant == 'light', opacify($_wm_border, 0.15), opacify($_wm_border, 0.1)), 0 0 0 1px $borders_color; &.maximized { border-radius: 0; } } .csd.popup & {