Merge branch 'master' into proton-fixes

This commit is contained in:
AdamXweb 2021-05-30 23:38:39 +10:00 committed by GitHub
commit 6152f0cd8c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 5 deletions

View File

@ -44,6 +44,8 @@ DASH_TO_DOCK_DIR_HOME="/home/${MY_USERNAME}/.local/share/gnome-shell/extensions/
FIREFOX_SRC_DIR="${REPO_DIR}/src/other/firefox"
FIREFOX_DIR_HOME="/home/${MY_USERNAME}/.mozilla/firefox"
FIREFOX_THEME_DIR="/home/${MY_USERNAME}/.mozilla/firefox/firefox-themes"
FIREFOX_FLATPAK_DIR_HOME="/home/${MY_USERNAME}/.var/app/org.mozilla.firefox/.mozilla/firefox"
FIREFOX_FLATPAK_THEME_DIR="/home/${MY_USERNAME}/.var/app/org.mozilla.firefox/.mozilla/firefox/firefox-themes"
export WHITESUR_TMP_DIR="/tmp/WhiteSur.lock"
if [[ -w "/" ]]; then

View File

@ -434,7 +434,8 @@ revert_gdm_theme() {
install_firefox_theme() {
remove_firefox_theme
userify cp -rf "${FIREFOX_SRC_DIR}" "${FIREFOX_THEME_DIR}"
[[ ! -d "${FIREFOX_THEME_DIR}" ]] && mkdir -p ${FIREFOX_THEME_DIR}
userify cp -rf "${FIREFOX_SRC_DIR}"/* "${FIREFOX_THEME_DIR}"
config_firefox
}
@ -462,8 +463,8 @@ edit_firefox_theme_prefs() {
}
remove_firefox_theme() {
rm -rf "${FIREFOX_DIR_HOME}/"*"default"*"/chrome"
rm -rf "${FIREFOX_THEME_DIR}"
# rm -rf "${FIREFOX_DIR_HOME}/"*"default"*"/chrome"
rm -rf "${FIREFOX_THEME_DIR}/WhiteSur"
}
###############################################################################

View File

@ -127,6 +127,7 @@ tab[selected]:-moz-window-inactive {
}
/* If tab favicon is not present, force tab label to the center */
.tabbrowser-tab .tab-label-container {
margin-left: 0 !important;
}
@ -368,4 +369,4 @@ tab[selected]:-moz-window-inactive {
margin-left: 0 !important;
margin-right: auto !important
}
}
}

View File

@ -67,7 +67,13 @@ while [[ $# -gt 0 ]]; do
edit_firefox="true" ;;
esac
if ! has_command firefox; then
if [[ -d "${FIREFOX_FLATPAK_DIR_HOME}" ]]; then
FIREFOX_DIR_HOME=${FIREFOX_FLATPAK_DIR_HOME}
[[ ! -d "${FIREFOX_FLATPAK_THEME_DIR}" ]] && mkdir -p ${FIREFOX_FLATPAK_THEME_DIR}
FIREFOX_THEME_DIR=${FIREFOX_FLATPAK_THEME_DIR}
fi;
if [[ ! -d "${FIREFOX_FLATPAK_DIR_HOME}" ]] && ! has_command firefox; then
prompt -e "'${1}' ERROR: There's no Firefox installed in your system"
has_any_error="true"
elif [[ ! -d "${FIREFOX_DIR_HOME}" ]]; then