diff --git a/lib-install.sh b/lib-install.sh index 9285793..4bb99fa 100755 --- a/lib-install.sh +++ b/lib-install.sh @@ -657,10 +657,10 @@ install_firefox_theme() { } config_firefox() { - if has_snap_app firefox; then - local TARGET_DIR="${FIREFOX_SNAP_THEME_DIR}" - local FIREFOX_DIR="${FIREFOX_SNAP_DIR_HOME}" - elif has_flatpak_app org.mozilla.firefox; then + # if has_snap_app firefox; then + # local TARGET_DIR="${FIREFOX_SNAP_THEME_DIR}" + # local FIREFOX_DIR="${FIREFOX_SNAP_DIR_HOME}" + if has_flatpak_app org.mozilla.firefox; then local TARGET_DIR="${FIREFOX_FLATPAK_THEME_DIR}" local FIREFOX_DIR="${FIREFOX_FLATPAK_DIR_HOME}" else @@ -685,9 +685,9 @@ config_firefox() { } edit_firefox_theme_prefs() { - if has_snap_app firefox; then - local TARGET_DIR="${FIREFOX_SNAP_THEME_DIR}" - elif has_flatpak_app org.mozilla.firefox; then + # if has_snap_app firefox; then + # local TARGET_DIR="${FIREFOX_SNAP_THEME_DIR}" + if has_flatpak_app org.mozilla.firefox; then local TARGET_DIR="${FIREFOX_FLATPAK_THEME_DIR}" else local TARGET_DIR="${FIREFOX_THEME_DIR}" diff --git a/src/other/firefox/Monterey/parts/icons.css b/src/other/firefox/Monterey/parts/icons.css index 88677c1..8de1a95 100644 --- a/src/other/firefox/Monterey/parts/icons.css +++ b/src/other/firefox/Monterey/parts/icons.css @@ -28,7 +28,7 @@ /* Popovers subview menu arrow */ .PanelUI-subView .subviewbutton-nav::after { content: "" !important; - background: url("../icons/pan-start-symbolic.svg"); + background: url("../icons/pan-end-symbolic.svg"); background-size: contain; height: 16px; width: 16px; diff --git a/src/other/firefox/Monterey/parts/tabsbar.css b/src/other/firefox/Monterey/parts/tabsbar.css index 0698872..e531964 100644 --- a/src/other/firefox/Monterey/parts/tabsbar.css +++ b/src/other/firefox/Monterey/parts/tabsbar.css @@ -18,6 +18,10 @@ tab > stack { background-image: none !important; } +.tabbrowser-tab { + margin: 2px 0 0 !important; +} + .tabbrowser-tab:not([visuallyselected="true"], [multiselected]), .tabbrowser-tab:-moz-lwtheme { color: var(--gnome-tabbar-tab-color) !important; } @@ -27,6 +31,8 @@ tab > stack { } .tab-background { + margin: 0 !important; + background-color: transparent !important; transition: background 200ms !important; } @@ -115,11 +121,6 @@ tab > stack { display: flex; } -.tab-background { - background-color: transparent !important; - transition: all 200ms; -} - #TabsToolbar #alltabs-button { padding: 0 0 !important; visibility: collapse !important; @@ -127,7 +128,7 @@ tab > stack { #TabsToolbar .toolbarbutton-1, #tabs-newtab-button, #TabsToolbar #new-tab-button { - margin: 4px 2px -4px !important; + margin: 2px 2px 0 !important; padding: 0 10px !important; max-height: 32px !important; min-height: 32px !important; diff --git a/src/other/firefox/Monterey/parts/toolbox.css b/src/other/firefox/Monterey/parts/toolbox.css index 24474c8..8f32767 100644 --- a/src/other/firefox/Monterey/parts/toolbox.css +++ b/src/other/firefox/Monterey/parts/toolbox.css @@ -40,15 +40,15 @@ findbar:-moz-window-inactive { #titlebar { min-height: 0 !important - max-height: 36px !important; + max-height: 48px !important; } #TabsToolbar { - margin-top: -44px !important; + margin-top: -42px !important; padding: 0 !important; - margin-bottom: 8px !important; + margin-bottom: 6px !important; background: none !important; - max-height: 36px !important; + max-height: 48px !important; } #nav-bar {