From 91207adc903e87bffd088e04c8e25914d95342e5 Mon Sep 17 00:00:00 2001 From: vinceliuice Date: Mon, 12 Jun 2023 02:18:15 +0800 Subject: [PATCH] update --- shell/lib-install.sh | 1 + src/other/firefox/Monterey/parts/buttons.css | 373 ------------------ .../Monterey/parts/headerbar-urlbar-alt.css | 209 ---------- .../Monterey/parts/headerbar-urlbar.css | 5 + .../firefox/WhiteSur/parts/buttons-fixes.css | 240 ----------- src/other/firefox/WhiteSur/parts/entries.css | 88 ----- src/other/firefox/WhiteSur/parts/findbar.css | 62 --- .../parts/headerbar-private-urlbar.css | 39 -- .../WhiteSur/parts/headerbar-urlbar.css | 5 + .../firefox/WhiteSur/parts/headerbar.css | 136 ------- src/other/firefox/WhiteSur/parts/tabsbar.css | 3 +- src/other/firefox/WhiteSur/parts/toolbox.css | 4 + src/other/firefox/WhiteSur/theme.css | 2 + .../parts/buttons-fixes.css | 0 .../{WhiteSur => common}/parts/buttons.css | 0 .../{Monterey => common}/parts/entries.css | 0 .../{Monterey => common}/parts/findbar.css | 0 .../parts/headerbar-private-urlbar.css | 0 .../{Monterey => common}/parts/headerbar.css | 2 +- 19 files changed, 20 insertions(+), 1149 deletions(-) delete mode 100644 src/other/firefox/Monterey/parts/buttons.css delete mode 100644 src/other/firefox/Monterey/parts/headerbar-urlbar-alt.css delete mode 100644 src/other/firefox/WhiteSur/parts/buttons-fixes.css delete mode 100644 src/other/firefox/WhiteSur/parts/entries.css delete mode 100644 src/other/firefox/WhiteSur/parts/findbar.css delete mode 100644 src/other/firefox/WhiteSur/parts/headerbar-private-urlbar.css delete mode 100644 src/other/firefox/WhiteSur/parts/headerbar.css rename src/other/firefox/{Monterey => common}/parts/buttons-fixes.css (100%) rename src/other/firefox/{WhiteSur => common}/parts/buttons.css (100%) rename src/other/firefox/{Monterey => common}/parts/entries.css (100%) rename src/other/firefox/{Monterey => common}/parts/findbar.css (100%) rename src/other/firefox/{Monterey => common}/parts/headerbar-private-urlbar.css (100%) rename src/other/firefox/{Monterey => common}/parts/headerbar.css (98%) diff --git a/shell/lib-install.sh b/shell/lib-install.sh index 6b6e601..33930da 100755 --- a/shell/lib-install.sh +++ b/shell/lib-install.sh @@ -686,6 +686,7 @@ install_firefox_theme() { udo cp -rf "${FIREFOX_SRC_DIR}"/userContent-Monterey.css "${TARGET_DIR}"/userContent.css if [[ "${alttheme}" == 'true' ]]; then udo cp -rf "${FIREFOX_SRC_DIR}"/userChrome-Monterey-alt.css "${TARGET_DIR}"/userChrome.css + udo cp -rf "${FIREFOX_SRC_DIR}"/WhiteSur/parts/headerbar-urlbar.css "${TARGET_DIR}"/Monterey/parts/headerbar-urlbar-alt.css else udo cp -rf "${FIREFOX_SRC_DIR}"/userChrome-Monterey.css "${TARGET_DIR}"/userChrome.css fi diff --git a/src/other/firefox/Monterey/parts/buttons.css b/src/other/firefox/Monterey/parts/buttons.css deleted file mode 100644 index 936810c..0000000 --- a/src/other/firefox/Monterey/parts/buttons.css +++ /dev/null @@ -1,373 +0,0 @@ -/* Buttons */ -@import "buttons-fixes.css"; -@namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"; - -/* Hide buttons separator */ -#nav-bar .toolbaritem-combined-buttons separator { - display: none !important; -} - -#appMenu-popup .toolbaritem-combined-buttons toolbarseparator { - border: 0 !important; -} - -/* Buttons */ -/*#nav-bar toolbarbutton:not(#urlbar-zoom-button),*/ -.subviewbutton.panel-subview-footer, -.panel-footer button, -#downloadsHistory, -#downloadsPanel-mainView .download-state .downloadButton, -#appMenu-popup .panel-banner-item, -#appMenu-popup .toolbaritem-combined-buttons toolbarbutton:not(#appMenu-fxa-label), -.subviewbutton-back:not(#hack), -#context-navigation menuitem, -.identity-popup-preferences-button:not(#hack), -.findbar-container toolbarbutton, -#sidebar-switcher-target, -#viewButton, -.close-icon:not(.tab-close-button), -button.close:not(.ghost-button), -.menulist-label-box, -.expander-down, .expander-up, -.notification-button, -#identity-popup-security-expander, -#protections-popup-info-button, -#PanelUI-panic-view-button, -.tracking-protection-button, -.dialog-button, -.autocomplete-richlistitem[type="loginsFooter"], -.dialog-button-box button, -.searchbar-engine-one-off-item, -.permission-popup-permission-remove-button, -.button.connect-device, -#item-choose button, -#editBMPanel_newFolderButton, -button.customizationmode-button { - -moz-appearance: none !important; - background: var(--gnome-button-background) !important; - box-shadow: var(--gnome-button-box-shadow) !important; - border: 1px solid var(--gnome-button-border-color) !important; - border-bottom-color: var(--gnome-button-border-accent-color) !important; - border-radius: 8px !important; - padding: 0 4px !important; - height: 28px !important; - max-height: 28px !important; - min-height: 28px !important; - min-width: 28px !important; - color: var(--gnome-toolbar-color) !important; - transition: all 200ms; -} - -menulist { - -moz-appearance: none !important; - background: var(--gnome-button-background) !important; - box-shadow: var(--gnome-button-box-shadow) !important; - border: 1px solid var(--gnome-button-border-color) !important; - border-bottom-color: var(--gnome-button-border-accent-color) !important; - border-radius: 8px !important; - color: var(--gnome-toolbar-color) !important; -} - -xul|menulist { - padding: 0 10px !important; - min-height: 28px !important; -} - -/* Text buttons */ -.subviewbutton.panel-subview-footer, -.panel-footer button, -#downloadsHistory, -#overflowMenu-customize-button, -#appMenu-popup .panel-banner-item, -#appMenu-zoomReset-button:not(#appMenu-fxa-label):not(#hack), -#appMenu-popup #appMenu-zoomReset-button2:not(#hack), -#tracking-protection-preferences-button:not(#hack), -.findbar-container toolbarbutton.findbar-button, -.notification-button, -.protections-popup-footer-button, -#PanelUI-panic-view-button, -.tracking-protection-button, -.dialog-button, -.autocomplete-richlistitem[type="loginsFooter"], -.dialog-button-box button, -.toolbaritem-combined-buttons:is(:not([cui-areatype="toolbar"]), -[overflowedItem="true"]) > #appMenu-fxa-label2:not(#hack), -.button.connect-device, -#item-choose button, -#editBMPanel_newFolderButton, -button.customizationmode-button { - padding: 2px 10px !important; - text-align: center !important; -} - -.subviewbutton.panel-subview-footer label { - text-align: center !important; -} - -/* Drop down buttons */ -#sidebar-switcher-target, -#viewButton { - padding: 2px 16px !important; - position: relative; -} -#sidebar-switcher-arrow, -#viewButton .button-menu-dropmarker { /* Arrow position, type b */ - transform: translate(6px, 0) -} -.menulist-label-box { - padding: 2px 26px 2px 16px !important; - position: relative; -} -.menulist-label-box:after { /* Arrow position */ - position: absolute !important; - right: 8px !important; - top: 8px !important; -} -.menulist-label-box:after { /* Create arrow if icon tag no exist */ - content: ""; -} - -/* Hover buttons */ -menulist:hover, -/*#nav-bar toolbarbutton:not(#urlbar-zoom-button):not([open]):not([disabled]):not([checked]):hover,*/ -.subviewbutton.panel-subview-footer:hover, -.panel-footer button:hover, -#downloadsHistory:hover, -#downloadsPanel-mainView .download-state .downloadButton:hover, -#overflowMenu-customize-button:hover, -#appMenu-popup .panel-banner-item:hover, -.subviewbutton-back:not(#hack):hover, -#appMenu-popup .toolbaritem-combined-buttons toolbarbutton:not(#appMenu-fxa-label):not([disabled]):hover, -#context-navigation menuitem:not([disabled]):hover, -.identity-popup-preferences-button:not(#hack):hover, -.findbar-container toolbarbutton:hover, -.findbar-closebutton .toolbarbutton-icon:hover, -#sidebar-switcher-target:hover, -#viewButton:hover, -.close-icon:not(.tab-close-button):hover, -button.close:not(.ghost-button):hover, -menulist:hover .menulist-label-box, -.expander-down:hover, .expander-up:hover, -.notification-button:hover, -.protections-popup-footer-button:hover, -#identity-popup-security-expander:hover, -#protections-popup-info-button:hover, -.tracking-protection-button:hover, -.dialog-button:hover, -.autocomplete-richlistitem[type="loginsFooter"]:hover, -.dialog-button-box button:hover, -.searchbar-engine-one-off-item:hover, -.permission-popup-permission-remove-button:hover, -button.customizationmode-button:hover { - outline: 0 !important; - background: var(--gnome-button-hover-background) !important; -} - -/* Active buttons */ -menulist[open], -/*#nav-bar toolbarbutton:not(#urlbar-zoom-button):not([disabled]):not(#hack):active,*/ -/*#nav-bar toolbarbutton:not(#urlbar-zoom-button):not([disabled])[open],*/ -/*#nav-bar toolbarbutton:not(#urlbar-zoom-button):not([disabled])[checked],*/ -.subviewbutton.panel-subview-footer:active, -.panel-footer button:active, -#downloadsHistory:active, -#downloadsPanel-mainView .download-state .downloadButton:active, -#overflowMenu-customize-button:active, -#appMenu-popup .panel-banner-item:active, -.subviewbutton-back:not(#hack):active, -#appMenu-popup .toolbaritem-combined-buttons toolbarbutton:not([disabled]):not(#appMenu-fxa-label):active, -#context-navigation menuitem:active:not([disabled]), -.identity-popup-preferences-button:not(#hack):active, -.findbar-container toolbarbutton[checked], -.findbar-container toolbarbutton:active, -#sidebar-switcher-target:active, #sidebar-switcher-target.active, -#viewButton[open], -.close-icon:not(.tab-close-button):active, -button.close:not(.ghost-button):active, -menulist[open] .menulist-label-box, -.expander-down:active, .expander-up:active, -.notification-button:active, -.protections-popup-footer-button:not(#hack):active, -#identity-popup-security-expander:active, -#protections-popup-info-button:not(#hack):active, -#protections-popup-info-button:not(#hack)[checked], -.tracking-protection-button:active, -.dialog-button:active, -.autocomplete-richlistitem[type="loginsFooter"]:active, -.dialog-button-box button:active, -.permission-popup-permission-remove-button:active, -button.customizationmode-button:active { - background: var(--gnome-button-active-background) !important; - box-shadow: var(--gnome-button-active-box-shadow) !important; - border-color: var(--gnome-button-active-border-color) !important; -} - -/* Disabled buttons */ -/*#nav-bar toolbarbutton:not(#urlbar-zoom-button)[disabled],*/ -#appMenu-popup .toolbaritem-combined-buttons toolbarbutton[disabled], -#context-navigation menuitem[disabled], -button.customizationmode-button[disabled] { - background: var(--gnome-button-disabled-background) !important; - border-color: var(--gnome-button-disabled-border-color) !important; - box-shadow: var(--gnome-button-disabled-box-shadow) !important; - opacity: 1 !important; -} - -#nav-bar toolbarbutton:not(#urlbar-zoom-button)[disabled] image, -#appMenu-popup .toolbaritem-combined-buttons toolbarbutton[disabled] image, -#context-navigation menuitem[disabled] image { - opacity: .4 !important; -} - -#nav-bar toolbarbutton:not(#urlbar-zoom-button)[disabled]:hover, -#appMenu-popup .toolbaritem-combined-buttons toolbarbutton[disabled]:hover { - background: transparent !important; -} - -/* Inactive window buttons */ -/*#nav-bar toolbarbutton:not(#urlbar-zoom-button):-moz-window-inactive,*/ -.findbar-container toolbarbutton:-moz-window-inactive, -#sidebar-switcher-target:-moz-window-inactive, -#viewButton:-moz-window-inactive, -.notification-button:-moz-window-inactive { - background: var(--gnome-inactive-button-background) !important; - box-shadow: var(--gnome-inactive-button-box-shadow) !important; - border-color: var(--gnome-inactive-button-border-color) !important; -} - -/* Flat buttons */ -.subviewbutton-back:not(#hack), -.close-icon:not(.tab-close-button), -button.close:not(.ghost-button), -#protections-popup-info-button, -.permission-popup-permission-remove-button { - background: transparent !important; - box-shadow: none !important; - border-color: transparent !important; - border-radius: 8px !important; - border: none !important; -} - -.subviewbutton-back:not(#hack):not(:active):hover, -.close-icon:not(.tab-close-button):not(:active):hover, -button.close:not(.ghost-button):not(:active):hover, -#protections-popup-info-button:hover, -.permission-popup-permission-remove-button:not(:active):hover { - background: var(--gnome-headerbar-button-hover-background) !important; - box-shadow: none !important; - border-color: var(--gnome-button-border-color) !important; - border-bottom-color: var(--gnome-button-border-accent-color) !important; -} - -.subviewbutton-back:not(#hack):active, -.close-icon:not(.tab-close-button):active, -button.close:not(.ghost-button):active, -#protections-popup-info-button:active, -.permission-popup-permission-remove-button:active { - box-shadow: none !important; - background: var(--gnome-headerbar-button-active-background) !important; -} - -button.close, -.close-icon:not(.tab-close-button) { - box-shadow: none !important; - border: none !important; - border-radius: 100% !important; -} - -/* Circle buttons */ -#downloadsPanel-mainView .download-state .downloadButton, -.identity-popup-permission-remove-button:not(#hack) { - padding: 0 0 !important; - height: 32px !important; - width: 32px !important; - min-height: 32px !important; - min-width: 32px !important; - border-radius: 100% !important; -} - -/* Combined buttons */ -#nav-bar .toolbaritem-combined-buttons:not(.unified-extensions-item) toolbarbutton:not(:last-of-type):not(#hack), -#appMenu-popup .toolbaritem-combined-buttons toolbarbutton:not(:last-of-type):not(#appMenu-zoomEnlarge-button), -#context-navigation menuitem:not(:last-of-type), -.findbar-container toolbarbutton.findbar-find-previous, -.findbar-button:not(:last-of-type) { - border-top-right-radius: 0 !important; - border-bottom-right-radius: 0 !important; - border-right-width: 0 !important; - margin-right: 0 !important; -} - -#nav-bar .toolbaritem-combined-buttons:not(.unified-extensions-item) toolbarbutton:not(:first-of-type):not(#hack), -#appMenu-popup .toolbaritem-combined-buttons toolbarbutton:not(:first-of-type):not(#appMenu-fullscreen-button), -#context-navigation menuitem:not(:first-of-type), -.findbar-container toolbarbutton.findbar-find-previous, -.findbar-container toolbarbutton.findbar-find-next, -.findbar-button:not(:first-of-type) { - border-top-left-radius: 0 !important; - border-bottom-left-radius: 0 !important; - margin-left: 0 !important; -} - -/* Buttons with suggested action */ -#appMenu-popup .panel-banner-item[notificationid="update-restart"], -button.popup-notification-primary-button, -#editBookmarkPanelDoneButton, -#tracking-action-block { - color: white !important; - background: var(--gnome-button-suggested-action-background) !important; - border-color: var(--gnome-button-suggested-action-border-color) !important; - border-bottom-color: var(--gnome-button-suggested-action-border-accent-color) !important; - box-shadow: var(--gnome-button-suggested-action-box-shadow) !important; - text-shadow: 0 -1px rgba(0, 0, 0, 0.5) !important; -} - -#appMenu-popup .panel-banner-item[notificationid="update-restart"]:hover, -button.popup-notification-primary-button.popup-notification-button:hover, -#editBookmarkPanelDoneButton:hover { - background: var(--gnome-button-suggested-action-hover-background) !important; -} - -#appMenu-popup .panel-banner-item[notificationid="update-restart"]:active, -button.popup-notification-primary-button.popup-notification-button:active, -#editBookmarkPanelDoneButton:active { - background: var(--gnome-button-suggested-action-active-background) !important; - border-color: var(--gnome-button-suggested-action-active-border-color) !important; - box-shadow: var(--gnome-button-suggested-action-active-box-shadow) !important; - text-shadow: none !important; -} - -/* Buttons with destructive action */ -#editBookmarkPanelRemoveButton, -.identity-popup-permission-remove-button, -#PanelUI-panic-view-button { - color: white !important; - background: var(--gnome-button-destructive-action-background) !important; - border-color: var(--gnome-button-destructive-action-border-color) !important; - border-bottom-color: var(--gnome-button-destructive-action-border-accent-color) !important; - box-shadow: var(--gnome-button-destructive-action-box-shadow) !important; - text-shadow: 0 -1px rgba(0, 0, 0, 0.558275) !important; -} - -#editBookmarkPanelRemoveButton:hover, -.identity-popup-permission-remove-button:not(#hack):hover, -#PanelUI-panic-view-button:hover { - background: var(--gnome-button-destructive-action-hover-background) !important; -} - -#editBookmarkPanelRemoveButton:active, -.identity-popup-permission-remove-button:not(#hack):active, -#PanelUI-panic-view-button:active { - background: var(--gnome-button-destructive-action-active-background) !important; - border-color: var(--gnome-button-destructive-action-active-border-color) !important; - box-shadow: var(--gnome-button-destructive-action-active-box-shadow) !important; -} - -.identity-popup-permission-remove-button:not(#hack):hover { /* Is flat */ - border-color: var(--gnome-button-destructive-action-border-color) !important; - border-bottom-color: var(--gnome-button-destructive-action-border-accent-color) !important; - box-shadow: var(--gnome-button-destructive-action-box-shadow) !important; -} -.identity-popup-permission-remove-button:not(#hack):hover .button-icon { - filter: invert(100%) brightness(200%); -} diff --git a/src/other/firefox/Monterey/parts/headerbar-urlbar-alt.css b/src/other/firefox/Monterey/parts/headerbar-urlbar-alt.css deleted file mode 100644 index bbad908..0000000 --- a/src/other/firefox/Monterey/parts/headerbar-urlbar-alt.css +++ /dev/null @@ -1,209 +0,0 @@ -/* Header bar's URL bar */ - -@namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"; - -#urlbar { - --urlbar-height: 32px !important; - --urlbar-container-height: 32px !important; - --urlbar-toolbar-height: 32px !important; - --urlbar-inner-padding: 0 !important; -} - -/* Center the URL bar */ -toolbarspring { - max-width: 10000px !important; -} - -/* URL bar */ -#urlbar { -/* margin-top: 0 !important;*/ - box-shadow: none !important; - background: var(--gnome-popover-background) !important; - border-radius: 8px !important; - border: none !important; - padding: 0 !important; -} -#urlbar-background { - box-shadow: none !important; - border: none !important; - background: transparent !important; - border-radius: 8px !important; - padding: 0 !important; -} - -#urlbar:-moz-window-inactive { - border-color: var(--gnome-inactive-headerbar-background) !important; -} - -#urlbar #urlbar-input-container { - padding: 0 !important; -} -#urlbar[breakout][breakout-extend] { - left: 0 !important; - top: 0 !important; - width: 100% !important; - z-index: 5 !important; - padding: 0 !important; - border-radius: 10px !important; -} -#urlbar[breakout][breakout-extend][open] { - height: auto !important; - max-height: unset !important; -} -#urlbar[breakout][breakout-extend] #urlbar-input-container { - height: 32px !important; - max-height: 32px !important; - padding: 0 !important; -} - -#urlbar[breakout][breakout-extend][open] #urlbar-background { - box-shadow: var(--gnome-urlbar-box-shadow) !important; -} - -#urlbar-input { - text-align: center !important; -} - -/* URL bar results */ -.urlbarView { - background: transparent !important; - color: var(--gnome-toolbar-color) !important; - margin: 0 !important; - width: 100% !important; -} - -.urlbarView-body-outer { - --item-padding-start: 0 !important; - --item-padding-end: 0 !important; - max-height: 40vh !important; - overflow-x: auto; - padding: 0 8px !important; -} - -.urlbarView-body-inner { - border: 0 !important; -} - -.urlbarView-row-inner, .urlbarView-no-wrap { - align-items: center !important; -} -.urlbarView-row-inner { - padding-block: 5px !important; - border-radius: 5px !important; -} -.urlbarView-action { - background: transparent !important; -} -/* Search engines buttons */ -.search-one-offs { - margin: 0 0 2px !important; - padding: 8px !important; - background: var(--gnome-popover-background) !important; - border-top: 1px solid var(--gnome-button-border-color) !important; - border-radius: 0 0 8px 8px !important; -} - -.searchbar-engine-one-off-item { - --toolbarbutton-active-background: transparent !important; - --toolbarbutton-hover-background: transparent !important; - -moz-appearance: none !important; - background: var(--gnome-button-background) !important; - box-shadow: var(--gnome-button-box-shadow) !important; - border: 1px solid var(--gnome-button-border-color) !important; - border-left-width: 0 !important; - border-bottom-color: var(--gnome-button-border-accent-color) !important; - padding: 0 2px !important; - min-height: 34px !important; - min-width: 34px !important; - margin: 0 !important; - border-radius: 0 !important; -} -.searchbar-engine-one-off-item:hover, .searchbar-engine-one-off-item[selected] { - background: var(--gnome-button-hover-background) !important; - color: unset !important; -} -.searchbar-engine-one-off-item:first-child { - border-radius: 5px 0 0 5px !important; - border-left-width: 1px !important; -} -.searchbar-engine-one-off-item:last-child:not(.search-setting-button) { - border-radius: 0 5px 5px 0 !important; -} - -#urlbar-anon-search-settings-compact, -.search-setting-button { - border-left-width: 1px !important; - border-bottom: 1px solid var(--gnome-button-border-accent-color) !important; - border-radius: 5px !important; - margin-left: 6px !important; -} - -/* URL bar and Search bar */ -#urlbar[focused] .urlbar-textbox-container { - margin: -1px !important; -} -#searchbar > .searchbar-textbox[focused] .searchbar-search-button { - margin-left: -1px !important; -} -#searchbar > .searchbar-textbox[focused] .search-go-button { - margin-right: -1px !important; -} - -/* URL bar and Search bar's icons */ -.urlbar-icon-wrapper:hover, -.urlbar-icon-wrapper[open], -.urlbar-icon:hover:active, -.urlbar-icon-wrapper:hover:active, -.searchbar-search-button:hover .searchbar-search-icon, -.searchbar-search-button[open] .searchbar-search-icon, -.searchbar-search-button:hover:active .searchbar-search-icon { - background-color: transparent !important; - fill-opacity: 1 !important; -} - -#identity-box { - margin: 3px 2px !important; - border-radius: 5px !important; -} - -.urlbar-page-action, #urlbar-go-button, .search-go-button, -#tracking-protection-icon-container { - width: 28px !important; - height: 26px !important; - margin: 3px 0 !important; - padding: 4px 6px !important; - border-radius: 5px !important; -} - -#identity-box:hover { - background: var(--gnome-headerbar-button-hover-background) !important; -} - -#identity-box:active { - background: var(--gnome-headerbar-button-active-background) !important; -} - -.identity-box-button { - border-radius: 5px !important; - background: none !important; -} - -/* Search mode indicator */ -#urlbar-search-mode-indicator, -#urlbar-label-box { - background: var(--gnome-headerbar-button-hover-background) !important; - border: none !important; - border-radius: 5px !important; - outline: 0 !important; - margin-top: 3px !important; - margin-bottom: 3px !important; -} -#urlbar-search-mode-indicator-title { - padding-inline: 4px !important;; -} -#urlbar-search-mode-indicator-close { - background-size: 12px 12px !important; - border-radius: 3px !important; - opacity: 0.8 !important; - fill: var(--gnome-toolbar-color) !important; -} diff --git a/src/other/firefox/Monterey/parts/headerbar-urlbar.css b/src/other/firefox/Monterey/parts/headerbar-urlbar.css index 318c0d1..6bf2f35 100644 --- a/src/other/firefox/Monterey/parts/headerbar-urlbar.css +++ b/src/other/firefox/Monterey/parts/headerbar-urlbar.css @@ -169,6 +169,11 @@ toolbarspring { border-radius: 5px !important; } +#notification-popup-box { + height: 26px !important; + border-radius: 5px !important; +} + .urlbar-page-action, #urlbar-go-button, .search-go-button, #tracking-protection-icon-container { width: 28px !important; diff --git a/src/other/firefox/WhiteSur/parts/buttons-fixes.css b/src/other/firefox/WhiteSur/parts/buttons-fixes.css deleted file mode 100644 index a0e1742..0000000 --- a/src/other/firefox/WhiteSur/parts/buttons-fixes.css +++ /dev/null @@ -1,240 +0,0 @@ -/* Buttons Issues/Glitches fixes */ -@namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"; - -/* Fix hover background */ -.toolbarbutton-badge-stack:not(#hack), .toolbarbutton-icon:not(#hack), .toolbarbutton-text:not(#hack) { - background: transparent !important; -} - -/* Fix button box */ -.panel-footer.panel-footer-menulike > button > .button-box { - display: -moz-box !important; -} - -/* menulist */ -#label-box:not([native]) { - font-weight: 400 !important; -} - -/* Overrides: Make the back button the same as other buttons */ -:root:not([uidensity=compact]) #back-button { - border-radius: var(--toolbarbutton-border-radius) !important; -} -:root:not([uidensity=compact]) #back-button > .toolbarbutton-icon { - background-color: unset !important; - border: unset !important; - width: calc(2 * var(--toolbarbutton-inner-padding) + 16px) !important; - height: calc(2 * var(--toolbarbutton-inner-padding) + 16px) !important; - padding: var(--toolbarbutton-inner-padding) !important; - border-radius: var(--toolbarbutton-border-radius); - box-shadow: none !important; -} -:root:not([uidensity=compact]) #back-button:not([disabled]):not([open]):hover > .toolbarbutton-icon { - background-color: var(--toolbarbutton-hover-background) !important; - box-shadow: unset; - border-color: unset; -} -:root:not([uidensity=compact]) #back-button[open] > .toolbarbutton-icon, -:root:not([uidensity=compact]) #back-button:not([disabled]):hover:active > .toolbarbutton-icon { - background-color: var(--toolbarbutton-active-background) !important; - border-color: unset; -} - -/* Remove the header bar buttons' hover styles */ -#nav-bar { - --toolbarbutton-active-background: transparent !important; - --toolbarbutton-hover-background: transparent !important; -} - -/* Glitch customizing: Cut / Copy / Paste buttons' icons - * :not(#hack) is there just to elevate rule priority */ -:root[customizing] #nav-bar > hbox toolbaritem toolbarbutton image:not(#hack) { - opacity: 1 !important; -} -/* Glitch customizing: Reload and Cut / Copy / Paste buttons */ -:root:-moz-window-inactive[customizing] #nav-bar #stop-reload-button toolbarbutton, -:root:-moz-window-inactive[customizing] #nav-bar #edit-controls toolbarbutton { - background-image: var(--gnome-inactive-button-background); - box-shadow: var(--gnome-inactive-button-box-shadow); -} -/* Glitch customizing: Reload and Cut / Copy / Paste buttons' icons */ -:root:-moz-window-inactive[customizing] #nav-bar #stop-reload-button image.toolbarbutton-icon, -:root:-moz-window-inactive[customizing] #nav-bar #edit-controls image.toolbarbutton-icon { - opacity: .7 !important; -} - -/* Glitch: Overflow and Burger buttons - * :not(#hack) is there just to elevate rule priority */ -:root[customizing] #nav-bar > toolbarbutton[disabled]:not(#hack), -:root[customizing] #nav-bar > toolbaritem > toolbarbutton[disabled]:not(#hack) { - opacity: .5 !important; -} -/* Glitch: Overflow button's icon */ -:root[customizing] #nav-bar toolbarbutton:not(#urlbar-zoom-button)[disabled] image { - fill-opacity: var(--toolbarbutton-icon-fill-opacity) !important; -} - -/* Bookmark buttons */ -#nav-bar toolbarbutton.bookmark-item { - width: auto !important; -} -#nav-bar toolbarbutton.bookmark-item .toolbarbutton-icon { - margin-left: 6px; -} -#nav-bar toolbarbutton.bookmark-item .toolbarbutton-text { - padding-right: 6px; -} - -/* Remove Burger button's left separator */ -#PanelUI-button { - border: 0 !important; - margin: 0 !important; - padding-inline-start: 0 !important; -} - -/* Space main menu button from other headerbar buttons -#nav-bar #PanelUI-menu-button:not(#hack) { - margin-left: 10px !important; -}*/ - -/* Fix library animation */ -#library-animatable-box { - --library-button-height: 46px !important; - --library-icon-x: 1716px !important; - /*--library-icon-x: 1715.9833984375px !important;*/ -} -#library-button[animate] > .toolbarbutton-icon { - fill: transparent !important; -} - -/* Fix toolbars close icons */ -.close-icon:not(.tab-close-button) .toolbarbutton-icon { - height: 16px !important; - width: 16px !important; - margin: 6px !important; - padding: 0 !important; -} - -button.close:not(.ghost-button) { - margin: 0 !important; -} - -button.close.ghost-button { - margin: 6px !important; -} - -button.close.ghost-button:not(:active):hover { - background-color: var(--gnome-headerbar-button-hover-background) !important; -} - -button.close.ghost-button:active { - background-color: var(--gnome-headerbar-button-active-background) !important; -} - -/* */ -#appMenu-popup .panel-banner-item[notificationid="update-restart"]::after { - display: none !important; -} - -/* Identity site popover buttons */ -.identity-popup-preferences-button:not(#hack) { - list-style-image: url("chrome://browser/skin/settings.svg") !important; -} -#tracking-protection-preferences-button > .toolbarbutton-text { - padding-inline-end: 0 !important; -} -.protections-popup-footer-button-label { - margin-inline-start: 3px !important; -} - -/* Fix findbar buttons issues */ -.findbar-container .findbar-find-previous image, -.findbar-container .findbar-find-next image { - margin: 6px !important; - opacity: 1 !important; -} -.findbar-container toolbarbutton:focus { - outline: 0 !important; -} - -/* Sidebar header button reset font size */ -#sidebar-header { - font-size: 1em !important; -} - -/* Sidebar header button sizing */ -#sidebar-switcher-target { - flex: unset !important; -} - -/* Sidebar header button arrow opacity */ -#sidebar-switcher-arrow { - opacity: 1 !important; -} - -/* Sidebar history view */ -#viewButton { - margin: 0 !important; - margin-inline-start: 6px !important; -} - -/* Menulist */ -#identity-popup-popup-menulist { - margin-right: 0 !important; -} - -/* Auto complete popup button*/ -.autocomplete-richlistitem[type="loginsFooter"] { - margin: 4px 4px 0 4px !important; -} - -#context-navigation > .menuitem-iconic > .menu-iconic-left > .menu-iconic-icon { - margin: 3px !important; -} - -/* Bookmarks editor buttons */ -.expander-down image, .expander-up image { - margin-top: 8px !important; -} - -/* Identity popup tracking protection button */ -.tracking-protection-button { - margin-inline-end: 0 !important; -} - -/* Identity popup delete permission button */ -.identity-popup-permission-remove-button { - opacity: 1 !important; -} - -/* Identity popup expander button */ -#identity-popup-security { - -moz-box-align: center; -} -#identity-popup-security-expander { - width: 34px !important; -} -#identity-popup-security-expander .button-icon { - margin: 0 !important; -} - -/* Protections popup */ -#protections-popup-info-button { - margin: 0 !important; - margin-inline-end: 0 !important; -} -.protections-popup-footer-icon { - display: none !important; -} -.protections-popup-footer-button-label { - margin-inline-start: 0 !important; -} -#protections-popup-footer-protection-type-label { - margin-inline-end: 0 !important; - margin-block: 0 !important; -} - -/* Close button */ -.close-icon:not(.tab-close-button) .toolbarbutton-icon { - outline: 0 !important; -} diff --git a/src/other/firefox/WhiteSur/parts/entries.css b/src/other/firefox/WhiteSur/parts/entries.css deleted file mode 100644 index 00adf4b..0000000 --- a/src/other/firefox/WhiteSur/parts/entries.css +++ /dev/null @@ -1,88 +0,0 @@ -/* Entries */ - -@namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"; - -/* Entries */ -#searchbar, -#search-box, -.findbar-textbox, -#loginTextbox, -#password1Textbox { - -moz-appearance: none !important; - background: var(--gnome-urlbar-background) !important; - border: 1px solid var(--gnome-urlbar-border-color) !important; - border-radius: 8px !important; - box-shadow: none !important; - color: var(--gnome-urlbar-color) !important; - height: 28px !important; - max-height: 28px !important; - margin: 0 !important; - padding: 6px !important; - box-sizing: border-box; - transition: all 100ms; -} - -/* Entries focused */ -#urlbar[breakout][breakout-extend], -#searchbar:focus-within, -#search-box[focused], -/*.findbar-textbox[focused],*/ -/*.findbar-textbox:focus,*/ -#loginTextbox:focus, -#password1Textbox:focus { - outline: 2px solid var(--gnome-focused-urlbar-border-color) !important; - outline-offset: -2px; - -moz-outline-radius: 8px; - transition: all 100ms; -} - -.findbar-textbox[focused], -.findbar-textbox:focus { - outline: none !important; - box-shadow: inset 0 0 0 1px var(--gnome-focused-urlbar-border-color) !important; - border: 1px solid var(--gnome-focused-urlbar-border-color) !important; -} - -/* Inactive window entries */ -#searchbar:-moz-window-inactive, -#search-box:-moz-window-inactive, -.findbar-textbox:-moz-window-inactive, -#loginTextbox:-moz-window-inactive, -#password1Textbox:-moz-window-inactive { - background: var(--gnome-inactive-urlbar-background) !important; - border-color: var(--gnome-inactive-urlbar-border-color) !important; - color: var(--gnome-inactive-urlbar-color) !important; -} - -/* Entries combined */ -.findbar-textbox:not(.minimal) { - border-top-right-radius: 0 !important; - border-bottom-right-radius: 0 !important; - border-right-width: 0 !important; -} -.findbar-textbox:not(.minimal)[focused], .findbar-textbox:not(.minimal):focus { - -moz-outline-radius: 8px 0 0 8px !important; -} - -/* Entries fixes */ -#urlbar-container, #search-container { - padding: 0 !important; - margin: 0 3px !important; -} -#urlbar-input-container { - background: transparent !important; - border: 0 !important; -} -#urlbar, #searchbar { - margin: 0 3px !important; - padding: 0 !important; -} -.searchbar-textbox { - border: 0 !important; - padding: 0 !important; - margin: 0 !important; - min-height: auto !important; -} -#searchbar > .searchbar-textbox[focused] .searchbar-search-button:not(#hack) { - margin: 0 !important; -} diff --git a/src/other/firefox/WhiteSur/parts/findbar.css b/src/other/firefox/WhiteSur/parts/findbar.css deleted file mode 100644 index a70deba..0000000 --- a/src/other/firefox/WhiteSur/parts/findbar.css +++ /dev/null @@ -1,62 +0,0 @@ -/* Find bar */ - -@namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"; - -findbar { - padding: 0 !important; - position: relative; -} - -.findbar-container { - align-items: center; - padding: 6px !important; - display: flex; - justify-content: flex-start; - position: relative; - flex-direction: row; - margin: 0 !important; - width: calc(100% - 42px); - height: auto !important; -} - -hbox[anonid="findbar-textbox-wrapper"] { - position: absolute; - right: calc(50vw - 36px); - transform: translate(50%, 0); - display: flex !important; -} - -.findbar-find-status, .found-matches { - order: -1; - padding: 7px 0; -} -.findbar-find-status { - padding-left: 6px; - flex: 1; -} - -.findbar-textbox:focus + .findbar-find-previous { - border-left-color: var(--gnome-focused-urlbar-border-color) !important; -} - -.findbar-highlight, .findbar-case-sensitive, .findbar-match-diacritics, .findbar-entire-word, .findbar-label { - margin: 0 3px !important; - font-size: 0.9em !important; -} - -.findbar-closebutton.close-icon { - margin: 6px 6px 6px 0 !important; - padding: 0 0 !important; - border-radius: 100px !important; -} - -@media (max-width: 1100px) { - hbox[anonid="findbar-textbox-wrapper"] { - position: relative; - right: 0; - transform: none; - } - .findbar-find-status, .found-matches { - order: 0; - } -} diff --git a/src/other/firefox/WhiteSur/parts/headerbar-private-urlbar.css b/src/other/firefox/WhiteSur/parts/headerbar-private-urlbar.css deleted file mode 100644 index 427801e..0000000 --- a/src/other/firefox/WhiteSur/parts/headerbar-private-urlbar.css +++ /dev/null @@ -1,39 +0,0 @@ -/* Private window header bar's URL bar */ - -@namespace xul url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); - -:root[privatebrowsingmode="temporary"] #nav-bar toolbarspring:first-of-type:before { - background: url("../icons/user-not-tracked.svg") no-repeat; - background-size: contain; - content: ""; - display: block; - position: absolute; - width: 32px; - height: 32px; - top: 8px; - opacity: 0.3; - transform: translate(15px, 0); -} - -:root[privatebrowsingmode="temporary"] #nav-bar toolbarspring:first-of-type:-moz-lwtheme-brighttext:before { - background-image: url("../icons/user-not-tracked-dark.svg"); -} - -@media (prefers-color-scheme: dark) { - :root[privatebrowsingmode="temporary"] #nav-bar toolbarspring:first-of-type:before { - background: url("../icons/user-not-tracked-dark.svg") no-repeat; - background-size: contain; - content: ""; - display: block; - position: absolute; - width: 32px; - height: 32px; - top: 8px; - opacity: 0.3; - transform: translate(15px, 0); - } -} - -#TabsToolbar .private-browsing-indicator { - display: none !important; -} diff --git a/src/other/firefox/WhiteSur/parts/headerbar-urlbar.css b/src/other/firefox/WhiteSur/parts/headerbar-urlbar.css index a0797f5..ccc7c2d 100644 --- a/src/other/firefox/WhiteSur/parts/headerbar-urlbar.css +++ b/src/other/firefox/WhiteSur/parts/headerbar-urlbar.css @@ -167,6 +167,11 @@ toolbarspring { border-radius: 5px !important; } +#notification-popup-box { + height: 26px !important; + border-radius: 5px !important; +} + .urlbar-page-action, #urlbar-go-button, .search-go-button, #tracking-protection-icon-container { width: 28px !important; diff --git a/src/other/firefox/WhiteSur/parts/headerbar.css b/src/other/firefox/WhiteSur/parts/headerbar.css deleted file mode 100644 index 9aff8fb..0000000 --- a/src/other/firefox/WhiteSur/parts/headerbar.css +++ /dev/null @@ -1,136 +0,0 @@ -/* Header bar */ -@import "headerbar-urlbar.css"; -@import "headerbar-private-urlbar.css"; -@namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"; - -/* Headerbar */ -#nav-bar { - padding: 8px !important; -} - -/* Headerbar CSD colors */ -:root[tabsintitlebar] #nav-bar { - border: none !important; - border-bottom: none !important; - box-shadow: var(--gnome-headerbar-box-shadow) !important; -} -:root[tabsintitlebar] #nav-bar:-moz-window-inactive { - box-shadow: var(--gnome-inactive-headerbar-box-shadow) !important; -} - -/* Headerbar buttons */ -#nav-bar toolbarbutton:not(#urlbar-zoom-button), -toolbar .toolbaritem-combined-buttons > .toolbarbutton-1 { - border: none !important; - box-shadow: none !important; - background: none !important; - -moz-appearance: none !important; - border-radius: 8px !important; - margin: 8px 2px !important; - padding: 0 10px !important; - max-height: 32px !important; - min-height: 32px !important; - min-width: 32px !important; - color: var(--gnome-toolbar-color) !important; - transition: background 200ms; - --toolbarbutton-inner-padding: 0 !important; -} - -:root:-moz-window-inactive #nav-bar toolbarbutton:not(#urlbar-zoom-button) { - background: none !important; -} - -#nav-bar .toolbaritem-combined-buttons { - margin: 0 !important; -} - -/* Hover headerbar buttons */ -#nav-bar toolbarbutton:not(#urlbar-zoom-button):not([open]):not([disabled]):not([checked]):hover, -#TabsToolbar .toolbarbutton-1:hover, -#tabs-newtab-button:hover, #TabsToolbar #new-tab-button:hover { - outline: 0 !important; - background: var(--gnome-headerbar-button-hover-background) !important; -} - -/* Active headerbar buttons */ -#nav-bar toolbarbutton:not(#urlbar-zoom-button):not([disabled]):not(#hack):active, -#nav-bar toolbarbutton:not(#urlbar-zoom-button):not([disabled])[open], -#nav-bar toolbarbutton:not(#urlbar-zoom-button):not([disabled])[checked], -#TabsToolbar .toolbarbutton-1:active, #TabsToolbar .toolbarbutton-1[open], -#tabs-newtab-button:active, #TabsToolbar #new-tab-button:active { - background: var(--gnome-headerbar-button-active-background) !important; -} - -/* Disabled headerbar buttons */ -#nav-bar toolbarbutton:not(#urlbar-zoom-button)[disabled] { - background: transparent !important; - border-color: var(--gnome-button-disabled-border-color) !important; - box-shadow: none !important; - opacity: 1 !important; -} - -/* Inactive window buttons */ -#nav-bar toolbarbutton:not(#urlbar-zoom-button):-moz-window-inactive { - background: var(--gnome-inactive-button-background) !important; - box-shadow: var(--gnome-inactive-button-box-shadow) !important; - border-color: var(--gnome-inactive-button-border-color) !important; -} - -/* Buttons with margins */ -#nav-bar toolbarbutton:not(#urlbar-zoom-button) { - margin: 0 2px !important; -} - -#nav-bar #back-button:not(#hack), -#nav-bar #forward-button:not(#hack) { - padding: 0 4px !important; - width: 34px !important; - min-width: 34px !important; -} - -#nav-bar #forward-button:not(#hack) { - margin-left: 0 !important; -} - -#nav-bar #back-button:not(#hack) { - margin-right: 1px !important; -} - -/* Headerbar entries */ -#nav-bar #searchbar, -#urlbar #urlbar-input-container { - -moz-appearance: none !important; - background: var(--gnome-urlbar-background) !important; - border: none !important; - box-shadow: none !important; - border-radius: 8px !important; - color: var(--gnome-urlbar-color) !important; - padding: 0 3px !important; - height: 32px !important; - max-height: 32px !important; - 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; - transition-duration: 100ms; -} - -#urlbar[breakout][breakout-extend] #urlbar-input-container, -#urlbar[breakout][breakout-extend] #urlbar-input-container:hover { - background: none !important; - box-shadow: none !important; - padding: 0 3px !important; -} - -#nav-bar #searchbar:focus-within { - border: none !important; - background: var(--gnome-urlbar-background) !important; - box-shadow: inset 0 0 0 2px var(--gnome-focused-urlbar-highlight-color) !important; -} diff --git a/src/other/firefox/WhiteSur/parts/tabsbar.css b/src/other/firefox/WhiteSur/parts/tabsbar.css index cc3c6fe..43a05d3 100644 --- a/src/other/firefox/WhiteSur/parts/tabsbar.css +++ b/src/other/firefox/WhiteSur/parts/tabsbar.css @@ -73,7 +73,8 @@ } .tabbrowser-tab[selected] + .tabbrowser-tab, -.tabbrowser-tab:hover + .tabbrowser-tab { +.tabbrowser-tab:hover + .tabbrowser-tab, +.tabbrowser-tab[first-tab] { border-color: transparent !important; } diff --git a/src/other/firefox/WhiteSur/parts/toolbox.css b/src/other/firefox/WhiteSur/parts/toolbox.css index b8c9697..5126b86 100644 --- a/src/other/firefox/WhiteSur/parts/toolbox.css +++ b/src/other/firefox/WhiteSur/parts/toolbox.css @@ -92,6 +92,10 @@ findbar:-moz-window-inactive label, order: 10; } #navigator-toolbox #TabsToolbar { + -moz-box-ordinal-group: 20; + order: 20; +} +.container.infobar { -moz-box-ordinal-group: 100; order: 100; } diff --git a/src/other/firefox/WhiteSur/theme.css b/src/other/firefox/WhiteSur/theme.css index c8c529f..f48e4f4 100644 --- a/src/other/firefox/WhiteSur/theme.css +++ b/src/other/firefox/WhiteSur/theme.css @@ -2,6 +2,8 @@ @import "parts/buttons.css"; @import "parts/entries.css"; @import "parts/controls.css"; +@import "parts/headerbar-urlbar.css"; +@import "parts/headerbar-private-urlbar.css"; @import "parts/headerbar.css"; @import "parts/csd.css"; @import "parts/titlebutton-light.css"; diff --git a/src/other/firefox/Monterey/parts/buttons-fixes.css b/src/other/firefox/common/parts/buttons-fixes.css similarity index 100% rename from src/other/firefox/Monterey/parts/buttons-fixes.css rename to src/other/firefox/common/parts/buttons-fixes.css diff --git a/src/other/firefox/WhiteSur/parts/buttons.css b/src/other/firefox/common/parts/buttons.css similarity index 100% rename from src/other/firefox/WhiteSur/parts/buttons.css rename to src/other/firefox/common/parts/buttons.css diff --git a/src/other/firefox/Monterey/parts/entries.css b/src/other/firefox/common/parts/entries.css similarity index 100% rename from src/other/firefox/Monterey/parts/entries.css rename to src/other/firefox/common/parts/entries.css diff --git a/src/other/firefox/Monterey/parts/findbar.css b/src/other/firefox/common/parts/findbar.css similarity index 100% rename from src/other/firefox/Monterey/parts/findbar.css rename to src/other/firefox/common/parts/findbar.css diff --git a/src/other/firefox/Monterey/parts/headerbar-private-urlbar.css b/src/other/firefox/common/parts/headerbar-private-urlbar.css similarity index 100% rename from src/other/firefox/Monterey/parts/headerbar-private-urlbar.css rename to src/other/firefox/common/parts/headerbar-private-urlbar.css diff --git a/src/other/firefox/Monterey/parts/headerbar.css b/src/other/firefox/common/parts/headerbar.css similarity index 98% rename from src/other/firefox/Monterey/parts/headerbar.css rename to src/other/firefox/common/parts/headerbar.css index 46041a4..5ea8c50 100644 --- a/src/other/firefox/Monterey/parts/headerbar.css +++ b/src/other/firefox/common/parts/headerbar.css @@ -13,7 +13,7 @@ box-shadow: var(--gnome-headerbar-box-shadow) !important; } :root[tabsintitlebar] #nav-bar:-moz-window-inactive { - box-shadow: var(--gnome-inactive-headerbar-box-shadow); + box-shadow: var(--gnome-inactive-headerbar-box-shadow) !important; } /* Headerbar buttons */