From 4804292f0d91c44cd3580a701bc64c7b9134a50f Mon Sep 17 00:00:00 2001 From: vinceliuice Date: Wed, 31 Jan 2018 00:25:42 +0800 Subject: [PATCH] update --- src/gtk-3.0/gtk-dark.css | 27 ++++++++++++++++++--------- src/gtk-3.0/gtk-light.css | 27 ++++++++++++++++++--------- src/gtk-3.0/sass/_drawing.scss | 6 ++++-- 3 files changed, 40 insertions(+), 20 deletions(-) diff --git a/src/gtk-3.0/gtk-dark.css b/src/gtk-3.0/gtk-dark.css index 65a0653..d06fb9c 100644 --- a/src/gtk-3.0/gtk-dark.css +++ b/src/gtk-3.0/gtk-dark.css @@ -737,10 +737,11 @@ modelbutton.flat { color: #ffffff; background-color: rgba(132, 132, 132, 0.95); background-image: none; - text-shadow: none; border-color: rgba(255, 255, 255, 0.12); border-top-color: rgba(255, 255, 255, 0.12); border-bottom-color: rgba(255, 255, 255, 0.12); + text-shadow: none; + -gtk-icon-shadow: none; box-shadow: none; } menuitem.button.flat:checked, modelbutton.flat:checked { @@ -1133,10 +1134,11 @@ headerbar button, color: #ffffff; background-color: rgba(132, 132, 132, 0.95); background-image: none; - text-shadow: none; border-color: rgba(255, 255, 255, 0.12); border-top-color: rgba(255, 255, 255, 0.12); border-bottom-color: rgba(255, 255, 255, 0.12); + text-shadow: none; + -gtk-icon-shadow: none; box-shadow: none; background-clip: padding-box; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); @@ -1146,8 +1148,9 @@ headerbar button, color: #ffffff; background-color: rgba(119, 119, 119, 0.95); background-image: none; - text-shadow: none; border-color: rgba(255, 255, 255, 0.12); + text-shadow: none; + -gtk-icon-shadow: none; box-shadow: none; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); transition-duration: 300ms; @@ -1218,8 +1221,9 @@ headerbar .linked:not(.vertical).path-bar > button, color: #ffffff; background-color: rgba(119, 119, 119, 0.95); background-image: none; - text-shadow: none; border-color: rgba(255, 255, 255, 0.12); + text-shadow: none; + -gtk-icon-shadow: none; box-shadow: none; box-shadow: 1px 0 rgba(119, 119, 119, 0.95); } headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:checked, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:checked, @@ -1228,10 +1232,11 @@ headerbar .linked:not(.vertical).path-bar > button, color: #ffffff; background-color: rgba(132, 132, 132, 0.95); background-image: none; - text-shadow: none; border-color: rgba(255, 255, 255, 0.12); border-top-color: rgba(255, 255, 255, 0.12); border-bottom-color: rgba(255, 255, 255, 0.12); + text-shadow: none; + -gtk-icon-shadow: none; box-shadow: none; box-shadow: 1px 0 rgba(132, 132, 132, 0.95); } headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, @@ -1385,8 +1390,9 @@ headerbar spinbutton:not(.vertical) button:active, .nemo-window .primary-toolbar color: #ffffff; background-color: rgba(119, 119, 119, 0.95); background-image: none; - text-shadow: none; border-color: rgba(255, 255, 255, 0.12); + text-shadow: none; + -gtk-icon-shadow: none; box-shadow: none; } headerbar spinbutton:not(.vertical) button:disabled, .nemo-window .primary-toolbar spinbutton:not(.vertical) button:disabled { color: rgba(225, 219, 219, 0.4); } @@ -1470,10 +1476,11 @@ headerbar scale trough, .nemo-window .primary-toolbar scale trough { color: #ffffff; background-color: rgba(132, 132, 132, 0.95); background-image: none; - text-shadow: none; border-color: rgba(255, 255, 255, 0.12); border-top-color: rgba(255, 255, 255, 0.12); border-bottom-color: rgba(255, 255, 255, 0.12); + text-shadow: none; + -gtk-icon-shadow: none; box-shadow: none; } .path-bar button.text-button.image-button label { padding-left: 0; @@ -3249,8 +3256,9 @@ headerbar button.titlebutton, color: #ffffff; background-color: rgba(119, 119, 119, 0.95); background-image: none; - text-shadow: none; border-color: rgba(255, 255, 255, 0.12); + text-shadow: none; + -gtk-icon-shadow: none; box-shadow: none; } headerbar button.titlebutton.close, headerbar button.titlebutton.maximize, headerbar button.titlebutton.minimize, headerbar button.titlebutton.restore, .titlebar button.titlebutton.close, @@ -3419,8 +3427,9 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can color: #ffffff; background-color: rgba(119, 119, 119, 0.95); background-image: none; - text-shadow: none; border-color: rgba(255, 255, 255, 0.12); + text-shadow: none; + -gtk-icon-shadow: none; box-shadow: none; } } .nautilus-operations-button-needs-attention { animation: needs_attention_keyframes 2s ease-in-out; } diff --git a/src/gtk-3.0/gtk-light.css b/src/gtk-3.0/gtk-light.css index c74ccbb..41342ab 100644 --- a/src/gtk-3.0/gtk-light.css +++ b/src/gtk-3.0/gtk-light.css @@ -740,10 +740,11 @@ modelbutton.flat { color: #ffffff; background-color: #686868; background-image: linear-gradient(0deg, #656565 0%, #707070 100%); - text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05); border-color: rgba(0, 0, 0, 0.11); border-top-color: rgba(0, 0, 0, 0.11); border-bottom-color: rgba(0, 0, 0, 0.11); + text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05); + -gtk-icon-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05); box-shadow: none; } menuitem.button.flat:checked, modelbutton.flat:checked { @@ -1133,10 +1134,11 @@ headerbar button, color: #ffffff; background-color: #686868; background-image: linear-gradient(0deg, #656565 0%, #707070 100%); - text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05); border-color: rgba(0, 0, 0, 0.11); border-top-color: rgba(0, 0, 0, 0.11); border-bottom-color: rgba(0, 0, 0, 0.11); + text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05); + -gtk-icon-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05); box-shadow: none; background-clip: border-box; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); @@ -1146,8 +1148,9 @@ headerbar button, color: #ffffff; background-color: #afafaf; background-image: none; - text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05); border-color: rgba(0, 0, 0, 0.11); + text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05); + -gtk-icon-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05); box-shadow: none; transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); transition-duration: 300ms; @@ -1218,8 +1221,9 @@ headerbar .linked:not(.vertical).path-bar > button, color: #ffffff; background-color: #afafaf; background-image: none; - text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05); border-color: rgba(0, 0, 0, 0.11); + text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05); + -gtk-icon-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05); box-shadow: none; box-shadow: 1px 0 #afafaf; } headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:checked, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:checked, @@ -1228,10 +1232,11 @@ headerbar .linked:not(.vertical).path-bar > button, color: #ffffff; background-color: #686868; background-image: linear-gradient(0deg, #656565 0%, #707070 100%); - text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05); border-color: rgba(0, 0, 0, 0.11); border-top-color: rgba(0, 0, 0, 0.11); border-bottom-color: rgba(0, 0, 0, 0.11); + text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05); + -gtk-icon-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05); box-shadow: none; box-shadow: 1px 0 #686868; } headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, .nemo-window .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, @@ -1385,8 +1390,9 @@ headerbar spinbutton:not(.vertical) button:active, .nemo-window .primary-toolbar color: #ffffff; background-color: #afafaf; background-image: none; - text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05); border-color: rgba(0, 0, 0, 0.11); + text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05); + -gtk-icon-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05); box-shadow: none; } headerbar spinbutton:not(.vertical) button:disabled, .nemo-window .primary-toolbar spinbutton:not(.vertical) button:disabled { color: rgba(40, 32, 32, 0.4); } @@ -1468,10 +1474,11 @@ headerbar scale trough, .nemo-window .primary-toolbar scale trough { color: #ffffff; background-color: #686868; background-image: linear-gradient(0deg, #656565 0%, #707070 100%); - text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05); border-color: rgba(0, 0, 0, 0.11); border-top-color: rgba(0, 0, 0, 0.11); border-bottom-color: rgba(0, 0, 0, 0.11); + text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05); + -gtk-icon-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05); box-shadow: none; } .path-bar button.text-button.image-button label { padding-left: 0; @@ -3248,8 +3255,9 @@ headerbar button.titlebutton, color: #ffffff; background-color: #afafaf; background-image: none; - text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05); border-color: rgba(0, 0, 0, 0.11); + text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05); + -gtk-icon-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05); box-shadow: none; } headerbar button.titlebutton.close, headerbar button.titlebutton.maximize, headerbar button.titlebutton.minimize, headerbar button.titlebutton.restore, .titlebar button.titlebutton.close, @@ -3418,8 +3426,9 @@ popover.background label.nautilus-canvas-item.separator, headerbar .nautilus-can color: #ffffff; background-color: #afafaf; background-image: none; - text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05); border-color: rgba(0, 0, 0, 0.11); + text-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05); + -gtk-icon-shadow: 0 -1px rgba(255, 255, 255, 0.04), -1px 0px rgba(32, 32, 32, 0.05), 1px 0px rgba(32, 32, 32, 0.05), 0px 1px rgba(32, 32, 32, 0.3), 0px 2px rgba(32, 32, 32, 0.05); box-shadow: none; } } .nautilus-operations-button-needs-attention { animation: needs_attention_keyframes 2s ease-in-out; } diff --git a/src/gtk-3.0/sass/_drawing.scss b/src/gtk-3.0/sass/_drawing.scss index 2adf4c1..56f7205 100644 --- a/src/gtk-3.0/sass/_drawing.scss +++ b/src/gtk-3.0/sass/_drawing.scss @@ -278,8 +278,9 @@ $animation_1: needs_attention 0.3s cubic-bezier(0, 0, 0.2, 1); color: $selected_fg_color; background-color: $header_button_active_bg; background-image: none; - text-shadow: if($variant=='light', $text_shadow, none); border-color: $borders_color; + text-shadow: if($variant=='light', $text_shadow, none); + -gtk-icon-shadow: if($variant=='light', $text_shadow, none); box-shadow: none; } @@ -290,10 +291,11 @@ $animation_1: needs_attention 0.3s cubic-bezier(0, 0, 0.2, 1); color: $selected_fg_color; background-color: $header_button_checked_bg; background-image: if($variant=='light', linear-gradient( 0deg, #656565 0%, #707070 100%), none); - text-shadow: if($variant=='light', $text_shadow, none); border-color: $borders_color; border-top-color: if($variant=='light', lighten($borders_color, 0%), $borders_color); border-bottom-color: if($variant=='light', lighten($borders_color, 0%), $borders_color); + text-shadow: if($variant=='light', $text_shadow, none); + -gtk-icon-shadow: if($variant=='light', $text_shadow, none); box-shadow: none; }