diff --git a/install.sh b/install.sh index 084563c..90d99b2 100755 --- a/install.sh +++ b/install.sh @@ -136,7 +136,7 @@ if [[ "${uninstall}" == 'true' ]]; then if [[ "${libadwaita}" == 'true' ]]; then if [[ "$UID" != '0' ]]; then remove_libadwaita - prompt -s "Removed gtk-4.0 theme files in '${HOME}/.config/gtk-4.0/' !"; echo + prompt -s "Removed gtk-4.0 theme files in '${HOME}/.config/gtk-4.0/' !"; else prompt -e "Do not run '--libadwaita' option with sudo!"; echo fi diff --git a/shell/lib-install.sh b/shell/lib-install.sh index 33930da..2e3b042 100755 --- a/shell/lib-install.sh +++ b/shell/lib-install.sh @@ -530,9 +530,9 @@ config_gtk4() { # Install gtk4.0 into config for libadwaita mkdir -p "${TARGET_DIR}" - rm -rf "${TARGET_DIR}/"{gtk.css,gtk-dark.css,assets,windows-assets} + backup_file "${TARGET_DIR}/gtk.css" "udo" + rm -rf "${TARGET_DIR}/"{gtk.css,assets,windows-assets} sassc ${SASSC_OPT} "${THEME_SRC_DIR}/main/gtk-4.0/gtk${color}.scss" "${TARGET_DIR}/gtk.css" - sassc ${SASSC_OPT} "${THEME_SRC_DIR}/main/gtk-4.0/gtk-Dark.scss" "${TARGET_DIR}/gtk-dark.css" cp -r "${THEME_SRC_DIR}/assets/gtk/common-assets/assets" "${TARGET_DIR}" cp -r "${THEME_SRC_DIR}/assets/gtk/common-assets/sidebar-assets/"*".png" "${TARGET_DIR}/assets" cp -r "${THEME_SRC_DIR}/assets/gtk/scalable" "${TARGET_DIR}/assets" @@ -548,7 +548,8 @@ install_libadwaita() { } remove_libadwaita() { - rm -rf "${HOME}/.config/gtk-4.0/"{gtk.css,gtk-dark.css,assets,windows-assets} + restore_file "${TARGET_DIR}/gtk.css" + rm -rf "${HOME}/.config/gtk-4.0/"{gtk-dark.css,assets,windows-assets} } ############################################################################### @@ -789,7 +790,7 @@ install_dash_to_dock_theme() { if [[ "${GNOME_VERSION}" != '3-28' ]]; then udo sassc ${SASSC_OPT} "${DASH_TO_DOCK_SRC_DIR}/stylesheet-4.scss" "${DASH_TO_DOCK_DIR_HOME}/stylesheet.css" else - udo sassc ${SASSC_OPT} "${DASH_TO_DOCK_SRC_DIR}/stylesheet-3.scss" "${DASH_TO_DOCK_DIR_HOME}/stylesheet.css" + udo sassc ${SASSC_OPT} "${DASH_TO_DOCK_SRC_DIR}/stylesheet-3.scss" "${DASH_TO_DOCK_DIR_HOME}/stylesheet.css" fi elif [[ -d "${DASH_TO_DOCK_DIR_ROOT}" ]]; then backup_file "${DASH_TO_DOCK_DIR_ROOT}/stylesheet.css" "sudo" diff --git a/src/other/firefox/WhiteSur/parts/tabsbar.css b/src/other/firefox/WhiteSur/parts/tabsbar.css index 83ccef5..e9e957b 100644 --- a/src/other/firefox/WhiteSur/parts/tabsbar.css +++ b/src/other/firefox/WhiteSur/parts/tabsbar.css @@ -11,11 +11,14 @@ } /* Tabs bar height */ -#tabbrowser-tabs, -#tabbrowser-tabs arrowscrollbox { +#tabbrowser-tabs { --tab-min-height: 32px !important; } +#tabbrowser-tabs:not([secondarytext-unsupported]) .tab-label-container { + max-height: 32px !important; +} + /* Extra margin for the first and last tabs */ .tabbrowser-tab[first-tab]:not([pinned=true]) { margin-left: 8px !important;