From 0ae74031e1e3a8037fcdfa6a3fca3be6db1e32fc Mon Sep 17 00:00:00 2001 From: vinceliuice Date: Sat, 22 Aug 2020 23:09:22 +0800 Subject: [PATCH] update --- src/main/cinnamon/cinnamon-dark-solid.scss | 1 + src/main/cinnamon/cinnamon-dark.scss | 1 + src/main/cinnamon/cinnamon-light-solid.scss | 1 + src/main/cinnamon/cinnamon-light.scss | 1 + src/main/gtk-3.0/gtk-dark-solid.css | 27 ++++++++++++++++----- src/main/gtk-3.0/gtk-dark-solid.scss | 1 + src/main/gtk-3.0/gtk-dark.css | 27 ++++++++++++++++----- src/main/gtk-3.0/gtk-dark.scss | 1 + src/main/gtk-3.0/gtk-light-solid.css | 27 ++++++++++++++++----- src/main/gtk-3.0/gtk-light-solid.scss | 1 + src/main/gtk-3.0/gtk-light.css | 27 ++++++++++++++++----- src/main/gtk-3.0/gtk-light.scss | 1 + src/sass/_colors.scss | 10 +++----- src/sass/gnome-shell/_common.scss | 2 -- src/sass/gtk/_applications.scss | 26 ++++++++++++++++---- src/sass/gtk/_budgie.scss | 2 -- 16 files changed, 117 insertions(+), 39 deletions(-) diff --git a/src/main/cinnamon/cinnamon-dark-solid.scss b/src/main/cinnamon/cinnamon-dark-solid.scss index a0c7756f..0bb640d2 100644 --- a/src/main/cinnamon/cinnamon-dark-solid.scss +++ b/src/main/cinnamon/cinnamon-dark-solid.scss @@ -1,6 +1,7 @@ $variant: 'dark'; $laptop: 'true'; $trans: 'false'; +$black: 'false'; @import '../../sass/colors'; @import '../../sass/variables'; diff --git a/src/main/cinnamon/cinnamon-dark.scss b/src/main/cinnamon/cinnamon-dark.scss index ea06e93b..66eb238d 100644 --- a/src/main/cinnamon/cinnamon-dark.scss +++ b/src/main/cinnamon/cinnamon-dark.scss @@ -1,6 +1,7 @@ $variant: 'dark'; $laptop: 'true'; $trans: 'true'; +$black: 'false'; @import '../../sass/colors'; @import '../../sass/variables'; diff --git a/src/main/cinnamon/cinnamon-light-solid.scss b/src/main/cinnamon/cinnamon-light-solid.scss index 3f507ce7..ceb34d0f 100644 --- a/src/main/cinnamon/cinnamon-light-solid.scss +++ b/src/main/cinnamon/cinnamon-light-solid.scss @@ -1,6 +1,7 @@ $variant: 'light'; $laptop: 'true'; $trans: 'false'; +$black: 'true'; @import '../../sass/colors'; @import '../../sass/variables'; diff --git a/src/main/cinnamon/cinnamon-light.scss b/src/main/cinnamon/cinnamon-light.scss index add0d0e8..6dce1dcb 100644 --- a/src/main/cinnamon/cinnamon-light.scss +++ b/src/main/cinnamon/cinnamon-light.scss @@ -1,6 +1,7 @@ $variant: 'light'; $laptop: 'true'; $trans: 'true'; +$black: 'false'; @import '../../sass/colors'; @import '../../sass/variables'; diff --git a/src/main/gtk-3.0/gtk-dark-solid.css b/src/main/gtk-3.0/gtk-dark-solid.css index e9a98ee3..6fb17015 100644 --- a/src/main/gtk-3.0/gtk-dark-solid.css +++ b/src/main/gtk-3.0/gtk-dark-solid.css @@ -7072,6 +7072,23 @@ window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sideba border-bottom-left-radius: 14px; } +.geary-main-window.background.csd > overlay > box.vertical > paned > .sidebar treeview.view.sidebar, +window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sidebar treeview.view.sidebar { + padding: 3px 0; +} + +.geary-main-window.background.csd > overlay > box.vertical > paned > .sidebar treeview.view.sidebar:hover, +window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sidebar treeview.view.sidebar:hover { + color: #dedede; + background-color: rgba(222, 222, 222, 0.1); +} + +.geary-main-window.background.csd > overlay > box.vertical > paned > .sidebar treeview.view.sidebar:selected, +window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sidebar treeview.view.sidebar:selected { + color: #dedede; + background-color: rgba(222, 222, 222, 0.15); +} + .geary-main-window.background.csd stack#conversation_viewer, window#GearyMainWindow.background.csd stack#conversation_viewer { border-bottom-right-radius: 14px; @@ -7096,6 +7113,7 @@ window#GearyMainWindow.background.csd stack#conversation_viewer searchbar > reve .geary-main-window.background.csd paned.geary-sidebar-pane-separator > separator, window#GearyMainWindow.background.csd paned.geary-sidebar-pane-separator > separator { margin-left: -1px; + background: none; } .geary-main-window.background.csd paned.geary-sidebar-pane-separator statusbar, @@ -7142,19 +7160,18 @@ window#GearyMainWindow.background.csd paned.geary-sidebar-pane-separator frame.g .geary-main-window.background.csd paned.geary-sidebar-pane-separator frame.geary-conversation-frame scrolledwindow treeview.view, window#GearyMainWindow.background.csd paned.geary-sidebar-pane-separator frame.geary-conversation-frame scrolledwindow treeview.view { - border-image: none; + border: none; background-image: none; } .geary-main-window.background.csd paned.geary-sidebar-pane-separator frame.geary-conversation-frame scrolledwindow treeview.view:hover, window#GearyMainWindow.background.csd paned.geary-sidebar-pane-separator frame.geary-conversation-frame scrolledwindow treeview.view:hover { - background-color: rgba(8, 96, 242, 0.1); + background-color: rgba(222, 222, 222, 0.1); } .geary-main-window.background.csd paned.geary-sidebar-pane-separator frame.geary-conversation-frame scrolledwindow treeview.view:selected, window#GearyMainWindow.background.csd paned.geary-sidebar-pane-separator frame.geary-conversation-frame scrolledwindow treeview.view:selected { - background-color: rgba(8, 96, 242, 0.15); - box-shadow: inset 2px 0 #0860f2; + background-color: rgba(222, 222, 222, 0.15); color: white; } @@ -9434,12 +9451,10 @@ box:not(.unpinned):not(.pinned) > revealer > button.flat.launcher, .raven .raven .left frame.raven-frame > border { border: none; - border-right: 1px solid rgba(0, 0, 0, 0.22); } .right frame.raven-frame > border { border: none; - border-left: 1px solid rgba(0, 0, 0, 0.22); } .top .shadow-block { diff --git a/src/main/gtk-3.0/gtk-dark-solid.scss b/src/main/gtk-3.0/gtk-dark-solid.scss index ee7e174b..73e7f7e9 100644 --- a/src/main/gtk-3.0/gtk-dark-solid.scss +++ b/src/main/gtk-3.0/gtk-dark-solid.scss @@ -1,6 +1,7 @@ $variant: 'dark'; $laptop: 'false'; $trans: 'false'; +$black: 'false'; @import '../../sass/colors'; @import '../../sass/variables'; diff --git a/src/main/gtk-3.0/gtk-dark.css b/src/main/gtk-3.0/gtk-dark.css index ad1dcb29..38a68452 100644 --- a/src/main/gtk-3.0/gtk-dark.css +++ b/src/main/gtk-3.0/gtk-dark.css @@ -7068,6 +7068,23 @@ window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sideba border-bottom-left-radius: 14px; } +.geary-main-window.background.csd > overlay > box.vertical > paned > .sidebar treeview.view.sidebar, +window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sidebar treeview.view.sidebar { + padding: 3px 0; +} + +.geary-main-window.background.csd > overlay > box.vertical > paned > .sidebar treeview.view.sidebar:hover, +window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sidebar treeview.view.sidebar:hover { + color: #dedede; + background-color: rgba(222, 222, 222, 0.1); +} + +.geary-main-window.background.csd > overlay > box.vertical > paned > .sidebar treeview.view.sidebar:selected, +window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sidebar treeview.view.sidebar:selected { + color: #dedede; + background-color: rgba(222, 222, 222, 0.15); +} + .geary-main-window.background.csd stack#conversation_viewer, window#GearyMainWindow.background.csd stack#conversation_viewer { border-bottom-right-radius: 14px; @@ -7092,6 +7109,7 @@ window#GearyMainWindow.background.csd stack#conversation_viewer searchbar > reve .geary-main-window.background.csd paned.geary-sidebar-pane-separator > separator, window#GearyMainWindow.background.csd paned.geary-sidebar-pane-separator > separator { margin-left: -1px; + background: none; } .geary-main-window.background.csd paned.geary-sidebar-pane-separator statusbar, @@ -7138,19 +7156,18 @@ window#GearyMainWindow.background.csd paned.geary-sidebar-pane-separator frame.g .geary-main-window.background.csd paned.geary-sidebar-pane-separator frame.geary-conversation-frame scrolledwindow treeview.view, window#GearyMainWindow.background.csd paned.geary-sidebar-pane-separator frame.geary-conversation-frame scrolledwindow treeview.view { - border-image: none; + border: none; background-image: none; } .geary-main-window.background.csd paned.geary-sidebar-pane-separator frame.geary-conversation-frame scrolledwindow treeview.view:hover, window#GearyMainWindow.background.csd paned.geary-sidebar-pane-separator frame.geary-conversation-frame scrolledwindow treeview.view:hover { - background-color: rgba(8, 96, 242, 0.1); + background-color: rgba(222, 222, 222, 0.1); } .geary-main-window.background.csd paned.geary-sidebar-pane-separator frame.geary-conversation-frame scrolledwindow treeview.view:selected, window#GearyMainWindow.background.csd paned.geary-sidebar-pane-separator frame.geary-conversation-frame scrolledwindow treeview.view:selected { - background-color: rgba(8, 96, 242, 0.15); - box-shadow: inset 2px 0 #0860f2; + background-color: rgba(222, 222, 222, 0.15); color: white; } @@ -9430,12 +9447,10 @@ box:not(.unpinned):not(.pinned) > revealer > button.flat.launcher, .raven .raven .left frame.raven-frame > border { border: none; - border-right: 1px solid rgba(0, 0, 0, 0.22); } .right frame.raven-frame > border { border: none; - border-left: 1px solid rgba(0, 0, 0, 0.22); } .top .shadow-block { diff --git a/src/main/gtk-3.0/gtk-dark.scss b/src/main/gtk-3.0/gtk-dark.scss index e047784d..03e315c0 100644 --- a/src/main/gtk-3.0/gtk-dark.scss +++ b/src/main/gtk-3.0/gtk-dark.scss @@ -1,6 +1,7 @@ $variant: 'dark'; $laptop: 'false'; $trans: 'true'; +$black: 'false'; @import '../../sass/colors'; @import '../../sass/variables'; diff --git a/src/main/gtk-3.0/gtk-light-solid.css b/src/main/gtk-3.0/gtk-light-solid.css index facd0092..2828753f 100644 --- a/src/main/gtk-3.0/gtk-light-solid.css +++ b/src/main/gtk-3.0/gtk-light-solid.css @@ -7088,6 +7088,23 @@ window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sideba border-bottom-left-radius: 14px; } +.geary-main-window.background.csd > overlay > box.vertical > paned > .sidebar treeview.view.sidebar, +window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sidebar treeview.view.sidebar { + padding: 3px 0; +} + +.geary-main-window.background.csd > overlay > box.vertical > paned > .sidebar treeview.view.sidebar:hover, +window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sidebar treeview.view.sidebar:hover { + color: #242424; + background-color: rgba(36, 36, 36, 0.1); +} + +.geary-main-window.background.csd > overlay > box.vertical > paned > .sidebar treeview.view.sidebar:selected, +window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sidebar treeview.view.sidebar:selected { + color: #242424; + background-color: rgba(36, 36, 36, 0.15); +} + .geary-main-window.background.csd stack#conversation_viewer, window#GearyMainWindow.background.csd stack#conversation_viewer { border-bottom-right-radius: 14px; @@ -7112,6 +7129,7 @@ window#GearyMainWindow.background.csd stack#conversation_viewer searchbar > reve .geary-main-window.background.csd paned.geary-sidebar-pane-separator > separator, window#GearyMainWindow.background.csd paned.geary-sidebar-pane-separator > separator { margin-left: -1px; + background: none; } .geary-main-window.background.csd paned.geary-sidebar-pane-separator statusbar, @@ -7158,19 +7176,18 @@ window#GearyMainWindow.background.csd paned.geary-sidebar-pane-separator frame.g .geary-main-window.background.csd paned.geary-sidebar-pane-separator frame.geary-conversation-frame scrolledwindow treeview.view, window#GearyMainWindow.background.csd paned.geary-sidebar-pane-separator frame.geary-conversation-frame scrolledwindow treeview.view { - border-image: none; + border: none; background-image: none; } .geary-main-window.background.csd paned.geary-sidebar-pane-separator frame.geary-conversation-frame scrolledwindow treeview.view:hover, window#GearyMainWindow.background.csd paned.geary-sidebar-pane-separator frame.geary-conversation-frame scrolledwindow treeview.view:hover { - background-color: rgba(8, 96, 242, 0.1); + background-color: rgba(36, 36, 36, 0.1); } .geary-main-window.background.csd paned.geary-sidebar-pane-separator frame.geary-conversation-frame scrolledwindow treeview.view:selected, window#GearyMainWindow.background.csd paned.geary-sidebar-pane-separator frame.geary-conversation-frame scrolledwindow treeview.view:selected { - background-color: rgba(8, 96, 242, 0.15); - box-shadow: inset 2px 0 #0860f2; + background-color: rgba(36, 36, 36, 0.15); color: #242424; } @@ -9472,12 +9489,10 @@ box:not(.unpinned):not(.pinned) > revealer > button.flat.launcher, .raven .raven .left frame.raven-frame > border { border: none; - border-right: 1px solid rgba(255, 255, 255, 0.22); } .right frame.raven-frame > border { border: none; - border-left: 1px solid rgba(255, 255, 255, 0.22); } .top .shadow-block { diff --git a/src/main/gtk-3.0/gtk-light-solid.scss b/src/main/gtk-3.0/gtk-light-solid.scss index 205108e6..1e42200d 100644 --- a/src/main/gtk-3.0/gtk-light-solid.scss +++ b/src/main/gtk-3.0/gtk-light-solid.scss @@ -1,6 +1,7 @@ $variant: 'light'; $laptop: 'false'; $trans: 'false'; +$black: 'true'; @import '../../sass/colors'; @import '../../sass/variables'; diff --git a/src/main/gtk-3.0/gtk-light.css b/src/main/gtk-3.0/gtk-light.css index c796b771..8dc15a00 100644 --- a/src/main/gtk-3.0/gtk-light.css +++ b/src/main/gtk-3.0/gtk-light.css @@ -7084,6 +7084,23 @@ window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sideba border-bottom-left-radius: 14px; } +.geary-main-window.background.csd > overlay > box.vertical > paned > .sidebar treeview.view.sidebar, +window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sidebar treeview.view.sidebar { + padding: 3px 0; +} + +.geary-main-window.background.csd > overlay > box.vertical > paned > .sidebar treeview.view.sidebar:hover, +window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sidebar treeview.view.sidebar:hover { + color: #242424; + background-color: rgba(36, 36, 36, 0.1); +} + +.geary-main-window.background.csd > overlay > box.vertical > paned > .sidebar treeview.view.sidebar:selected, +window#GearyMainWindow.background.csd > overlay > box.vertical > paned > .sidebar treeview.view.sidebar:selected { + color: #242424; + background-color: rgba(36, 36, 36, 0.15); +} + .geary-main-window.background.csd stack#conversation_viewer, window#GearyMainWindow.background.csd stack#conversation_viewer { border-bottom-right-radius: 14px; @@ -7108,6 +7125,7 @@ window#GearyMainWindow.background.csd stack#conversation_viewer searchbar > reve .geary-main-window.background.csd paned.geary-sidebar-pane-separator > separator, window#GearyMainWindow.background.csd paned.geary-sidebar-pane-separator > separator { margin-left: -1px; + background: none; } .geary-main-window.background.csd paned.geary-sidebar-pane-separator statusbar, @@ -7154,19 +7172,18 @@ window#GearyMainWindow.background.csd paned.geary-sidebar-pane-separator frame.g .geary-main-window.background.csd paned.geary-sidebar-pane-separator frame.geary-conversation-frame scrolledwindow treeview.view, window#GearyMainWindow.background.csd paned.geary-sidebar-pane-separator frame.geary-conversation-frame scrolledwindow treeview.view { - border-image: none; + border: none; background-image: none; } .geary-main-window.background.csd paned.geary-sidebar-pane-separator frame.geary-conversation-frame scrolledwindow treeview.view:hover, window#GearyMainWindow.background.csd paned.geary-sidebar-pane-separator frame.geary-conversation-frame scrolledwindow treeview.view:hover { - background-color: rgba(8, 96, 242, 0.1); + background-color: rgba(36, 36, 36, 0.1); } .geary-main-window.background.csd paned.geary-sidebar-pane-separator frame.geary-conversation-frame scrolledwindow treeview.view:selected, window#GearyMainWindow.background.csd paned.geary-sidebar-pane-separator frame.geary-conversation-frame scrolledwindow treeview.view:selected { - background-color: rgba(8, 96, 242, 0.15); - box-shadow: inset 2px 0 #0860f2; + background-color: rgba(36, 36, 36, 0.15); color: #242424; } @@ -9468,12 +9485,10 @@ box:not(.unpinned):not(.pinned) > revealer > button.flat.launcher, .raven .raven .left frame.raven-frame > border { border: none; - border-right: 1px solid rgba(255, 255, 255, 0.22); } .right frame.raven-frame > border { border: none; - border-left: 1px solid rgba(255, 255, 255, 0.22); } .top .shadow-block { diff --git a/src/main/gtk-3.0/gtk-light.scss b/src/main/gtk-3.0/gtk-light.scss index 3059132d..eb5ee8f9 100644 --- a/src/main/gtk-3.0/gtk-light.scss +++ b/src/main/gtk-3.0/gtk-light.scss @@ -1,6 +1,7 @@ $variant: 'light'; $laptop: 'false'; $trans: 'true'; +$black: 'false'; @import '../../sass/colors'; @import '../../sass/variables'; diff --git a/src/sass/_colors.scss b/src/sass/_colors.scss index 76eddfff..614c0012 100644 --- a/src/sass/_colors.scss +++ b/src/sass/_colors.scss @@ -110,21 +110,19 @@ $osd_borders_color: $borders_color; $menu_bg: if($variant == 'light', $base_color, $bg_color); $menu_bd: if($variant == 'light', rgba(black, 0.05), rgba(white, 0.08)); -@if $trans == 'true' { - $menu_bg: if($variant == 'light', rgba($base_color, 0.95), rgba($bg_color, 0.95)); -} +@if $trans == 'true' { $menu_bg: if($variant == 'light', rgba($base_color, 0.95), rgba($bg_color, 0.95)); } // Panel colors $panel_opacity: 0.16; $panel_bg: if($variant == 'light', #f1f1f1, #2a2a2a); -@if $trans == 'true' { - $panel_bg: if($variant == 'light', rgba(white, $panel_opacity), rgba(black, $panel_opacity)); -} +@if $trans == 'true' { $panel_bg: if($variant == 'light', rgba(white, $panel_opacity), rgba(black, $panel_opacity)); } $panel_fg: if($trans == 'true', white, $text_color); +@if $black == 'true' { $panel_fg: $text_color; } + $panel_top_color: if($variant == 'dark', #333333, #f5f5f5); $panel_bottom_color: if($variant == 'dark', #2a2a2a, #e2e2e2); $panel_border_color: if($variant == 'light', rgba(white, 0.22), rgba(black, 0.22)); diff --git a/src/sass/gnome-shell/_common.scss b/src/sass/gnome-shell/_common.scss index ef461fc8..25bc059f 100644 --- a/src/sass/gnome-shell/_common.scss +++ b/src/sass/gnome-shell/_common.scss @@ -1073,8 +1073,6 @@ $popop_menuitem_radius: $wm_radius - 4px; $panel_shadow: 0 2px 3px rgba(black, 0.03), 0 3px 5px rgba(black, 0.03), 0 5px 10px rgba(black, 0.02); $panel_asset_shadow: 0 1px 3px 3px rgba(black, 0.15); -@if $black == 'true' { $panel_fg: $text_color; } - #panel { background-color: $panel_bg; /* transition from solid to transparent */ diff --git a/src/sass/gtk/_applications.scss b/src/sass/gtk/_applications.scss index d93351e6..9a36ca5c 100644 --- a/src/sass/gtk/_applications.scss +++ b/src/sass/gtk/_applications.scss @@ -2670,6 +2670,20 @@ window#GearyMainWindow.background.csd { > searchbar { @extend %side_searchbar; } + + treeview.view.sidebar { + padding: 3px 0; + + &:hover { + color: $fg_color; + background-color: rgba($fg_color, 0.1); + } + + &:selected { + color: $fg_color; + background-color: rgba($fg_color, 0.15); + } + } } } } @@ -2696,7 +2710,10 @@ window#GearyMainWindow.background.csd { } paned.geary-sidebar-pane-separator { - > separator { margin-left: -1px } + > separator { + margin-left: -1px; + background: none; + } statusbar { margin: -8px -12px; @@ -2730,14 +2747,13 @@ window#GearyMainWindow.background.csd { border-radius: $bt_radius; treeview.view { - border-image: none; + border: none; background-image: none; - &:hover { background-color: rgba($selected_bg_color, 0.1); } + &:hover { background-color: rgba($fg_color, 0.1); } &:selected { - background-color: rgba($selected_bg_color, 0.15); - box-shadow: inset 2px 0 $selected_bg_color; + background-color: rgba($fg_color, 0.15); color: if($variant == 'light', $fg_color, $selected_fg_color); } diff --git a/src/sass/gtk/_budgie.scss b/src/sass/gtk/_budgie.scss index 26b6c3df..7df3376a 100644 --- a/src/sass/gtk/_budgie.scss +++ b/src/sass/gtk/_budgie.scss @@ -622,12 +622,10 @@ box:not(.unpinned):not(.pinned) > revealer > button.flat.launcher { border-image // Raven borders .left frame.raven-frame > border { border: none; - border-right: 1px solid $panel_border_color; } .right frame.raven-frame > border { border: none; - border-left: 1px solid $panel_border_color; } $pos_list: ((top, bottom), (left, right), (right, left));