From 186af27fb80d2faf53cba95d20ad996eda649a33 Mon Sep 17 00:00:00 2001 From: Vince Date: Fri, 23 Oct 2020 12:10:54 +0800 Subject: [PATCH] Fixed firefox issue --- src/main/gnome-shell/gnome-shell-dark-alt.css | 4 +- .../gnome-shell-dark-solid-alt.css | 4 +- .../gnome-shell/gnome-shell-dark-solid.css | 4 +- src/main/gnome-shell/gnome-shell-dark.css | 4 +- .../gnome-shell/gnome-shell-light-alt.css | 4 +- .../gnome-shell-light-solid-alt.css | 4 +- .../gnome-shell/gnome-shell-light-solid.css | 4 +- src/main/gnome-shell/gnome-shell-light.css | 4 +- src/main/gtk-3.0/gtk-dark-solid.css | 95 +++++++++---------- src/main/gtk-3.0/gtk-dark.css | 89 ++++++++--------- src/main/gtk-3.0/gtk-light-solid.css | 89 ++++++++--------- src/main/gtk-3.0/gtk-light.css | 89 ++++++++--------- src/sass/_variables.scss | 2 + src/sass/gnome-shell/_common.scss | 7 +- src/sass/gtk/_applications.scss | 22 +++-- src/sass/gtk/_budgie.scss | 29 ++---- 16 files changed, 210 insertions(+), 244 deletions(-) diff --git a/src/main/gnome-shell/gnome-shell-dark-alt.css b/src/main/gnome-shell/gnome-shell-dark-alt.css index d2ec37e..91decaa 100644 --- a/src/main/gnome-shell/gnome-shell-dark-alt.css +++ b/src/main/gnome-shell/gnome-shell-dark-alt.css @@ -1256,11 +1256,11 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { transition-duration: 250ms; font-weight: bold; height: 28px; - box-shadow: 0 2px 3px rgba(0, 0, 0, 0.03), 0 3px 5px rgba(0, 0, 0, 0.03), 0 5px 10px rgba(0, 0, 0, 0.02); + box-shadow: 0 3px 6px rgba(0, 0, 0, 0.22), 0 5px 16px rgba(0, 0, 0, 0.35); } #panel:overview, #panel.unlock-screen, #panel.login-screen, #panel.lock-screen { - background-color: rgba(0, 0, 0, 0.16); + background-color: transparent; } #panel #panelLeft, #panel #panelCenter { diff --git a/src/main/gnome-shell/gnome-shell-dark-solid-alt.css b/src/main/gnome-shell/gnome-shell-dark-solid-alt.css index a542254..81e2de5 100644 --- a/src/main/gnome-shell/gnome-shell-dark-solid-alt.css +++ b/src/main/gnome-shell/gnome-shell-dark-solid-alt.css @@ -1256,11 +1256,11 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { transition-duration: 250ms; font-weight: bold; height: 28px; - box-shadow: 0 2px 3px rgba(0, 0, 0, 0.03), 0 3px 5px rgba(0, 0, 0, 0.03), 0 5px 10px rgba(0, 0, 0, 0.02); + box-shadow: 0 3px 6px rgba(0, 0, 0, 0.22), 0 5px 16px rgba(0, 0, 0, 0.35); } #panel:overview, #panel.unlock-screen, #panel.login-screen, #panel.lock-screen { - background-color: #2a2a2a; + background-color: transparent; } #panel #panelLeft, #panel #panelCenter { diff --git a/src/main/gnome-shell/gnome-shell-dark-solid.css b/src/main/gnome-shell/gnome-shell-dark-solid.css index a542254..81e2de5 100644 --- a/src/main/gnome-shell/gnome-shell-dark-solid.css +++ b/src/main/gnome-shell/gnome-shell-dark-solid.css @@ -1256,11 +1256,11 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { transition-duration: 250ms; font-weight: bold; height: 28px; - box-shadow: 0 2px 3px rgba(0, 0, 0, 0.03), 0 3px 5px rgba(0, 0, 0, 0.03), 0 5px 10px rgba(0, 0, 0, 0.02); + box-shadow: 0 3px 6px rgba(0, 0, 0, 0.22), 0 5px 16px rgba(0, 0, 0, 0.35); } #panel:overview, #panel.unlock-screen, #panel.login-screen, #panel.lock-screen { - background-color: #2a2a2a; + background-color: transparent; } #panel #panelLeft, #panel #panelCenter { diff --git a/src/main/gnome-shell/gnome-shell-dark.css b/src/main/gnome-shell/gnome-shell-dark.css index d2ec37e..91decaa 100644 --- a/src/main/gnome-shell/gnome-shell-dark.css +++ b/src/main/gnome-shell/gnome-shell-dark.css @@ -1256,11 +1256,11 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { transition-duration: 250ms; font-weight: bold; height: 28px; - box-shadow: 0 2px 3px rgba(0, 0, 0, 0.03), 0 3px 5px rgba(0, 0, 0, 0.03), 0 5px 10px rgba(0, 0, 0, 0.02); + box-shadow: 0 3px 6px rgba(0, 0, 0, 0.22), 0 5px 16px rgba(0, 0, 0, 0.35); } #panel:overview, #panel.unlock-screen, #panel.login-screen, #panel.lock-screen { - background-color: rgba(0, 0, 0, 0.16); + background-color: transparent; } #panel #panelLeft, #panel #panelCenter { diff --git a/src/main/gnome-shell/gnome-shell-light-alt.css b/src/main/gnome-shell/gnome-shell-light-alt.css index e404d77..817ae38 100644 --- a/src/main/gnome-shell/gnome-shell-light-alt.css +++ b/src/main/gnome-shell/gnome-shell-light-alt.css @@ -1256,11 +1256,11 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { transition-duration: 250ms; font-weight: bold; height: 28px; - box-shadow: 0 2px 3px rgba(0, 0, 0, 0.03), 0 3px 5px rgba(0, 0, 0, 0.03), 0 5px 10px rgba(0, 0, 0, 0.02); + box-shadow: 0 3px 6px rgba(0, 0, 0, 0.22), 0 5px 16px rgba(0, 0, 0, 0.35); } #panel:overview, #panel.unlock-screen, #panel.login-screen, #panel.lock-screen { - background-color: rgba(255, 255, 255, 0.16); + background-color: transparent; } #panel #panelLeft, #panel #panelCenter { diff --git a/src/main/gnome-shell/gnome-shell-light-solid-alt.css b/src/main/gnome-shell/gnome-shell-light-solid-alt.css index 0b73c7d..908efdf 100644 --- a/src/main/gnome-shell/gnome-shell-light-solid-alt.css +++ b/src/main/gnome-shell/gnome-shell-light-solid-alt.css @@ -1256,11 +1256,11 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { transition-duration: 250ms; font-weight: bold; height: 28px; - box-shadow: 0 2px 3px rgba(0, 0, 0, 0.03), 0 3px 5px rgba(0, 0, 0, 0.03), 0 5px 10px rgba(0, 0, 0, 0.02); + box-shadow: 0 3px 6px rgba(0, 0, 0, 0.22), 0 5px 16px rgba(0, 0, 0, 0.35); } #panel:overview, #panel.unlock-screen, #panel.login-screen, #panel.lock-screen { - background-color: #f1f1f1; + background-color: transparent; } #panel #panelLeft, #panel #panelCenter { diff --git a/src/main/gnome-shell/gnome-shell-light-solid.css b/src/main/gnome-shell/gnome-shell-light-solid.css index 0b73c7d..908efdf 100644 --- a/src/main/gnome-shell/gnome-shell-light-solid.css +++ b/src/main/gnome-shell/gnome-shell-light-solid.css @@ -1256,11 +1256,11 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { transition-duration: 250ms; font-weight: bold; height: 28px; - box-shadow: 0 2px 3px rgba(0, 0, 0, 0.03), 0 3px 5px rgba(0, 0, 0, 0.03), 0 5px 10px rgba(0, 0, 0, 0.02); + box-shadow: 0 3px 6px rgba(0, 0, 0, 0.22), 0 5px 16px rgba(0, 0, 0, 0.35); } #panel:overview, #panel.unlock-screen, #panel.login-screen, #panel.lock-screen { - background-color: #f1f1f1; + background-color: transparent; } #panel #panelLeft, #panel #panelCenter { diff --git a/src/main/gnome-shell/gnome-shell-light.css b/src/main/gnome-shell/gnome-shell-light.css index cf811ed..26139b4 100644 --- a/src/main/gnome-shell/gnome-shell-light.css +++ b/src/main/gnome-shell/gnome-shell-light.css @@ -1256,11 +1256,11 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { transition-duration: 250ms; font-weight: bold; height: 28px; - box-shadow: 0 2px 3px rgba(0, 0, 0, 0.03), 0 3px 5px rgba(0, 0, 0, 0.03), 0 5px 10px rgba(0, 0, 0, 0.02); + box-shadow: 0 3px 6px rgba(0, 0, 0, 0.22), 0 5px 16px rgba(0, 0, 0, 0.35); } #panel:overview, #panel.unlock-screen, #panel.login-screen, #panel.lock-screen { - background-color: rgba(255, 255, 255, 0.16); + background-color: transparent; } #panel #panelLeft, #panel #panelCenter { diff --git a/src/main/gtk-3.0/gtk-dark-solid.css b/src/main/gtk-3.0/gtk-dark-solid.css index 93c1eea..ea2deab 100644 --- a/src/main/gtk-3.0/gtk-dark-solid.css +++ b/src/main/gtk-3.0/gtk-dark-solid.css @@ -4707,8 +4707,8 @@ headerbar button.titlebutton.minimize:active, background-image: -gtk-scaled(url("windows-assets/titlebutton-restore-active-dark.png"), url("windows-assets/titlebutton-restore-active-dark@2.png")); } -.budgie-menu button:checked, #MozillaGtkWidget.background > widget > scrolledwindow > textview text:selected, #MozillaGtkWidget.background > widget > scrolledwindow > textview text:selected:focus, -#MozillaGtkWidget.background > widget > scrolledwindow > textview text selection, .nemo-window .nemo-window-pane widget.entry:selected:focus, .nemo-window .nemo-window-pane widget.entry:selected, .emoji widget:hover, .view:selected:focus, textview text selection:focus, textview text selection, iconview:selected:focus, flowbox flowboxchild:selected, label:disabled selection, entry selection:focus, entry selection, menuitem.button.flat:active, .raven .raven-header:not(.top) button.button:active, menuitem.button.flat:active arrow, .raven .raven-header:not(.top) button.button:active arrow, menuitem.button.flat:selected, .raven .raven-header:not(.top) button.button:selected, menuitem.button.flat:selected arrow, .raven .raven-header:not(.top) button.button:selected arrow, +.budgie-menu button:checked, #MozillaGtkWidget > widget > scrolledwindow > textview text:selected, #MozillaGtkWidget > widget > scrolledwindow > textview text:selected:focus, +#MozillaGtkWidget > widget > scrolledwindow > textview text selection, .nemo-window .nemo-window-pane widget.entry:selected:focus, .nemo-window .nemo-window-pane widget.entry:selected, .emoji widget:hover, .view:selected:focus, textview text selection:focus, textview text selection, iconview:selected:focus, flowbox flowboxchild:selected, label:disabled selection, entry selection:focus, entry selection, menuitem.button.flat:active, .raven .raven-header:not(.top) button.button:active, menuitem.button.flat:active arrow, .raven .raven-header:not(.top) button.button:active arrow, menuitem.button.flat:selected, .raven .raven-header:not(.top) button.button:selected, menuitem.button.flat:selected arrow, .raven .raven-header:not(.top) button.button:selected arrow, modelbutton.flat:active, modelbutton.flat:active arrow, modelbutton.flat:selected, @@ -4718,8 +4718,8 @@ calendar:selected, .csd filechooser stack.view scrolledwindow treeview.view:sele color: white; } -.budgie-menu button:disabled:checked, #MozillaGtkWidget.background > widget > scrolledwindow > textview text:disabled:selected, -#MozillaGtkWidget.background > widget > scrolledwindow > textview text selection:disabled, .nemo-window .nemo-window-pane widget.entry:disabled:selected, .emoji widget:disabled:hover { +.budgie-menu button:disabled:checked, #MozillaGtkWidget > widget > scrolledwindow > textview text:disabled:selected, +#MozillaGtkWidget > widget > scrolledwindow > textview text selection:disabled, .nemo-window .nemo-window-pane widget.entry:disabled:selected, .emoji widget:disabled:hover { color: #84b0f9; } @@ -7311,72 +7311,71 @@ window.background:not(.csd) > window > menu menuitem { transition: none; } -#MozillaGtkWidget.background { +#MozillaGtkWidget { background-color: #333333; } -#MozillaGtkWidget.background .background, -#MozillaGtkWidget.background frame, -#MozillaGtkWidget.background separator, -#MozillaGtkWidget.background scrolledwindow { +#MozillaGtkWidget .background, +#MozillaGtkWidget frame, +#MozillaGtkWidget separator, +#MozillaGtkWidget scrolledwindow { background-color: #242424; } -#MozillaGtkWidget.background scrollbar { +#MozillaGtkWidget scrollbar { background-color: transparent; } -#MozillaGtkWidget.background scrollbar slider { +#MozillaGtkWidget scrollbar slider { background-color: gray; } -#MozillaGtkWidget.background scrollbar slider:hover { +#MozillaGtkWidget scrollbar slider:hover { background-color: #9a9a9a; } -#MozillaGtkWidget.background scrollbar slider:hover:active { +#MozillaGtkWidget scrollbar slider:hover:active { background-color: #b3b3b3; } -#MozillaGtkWidget.background scrollbar slider:disabled { +#MozillaGtkWidget scrollbar slider:disabled { background-color: transparent; } -#MozillaGtkWidget.background *:not(menuitem):hover, #MozillaGtkWidget.background *:not(menuitem):hover button, -#MozillaGtkWidget.background *:focus, -#MozillaGtkWidget.background *:focus button, -#MozillaGtkWidget.background *:active, -#MozillaGtkWidget.background *:active button, -#MozillaGtkWidget.background *:checked, -#MozillaGtkWidget.background *:checked button { - color: #dedede; -} - -#MozillaGtkWidget.background > window.background > menu { +#MozillaGtkWidget > window.background > menu { border: none; background-color: #333333; border-radius: 0; } -#MozillaGtkWidget.background > window.background > menu > separator { +#MozillaGtkWidget > window.background > menu > separator { margin-top: 2px; margin-bottom: 2px; background-color: rgba(255, 255, 255, 0.12); } -#MozillaGtkWidget.background > widget border { +#MozillaGtkWidget > widget > frame > border { border-color: #666666; } -#MozillaGtkWidget.background > widget separator { - background-color: rgba(255, 255, 255, 0.12); -} - -#MozillaGtkWidget.background > widget > scrolledwindow > textview { +#MozillaGtkWidget > widget text { background-color: #333333; } -#MozillaGtkWidget.background > widget > scrolledwindow > textview text { +#MozillaGtkWidget > widget text:selected { + background-color: #0860f2; + color: white; +} + +#MozillaGtkWidget > widget separator { + background-color: rgba(255, 255, 255, 0.12); +} + +#MozillaGtkWidget > widget > scrolledwindow > textview { + background-color: #333333; +} + +#MozillaGtkWidget > widget > scrolledwindow > textview text { background-color: transparent; color: #aaaaaa; } @@ -9164,25 +9163,20 @@ popover.background.places-menu row { background-color: #2a2a2a; color: #dadada; font-weight: 500; - box-shadow: none; - border: none; - background-clip: padding-box; + border-width: 0; } .budgie-panel.transparent { background-color: rgba(42, 42, 42, 0.1); - box-shadow: none; + border-width: 0; } .bottom .budgie-panel { - border: solid rgba(0, 0, 0, 0.22); - border-width: 1px 1px 0 1px; border-radius: 14px 14px 0 0; } .bottom .budgie-panel.dock-mode { border-radius: 0 0 0 0; - border-width: 1px 0 0 0; } .left .budgie-panel { @@ -9191,7 +9185,6 @@ popover.background.places-menu row { .left .budgie-panel.dock-mode { border-radius: 0 0 0 0; - border-width: 0 1px 0 0; } .right .budgie-panel { @@ -9200,7 +9193,6 @@ popover.background.places-menu row { .right .budgie-panel.dock-mode { border-radius: 0 0 0 0; - border-width: 0 0 0 1px; } .budgie-panel button { @@ -9516,29 +9508,30 @@ box:not(.unpinned):not(.pinned) > revealer > button.flat.launcher, .raven .raven border-image: none; } -.left frame.raven-frame > border { - border: none; -} - -.right frame.raven-frame > border { - border: none; +frame.raven-frame > border { + border-style: none; } .top .shadow-block { - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.35) 0%, rgba(0, 0, 0, 0.15) 15%, rgba(0, 0, 0, 0.03) 60%, transparent); + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.05) 0%, rgba(0, 0, 0, 0.03) 15%, rgba(0, 0, 0, 0.02) 60%, transparent); +} + +.bottom .shadow-block { + background-image: linear-gradient(to top, rgba(0, 0, 0, 0.05) 0%, rgba(0, 0, 0, 0.03) 15%, rgba(0, 0, 0, 0.02) 60%, transparent); } .left .shadow-block { - background-image: linear-gradient(to right, rgba(0, 0, 0, 0.35) 0%, rgba(0, 0, 0, 0.15) 15%, rgba(0, 0, 0, 0.03) 60%, transparent); + background-image: linear-gradient(to right, rgba(0, 0, 0, 0.05) 0%, rgba(0, 0, 0, 0.03) 15%, rgba(0, 0, 0, 0.02) 60%, transparent); } .right .shadow-block { - background-image: linear-gradient(to left, rgba(0, 0, 0, 0.35) 0%, rgba(0, 0, 0, 0.15) 15%, rgba(0, 0, 0, 0.03) 60%, transparent); + background-image: linear-gradient(to left, rgba(0, 0, 0, 0.05) 0%, rgba(0, 0, 0, 0.03) 15%, rgba(0, 0, 0, 0.02) 60%, transparent); } .raven { background-color: #1f1f1f; color: #dadada; + box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.2), 0 3px 5px 0 rgba(0, 0, 0, 0.15); } .raven > box { diff --git a/src/main/gtk-3.0/gtk-dark.css b/src/main/gtk-3.0/gtk-dark.css index 2e39a9a..f88cdc8 100644 --- a/src/main/gtk-3.0/gtk-dark.css +++ b/src/main/gtk-3.0/gtk-dark.css @@ -4707,8 +4707,8 @@ headerbar button.titlebutton.minimize:active, background-image: -gtk-scaled(url("windows-assets/titlebutton-restore-active-dark.png"), url("windows-assets/titlebutton-restore-active-dark@2.png")); } -.budgie-menu button:checked, #MozillaGtkWidget.background > widget > scrolledwindow > textview text:selected, #MozillaGtkWidget.background > widget > scrolledwindow > textview text:selected:focus, -#MozillaGtkWidget.background > widget > scrolledwindow > textview text selection, .nemo-window .nemo-window-pane widget.entry:selected:focus, .nemo-window .nemo-window-pane widget.entry:selected, .emoji widget:hover, .view:selected:focus, textview text selection:focus, textview text selection, iconview:selected:focus, flowbox flowboxchild:selected, label:disabled selection, entry selection:focus, entry selection, menuitem.button.flat:active, .raven .raven-header:not(.top) button.button:active, menuitem.button.flat:active arrow, .raven .raven-header:not(.top) button.button:active arrow, menuitem.button.flat:selected, .raven .raven-header:not(.top) button.button:selected, menuitem.button.flat:selected arrow, .raven .raven-header:not(.top) button.button:selected arrow, +.budgie-menu button:checked, #MozillaGtkWidget > widget > scrolledwindow > textview text:selected, #MozillaGtkWidget > widget > scrolledwindow > textview text:selected:focus, +#MozillaGtkWidget > widget > scrolledwindow > textview text selection, .nemo-window .nemo-window-pane widget.entry:selected:focus, .nemo-window .nemo-window-pane widget.entry:selected, .emoji widget:hover, .view:selected:focus, textview text selection:focus, textview text selection, iconview:selected:focus, flowbox flowboxchild:selected, label:disabled selection, entry selection:focus, entry selection, menuitem.button.flat:active, .raven .raven-header:not(.top) button.button:active, menuitem.button.flat:active arrow, .raven .raven-header:not(.top) button.button:active arrow, menuitem.button.flat:selected, .raven .raven-header:not(.top) button.button:selected, menuitem.button.flat:selected arrow, .raven .raven-header:not(.top) button.button:selected arrow, modelbutton.flat:active, modelbutton.flat:active arrow, modelbutton.flat:selected, @@ -4718,8 +4718,8 @@ calendar:selected, .csd filechooser stack.view scrolledwindow treeview.view:sele color: white; } -.budgie-menu button:disabled:checked, #MozillaGtkWidget.background > widget > scrolledwindow > textview text:disabled:selected, -#MozillaGtkWidget.background > widget > scrolledwindow > textview text selection:disabled, .nemo-window .nemo-window-pane widget.entry:disabled:selected, .emoji widget:disabled:hover { +.budgie-menu button:disabled:checked, #MozillaGtkWidget > widget > scrolledwindow > textview text:disabled:selected, +#MozillaGtkWidget > widget > scrolledwindow > textview text selection:disabled, .nemo-window .nemo-window-pane widget.entry:disabled:selected, .emoji widget:disabled:hover { color: #84b0f9; } @@ -7307,72 +7307,71 @@ window.background:not(.csd) > window > menu menuitem { transition: none; } -#MozillaGtkWidget.background { +#MozillaGtkWidget { background-color: #333333; } -#MozillaGtkWidget.background .background, -#MozillaGtkWidget.background frame, -#MozillaGtkWidget.background separator, -#MozillaGtkWidget.background scrolledwindow { +#MozillaGtkWidget .background, +#MozillaGtkWidget frame, +#MozillaGtkWidget separator, +#MozillaGtkWidget scrolledwindow { background-color: #242424; } -#MozillaGtkWidget.background scrollbar { +#MozillaGtkWidget scrollbar { background-color: transparent; } -#MozillaGtkWidget.background scrollbar slider { +#MozillaGtkWidget scrollbar slider { background-color: gray; } -#MozillaGtkWidget.background scrollbar slider:hover { +#MozillaGtkWidget scrollbar slider:hover { background-color: #9a9a9a; } -#MozillaGtkWidget.background scrollbar slider:hover:active { +#MozillaGtkWidget scrollbar slider:hover:active { background-color: #b3b3b3; } -#MozillaGtkWidget.background scrollbar slider:disabled { +#MozillaGtkWidget scrollbar slider:disabled { background-color: transparent; } -#MozillaGtkWidget.background *:not(menuitem):hover, #MozillaGtkWidget.background *:not(menuitem):hover button, -#MozillaGtkWidget.background *:focus, -#MozillaGtkWidget.background *:focus button, -#MozillaGtkWidget.background *:active, -#MozillaGtkWidget.background *:active button, -#MozillaGtkWidget.background *:checked, -#MozillaGtkWidget.background *:checked button { - color: #dedede; -} - -#MozillaGtkWidget.background > window.background > menu { +#MozillaGtkWidget > window.background > menu { border: none; background-color: rgba(51, 51, 51, 0.95); border-radius: 0; } -#MozillaGtkWidget.background > window.background > menu > separator { +#MozillaGtkWidget > window.background > menu > separator { margin-top: 2px; margin-bottom: 2px; background-color: rgba(255, 255, 255, 0.12); } -#MozillaGtkWidget.background > widget border { +#MozillaGtkWidget > widget > frame > border { border-color: #666666; } -#MozillaGtkWidget.background > widget separator { +#MozillaGtkWidget > widget text { + background-color: #333333; +} + +#MozillaGtkWidget > widget text:selected { + background-color: #0860f2; + color: white; +} + +#MozillaGtkWidget > widget separator { background-color: rgba(255, 255, 255, 0.12); } -#MozillaGtkWidget.background > widget > scrolledwindow > textview { +#MozillaGtkWidget > widget > scrolledwindow > textview { background-color: rgba(51, 51, 51, 0.95); } -#MozillaGtkWidget.background > widget > scrolledwindow > textview text { +#MozillaGtkWidget > widget > scrolledwindow > textview text { background-color: transparent; color: #aaaaaa; } @@ -9160,25 +9159,20 @@ popover.background.places-menu row { background-color: rgba(0, 0, 0, 0.16); color: white; font-weight: 500; - box-shadow: none; - border: none; - background-clip: padding-box; + border-width: 0; } .budgie-panel.transparent { background-color: rgba(0, 0, 0, 0.1); - box-shadow: none; + border-width: 0; } .bottom .budgie-panel { - border: solid rgba(0, 0, 0, 0.22); - border-width: 1px 1px 0 1px; border-radius: 14px 14px 0 0; } .bottom .budgie-panel.dock-mode { border-radius: 0 0 0 0; - border-width: 1px 0 0 0; } .left .budgie-panel { @@ -9187,7 +9181,6 @@ popover.background.places-menu row { .left .budgie-panel.dock-mode { border-radius: 0 0 0 0; - border-width: 0 1px 0 0; } .right .budgie-panel { @@ -9196,7 +9189,6 @@ popover.background.places-menu row { .right .budgie-panel.dock-mode { border-radius: 0 0 0 0; - border-width: 0 0 0 1px; } .budgie-panel button { @@ -9512,29 +9504,30 @@ box:not(.unpinned):not(.pinned) > revealer > button.flat.launcher, .raven .raven border-image: none; } -.left frame.raven-frame > border { - border: none; -} - -.right frame.raven-frame > border { - border: none; +frame.raven-frame > border { + border-style: none; } .top .shadow-block { - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.35) 0%, rgba(0, 0, 0, 0.15) 15%, rgba(0, 0, 0, 0.03) 60%, transparent); + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.05) 0%, rgba(0, 0, 0, 0.03) 15%, rgba(0, 0, 0, 0.02) 60%, transparent); +} + +.bottom .shadow-block { + background-image: linear-gradient(to top, rgba(0, 0, 0, 0.05) 0%, rgba(0, 0, 0, 0.03) 15%, rgba(0, 0, 0, 0.02) 60%, transparent); } .left .shadow-block { - background-image: linear-gradient(to right, rgba(0, 0, 0, 0.35) 0%, rgba(0, 0, 0, 0.15) 15%, rgba(0, 0, 0, 0.03) 60%, transparent); + background-image: linear-gradient(to right, rgba(0, 0, 0, 0.05) 0%, rgba(0, 0, 0, 0.03) 15%, rgba(0, 0, 0, 0.02) 60%, transparent); } .right .shadow-block { - background-image: linear-gradient(to left, rgba(0, 0, 0, 0.35) 0%, rgba(0, 0, 0, 0.15) 15%, rgba(0, 0, 0, 0.03) 60%, transparent); + background-image: linear-gradient(to left, rgba(0, 0, 0, 0.05) 0%, rgba(0, 0, 0, 0.03) 15%, rgba(0, 0, 0, 0.02) 60%, transparent); } .raven { background-color: rgba(31, 31, 31, 0.95); color: #dadada; + box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.2), 0 3px 5px 0 rgba(0, 0, 0, 0.15); } .raven > box { diff --git a/src/main/gtk-3.0/gtk-light-solid.css b/src/main/gtk-3.0/gtk-light-solid.css index 27539e6..6d2003a 100644 --- a/src/main/gtk-3.0/gtk-light-solid.css +++ b/src/main/gtk-3.0/gtk-light-solid.css @@ -4728,8 +4728,8 @@ headerbar button.titlebutton.minimize:active, background-image: -gtk-scaled(url("windows-assets/titlebutton-restore-active.png"), url("windows-assets/titlebutton-restore-active@2.png")); } -.budgie-menu button:checked, #MozillaGtkWidget.background > widget > scrolledwindow > textview text:selected, #MozillaGtkWidget.background > widget > scrolledwindow > textview text:selected:focus, -#MozillaGtkWidget.background > widget > scrolledwindow > textview text selection, .nemo-window .nemo-window-pane widget.entry:selected:focus, .nemo-window .nemo-window-pane widget.entry:selected, .emoji widget:hover, .view:selected:focus, textview text selection:focus, textview text selection, iconview:selected:focus, flowbox flowboxchild:selected, label:disabled selection, entry selection:focus, entry selection, menuitem.button.flat:active, .raven .raven-header:not(.top) button.button:active, menuitem.button.flat:active arrow, .raven .raven-header:not(.top) button.button:active arrow, menuitem.button.flat:selected, .raven .raven-header:not(.top) button.button:selected, menuitem.button.flat:selected arrow, .raven .raven-header:not(.top) button.button:selected arrow, +.budgie-menu button:checked, #MozillaGtkWidget > widget > scrolledwindow > textview text:selected, #MozillaGtkWidget > widget > scrolledwindow > textview text:selected:focus, +#MozillaGtkWidget > widget > scrolledwindow > textview text selection, .nemo-window .nemo-window-pane widget.entry:selected:focus, .nemo-window .nemo-window-pane widget.entry:selected, .emoji widget:hover, .view:selected:focus, textview text selection:focus, textview text selection, iconview:selected:focus, flowbox flowboxchild:selected, label:disabled selection, entry selection:focus, entry selection, menuitem.button.flat:active, .raven .raven-header:not(.top) button.button:active, menuitem.button.flat:active arrow, .raven .raven-header:not(.top) button.button:active arrow, menuitem.button.flat:selected, .raven .raven-header:not(.top) button.button:selected, menuitem.button.flat:selected arrow, .raven .raven-header:not(.top) button.button:selected arrow, modelbutton.flat:active, modelbutton.flat:active arrow, modelbutton.flat:selected, @@ -4739,8 +4739,8 @@ calendar:selected, .csd filechooser stack.view scrolledwindow treeview.view:sele color: white; } -.budgie-menu button:disabled:checked, #MozillaGtkWidget.background > widget > scrolledwindow > textview text:disabled:selected, -#MozillaGtkWidget.background > widget > scrolledwindow > textview text selection:disabled, .nemo-window .nemo-window-pane widget.entry:disabled:selected, .emoji widget:disabled:hover { +.budgie-menu button:disabled:checked, #MozillaGtkWidget > widget > scrolledwindow > textview text:disabled:selected, +#MozillaGtkWidget > widget > scrolledwindow > textview text selection:disabled, .nemo-window .nemo-window-pane widget.entry:disabled:selected, .emoji widget:disabled:hover { color: #84b0f9; } @@ -7337,72 +7337,71 @@ window.background:not(.csd) > window > menu menuitem { transition: none; } -#MozillaGtkWidget.background { +#MozillaGtkWidget { background-color: #f5f5f5; } -#MozillaGtkWidget.background .background, -#MozillaGtkWidget.background frame, -#MozillaGtkWidget.background separator, -#MozillaGtkWidget.background scrolledwindow { +#MozillaGtkWidget .background, +#MozillaGtkWidget frame, +#MozillaGtkWidget separator, +#MozillaGtkWidget scrolledwindow { background-color: #ffffff; } -#MozillaGtkWidget.background scrollbar { +#MozillaGtkWidget scrollbar { background-color: transparent; } -#MozillaGtkWidget.background scrollbar slider { +#MozillaGtkWidget scrollbar slider { background-color: #979797; } -#MozillaGtkWidget.background scrollbar slider:hover { +#MozillaGtkWidget scrollbar slider:hover { background-color: #787878; } -#MozillaGtkWidget.background scrollbar slider:hover:active { +#MozillaGtkWidget scrollbar slider:hover:active { background-color: #585858; } -#MozillaGtkWidget.background scrollbar slider:disabled { +#MozillaGtkWidget scrollbar slider:disabled { background-color: transparent; } -#MozillaGtkWidget.background *:not(menuitem):hover, #MozillaGtkWidget.background *:not(menuitem):hover button, -#MozillaGtkWidget.background *:focus, -#MozillaGtkWidget.background *:focus button, -#MozillaGtkWidget.background *:active, -#MozillaGtkWidget.background *:active button, -#MozillaGtkWidget.background *:checked, -#MozillaGtkWidget.background *:checked button { - color: #242424; -} - -#MozillaGtkWidget.background > window.background > menu { +#MozillaGtkWidget > window.background > menu { border: none; background-color: #ffffff; border-radius: 0; } -#MozillaGtkWidget.background > window.background > menu > separator { +#MozillaGtkWidget > window.background > menu > separator { margin-top: 2px; margin-bottom: 2px; background-color: rgba(0, 0, 0, 0.12); } -#MozillaGtkWidget.background > widget border { +#MozillaGtkWidget > widget > frame > border { border-color: #cfcfcf; } -#MozillaGtkWidget.background > widget separator { +#MozillaGtkWidget > widget text { + background-color: #f5f5f5; +} + +#MozillaGtkWidget > widget text:selected { + background-color: #0860f2; + color: white; +} + +#MozillaGtkWidget > widget separator { background-color: rgba(0, 0, 0, 0.12); } -#MozillaGtkWidget.background > widget > scrolledwindow > textview { +#MozillaGtkWidget > widget > scrolledwindow > textview { background-color: #ffffff; } -#MozillaGtkWidget.background > widget > scrolledwindow > textview text { +#MozillaGtkWidget > widget > scrolledwindow > textview text { background-color: transparent; color: #363636; } @@ -9201,25 +9200,20 @@ popover.background.places-menu row { background-color: #f1f1f1; color: #363636; font-weight: 500; - box-shadow: none; - border: none; - background-clip: padding-box; + border-width: 0; } .budgie-panel.transparent { background-color: rgba(241, 241, 241, 0.1); - box-shadow: none; + border-width: 0; } .bottom .budgie-panel { - border: solid rgba(255, 255, 255, 0.22); - border-width: 1px 1px 0 1px; border-radius: 14px 14px 0 0; } .bottom .budgie-panel.dock-mode { border-radius: 0 0 0 0; - border-width: 1px 0 0 0; } .left .budgie-panel { @@ -9228,7 +9222,6 @@ popover.background.places-menu row { .left .budgie-panel.dock-mode { border-radius: 0 0 0 0; - border-width: 0 1px 0 0; } .right .budgie-panel { @@ -9237,7 +9230,6 @@ popover.background.places-menu row { .right .budgie-panel.dock-mode { border-radius: 0 0 0 0; - border-width: 0 0 0 1px; } .budgie-panel button { @@ -9553,29 +9545,30 @@ box:not(.unpinned):not(.pinned) > revealer > button.flat.launcher, .raven .raven border-image: none; } -.left frame.raven-frame > border { - border: none; -} - -.right frame.raven-frame > border { - border: none; +frame.raven-frame > border { + border-style: none; } .top .shadow-block { - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.35) 0%, rgba(0, 0, 0, 0.15) 15%, rgba(0, 0, 0, 0.03) 60%, transparent); + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.05) 0%, rgba(0, 0, 0, 0.03) 15%, rgba(0, 0, 0, 0.02) 60%, transparent); +} + +.bottom .shadow-block { + background-image: linear-gradient(to top, rgba(0, 0, 0, 0.05) 0%, rgba(0, 0, 0, 0.03) 15%, rgba(0, 0, 0, 0.02) 60%, transparent); } .left .shadow-block { - background-image: linear-gradient(to right, rgba(0, 0, 0, 0.35) 0%, rgba(0, 0, 0, 0.15) 15%, rgba(0, 0, 0, 0.03) 60%, transparent); + background-image: linear-gradient(to right, rgba(0, 0, 0, 0.05) 0%, rgba(0, 0, 0, 0.03) 15%, rgba(0, 0, 0, 0.02) 60%, transparent); } .right .shadow-block { - background-image: linear-gradient(to left, rgba(0, 0, 0, 0.35) 0%, rgba(0, 0, 0, 0.15) 15%, rgba(0, 0, 0, 0.03) 60%, transparent); + background-image: linear-gradient(to left, rgba(0, 0, 0, 0.05) 0%, rgba(0, 0, 0, 0.03) 15%, rgba(0, 0, 0, 0.02) 60%, transparent); } .raven { background-color: #dedede; color: #363636; + box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.2), 0 3px 5px 0 rgba(0, 0, 0, 0.15); } .raven > box { diff --git a/src/main/gtk-3.0/gtk-light.css b/src/main/gtk-3.0/gtk-light.css index 33e139e..101b7a3 100644 --- a/src/main/gtk-3.0/gtk-light.css +++ b/src/main/gtk-3.0/gtk-light.css @@ -4728,8 +4728,8 @@ headerbar button.titlebutton.minimize:active, background-image: -gtk-scaled(url("windows-assets/titlebutton-restore-active.png"), url("windows-assets/titlebutton-restore-active@2.png")); } -.budgie-menu button:checked, #MozillaGtkWidget.background > widget > scrolledwindow > textview text:selected, #MozillaGtkWidget.background > widget > scrolledwindow > textview text:selected:focus, -#MozillaGtkWidget.background > widget > scrolledwindow > textview text selection, .nemo-window .nemo-window-pane widget.entry:selected:focus, .nemo-window .nemo-window-pane widget.entry:selected, .emoji widget:hover, .view:selected:focus, textview text selection:focus, textview text selection, iconview:selected:focus, flowbox flowboxchild:selected, label:disabled selection, entry selection:focus, entry selection, menuitem.button.flat:active, .raven .raven-header:not(.top) button.button:active, menuitem.button.flat:active arrow, .raven .raven-header:not(.top) button.button:active arrow, menuitem.button.flat:selected, .raven .raven-header:not(.top) button.button:selected, menuitem.button.flat:selected arrow, .raven .raven-header:not(.top) button.button:selected arrow, +.budgie-menu button:checked, #MozillaGtkWidget > widget > scrolledwindow > textview text:selected, #MozillaGtkWidget > widget > scrolledwindow > textview text:selected:focus, +#MozillaGtkWidget > widget > scrolledwindow > textview text selection, .nemo-window .nemo-window-pane widget.entry:selected:focus, .nemo-window .nemo-window-pane widget.entry:selected, .emoji widget:hover, .view:selected:focus, textview text selection:focus, textview text selection, iconview:selected:focus, flowbox flowboxchild:selected, label:disabled selection, entry selection:focus, entry selection, menuitem.button.flat:active, .raven .raven-header:not(.top) button.button:active, menuitem.button.flat:active arrow, .raven .raven-header:not(.top) button.button:active arrow, menuitem.button.flat:selected, .raven .raven-header:not(.top) button.button:selected, menuitem.button.flat:selected arrow, .raven .raven-header:not(.top) button.button:selected arrow, modelbutton.flat:active, modelbutton.flat:active arrow, modelbutton.flat:selected, @@ -4739,8 +4739,8 @@ calendar:selected, .csd filechooser stack.view scrolledwindow treeview.view:sele color: white; } -.budgie-menu button:disabled:checked, #MozillaGtkWidget.background > widget > scrolledwindow > textview text:disabled:selected, -#MozillaGtkWidget.background > widget > scrolledwindow > textview text selection:disabled, .nemo-window .nemo-window-pane widget.entry:disabled:selected, .emoji widget:disabled:hover { +.budgie-menu button:disabled:checked, #MozillaGtkWidget > widget > scrolledwindow > textview text:disabled:selected, +#MozillaGtkWidget > widget > scrolledwindow > textview text selection:disabled, .nemo-window .nemo-window-pane widget.entry:disabled:selected, .emoji widget:disabled:hover { color: #84b0f9; } @@ -7333,72 +7333,71 @@ window.background:not(.csd) > window > menu menuitem { transition: none; } -#MozillaGtkWidget.background { +#MozillaGtkWidget { background-color: #f5f5f5; } -#MozillaGtkWidget.background .background, -#MozillaGtkWidget.background frame, -#MozillaGtkWidget.background separator, -#MozillaGtkWidget.background scrolledwindow { +#MozillaGtkWidget .background, +#MozillaGtkWidget frame, +#MozillaGtkWidget separator, +#MozillaGtkWidget scrolledwindow { background-color: #ffffff; } -#MozillaGtkWidget.background scrollbar { +#MozillaGtkWidget scrollbar { background-color: transparent; } -#MozillaGtkWidget.background scrollbar slider { +#MozillaGtkWidget scrollbar slider { background-color: #979797; } -#MozillaGtkWidget.background scrollbar slider:hover { +#MozillaGtkWidget scrollbar slider:hover { background-color: #787878; } -#MozillaGtkWidget.background scrollbar slider:hover:active { +#MozillaGtkWidget scrollbar slider:hover:active { background-color: #585858; } -#MozillaGtkWidget.background scrollbar slider:disabled { +#MozillaGtkWidget scrollbar slider:disabled { background-color: transparent; } -#MozillaGtkWidget.background *:not(menuitem):hover, #MozillaGtkWidget.background *:not(menuitem):hover button, -#MozillaGtkWidget.background *:focus, -#MozillaGtkWidget.background *:focus button, -#MozillaGtkWidget.background *:active, -#MozillaGtkWidget.background *:active button, -#MozillaGtkWidget.background *:checked, -#MozillaGtkWidget.background *:checked button { - color: #242424; -} - -#MozillaGtkWidget.background > window.background > menu { +#MozillaGtkWidget > window.background > menu { border: none; background-color: rgba(255, 255, 255, 0.95); border-radius: 0; } -#MozillaGtkWidget.background > window.background > menu > separator { +#MozillaGtkWidget > window.background > menu > separator { margin-top: 2px; margin-bottom: 2px; background-color: rgba(0, 0, 0, 0.12); } -#MozillaGtkWidget.background > widget border { +#MozillaGtkWidget > widget > frame > border { border-color: #cfcfcf; } -#MozillaGtkWidget.background > widget separator { +#MozillaGtkWidget > widget text { + background-color: #f5f5f5; +} + +#MozillaGtkWidget > widget text:selected { + background-color: #0860f2; + color: white; +} + +#MozillaGtkWidget > widget separator { background-color: rgba(0, 0, 0, 0.12); } -#MozillaGtkWidget.background > widget > scrolledwindow > textview { +#MozillaGtkWidget > widget > scrolledwindow > textview { background-color: rgba(255, 255, 255, 0.95); } -#MozillaGtkWidget.background > widget > scrolledwindow > textview text { +#MozillaGtkWidget > widget > scrolledwindow > textview text { background-color: transparent; color: #363636; } @@ -9197,25 +9196,20 @@ popover.background.places-menu row { background-color: rgba(255, 255, 255, 0.16); color: white; font-weight: 500; - box-shadow: none; - border: none; - background-clip: padding-box; + border-width: 0; } .budgie-panel.transparent { background-color: rgba(255, 255, 255, 0.1); - box-shadow: none; + border-width: 0; } .bottom .budgie-panel { - border: solid rgba(255, 255, 255, 0.22); - border-width: 1px 1px 0 1px; border-radius: 14px 14px 0 0; } .bottom .budgie-panel.dock-mode { border-radius: 0 0 0 0; - border-width: 1px 0 0 0; } .left .budgie-panel { @@ -9224,7 +9218,6 @@ popover.background.places-menu row { .left .budgie-panel.dock-mode { border-radius: 0 0 0 0; - border-width: 0 1px 0 0; } .right .budgie-panel { @@ -9233,7 +9226,6 @@ popover.background.places-menu row { .right .budgie-panel.dock-mode { border-radius: 0 0 0 0; - border-width: 0 0 0 1px; } .budgie-panel button { @@ -9549,29 +9541,30 @@ box:not(.unpinned):not(.pinned) > revealer > button.flat.launcher, .raven .raven border-image: none; } -.left frame.raven-frame > border { - border: none; -} - -.right frame.raven-frame > border { - border: none; +frame.raven-frame > border { + border-style: none; } .top .shadow-block { - background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.35) 0%, rgba(0, 0, 0, 0.15) 15%, rgba(0, 0, 0, 0.03) 60%, transparent); + background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.05) 0%, rgba(0, 0, 0, 0.03) 15%, rgba(0, 0, 0, 0.02) 60%, transparent); +} + +.bottom .shadow-block { + background-image: linear-gradient(to top, rgba(0, 0, 0, 0.05) 0%, rgba(0, 0, 0, 0.03) 15%, rgba(0, 0, 0, 0.02) 60%, transparent); } .left .shadow-block { - background-image: linear-gradient(to right, rgba(0, 0, 0, 0.35) 0%, rgba(0, 0, 0, 0.15) 15%, rgba(0, 0, 0, 0.03) 60%, transparent); + background-image: linear-gradient(to right, rgba(0, 0, 0, 0.05) 0%, rgba(0, 0, 0, 0.03) 15%, rgba(0, 0, 0, 0.02) 60%, transparent); } .right .shadow-block { - background-image: linear-gradient(to left, rgba(0, 0, 0, 0.35) 0%, rgba(0, 0, 0, 0.15) 15%, rgba(0, 0, 0, 0.03) 60%, transparent); + background-image: linear-gradient(to left, rgba(0, 0, 0, 0.05) 0%, rgba(0, 0, 0, 0.03) 15%, rgba(0, 0, 0, 0.02) 60%, transparent); } .raven { background-color: rgba(222, 222, 222, 0.85); color: #363636; + box-shadow: 0 2px 3px 0 rgba(0, 0, 0, 0.2), 0 3px 5px 0 rgba(0, 0, 0, 0.15); } .raven > box { diff --git a/src/sass/_variables.scss b/src/sass/_variables.scss index d2623df..fe9d8aa 100644 --- a/src/sass/_variables.scss +++ b/src/sass/_variables.scss @@ -55,6 +55,8 @@ $button_transition: all $shorter_duration $ease-out-quad; $backdrop_transition: $longer_duration ease-out; // Shadow +$panel_shadow: 0 0 10px rgba(black, 0.35), 0 0 24px rgba(black, 0.30); +$panel_asset_shadow: 0 1px 3px 3px rgba(black, 0.15); $shadow_0: 0 1px 2px 0 rgba(black, 0.1), 0 2px 2px 0 rgba(black, 0.05); // Slider hover shadow $shadow_1: 0 1px 1px 0 rgba(black, 0.12), 0 1px 2px 0 rgba(black, 0.06); // Header-button shadow $shadow_2: 0 1px 1px 0 rgba(black, 0.1), 0 1px 2px 0 rgba(black, 0.05); // Slider normal shadow diff --git a/src/sass/gnome-shell/_common.scss b/src/sass/gnome-shell/_common.scss index ccf7a60..db2fb3a 100644 --- a/src/sass/gnome-shell/_common.scss +++ b/src/sass/gnome-shell/_common.scss @@ -1070,22 +1070,19 @@ $popop_menuitem_radius: $wm_radius - 4px; } /* TOP BAR */ -$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); - #panel { background-color: $panel_bg; /* transition from solid to transparent */ transition-duration: 250ms; font-weight: bold; height: $menuitem_size; - box-shadow: $panel_shadow; + box-shadow: 0 3px 6px rgba(black, 0.22), 0 5px 16px rgba(black, 0.35); &:overview, &.unlock-screen, &.login-screen, &.lock-screen { - background-color: $panel_bg; + background-color: transparent; } #panelLeft, #panelCenter { // spacing between activities<>app menu and such diff --git a/src/sass/gtk/_applications.scss b/src/sass/gtk/_applications.scss index c4c1548..54d5052 100644 --- a/src/sass/gtk/_applications.scss +++ b/src/sass/gtk/_applications.scss @@ -2904,7 +2904,7 @@ window.background:not(.csd) { // * Firefox Quantum * // *******************/ -#MozillaGtkWidget.background { +#MozillaGtkWidget { // blend with weird toolbar backgrounds background-color: $bg_color; @@ -2928,13 +2928,6 @@ window.background:not(.csd) { } } - *:not(menuitem):hover, // exclude menuitem node - *:focus, - *:active, - *:checked { - &, button { color: $fg_color; } // enforce opaque foregrounds - } - > window.background > menu { // context-menus border: none; // hide ugly double borders background-color: $menu_bg; @@ -2949,7 +2942,18 @@ window.background:not(.csd) { } > widget { - border { border-color: if($variant == 'light', darken($bg_color, 15%), lighten($bg_color, 20%)); } + // Emphasize toolbar's border-bottom + > frame > border { border-color: if($variant == 'light', darken($bg_color, 15%), lighten($bg_color, 20%)); } + + // For popover, entry in toolbar, etc. + text { background-color: $bg_color; } + + // For selection, active tab indicator, etc. + text:selected { + // Use traditional selection style as workaround + background-color: $selected_bg_color; + color: $selected_fg_color; + } separator { background-color: $borders_color; } diff --git a/src/sass/gtk/_budgie.scss b/src/sass/gtk/_budgie.scss index 8599242..f6f27e6 100644 --- a/src/sass/gtk/_budgie.scss +++ b/src/sass/gtk/_budgie.scss @@ -396,23 +396,19 @@ popover.background.places-menu { background-color: $panel_bg; color: $panel_fg; font-weight: 500; - box-shadow: none; - border: none; - background-clip: padding-box; + // box-shadow: $panel_shadow; + border-width: 0; &.transparent { background-color: rgba($panel_bg, 0.1); - box-shadow: none; + border-width: 0; } .bottom & { - border: solid $panel_border_color; - border-width: 1px 1px 0 1px; border-radius: $wm_radius $wm_radius 0 0; &.dock-mode { border-radius: 0 0 0 0; - border-width: 1px 0 0 0; } } @@ -421,7 +417,6 @@ popover.background.places-menu { &.dock-mode { border-radius: 0 0 0 0; - border-width: 0 1px 0 0; } } @@ -430,7 +425,6 @@ popover.background.places-menu { &.dock-mode { border-radius: 0 0 0 0; - border-width: 0 0 0 1px; } } @@ -638,15 +632,11 @@ popover.background.places-menu { box:not(.unpinned):not(.pinned) > revealer > button.flat.launcher { border-image: none; } // unset before drawing indicators // Raven borders -.left frame.raven-frame > border { - border: none; +frame.raven-frame > border { + border-style: none; } -.right frame.raven-frame > border { - border: none; -} - -$pos_list: ((top, bottom), (left, right), (right, left)); +$pos_list: ((top, bottom), (bottom, top), (left, right), (right, left)); @each $pos, $b_pos in $pos_list { // Panel borders @@ -656,24 +646,25 @@ $pos_list: ((top, bottom), (left, right), (right, left)); // Raven borders // .#{$pos} frame.raven-frame > border { - // border: none; - // border-#{$b_pos}: 1px solid $panel_border_color; + // margin-#{$b_pos}: 16px; // } // Shadows .#{$pos} .shadow-block { - background-image: linear-gradient(to $b_pos, rgba(black, 0.35) 0%, rgba(black, 0.15) 15%, rgba(black, 0.03) 60%, transparent); + background-image: linear-gradient(to $b_pos, rgba(black, 0.05) 0%, rgba(black, 0.03) 15%, rgba(black, 0.02) 60%, transparent); } } // .bottom .shadow-block { background-image: none; } $raven_opacity: if($variant =='light', 0.85, 0.95); +$raven_shadow: 0 0 3px 0 rgba(black, 0.2), 0 0 8px 0 rgba(black, 0.15), 0 0 16px 0 rgba(black, 0.1); // Raven .raven { background-color: if($trans == 'true', rgba($raven_bg_color, $raven_opacity), $raven_bg_color); color: $raven_fg_color; + box-shadow: $shadow_4; // for >=10.4 > box { margin-bottom: -10px; }