This commit is contained in:
vinceliuice 2025-01-11 15:09:34 +08:00
parent 6872a8bd86
commit 45d08171b6
2 changed files with 7 additions and 2 deletions

View File

@ -670,7 +670,11 @@ install_firefox_theme() {
local TARGET_DIR="${FIREFOX_THEME_DIR}"
fi
local theme_type="${darker}${adaptive}${colorscheme}"
if [[ "${colorscheme}" == '-nord' && "${adaptive}" == '-adaptive' ]]; then
local theme_type="${adaptive}"
else
local theme_type="${darker}${adaptive}${colorscheme}"
fi
remove_firefox_theme
@ -682,11 +686,13 @@ install_firefox_theme() {
[[ -f "${TARGET_DIR}"/customChrome.css ]] && mv "${TARGET_DIR}"/customChrome.css "${TARGET_DIR}"/customChrome.css.bak
cp -rf "${FIREFOX_SRC_DIR}"/customChrome.css "${TARGET_DIR}"
cp -rf "${FIREFOX_SRC_DIR}"/common/{icons,pages} "${TARGET_DIR}/${theme_name}"
if [[ "${colorscheme}" == '-nord' ]]; then
cp -rf "${FIREFOX_SRC_DIR}"/common/titlebuttons-nord "${TARGET_DIR}/${theme_name}"/titlebuttons
else
cp -rf "${FIREFOX_SRC_DIR}"/common/titlebuttons "${TARGET_DIR}/${theme_name}"
fi
cp -rf "${FIREFOX_SRC_DIR}"/common/*.css "${TARGET_DIR}/${theme_name}"
cp -rf "${FIREFOX_SRC_DIR}"/common/parts/*.css "${TARGET_DIR}/${theme_name}"/parts
[[ -f "${TARGET_DIR}"/userChrome.css ]] && mv "${TARGET_DIR}"/userChrome.css "${TARGET_DIR}"/userChrome.css.bak

View File

@ -339,7 +339,6 @@ else
fi
if [[ "${firefox}" == 'true' || "${edit_firefox}" == 'true' ]]; then
if [[ "${darker}" == '-darker' && "${adaptive}" == '-adaptive' ]]; then
prompt -w "FIREFOX: You can't use 'adaptive' and 'darker' at the same time. \n"
prompt -i "FIREFOX: Setting to adaptive only... \n"