diff --git a/core.sh b/core.sh index 2f451e8..d02cb3a 100755 --- a/core.sh +++ b/core.sh @@ -8,7 +8,7 @@ ROOT_UID=0 DEST_DIR= # Destination directory -if [ "$UID" -eq "$ROOT_UID" ]; then +if [[ "$UID" -eq "$ROOT_UID" ]]; then DEST_DIR="/usr/share/themes" else DEST_DIR="$HOME/.themes" diff --git a/install.sh b/install.sh index 618c3c4..944d1c4 100755 --- a/install.sh +++ b/install.sh @@ -322,9 +322,14 @@ if [[ ${remove} == 'true' ]]; then uninstall_theme fi else + if [[ "$libadwaita" == 'true' && "$UID" == "$ROOT_UID" ]]; then + echo -e "Do not run -l with sudo, that will link libadwaita theme to root folder !" + exit 0 + fi + install_theme - if [[ "$libadwaita" == 'true' ]]; then + if [[ "$libadwaita" == 'true' && "$UID" != "$ROOT_UID" ]]; then link_theme fi fi diff --git a/src/_sass/gtk/apps/_gnome-4.0.scss b/src/_sass/gtk/apps/_gnome-4.0.scss index 2f42fe7..2cd0fd7 100644 --- a/src/_sass/gtk/apps/_gnome-4.0.scss +++ b/src/_sass/gtk/apps/_gnome-4.0.scss @@ -775,26 +775,30 @@ window.dialog { } button.colorpad { - padding: 0px; - margin: 0px; - background-blend-mode: screen; - background-image: - linear-gradient(45deg, #0f0f0f55 25%, transparent 25%, transparent 75%, #0f0f0f55 75%, #0f0f0f55), - linear-gradient(45deg, #0f0f0f55 25%, transparent 25%, transparent 75%, #0f0f0f55 75%, #0f0f0f55); - background-color: gtkcolor(colorpad_color); - color: gtkcolor(colorpad_fg_color); - background-size: 18px 18px; - background-position: 0px 0px, 9px 9px; + padding: 0px; + margin: 0px; + background-blend-mode: screen; + background-image: + linear-gradient(45deg, #0f0f0f55 25%, transparent 25%, transparent 75%, #0f0f0f55 75%, #0f0f0f55), + linear-gradient(45deg, #0f0f0f55 25%, transparent 25%, transparent 75%, #0f0f0f55 75%, #0f0f0f55); + background-color: gtkcolor(colorpad_color); + color: gtkcolor(colorpad_fg_color); + background-size: 18px 18px; + background-position: 0px 0px, 9px 9px; - &:hover { - filter: brightness(93%); - } + &:hover { + filter: brightness(93%); + } - &:active { - filter: brightness(86%); - } + &:active { + filter: brightness(86%); + } - &:checked { - filter: brightness(100%); - } + &:checked { + filter: brightness(100%); + } +} + +window#desktopwindow { + background: none; } diff --git a/src/gtk/3.0/gtk-Compact.css b/src/gtk/3.0/gtk-Compact.css index 0b07414..a421404 100644 --- a/src/gtk/3.0/gtk-Compact.css +++ b/src/gtk/3.0/gtk-Compact.css @@ -7998,10 +7998,6 @@ image.raven-mpris { border-radius: 10px; } -button.centerbutton { - border-radius: 10px; -} - button.centerbutton:first-child { border-radius: 10px 0 0 10px; } diff --git a/src/gtk/3.0/gtk-Dark-Compact.css b/src/gtk/3.0/gtk-Dark-Compact.css index d659e51..cd39a79 100644 --- a/src/gtk/3.0/gtk-Dark-Compact.css +++ b/src/gtk/3.0/gtk-Dark-Compact.css @@ -7994,10 +7994,6 @@ image.raven-mpris { border-radius: 10px; } -button.centerbutton { - border-radius: 10px; -} - button.centerbutton:first-child { border-radius: 10px 0 0 10px; } diff --git a/src/gtk/3.0/gtk-Dark.css b/src/gtk/3.0/gtk-Dark.css index db4899f..7e72435 100644 --- a/src/gtk/3.0/gtk-Dark.css +++ b/src/gtk/3.0/gtk-Dark.css @@ -7994,10 +7994,6 @@ image.raven-mpris { border-radius: 12px; } -button.centerbutton { - border-radius: 12px; -} - button.centerbutton:first-child { border-radius: 12px 0 0 12px; } diff --git a/src/gtk/3.0/gtk-Light-Compact.css b/src/gtk/3.0/gtk-Light-Compact.css index 519d6f5..5866d32 100644 --- a/src/gtk/3.0/gtk-Light-Compact.css +++ b/src/gtk/3.0/gtk-Light-Compact.css @@ -7997,10 +7997,6 @@ image.raven-mpris { border-radius: 10px; } -button.centerbutton { - border-radius: 10px; -} - button.centerbutton:first-child { border-radius: 10px 0 0 10px; } diff --git a/src/gtk/3.0/gtk-Light.css b/src/gtk/3.0/gtk-Light.css index d2ce8af..d6b4add 100644 --- a/src/gtk/3.0/gtk-Light.css +++ b/src/gtk/3.0/gtk-Light.css @@ -7997,10 +7997,6 @@ image.raven-mpris { border-radius: 12px; } -button.centerbutton { - border-radius: 12px; -} - button.centerbutton:first-child { border-radius: 12px 0 0 12px; } diff --git a/src/gtk/3.0/gtk.css b/src/gtk/3.0/gtk.css index c248235..60c9734 100644 --- a/src/gtk/3.0/gtk.css +++ b/src/gtk/3.0/gtk.css @@ -7998,10 +7998,6 @@ image.raven-mpris { border-radius: 12px; } -button.centerbutton { - border-radius: 12px; -} - button.centerbutton:first-child { border-radius: 12px 0 0 12px; } diff --git a/src/gtk/4.0/gtk-Compact.css b/src/gtk/4.0/gtk-Compact.css index ce1fe36..40d332c 100644 --- a/src/gtk/4.0/gtk-Compact.css +++ b/src/gtk/4.0/gtk-Compact.css @@ -5481,6 +5481,10 @@ button.colorpad:checked { filter: brightness(100%); } +window#desktopwindow { + background: none; +} + avatar { border-radius: 9999px; font-weight: bold; diff --git a/src/gtk/4.0/gtk-Dark-Compact.css b/src/gtk/4.0/gtk-Dark-Compact.css index 17c0d82..e71df13 100644 --- a/src/gtk/4.0/gtk-Dark-Compact.css +++ b/src/gtk/4.0/gtk-Dark-Compact.css @@ -5451,6 +5451,10 @@ button.colorpad:checked { filter: brightness(100%); } +window#desktopwindow { + background: none; +} + avatar { border-radius: 9999px; font-weight: bold; diff --git a/src/gtk/4.0/gtk-Dark.css b/src/gtk/4.0/gtk-Dark.css index 4347965..6b177bb 100644 --- a/src/gtk/4.0/gtk-Dark.css +++ b/src/gtk/4.0/gtk-Dark.css @@ -5451,6 +5451,10 @@ button.colorpad:checked { filter: brightness(100%); } +window#desktopwindow { + background: none; +} + avatar { border-radius: 9999px; font-weight: bold; diff --git a/src/gtk/4.0/gtk-Light-Compact.css b/src/gtk/4.0/gtk-Light-Compact.css index 1cd514e..8b210c0 100644 --- a/src/gtk/4.0/gtk-Light-Compact.css +++ b/src/gtk/4.0/gtk-Light-Compact.css @@ -5435,6 +5435,10 @@ button.colorpad:checked { filter: brightness(100%); } +window#desktopwindow { + background: none; +} + avatar { border-radius: 9999px; font-weight: bold; diff --git a/src/gtk/4.0/gtk-Light.css b/src/gtk/4.0/gtk-Light.css index 67d6a5e..b3d0032 100644 --- a/src/gtk/4.0/gtk-Light.css +++ b/src/gtk/4.0/gtk-Light.css @@ -5435,6 +5435,10 @@ button.colorpad:checked { filter: brightness(100%); } +window#desktopwindow { + background: none; +} + avatar { border-radius: 9999px; font-weight: bold; diff --git a/src/gtk/4.0/gtk.css b/src/gtk/4.0/gtk.css index 7d058d0..85c5d1c 100644 --- a/src/gtk/4.0/gtk.css +++ b/src/gtk/4.0/gtk.css @@ -5481,6 +5481,10 @@ button.colorpad:checked { filter: brightness(100%); } +window#desktopwindow { + background: none; +} + avatar { border-radius: 9999px; font-weight: bold;