diff --git a/core.sh b/core.sh index 1255de2..5e1522c 100755 --- a/core.sh +++ b/core.sh @@ -187,9 +187,8 @@ clean() { } uninstall_link() { - [[ -L "${HOME}/.config/gtk-4.0/assets" ]] && rm -rf "${HOME}/.config/gtk-4.0/assets" && echo -e "Removing ${HOME}/.config/gtk-4.0/assets" - [[ -L "${HOME}/.config/gtk-4.0/gtk.css" ]] && rm -rf "${HOME}/.config/gtk-4.0/gtk.css" && echo -e "Removing ${HOME}/.config/gtk-4.0/gtk.css" - [[ -L "${HOME}/.config/gtk-4.0/gtk-dark.css" ]] && rm -rf "${HOME}/.config/gtk-4.0/gtk-dark.css" && echo -e "Removing ${HOME}/.config/gtk-4.0/gtk-dark.css" + rm -rf "${HOME}/.config/gtk-4.0/"{assets,gtk.css,gtk-dark.css} + echo -e "\nRemoving ${HOME}/.config/gtk-4.0 links..." } link_libadwaita() { diff --git a/src/_sass/gtk/_common-4.0.scss b/src/_sass/gtk/_common-4.0.scss index 612db54..7f51f54 100644 --- a/src/_sass/gtk/_common-4.0.scss +++ b/src/_sass/gtk/_common-4.0.scss @@ -1116,7 +1116,7 @@ headerbar { margin: 0; border-radius: $window-radius $window-radius 0 0; - @if $variant == 'light' and $topbar == 'dark' { + @if $topbar == 'dark' { background-color: transparent; } @else { background-color: $titlebar; @@ -1127,7 +1127,7 @@ headerbar { &:backdrop { color: $titlebar-text-secondary; - @if $variant == 'light' and $topbar == 'dark' { + @if $topbar == 'dark' { background-color: transparent; } @else { background-color: $titlebar-backdrop; @@ -1342,6 +1342,8 @@ headerbar { &.default-decoration { min-height: $small-size; padding: $space-size; + background-image: none; + background-color: $titlebar; box-shadow: inset 0 -1px $divider, inset 0 1px highlight($titlebar); windowcontrols { @@ -4023,7 +4025,7 @@ window { &.tiled-left { border-radius: 0; } } - @if $variant == 'light' and $topbar == 'dark' { + @if $topbar == 'dark' { &.background { background-color: transparent; background-image: linear-gradient(to bottom, diff --git a/src/_sass/gtk/apps/_gnome-4.0.scss b/src/_sass/gtk/apps/_gnome-4.0.scss index d3c271b..a3df9ec 100644 --- a/src/_sass/gtk/apps/_gnome-4.0.scss +++ b/src/_sass/gtk/apps/_gnome-4.0.scss @@ -350,14 +350,6 @@ window.dialog { } } -window.background { - > contents > leaflet { - stack.background { - background-color: transparent; - } - } -} - // // Calculator // diff --git a/src/_sass/gtk/apps/_libadwaita.scss b/src/_sass/gtk/apps/_libadwaita.scss index 38b20de..05846f4 100644 --- a/src/_sass/gtk/apps/_libadwaita.scss +++ b/src/_sass/gtk/apps/_libadwaita.scss @@ -715,16 +715,28 @@ tabbox:drop(active) { leaflet { border-radius: $window-radius; - box-shadow: inset 0 1px highlight($titlebar); + + &, &:backdrop { + box-shadow: inset 0 1px highlight($titlebar); + } + + leaflet { // reset + border-radius: 0; + outline: none; + box-shadow: none; + + &, &:backdrop { + box-shadow: none; + } + } headerbar { border-radius: 0; box-shadow: inset 0 -1px $divider; } - leaflet { - border-radius: 0; - outline: none; + stack.background { + background-color: transparent; } > box > scrolledwindow > viewport > widget > stack { diff --git a/src/gnome-shell/sass/widgets/_popovers-42.scss b/src/gnome-shell/sass/widgets/_popovers-42.scss index c17a87a..277a6dc 100644 --- a/src/gnome-shell/sass/widgets/_popovers-42.scss +++ b/src/gnome-shell/sass/widgets/_popovers-42.scss @@ -2,7 +2,7 @@ //.the popover itself .popup-menu-boxpointer { - // -arrow-border-radius: $popup_radius; + -arrow-border-radius: $container_padding; -arrow-background-color: transparent; -arrow-border-width: 0; -arrow-border-color: transparent; @@ -23,7 +23,7 @@ .popup-menu-content { padding: $container_padding; - margin: 0 6px 14px; + margin: 0 3px 14px; background-color: $menu_bg_color; border-radius: $popup_radius; border: none; diff --git a/src/gnome-shell/sass/widgets/_scrollbars.scss b/src/gnome-shell/sass/widgets/_scrollbars.scss index 6049b76..35da966 100644 --- a/src/gnome-shell/sass/widgets/_scrollbars.scss +++ b/src/gnome-shell/sass/widgets/_scrollbars.scss @@ -7,6 +7,7 @@ StScrollView { StScrollBar { padding: 0; + margin: 6px; StScrollView & { min-width: 8px; diff --git a/src/gnome-shell/shell-40-0/gnome-shell-Compact.css b/src/gnome-shell/shell-40-0/gnome-shell-Compact.css index 999922d..7d6e3f8 100644 --- a/src/gnome-shell/shell-40-0/gnome-shell-Compact.css +++ b/src/gnome-shell/shell-40-0/gnome-shell-Compact.css @@ -376,6 +376,7 @@ StScrollView.hfade { StScrollBar { padding: 0; + margin: 6px; } StScrollView StScrollBar { diff --git a/src/gnome-shell/shell-40-0/gnome-shell-Dark-Compact.css b/src/gnome-shell/shell-40-0/gnome-shell-Dark-Compact.css index 785f9f4..a0d1825 100644 --- a/src/gnome-shell/shell-40-0/gnome-shell-Dark-Compact.css +++ b/src/gnome-shell/shell-40-0/gnome-shell-Dark-Compact.css @@ -376,6 +376,7 @@ StScrollView.hfade { StScrollBar { padding: 0; + margin: 6px; } StScrollView StScrollBar { diff --git a/src/gnome-shell/shell-40-0/gnome-shell-Dark.css b/src/gnome-shell/shell-40-0/gnome-shell-Dark.css index 215906f..fb79ccd 100644 --- a/src/gnome-shell/shell-40-0/gnome-shell-Dark.css +++ b/src/gnome-shell/shell-40-0/gnome-shell-Dark.css @@ -376,6 +376,7 @@ StScrollView.hfade { StScrollBar { padding: 0; + margin: 6px; } StScrollView StScrollBar { diff --git a/src/gnome-shell/shell-40-0/gnome-shell.css b/src/gnome-shell/shell-40-0/gnome-shell.css index fe3da65..ecfe74b 100644 --- a/src/gnome-shell/shell-40-0/gnome-shell.css +++ b/src/gnome-shell/shell-40-0/gnome-shell.css @@ -376,6 +376,7 @@ StScrollView.hfade { StScrollBar { padding: 0; + margin: 6px; } StScrollView StScrollBar { diff --git a/src/gnome-shell/shell-42-0/gnome-shell-Compact.css b/src/gnome-shell/shell-42-0/gnome-shell-Compact.css index 0ff5488..d87a462 100644 --- a/src/gnome-shell/shell-42-0/gnome-shell-Compact.css +++ b/src/gnome-shell/shell-42-0/gnome-shell-Compact.css @@ -430,6 +430,7 @@ StScrollView.hfade { StScrollBar { padding: 0; + margin: 6px; } StScrollView StScrollBar { @@ -491,6 +492,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { /* Popovers/Menus */ .popup-menu-boxpointer { + -arrow-border-radius: 4px; -arrow-background-color: transparent; -arrow-border-width: 0; -arrow-border-color: transparent; @@ -511,7 +513,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { .popup-menu .popup-menu-content { padding: 4px; - margin: 0 6px 14px; + margin: 0 3px 14px; background-color: rgba(255, 255, 255, 0.97); border-radius: 18px; border: none; diff --git a/src/gnome-shell/shell-42-0/gnome-shell-Dark-Compact.css b/src/gnome-shell/shell-42-0/gnome-shell-Dark-Compact.css index 587110c..55cae7b 100644 --- a/src/gnome-shell/shell-42-0/gnome-shell-Dark-Compact.css +++ b/src/gnome-shell/shell-42-0/gnome-shell-Dark-Compact.css @@ -430,6 +430,7 @@ StScrollView.hfade { StScrollBar { padding: 0; + margin: 6px; } StScrollView StScrollBar { @@ -491,6 +492,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { /* Popovers/Menus */ .popup-menu-boxpointer { + -arrow-border-radius: 4px; -arrow-background-color: transparent; -arrow-border-width: 0; -arrow-border-color: transparent; @@ -511,7 +513,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { .popup-menu .popup-menu-content { padding: 4px; - margin: 0 6px 14px; + margin: 0 3px 14px; background-color: rgba(32, 32, 32, 0.97); border-radius: 18px; border: none; diff --git a/src/gnome-shell/shell-42-0/gnome-shell-Dark.css b/src/gnome-shell/shell-42-0/gnome-shell-Dark.css index b2e8470..028cf89 100644 --- a/src/gnome-shell/shell-42-0/gnome-shell-Dark.css +++ b/src/gnome-shell/shell-42-0/gnome-shell-Dark.css @@ -430,6 +430,7 @@ StScrollView.hfade { StScrollBar { padding: 0; + margin: 6px; } StScrollView StScrollBar { @@ -491,6 +492,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { /* Popovers/Menus */ .popup-menu-boxpointer { + -arrow-border-radius: 6px; -arrow-background-color: transparent; -arrow-border-width: 0; -arrow-border-color: transparent; @@ -511,7 +513,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { .popup-menu .popup-menu-content { padding: 6px; - margin: 0 6px 14px; + margin: 0 3px 14px; background-color: rgba(32, 32, 32, 0.97); border-radius: 20px; border: none; diff --git a/src/gnome-shell/shell-42-0/gnome-shell.css b/src/gnome-shell/shell-42-0/gnome-shell.css index 02a87f5..eb99911 100644 --- a/src/gnome-shell/shell-42-0/gnome-shell.css +++ b/src/gnome-shell/shell-42-0/gnome-shell.css @@ -430,6 +430,7 @@ StScrollView.hfade { StScrollBar { padding: 0; + margin: 6px; } StScrollView StScrollBar { @@ -491,6 +492,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { /* Popovers/Menus */ .popup-menu-boxpointer { + -arrow-border-radius: 6px; -arrow-background-color: transparent; -arrow-border-width: 0; -arrow-border-color: transparent; @@ -511,7 +513,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active { .popup-menu .popup-menu-content { padding: 6px; - margin: 0 6px 14px; + margin: 0 3px 14px; background-color: rgba(255, 255, 255, 0.97); border-radius: 20px; border: none; diff --git a/src/gtk/4.0/gtk-Compact.css b/src/gtk/4.0/gtk-Compact.css index 74d096c..2b5b9ab 100644 --- a/src/gtk/4.0/gtk-Compact.css +++ b/src/gtk/4.0/gtk-Compact.css @@ -1719,6 +1719,8 @@ headerbar .selection-mode { headerbar.default-decoration { min-height: 22px; padding: 4px; + background-image: none; + background-color: #2C2C2C; box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12), inset 0 1px rgba(255, 255, 255, 0.1); } @@ -4982,10 +4984,6 @@ window.dialog > box > stack > box > box > notebook.frame { border-radius: 0; } -window.background > contents > leaflet stack.background { - background-color: transparent; -} - .history-view { background-color: #FFFFFF; } @@ -6038,17 +6036,29 @@ tabbox:drop(active) { leaflet { border-radius: 16px; +} + +leaflet, leaflet:backdrop { box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); } +leaflet leaflet { + border-radius: 0; + outline: none; + box-shadow: none; +} + +leaflet leaflet, leaflet leaflet:backdrop { + box-shadow: none; +} + leaflet headerbar { border-radius: 0; box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12); } -leaflet leaflet { - border-radius: 0; - outline: none; +leaflet stack.background { + background-color: transparent; } leaflet > box > scrolledwindow > viewport > widget > stack { diff --git a/src/gtk/4.0/gtk-Dark-Compact.css b/src/gtk/4.0/gtk-Dark-Compact.css index 5cac4c1..6ba9c2b 100644 --- a/src/gtk/4.0/gtk-Dark-Compact.css +++ b/src/gtk/4.0/gtk-Dark-Compact.css @@ -1493,7 +1493,7 @@ headerbar { padding: 0; margin: 0; border-radius: 16px 16px 0 0; - background-color: #2C2C2C; + background-color: transparent; } headerbar:disabled { @@ -1502,7 +1502,7 @@ headerbar:disabled { headerbar:backdrop { color: rgba(255, 255, 255, 0.7); - background-color: #2C2C2C; + background-color: transparent; } headerbar:backdrop:disabled { @@ -1719,6 +1719,8 @@ headerbar .selection-mode { headerbar.default-decoration { min-height: 22px; padding: 4px; + background-image: none; + background-color: #2C2C2C; box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12), inset 0 1px rgba(255, 255, 255, 0.1); } @@ -4423,6 +4425,11 @@ window.csd.maximized, window.csd.fullscreen, window.csd.tiled, window.csd.tiled- border-radius: 0; } +window.background { + background-color: transparent; + background-image: linear-gradient(to bottom, #2C2C2C, #2C2C2C 40px, #212121 40px, #212121); +} + window:backdrop { box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12), 0 16px 14.4px 2px transparent, 0 6px 18px 5px transparent; } @@ -4947,10 +4954,6 @@ window.dialog > box > stack > box > box > notebook.frame { border-radius: 0; } -window.background > contents > leaflet stack.background { - background-color: transparent; -} - .history-view { background-color: #2C2C2C; } @@ -6003,17 +6006,29 @@ tabbox:drop(active) { leaflet { border-radius: 16px; +} + +leaflet, leaflet:backdrop { box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); } +leaflet leaflet { + border-radius: 0; + outline: none; + box-shadow: none; +} + +leaflet leaflet, leaflet leaflet:backdrop { + box-shadow: none; +} + leaflet headerbar { border-radius: 0; box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12); } -leaflet leaflet { - border-radius: 0; - outline: none; +leaflet stack.background { + background-color: transparent; } leaflet > box > scrolledwindow > viewport > widget > stack { diff --git a/src/gtk/4.0/gtk-Dark.css b/src/gtk/4.0/gtk-Dark.css index 1bdb2cf..8b78ba8 100644 --- a/src/gtk/4.0/gtk-Dark.css +++ b/src/gtk/4.0/gtk-Dark.css @@ -1493,7 +1493,7 @@ headerbar { padding: 0; margin: 0; border-radius: 18px 18px 0 0; - background-color: #2C2C2C; + background-color: transparent; } headerbar:disabled { @@ -1502,7 +1502,7 @@ headerbar:disabled { headerbar:backdrop { color: rgba(255, 255, 255, 0.7); - background-color: #2C2C2C; + background-color: transparent; } headerbar:backdrop:disabled { @@ -1719,6 +1719,8 @@ headerbar .selection-mode { headerbar.default-decoration { min-height: 24px; padding: 6px; + background-image: none; + background-color: #2C2C2C; box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12), inset 0 1px rgba(255, 255, 255, 0.1); } @@ -4423,6 +4425,11 @@ window.csd.maximized, window.csd.fullscreen, window.csd.tiled, window.csd.tiled- border-radius: 0; } +window.background { + background-color: transparent; + background-image: linear-gradient(to bottom, #2C2C2C, #2C2C2C 48px, #212121 48px, #212121); +} + window:backdrop { box-shadow: 0 2px 2.4px -1px rgba(0, 0, 0, 0.2), 0 4px 3px 0 rgba(0, 0, 0, 0.14), 0 1px 6px 0 rgba(0, 0, 0, 0.12), 0 16px 14.4px 2px transparent, 0 6px 18px 5px transparent; } @@ -4947,10 +4954,6 @@ window.dialog > box > stack > box > box > notebook.frame { border-radius: 0; } -window.background > contents > leaflet stack.background { - background-color: transparent; -} - .history-view { background-color: #2C2C2C; } @@ -6003,17 +6006,29 @@ tabbox:drop(active) { leaflet { border-radius: 18px; +} + +leaflet, leaflet:backdrop { box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); } +leaflet leaflet { + border-radius: 0; + outline: none; + box-shadow: none; +} + +leaflet leaflet, leaflet leaflet:backdrop { + box-shadow: none; +} + leaflet headerbar { border-radius: 0; box-shadow: inset 0 -1px rgba(255, 255, 255, 0.12); } -leaflet leaflet { - border-radius: 0; - outline: none; +leaflet stack.background { + background-color: transparent; } leaflet > box > scrolledwindow > viewport > widget > stack { diff --git a/src/gtk/4.0/gtk-Light-Compact.css b/src/gtk/4.0/gtk-Light-Compact.css index a8edb2d..7f6655e 100644 --- a/src/gtk/4.0/gtk-Light-Compact.css +++ b/src/gtk/4.0/gtk-Light-Compact.css @@ -1719,6 +1719,8 @@ headerbar .selection-mode { headerbar.default-decoration { min-height: 22px; padding: 4px; + background-image: none; + background-color: #FFFFFF; box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12), inset 0 1px rgba(255, 255, 255, 0.4); } @@ -4946,10 +4948,6 @@ window.dialog > box > stack > box > box > notebook.frame { border-radius: 0; } -window.background > contents > leaflet stack.background { - background-color: transparent; -} - .history-view { background-color: #FFFFFF; } @@ -6002,17 +6000,29 @@ tabbox:drop(active) { leaflet { border-radius: 16px; +} + +leaflet, leaflet:backdrop { box-shadow: inset 0 1px rgba(255, 255, 255, 0.4); } +leaflet leaflet { + border-radius: 0; + outline: none; + box-shadow: none; +} + +leaflet leaflet, leaflet leaflet:backdrop { + box-shadow: none; +} + leaflet headerbar { border-radius: 0; box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12); } -leaflet leaflet { - border-radius: 0; - outline: none; +leaflet stack.background { + background-color: transparent; } leaflet > box > scrolledwindow > viewport > widget > stack { diff --git a/src/gtk/4.0/gtk-Light.css b/src/gtk/4.0/gtk-Light.css index 248038f..db87aca 100644 --- a/src/gtk/4.0/gtk-Light.css +++ b/src/gtk/4.0/gtk-Light.css @@ -1719,6 +1719,8 @@ headerbar .selection-mode { headerbar.default-decoration { min-height: 24px; padding: 6px; + background-image: none; + background-color: #FFFFFF; box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12), inset 0 1px rgba(255, 255, 255, 0.4); } @@ -4946,10 +4948,6 @@ window.dialog > box > stack > box > box > notebook.frame { border-radius: 0; } -window.background > contents > leaflet stack.background { - background-color: transparent; -} - .history-view { background-color: #FFFFFF; } @@ -6002,17 +6000,29 @@ tabbox:drop(active) { leaflet { border-radius: 18px; +} + +leaflet, leaflet:backdrop { box-shadow: inset 0 1px rgba(255, 255, 255, 0.4); } +leaflet leaflet { + border-radius: 0; + outline: none; + box-shadow: none; +} + +leaflet leaflet, leaflet leaflet:backdrop { + box-shadow: none; +} + leaflet headerbar { border-radius: 0; box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12); } -leaflet leaflet { - border-radius: 0; - outline: none; +leaflet stack.background { + background-color: transparent; } leaflet > box > scrolledwindow > viewport > widget > stack { diff --git a/src/gtk/4.0/gtk.css b/src/gtk/4.0/gtk.css index 6213f13..b518465 100644 --- a/src/gtk/4.0/gtk.css +++ b/src/gtk/4.0/gtk.css @@ -1719,6 +1719,8 @@ headerbar .selection-mode { headerbar.default-decoration { min-height: 24px; padding: 6px; + background-image: none; + background-color: #2C2C2C; box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12), inset 0 1px rgba(255, 255, 255, 0.1); } @@ -4982,10 +4984,6 @@ window.dialog > box > stack > box > box > notebook.frame { border-radius: 0; } -window.background > contents > leaflet stack.background { - background-color: transparent; -} - .history-view { background-color: #FFFFFF; } @@ -6038,17 +6036,29 @@ tabbox:drop(active) { leaflet { border-radius: 18px; +} + +leaflet, leaflet:backdrop { box-shadow: inset 0 1px rgba(255, 255, 255, 0.1); } +leaflet leaflet { + border-radius: 0; + outline: none; + box-shadow: none; +} + +leaflet leaflet, leaflet leaflet:backdrop { + box-shadow: none; +} + leaflet headerbar { border-radius: 0; box-shadow: inset 0 -1px rgba(0, 0, 0, 0.12); } -leaflet leaflet { - border-radius: 0; - outline: none; +leaflet stack.background { + background-color: transparent; } leaflet > box > scrolledwindow > viewport > widget > stack {