From b70f7cf7037ffa835dd513f9947ea8819e8a1474 Mon Sep 17 00:00:00 2001 From: vinceliuice Date: Mon, 12 Feb 2018 18:31:35 +0800 Subject: [PATCH] Update --- src/gtk-3.0/gtk-dark.css | 17 +++++++++++++---- src/gtk-3.0/gtk-light.css | 17 +++++++++++++---- src/gtk-3.0/sass/_common.scss | 9 +++++++-- 3 files changed, 33 insertions(+), 10 deletions(-) diff --git a/src/gtk-3.0/gtk-dark.css b/src/gtk-3.0/gtk-dark.css index 89e05f5..5242204 100644 --- a/src/gtk-3.0/gtk-dark.css +++ b/src/gtk-3.0/gtk-dark.css @@ -56,7 +56,14 @@ iconview text, textview text { color: #dedede; - background-color: #242424; } + background-color: #242424; + transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); } + .view:hover, iconview:hover, + .view text:hover, + iconview text:hover, + textview text:hover { + transition: all 350ms cubic-bezier(0.25, 0.46, 0.45, 0.94); + background-color: rgba(255, 255, 255, 0.02); } .view:selected, iconview:selected, .view:selected:focus, iconview:selected:focus, .view text:selected, iconview text:selected, @@ -64,6 +71,7 @@ textview text { .view text:selected:focus, iconview text:selected:focus, textview text:selected:focus { + transition: all 350ms cubic-bezier(0.25, 0.46, 0.45, 0.94); border-radius: 5px; } textview border { @@ -877,7 +885,7 @@ toolbar, .inline-toolbar { toolbar.osd, .osd.inline-toolbar { padding: 7px; border: 1px solid rgba(255, 255, 255, 0.12); - border-radius: 5px; + border-radius: 8px; background-color: rgba(36, 36, 36, 0.85); } toolbar.osd.left, .osd.left.inline-toolbar, toolbar.osd.right, .osd.right.inline-toolbar, toolbar.osd.top, .osd.top.inline-toolbar, toolbar.osd.bottom, .osd.bottom.inline-toolbar { border-radius: 0; } @@ -931,7 +939,8 @@ searchbar { actionbar { padding: 6px; border-top: 1px solid rgba(255, 255, 255, 0.12); - background-color: #2b2b2b; } + background-color: #2b2b2b; + border-radius: 0 0 8px 8px; } headerbar, .titlebar:not(headerbar) { @@ -1733,7 +1742,7 @@ popover.background { border-radius: 5px; background-clip: border-box; background-color: #333333; - box-shadow: 0 2px 6px 0 rgba(0, 0, 0, 0.15); } + box-shadow: 0 3px 6px 0 rgba(0, 0, 0, 0.15); } .csd popover, popover, .csd popover.background, popover.background { diff --git a/src/gtk-3.0/gtk-light.css b/src/gtk-3.0/gtk-light.css index e965513..cff2667 100644 --- a/src/gtk-3.0/gtk-light.css +++ b/src/gtk-3.0/gtk-light.css @@ -56,7 +56,14 @@ iconview text, textview text { color: #363636; - background-color: #ffffff; } + background-color: #ffffff; + transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94); } + .view:hover, iconview:hover, + .view text:hover, + iconview text:hover, + textview text:hover { + transition: all 350ms cubic-bezier(0.25, 0.46, 0.45, 0.94); + background-color: rgba(0, 0, 0, 0.02); } .view:selected, iconview:selected, .view:selected:focus, iconview:selected:focus, .view text:selected, iconview text:selected, @@ -64,6 +71,7 @@ textview text { .view text:selected:focus, iconview text:selected:focus, textview text:selected:focus { + transition: all 350ms cubic-bezier(0.25, 0.46, 0.45, 0.94); border-radius: 5px; } textview border { @@ -880,7 +888,7 @@ toolbar, .inline-toolbar { toolbar.osd, .osd.inline-toolbar { padding: 7px; border: 1px solid rgba(0, 0, 0, 0.11); - border-radius: 5px; + border-radius: 8px; background-color: rgba(222, 222, 222, 0.85); } toolbar.osd.left, .osd.left.inline-toolbar, toolbar.osd.right, .osd.right.inline-toolbar, toolbar.osd.top, .osd.top.inline-toolbar, toolbar.osd.bottom, .osd.bottom.inline-toolbar { border-radius: 0; } @@ -934,7 +942,8 @@ searchbar { actionbar { padding: 6px; border-top: 1px solid rgba(0, 0, 0, 0.11); - background-color: #ededed; } + background-color: #ededed; + border-radius: 0 0 8px 8px; } headerbar, .titlebar:not(headerbar) { @@ -1731,7 +1740,7 @@ popover.background { border-radius: 5px; background-clip: border-box; background-color: #ffffff; - box-shadow: 0 2px 6px 0 rgba(0, 0, 0, 0.07); } + box-shadow: 0 3px 6px 0 rgba(0, 0, 0, 0.15); } .csd popover, popover, .csd popover.background, popover.background { diff --git a/src/gtk-3.0/sass/_common.scss b/src/gtk-3.0/sass/_common.scss index 4f919c2..c379087 100644 --- a/src/gtk-3.0/sass/_common.scss +++ b/src/gtk-3.0/sass/_common.scss @@ -75,9 +75,13 @@ $wm_radius: 8px; %view { color: $text_color; background-color: $base_color; + transition: all 200ms $ease-out-quad; + + &:hover { transition: all 350ms $ease-out-quad; background-color: if($variant=='light', rgba(black, 0.02), rgba(white, 0.02)); } &:selected { &, &:focus { + transition: all 350ms $ease-out-quad; @extend %selected_items; border-radius: $bt_radius; } @@ -986,7 +990,7 @@ toolbar { &.osd { padding: 7px; border: 1px solid $borders_color; - border-radius: $bt_radius; + border-radius: $wm_radius; background-color: transparentize($osd_bg_color, 0.1); &.left, @@ -1049,6 +1053,7 @@ actionbar { padding: 6px; border-top: 1px solid $borders_color; background-color: darken($bg_color, 3%); + border-radius: 0 0 $wm_radius $wm_radius; } // @@ -1896,7 +1901,7 @@ popover.background { background-clip: border-box; background-color: $_popover_bg; - box-shadow: 0 2px 6px 0 if($variant=='light', transparentize(black, 0.93), transparentize(black, 0.85)); + box-shadow: 0 3px 6px 0 if($variant=='light', transparentize(black, 0.85), transparentize(black, 0.85)); .csd &, & { border-radius: $bt_radius;