diff --git a/install.sh b/install.sh index 0fb84e71..62bf3246 100755 --- a/install.sh +++ b/install.sh @@ -19,6 +19,8 @@ if [[ "$UID" -eq "$ROOT_UID" ]]; then DEST_DIR="/usr/share/themes" elif [[ -n "$XDG_DATA_HOME" ]]; then DEST_DIR="$XDG_DATA_HOME/themes" +elif [[ -d "$HOME/.themes" ]]; then + DEST_DIR="$HOME/.themes" elif [[ -d "$HOME/.local/share/themes" ]]; then DEST_DIR="$HOME/.local/share/themes" else @@ -101,7 +103,7 @@ install() { local THEME_DIR="${1}/${2}${3}${4}${5}${6}" - [[ -d "${THEME_DIR}" ]] && rm -rf "${THEME_DIR}" + # [[ -d "${THEME_DIR}" ]] && rm -rf "${THEME_DIR}" echo "Installing '${THEME_DIR}'..." @@ -686,8 +688,14 @@ uninstall() { local THEME_DIR="${1}/${2}${3}${4}${5}${6}" + if [[ "$uninstall" == 'true' ]]; then + type='Uninstall' + else + type='Clean' + fi + if [[ -d "${THEME_DIR}" ]]; then - echo -e "Uninstall ${THEME_DIR}... " + echo -e "${type} ${THEME_DIR}... " rm -rf "${THEME_DIR}"{'','-hdpi','-xhdpi'} fi } @@ -704,6 +712,17 @@ uninstall_theme() { done } +clean_theme() { + if [[ "$UID" -eq "$ROOT_UID" ]]; then + uninstall_theme + else + local DEST_DIR="$HOME/.themes" + uninstall_theme + local DEST_DIR="$HOME/.local/share/themes" + uninstall_theme + fi +} + if [[ "$uninstall" == 'true' ]]; then if [[ "$libadwaita" == 'true' ]]; then echo -e "\nUninstall libadwaita theme from ${HOME}/.config/gtk-4.0 ..." @@ -713,7 +732,7 @@ if [[ "$uninstall" == 'true' ]]; then fi else install_package && tweaks_temp - gnome_shell_version && echo && install_theme + gnome_shell_version && echo && clean_theme && install_theme if [[ "$libadwaita" == 'true' ]]; then uninstall_libadwaita && install_libadwaita diff --git a/src/sass/gtk/apps/_misc.scss b/src/sass/gtk/apps/_misc.scss index 3d62bee5..4482ad6b 100644 --- a/src/sass/gtk/apps/_misc.scss +++ b/src/sass/gtk/apps/_misc.scss @@ -1,6 +1,6 @@ -/********* - * Tilix * - *********/ +// +// Tilix * +// overlay > revealer { &.left > scrolledwindow.frame, &.right > scrolledwindow.frame { @@ -30,10 +30,9 @@ button.flat.tilix-small-button { min-width: $small-size - 4px * 2; } - -/************** - * Terminator * - **************/ +// +// Terminator * +// .terminator-terminal-window { paned > separator { background-color: $background; } @@ -41,18 +40,17 @@ button.flat.tilix-small-button { notebook.frame { border-style: none; } } - -/************* - * Ubitquity * - *************/ +// +// Ubitquity * +// #live_installer .menubar progressbar trough { border-radius: 4px; // Adjust to hard-coded progress border-radius background-color: $titlebar-track-disabled; } -/********* - * Meld * - ********/ +// +// Meld * +// .meld-notebook { &, > stack { background: none; @@ -70,9 +68,9 @@ statusbar.meld-status-bar { } -/*********** - * Eclipse * - ***********/ +// +// Eclipse * +// window.background > box.vertical > scrolledwindow > widget toolbar { padding: 2px; @@ -83,9 +81,9 @@ window.background > box.vertical > scrolledwindow > widget toolbar { } -/************ - * Chromium * - ************/ +// +// Chromium * +// window.background.chromium { background-color: $surface; @@ -140,9 +138,9 @@ window.background.chromium { tooltip.background.chromium { background-color: rgba($tooltip, 1); } -/*********** - * Firefox * - ***********/ +// +// Firefox * +// #MozillaGtkWidget { decoration { border: none; } @@ -255,9 +253,10 @@ window.background:not(.csd) { } } -/************ - * Inkscape * - ************/ +// +// Inkscape * +// + #ToolboxCommon { > #AuxToolbox { #StyleSwatch { font-size: smaller; } @@ -336,15 +335,15 @@ scrolledwindow#DialogNotebook { } -/*********** - * Synapse * - ***********/ +// +// Synapse * +// box.vertical > widget > widget:selected { @extend %selected_items; } -/*************** - * Libreoffice * - ***************/ +// +// Libreoffice * +// window.background { > grid > widget > widget > scrolledwindow > viewport > grid > box > box > frame > box { background-color: $base; @@ -352,9 +351,9 @@ window.background { } -/********* - * Pamac * - *********/ +// +// Pamac * +// window.background.csd { > box.vertical > overlay > stack > box.vertical > box.horizontal { > revealer > stack { @@ -373,3 +372,13 @@ window.background.csd { } } } + +// +// KiCad / SLADE +// + +window.background:not(.csd):not(.solid-csd) { + > button:not(:hover):not(:active):not(:checked):not(:disabled):not(.flat) { // Why this ? + background-color: $base-alt; + } +}