From c61b84109e0a1ffdc2d522f37d84d0faafd27a2a Mon Sep 17 00:00:00 2001 From: Vince Date: Thu, 17 Jun 2021 11:37:58 +0800 Subject: [PATCH] Fixed #212 --- lib-core.sh | 4 ++-- lib-install.sh | 5 ++--- src/other/firefox/Monterey/parts/headerbar.css | 1 + src/other/firefox/WhiteSur/colors/dark.css | 2 +- src/other/firefox/WhiteSur/colors/light.css | 2 +- src/other/firefox/WhiteSur/parts/headerbar.css | 9 +++++++++ src/other/firefox/WhiteSur/parts/tabsbar.css | 4 +--- 7 files changed, 17 insertions(+), 10 deletions(-) diff --git a/lib-core.sh b/lib-core.sh index 6fb9b31..3e3f57b 100755 --- a/lib-core.sh +++ b/lib-core.sh @@ -645,7 +645,7 @@ sudo() { prompt -w "Executing '$(echo "${@}" | cut -c -35 )...' as root" if ! ${SUDO_BIN} -n true &> /dev/null; then - echo -e "${c_magenta} Authentication is required:${c_default}" + echo -e "${c_magenta} Authentication is required${c_default} ${c_green}(Please input your password):${c_default}" fi if [[ -p /dev/stdin ]]; then @@ -665,7 +665,7 @@ udo() { # Just in case. We put the prompt here to make it less annoying if ! ${SUDO_BIN} -u "${MY_USERNAME}" -n true &> /dev/null; then prompt -w "Executing '$(echo "${@}" | cut -c -35 )...' as user" - echo -e "${c_magenta} Authentication is required:${c_default}" + echo -e "${c_magenta} Authentication is required${c_default} ${c_green}(Please input your password):${c_default}" fi if [[ -p /dev/stdin ]]; then diff --git a/lib-install.sh b/lib-install.sh index 63947a1..d51b45d 100755 --- a/lib-install.sh +++ b/lib-install.sh @@ -185,7 +185,7 @@ install_theme_deps() { install_beggy_deps() { if ! has_command convert; then prompt -w "DEPS: 'imagemagick' is required for background editing." - prepare_deps + prepare_deps; stop_animation if has_command zypper; then sudo zypper in -y ImageMagick @@ -266,9 +266,8 @@ install_beggy() { ;; *) if [[ "${no_blur}" == "false" || "${darken}" == "true" ]]; then - install_beggy_deps; start_animation + install_beggy_deps convert "${background}" ${CONVERT_OPT} "${WHITESUR_TMP_DIR}/beggy.png" - stop_animation else cp -r "${background}" "${WHITESUR_TMP_DIR}/beggy.png" fi diff --git a/src/other/firefox/Monterey/parts/headerbar.css b/src/other/firefox/Monterey/parts/headerbar.css index 60fde0e..501969d 100644 --- a/src/other/firefox/Monterey/parts/headerbar.css +++ b/src/other/firefox/Monterey/parts/headerbar.css @@ -98,6 +98,7 @@ transition: box-shadow 200ms; } +:root:-moz-window-inactive #nav-bar #searchbar, :root:-moz-window-inactive #urlbar #urlbar-input-container { background: var(--gnome-inactive-urlbar-background) !important; } diff --git a/src/other/firefox/WhiteSur/colors/dark.css b/src/other/firefox/WhiteSur/colors/dark.css index 1dc48fa..685245f 100644 --- a/src/other/firefox/WhiteSur/colors/dark.css +++ b/src/other/firefox/WhiteSur/colors/dark.css @@ -86,7 +86,7 @@ --gnome-urlbar-box-shadow: inset 0 0 0 1px rgba(21, 83, 158, 0); --gnome-urlbar-color: #ffffff; --gnome-hover-urlbar-border-color: #585858; - --gnome-inactive-urlbar-background: #313131; + --gnome-inactive-urlbar-background: #383838; --gnome-inactive-urlbar-border-color: #282828; --gnome-inactive-urlbar-box-shadow: none; --gnome-inactive-urlbar-color: #d6d6d6; diff --git a/src/other/firefox/WhiteSur/colors/light.css b/src/other/firefox/WhiteSur/colors/light.css index f99ab21..0d69c7d 100644 --- a/src/other/firefox/WhiteSur/colors/light.css +++ b/src/other/firefox/WhiteSur/colors/light.css @@ -85,7 +85,7 @@ --gnome-urlbar-box-shadow: 0 3px 3px rgba(0, 0, 0, 0.08), 0 5px 8px rgba(0, 0, 0, 0.05), 0 8px 16px rgba(0, 0, 0, 0.03); --gnome-urlbar-color: #020202; --gnome-hover-urlbar-border-color: #e5e5e5; - --gnome-inactive-urlbar-background: linear-gradient(#fcfcfc, #fcfcfc); + --gnome-inactive-urlbar-background: #f0f0f0; --gnome-inactive-urlbar-border-color: #dadada; --gnome-inactive-urlbar-box-shadow: 0 3px 5px rgba(0, 0, 0, 0.05); --gnome-inactive-urlbar-color: #323232; diff --git a/src/other/firefox/WhiteSur/parts/headerbar.css b/src/other/firefox/WhiteSur/parts/headerbar.css index 95ce4f2..0b7dc53 100644 --- a/src/other/firefox/WhiteSur/parts/headerbar.css +++ b/src/other/firefox/WhiteSur/parts/headerbar.css @@ -36,6 +36,10 @@ --toolbarbutton-inner-padding: 0 !important; } +:root:-moz-window-inactive #nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.subviewbutton) { + background: none !important; +} + /* Hover headerbar buttons */ #nav-bar toolbarbutton:not(#urlbar-zoom-button):not(.subviewbutton):not([open]):not([disabled]):not([checked]):hover { outline: 0 !important; @@ -92,6 +96,11 @@ transition: box-shadow 200ms; } +:root:-moz-window-inactive #nav-bar #searchbar, +:root:-moz-window-inactive #urlbar #urlbar-input-container { + background: var(--gnome-inactive-urlbar-background) !important; +} + #nav-bar #searchbar:hover, #urlbar #urlbar-input-container:hover { box-shadow: inset 0 0 0 1px var(--gnome-hover-urlbar-border-color) !important; diff --git a/src/other/firefox/WhiteSur/parts/tabsbar.css b/src/other/firefox/WhiteSur/parts/tabsbar.css index 0d3c8c0..f0af262 100644 --- a/src/other/firefox/WhiteSur/parts/tabsbar.css +++ b/src/other/firefox/WhiteSur/parts/tabsbar.css @@ -78,10 +78,8 @@ tab > stack { /* Tab labels */ tab { color: var(--gnome-tabbar-tab-color) !important; - font-family: Cantarell, inherit; - font-weight: bold; - font-size: 1em; } + tab:hover { color: var(--gnome-tabbar-tab-hover-color) !important; }