From 2ae323cbcd58872967381f1c18a1480506a7f7c6 Mon Sep 17 00:00:00 2001 From: RealStickman Date: Sun, 14 May 2023 21:05:00 +0200 Subject: [PATCH] Update to lepton 7.3.0 --- .../firefox/default-release/chrome/LEPTON | 2 +- .../chrome/css/leptonChrome.css | 680 +++++++++++------- .../chrome/css/leptonContent.css | 343 ++++++--- .../chrome/icons/add-device.svg | 7 + .../chrome/icons/highlight.svg | 3 + .../default-release/chrome/icons/link.svg | 8 +- .../chrome/icons/no-search-results.svg | 36 + .../default-release/chrome/icons/pin-tab.svg | 4 +- .../chrome/icons/synced-tabs.svg | 12 + .../chrome/icons/unpin-tab.svg | 4 +- .../.mozilla/firefox/default-release/user.js | 4 +- 11 files changed, 742 insertions(+), 361 deletions(-) create mode 100644 arch-config/.mozilla/firefox/default-release/chrome/icons/add-device.svg create mode 100644 arch-config/.mozilla/firefox/default-release/chrome/icons/highlight.svg create mode 100644 arch-config/.mozilla/firefox/default-release/chrome/icons/no-search-results.svg create mode 100644 arch-config/.mozilla/firefox/default-release/chrome/icons/synced-tabs.svg diff --git a/arch-config/.mozilla/firefox/default-release/chrome/LEPTON b/arch-config/.mozilla/firefox/default-release/chrome/LEPTON index 05ea1ffb..c30c1b44 100644 --- a/arch-config/.mozilla/firefox/default-release/chrome/LEPTON +++ b/arch-config/.mozilla/firefox/default-release/chrome/LEPTON @@ -1,3 +1,3 @@ [Info] -Ver=v7.1.1 +Ver=v7.3.0 Branch=photon-style diff --git a/arch-config/.mozilla/firefox/default-release/chrome/css/leptonChrome.css b/arch-config/.mozilla/firefox/default-release/chrome/css/leptonChrome.css index 51af43ea..c95be058 100644 --- a/arch-config/.mozilla/firefox/default-release/chrome/css/leptonChrome.css +++ b/arch-config/.mozilla/firefox/default-release/chrome/css/leptonChrome.css @@ -241,7 +241,7 @@ color: var(--lwt-text-color) !important; } } - /*= Windows 7, 8 - Menu Active Color =========================================*/ + /*= Windows 7, 8 - Menu Bar ==================================================*/ @media (-moz-os-version: windows-win7), (-moz-platform: windows-win7), (-moz-os-version: windows-win8), @@ -260,63 +260,73 @@ color: inherit !important; /* Original: -moz-menubarhovertext */ background-color: color-mix(in srgb, currentColor 20%, transparent) !important; /* Original: -moz-menuhover */ } - menulist > menupopup > menuitem[_moz-menuactive="true"], - menulist > menupopup > menu[_moz-menuactive="true"] { - background-color: highlight !important; - color: highlighttext !important; - } - #PlacesToolbar menu, - #PlacesToolbar menuitem, - #BMB_bookmarksPopup menu, - #BMB_bookmarksPopup menuitem { - border: none !important; /* Remove border */ - } - #PlacesToolbar menu:not([disabled], :active)[_moz-menuactive="true"], - #PlacesToolbar menuitem:not([disabled], :active)[_moz-menuactive="true"], - #BMB_bookmarksPopup menu:not([disabled], :active)[_moz-menuactive="true"], - #BMB_bookmarksPopup menuitem:not([disabled], :active)[_moz-menuactive="true"] { - background-color: var(--button-hover-bgcolor) !important; - } } - @media (-moz-os-version: windows-win7), (-moz-platform: windows-win7) { - @media (-moz-windows-classic: 0) { + /*= Windows - Native Menu ====================================================*/ + @media not (-moz-windows-non-native-menus) { + @media (-moz-os-version: windows-win7), + (-moz-platform: windows-win7), + (-moz-os-version: windows-win8), + (-moz-platform: windows-win8), + (-moz-os-version: windows-win10), + (-moz-platform: windows-win10) { + .customization-uidensity-menuitem > .menu-iconic-left { + width: unset !important; + } + menulist > menupopup > menuitem[_moz-menuactive="true"], + menulist > menupopup > menu[_moz-menuactive="true"] { + background-color: highlight !important; + color: highlighttext !important; + } + #PlacesToolbar menu, + #PlacesToolbar menuitem, + #BMB_bookmarksPopup menu, + #BMB_bookmarksPopup menuitem { + border: none !important; /* Remove border */ + } + #PlacesToolbar menu:not([disabled], :active)[_moz-menuactive="true"], + #PlacesToolbar menuitem:not([disabled], :active)[_moz-menuactive="true"], + #BMB_bookmarksPopup menu:not([disabled], :active)[_moz-menuactive="true"], + #BMB_bookmarksPopup menuitem:not([disabled], :active)[_moz-menuactive="true"] { + background-color: var(--button-hover-bgcolor) !important; + } + } + @media (-moz-os-version: windows-win7), (-moz-platform: windows-win7) { + @media (not (-moz-windows-non-native-menus)) and (-moz-windows-classic: 0) { + menu[_moz-menuactive="true"], + menuitem[_moz-menuactive="true"] { + background-color: color-mix(in srgb, -moz-menuhover 5%, transparent) !important; + border-color: color-mix(in srgb, -moz-menuhover 60%, transparent) !important; + } + menu[_moz-menuactive="true"][disabled="true"], + menuitem[_moz-menuactive="true"][disabled="true"] { + background-color: color-mix(in srgb, currentColor 5%, transparent) !important; + border-color: color-mix(in srgb, currentColor 60%, transparent) !important; + } + /* Remove text shadow */ + :root:-moz-lwtheme #toolbar-menubar { + text-shadow: unset !important; + /* Original: 0 0 .5em white, 0 0 .5em white, 0 1px 0 rgba(255, 255, 255, .4) */ + } + /* Remove Color */ + :root:-moz-lwtheme #main-menubar:not(:-moz-window-inactive) { + background-color: unset !important; /* Original: rgba(255, 255, 255, .5) */ + color: unset !important; /* Original: black */ + } + } + } + @media (-moz-os-version: windows-win8), (-moz-platform: windows-win8) { menu[_moz-menuactive="true"], menuitem[_moz-menuactive="true"] { - background-color: color-mix(in srgb, -moz-menuhover 5%, transparent) !important; - border-color: color-mix(in srgb, -moz-menuhover 60%, transparent) !important; + background-color: color-mix(in srgb, -moz-menuhover 17%, transparent) !important; + border-color: color-mix(in srgb, -moz-menuhover 80%, transparent) !important; } menu[_moz-menuactive="true"][disabled="true"], menuitem[_moz-menuactive="true"][disabled="true"] { - background-color: color-mix(in srgb, currentColor 5%, transparent) !important; - border-color: color-mix(in srgb, currentColor 60%, transparent) !important; - } - /* Remove text shadow */ - :root:-moz-lwtheme #toolbar-menubar { - text-shadow: unset !important; - /* Original: 0 0 .5em white, 0 0 .5em white, 0 1px 0 rgba(255, 255, 255, .4) */ - } - /* Remove Color */ - :root:-moz-lwtheme #main-menubar:not(:-moz-window-inactive) { - background-color: unset !important; /* Original: rgba(255, 255, 255, .5) */ - color: unset !important; /* Original: black */ + background-color: color-mix(in srgb, currentColor 17%, transparent) !important; + border-color: color-mix(in srgb, currentColor 80%, transparent) !important; } } - } - @media (-moz-os-version: windows-win8), (-moz-platform: windows-win8) { - menu[_moz-menuactive="true"], - menuitem[_moz-menuactive="true"] { - background-color: color-mix(in srgb, -moz-menuhover 17%, transparent) !important; - border-color: color-mix(in srgb, -moz-menuhover 80%, transparent) !important; - } - menu[_moz-menuactive="true"][disabled="true"], - menuitem[_moz-menuactive="true"][disabled="true"] { - background-color: color-mix(in srgb, currentColor 17%, transparent) !important; - border-color: color-mix(in srgb, currentColor 80%, transparent) !important; - } - } - /*= Windows 10 - Native Menu Active Color =====================================*/ - @media (-moz-os-version: windows-win10), (-moz-platform: windows-win10) { - @media not (-moz-windows-non-native-menus) { + @media (-moz-os-version: windows-win10), (-moz-platform: windows-win10) { menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) menu[_moz-menuactive="true"], menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) menuitem[_moz-menuactive="true"], menupopup:not([placespopup="true"]) menu[_moz-menuactive="true"], @@ -1186,6 +1196,7 @@ --card-shadow: var(--shadow-10); --card-outline-color: var(--grey-30); --card-shadow-hover: var(--card-shadow), 0 0 0 5px var(--card-outline-color); + --uc-warning-icon-bgcolor: #ffa436; } @media (-moz-toolbar-prefers-color-scheme: dark), (prefers-color-scheme: dark) { :host, @@ -1222,6 +1233,13 @@ --in-content-link-color-visited: var(--in-content-link-color); --card-outline-color: var(--grey-60); --dialog-warning-text-color: var(--red-40); + --uc-warning-icon-bgcolor: #ffbd4f; + } + } + @media (prefers-contrast) { + :host, + :root { + --uc-warning-icon-bgcolor: var(--in-content-page-color); } } @supports -moz-bool-pref("userChrome.theme.proton_color.dark_blue_accent") { @@ -1524,7 +1542,8 @@ } #PopupAutoComplete > richlistbox > richlistitem[originaltype="generatedPassword"] > .two-line-wrapper > .ac-site-icon, #PopupAutoComplete > richlistbox > richlistitem[originaltype="loginWithOrigin"] > .two-line-wrapper > .ac-site-icon, - #PopupAutoComplete > richlistbox > richlistitem[originaltype="login"] > .ac-site-icon { + #PopupAutoComplete > richlistbox > richlistitem[originaltype="login"] > .ac-site-icon, + #PopupAutoComplete > richlistbox > richlistitem[originaltype="insecureWarning"] > .ac-site-icon { fill: GrayText !important; } #PopupAutoComplete > richlistbox > richlistitem[originaltype="loginsFooter"] { @@ -1540,6 +1559,15 @@ hsla(0deg, 0%, 80%, 0.5) ) !important; /* Original: hsla(0,0%,80%,.5), match arrowpanel-dimmed-further */ } + #PopupAutoComplete > richlistbox > richlistitem[originaltype="insecureWarning"] { + background-color: var(--panel-bgcolor) !important; /* Original: var(--arrowpanel-dimmed) */ + } + #PopupAutoComplete > richlistbox > richlistitem[originaltype="insecureWarning"]:hover { + background-color: var(--arrowpanel-dimmed, hsla(0deg, 0%, 80%, 0.35)) !important; + } + #PopupAutoComplete > richlistbox > richlistitem[originaltype="insecureWarning"] > .ac-title { + color: var(--arrowpanel-color, var(--in-content-page-color)) !important; /* Original: var(--grey-60) */ + } /* New Folder Button */ #editBMPanel_newFolderButton { appearance: none; @@ -1811,6 +1839,7 @@ /* From checkbox.css */ checkbox { appearance: none !important; + align-items: center !important; -moz-box-align: center !important; margin: 4px 2px !important; } @@ -1983,11 +2012,14 @@ } } #label-box { + align-items: center !important; -moz-box-align: center !important; + justify-content: center !important; -moz-box-pack: center !important; font-weight: 600 !important; } dropmarker { + display: flex !important; display: -moz-box !important; appearance: none !important; width: 12px !important; @@ -2167,6 +2199,7 @@ font-size: inherit !important; } xul|menulist::part(dropmarker) { + display: flex; display: -moz-box; margin-block: 6px !important; } @@ -2180,6 +2213,7 @@ display: none !important; } xul|menulist::part(dropmarker) { + display: flex !important; display: -moz-box !important; margin-block: 1px !important; } @@ -2261,6 +2295,9 @@ fill: currentColor !important; color: var(--in-content-deemphasized-text) !important; /* FieldText */ } + #viewGroup > radio .radio-icon { + background-image: none !important; + } @supports not -moz-bool-pref("userChrome.rounding.square_button") { #viewGroup > radio { border-radius: 8px !important; @@ -2742,6 +2779,13 @@ } } } + #sanitizeEverythingWarningIcon { + list-style-image: url("chrome://global/skin/icons/warning.svg") !important; + -moz-context-properties: fill; + fill: var(--uc-warning-icon-bgcolor); + width: 48px; + height: 48px; + } } /*= Monospace ================================================================*/ @supports -moz-bool-pref("userChrome.theme.monospace") { @@ -2778,7 +2822,13 @@ #identity-popup-more-info, #unified-extensions-manage-extensions, .unified-extensions-item-open-menu, - .unified-extensions-item-menu-button.subviewbutton { + .unified-extensions-item-menu-button.subviewbutton, + #PopupAutoComplete + > richlistbox + > richlistitem[originaltype="insecureWarning"] + > .ac-title + > .ac-text-overflow-container + > .ac-title-text { cursor: pointer !important; } } @@ -2923,7 +2973,7 @@ /*- Pinned Tab -------------------------------------------------------------*/ #tabbrowser-tabs:not([movingtab]) .tabbrowser-tab:not([collapsed]) { /* -moz-box-flex may be caused #tabbrowser-tabs[closebuttons] */ - transition: -moz-box-flex 0.2s var(--animation-easing-function), + transition: -moz-box-flex 0.2s var(--animation-easing-function), flex 0.2s var(--animation-easing-function), margin-inline-start 0.2s var(--animation-easing-function), min-width 0.1s ease-out, max-width 0.1s ease-out !important; } #tabbrowser-tabs:not([movingtab]) .tabbrowser-tab[pinned] { @@ -3002,6 +3052,7 @@ will-change: margin-inline-start, opacity, visibility; } #sidebar-box[hidden="true"] { + display: flex !important; display: -moz-box !important; margin-inline-start: -18em; opacity: 0; @@ -3148,12 +3199,23 @@ @supports -moz-bool-pref("userChrome.rounding.square_menuitem") { xul|menulist:not([native]), xul|menulist > xul|menupopup xul|menu, - xul|menulist > xul|menupopup xul|menuitem { + xul|menulist > xul|menupopup xul|menuitem, + .customization-uidensity-menuitem { border-radius: 0 !important; } } +@supports -moz-bool-pref("userChrome.rounding.square_toolbar") { + :root { + --uc-rounding-toolbar: 0; + } + .container.infobar, + .container.infobar::before, + notification-message { + border-radius: var(--uc-rounding-toolbar) !important; + } +} @supports -moz-bool-pref("userChrome.rounding.square_field") { - input:is([type="color"], [type="email"], [type="tel"], [type="text"], [type="password"], [type="url"], [type="number"]), + input:not([type="radio"], [type="checkbox"]), textarea, select, menulist, @@ -3172,6 +3234,7 @@ } } @supports -moz-bool-pref("userChrome.rounding.square_urlView_item") { + .urlbarView-row, .urlbarView-row-inner { --toolbarbutton-border-radius: 0; } @@ -3795,6 +3858,7 @@ @supports -moz-bool-pref("userChrome.padding.global_menubar") { /* Vertical Align - Center & Height: 100% */ #main-menubar { + flex: 1 !important; -moz-box-flex: 1 !important; } /* Rounding */ @@ -3819,6 +3883,16 @@ #main-menubar > menu > menupopup menu { padding-block: var(--bookmark-menu-padding) !important; } + @supports -moz-bool-pref("userChrome.compatibility.os.win11") { + #main-menubar > menu > menupopup menuitem, + #main-menubar > menu > menupopup menu { + --bookmark-menu-padding: 3px; + } + #main-menubar > menu > menupopup menuitem:is([type="checkbox"], [type="radio"]), + #main-menubar > menu > menupopup menu:is([type="checkbox"], [type="radio"]) { + --bookmark-menu-padding: 0px; + } + } } /*= Panel - Reduce padding ===================================================*/ @supports -moz-bool-pref("userChrome.padding.panel") { @@ -3932,12 +4006,12 @@ See the above repository for updates as well as full license text. */ /*= Tabbar - Move to bottom ==================================================*/ #titlebar { - order: 2; /* When userChrome.fullscreen.overlap */ + order: 2; -moz-box-ordinal-group: 2; --tabs-navbar-shadow-size: 0px; } #tab-notification-deck { - order: 2; /* When userChrome.fullscreen.overlap */ + order: 2; -moz-box-ordinal-group: 2; } #TabsToolbar .titlebar-spacer { @@ -3948,7 +4022,7 @@ } @supports -moz-bool-pref("userChrome.tabbar.on_bottom.above_bookmark") { #PersonalToolbar { - order: 2; /* When userChrome.fullscreen.overlap */ + order: 2; -moz-box-ordinal-group: 2; } } @@ -4044,12 +4118,12 @@ See the above repository for updates as well as full license text. */ /*= Tabbar - Move to bottom ==================================================*/ #titlebar { - order: 2; /* When userChrome.fullscreen.overlap */ + order: 2; -moz-box-ordinal-group: 2; --tabs-navbar-shadow-size: 0px; } #tab-notification-deck { - order: 2; /* When userChrome.fullscreen.overlap */ + order: 2; -moz-box-ordinal-group: 2; } #TabsToolbar .titlebar-spacer { @@ -4060,7 +4134,7 @@ } @supports -moz-bool-pref("userChrome.tabbar.on_bottom.above_bookmark") { #PersonalToolbar { - order: 2; /* When userChrome.fullscreen.overlap */ + order: 2; -moz-box-ordinal-group: 2; } } @@ -4196,10 +4270,11 @@ } #nav-bar { --toolbarbutton-inner-padding: 6px; /* Original: 8px */ - border-radius: var(--tab-border-radius, 4px); + border-radius: var(--uc-rounding-toolbar, var(--tab-border-radius, 4px)); } #nav-bar, #nav-bar-customization-target { + align-items: center; -moz-box-align: center; } #urlbar-container { @@ -4297,10 +4372,11 @@ } #nav-bar { --toolbarbutton-inner-padding: 6px; /* Original: 8px */ - border-radius: var(--tab-border-radius, 4px); + border-radius: var(--uc-rounding-toolbar, var(--tab-border-radius, 4px)); } #nav-bar, #nav-bar-customization-target { + align-items: center; -moz-box-align: center; } #urlbar-container { @@ -5831,6 +5907,7 @@ margin-inline-start: calc(var(--tab-shadow-max-size) * -1) !important; } .tabbrowser-tab[selected="true"][pinned="true"] { + flex: 100; -moz-box-flex: 100; max-width: var(--tab-max-width) !important; } @@ -5883,6 +5960,7 @@ :root:not([tabsintitlebar="true"]) #tabbrowser-tabs[hasadjacentnewtabbutton]:not([overflow="true"]) ~ #new-tab-button { + display: flex !important; display: -moz-box !important; } } @@ -5938,6 +6016,7 @@ > #tabbrowser-arrowscrollbox > #tabbrowser-arrowscrollbox-periphery > #tabs-newtab-button { + display: flex !important; display: -moz-box !important; } #alltabs-button, @@ -6143,7 +6222,7 @@ > .tab-stack > .tab-background:-moz-lwtheme { --uc-tab-shadow-color: var(--uc-tab-shadow-color-bundle); - filter: drop-shadow(-1px -0.5px 0px var(--uc-tab-shadow-color, transparent)) + filter: drop-shadow(-1px 0px 0px var(--uc-tab-shadow-color, transparent)) drop-shadow(1px -1px 0px var(--uc-tab-shadow-color, transparent)) drop-shadow(0 0 2px rgba(128, 128, 142, 0.5)); } :root:not([lwtheme-mozlightdark], [style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"]) @@ -6152,7 +6231,7 @@ .tabbrowser-tab:is([visuallyselected="true"], [multiselected]) > .tab-stack > .tab-background:-moz-lwtheme { - filter: drop-shadow(-1px -0.5px 0px var(--uc-tab-shadow-color, transparent)) + filter: drop-shadow(-1px 0px 0px var(--uc-tab-shadow-color, transparent)) drop-shadow(1px -1px 0px var(--uc-tab-shadow-color, transparent)); } } @@ -6517,6 +6596,7 @@ } @supports -moz-bool-pref("userChrome.tab.photon_like_contextline") { .tab-context-line { + display: inline-flex !important; display: -moz-inline-box !important; height: 2px !important; border-radius: var(--tab-border-radius, 4px) var(--tab-border-radius, 4px) 0 0 !important; @@ -6622,6 +6702,9 @@ background-color: var(--tabs-border-color); } } + #tabs-newtab-button::before { + left: calc(50% - (8px + var(--toolbarbutton-inner-padding))); + } } @supports not -moz-bool-pref("userChrome.tab.newtab_button_like_tab") { .tab-stack::before, @@ -6853,6 +6936,7 @@ @supports -moz-bool-pref("userChrome.tab.connect_to_window") { #tabs-newtab-button { /* Size */ + align-items: stretch !important; -moz-box-align: stretch !important; padding-top: var(--tab-block-margin) !important; } @@ -7025,6 +7109,12 @@ background-color: transparent !important; } } + /* Fix tab overlap #678 */ + @supports -moz-bool-pref("userChrome.tab.bottom_rounded_corner") { + tab:where([visuallyselected="true"]) { + z-index: 1; + } + } } /*= New tab button - Smaller button ==========================================*/ @supports -moz-bool-pref("userChrome.tab.newtab_button_smaller") { @@ -7090,6 +7180,7 @@ > .tab-stack > .tab-content > .tab-close-button:not([selected="true"]) { + display: inline-flex !important; display: -moz-inline-box !important; } #tabbrowser-tabs[closebuttons="activetab"] .tabbrowser-tab:not([visuallyselected]) .tab-close-button { @@ -7177,7 +7268,9 @@ } .tabbrowser-tab[pinned][visuallyselected]:not([style*="transform: translateX"]):hover:not([busy]) .tab-close-button { + display: flex !important; display: -moz-box !important; + order: -1 !important; -moz-box-ordinal-group: 0 !important; /* Looks like hover */ width: var(--uc-close-button-size) !important; @@ -7195,7 +7288,9 @@ } @supports -moz-bool-pref("userChrome.tab.close_button_at_pinned.always") { .tabbrowser-tab[pinned][visuallyselected]:not([busy]) .tab-close-button { + display: flex !important; display: -moz-box !important; + order: -1 !important; -moz-box-ordinal-group: 0 !important; /* Looks like hover */ width: var(--uc-close-button-size) !important; @@ -7214,7 +7309,9 @@ } @supports -moz-bool-pref("userChrome.tab.close_button_at_pinned.background") { .tabbrowser-tab[pinned]:not([style*="transform: translateX"]):hover:not([busy]) .tab-close-button { + display: flex !important; display: -moz-box !important; + order: -1 !important; -moz-box-ordinal-group: 0 !important; /* Looks like hover */ width: var(--uc-close-button-size) !important; @@ -7241,6 +7338,7 @@ /** Clipped tabs - Always show tab icon ***************************************/ @supports -moz-bool-pref("userChrome.tab.always_show_tab_icon") { .tab-icon-image:not([src], [pinned], [crashed], [busy]) { + display: inline-flex !important; display: -moz-inline-box !important; } } @@ -7256,6 +7354,7 @@ /*= Sound Tab - Show Label ===================================================*/ @supports -moz-bool-pref("userChrome.tab.sound_show_label") { .tab-secondary-label:is([soundplaying], [muted], [activemedia-blocked], [pictureinpicture]) { + display: flex !important; display: -moz-box !important; } } @@ -7433,10 +7532,12 @@ } .tabbrowser-tab[pictureinpicture]:not([pinned]) .tab-content::after { /* Shape */ + display: inline-flex !important; display: -moz-inline-box !important; width: 14px; height: 14px; background-size: 14px; + order: 1 !important; -moz-box-ordinal-group: 1 !important; /* Color */ fill: currentColor; @@ -7450,6 +7551,7 @@ } /* Close Button's position */ .tabbrowser-tab[pictureinpicture]:not([pinned]) .tab-close-button { + order: 2 !important; -moz-box-ordinal-group: 2 !important; } #tabbrowser-tabs:not([closebuttons="activetab"]) .tabbrowser-tab[pictureinpicture]:not([pinned]) .tab-close-button { @@ -7588,6 +7690,7 @@ position: absolute !important; } #nav-bar-customization-target { + justify-content: space-between; -moz-box-pack: justify; } #nav-bar { @@ -8070,12 +8173,15 @@ --uc-combined-circlebutton-active-background: color-mix(in srgb, currentColor 20%, transparent); } #nav-bar-customization-target > * { + order: 1; -moz-box-ordinal-group: 1; } #nav-bar-customization-target > #urlbar-container { + order: 5; -moz-box-ordinal-group: 5; } #nav-bar-customization-target > #urlbar-container ~ * { + order: 7; -moz-box-ordinal-group: 7; } } @@ -8126,15 +8232,8 @@ } @supports -moz-bool-pref("userChrome.combined.nav_button") or -moz-bool-pref("userChrome.combined.urlbar.nav_button") { @supports -moz-bool-pref("userChrome.combined.urlbar.nav_button") or - ( - not - ( - -moz-bool-pref("userChrome.combined.sub_button.as_normal") and -moz-bool-pref( - "userChrome.combined.nav_button" - ) - and -moz-bool-pref("userChrome.combined.urlbar.home_button") - ) - ) { + (not -moz-bool-pref("userChrome.combined.sub_button.as_normal")) or + (-moz-bool-pref("userChrome.combined.nav_button") and -moz-bool-pref("userChrome.combined.urlbar.home_button")) { #nav-bar-customization-target > #forward-button { --uc-forward-button-margin: calc(-1 * var(--uc-toolbarbutton-boundary) + 1px); z-index: 2; @@ -8427,9 +8526,11 @@ } @supports -moz-bool-pref("userChrome.combined.urlbar.nav_button") { #nav-bar-customization-target > #back-button { + order: 2; -moz-box-ordinal-group: 2; } #nav-bar-customization-target > #forward-button { + order: 4; -moz-box-ordinal-group: 4; } @supports -moz-bool-pref("userChrome.combined.urlbar.home_button") { @@ -8462,6 +8563,7 @@ } @supports -moz-bool-pref("userChrome.combined.urlbar.home_button") { #nav-bar-customization-target > #home-button { + order: 3; -moz-box-ordinal-group: 3; } @supports not -moz-bool-pref("userChrome.combined.urlbar.nav_button") { @@ -8509,6 +8611,7 @@ } @supports -moz-bool-pref("userChrome.combined.urlbar.reload_button") { #nav-bar-customization-target > #stop-reload-button { + order: 6; -moz-box-ordinal-group: 6; } #urlbar { @@ -8629,12 +8732,14 @@ counter-reset: bookmark-counts 0; } menupopup[placespopup="true"] > menu.bookmark-item::after { + display: inline-flex; display: -moz-inline-box; content: "(" counter(bookmark-counts) ")"; } menupopup[placespopup="true"] > menu.bookmark-item > .menu-iconic-highlightable-text, menupopup[placespopup="true"] > menu.bookmark-item > .menu-accel-container, menupopup[placespopup="true"] > menu.bookmark-item > .menu-right { + order: 2; -moz-box-ordinal-group: 2; } menu.bookmark-item > menupopup[placespopup="true"] > .bookmark-item { @@ -8649,6 +8754,7 @@ z-index: 1; } findbar { + order: -1; -moz-box-ordinal-group: 0; position: relative; height: 0 !important; @@ -8663,7 +8769,10 @@ } findbar::before { content: ""; + display: flex; display: -moz-box; + position: absolute; + flex: 200; -moz-box-flex: 200; } .findbar-container, @@ -8675,18 +8784,22 @@ height: 33px !important; } .findbar-container { + flex-direction: row-reverse; -moz-box-direction: reverse; border-width: 0 0 1px 1px; - border-radius: var(--toolbarbutton-border-radius) 0 0 var(--toolbarbutton-border-radius) !important; + border-radius: var(--uc-rounding-toolbar, var(--toolbarbutton-border-radius)) 0 0 + var(--uc-rounding-toolbar, var(--toolbarbutton-border-radius)) !important; } .findbar-container > .findbar-find-fast { padding: var(--toolbarbutton-inner-padding) 1px; margin: 0 !important; } .findbar-container > .findbar-find-status { + display: flex; display: -moz-box; overflow: hidden; text-overflow: ellipsis; + flex: 1; -moz-box-flex: 1; } .findbar-container > hbox { @@ -8754,6 +8867,7 @@ } @supports not -moz-bool-pref("userChrome.centered.tab.label") { .tab-icon-stack { + flex: 1; -moz-box-flex: 1; justify-content: end; } @@ -9534,6 +9648,7 @@ } @supports -moz-bool-pref("userChrome.autohide.fill_urlbar") { #nav-bar:not(:hover, :focus-within, [urlbar-exceeds-toolbar-bounds="true"]) #urlbar-container { + order: -1; -moz-box-ordinal-group: 0; min-width: calc( var(--uc-navbar-width, 100vw) - @@ -9854,6 +9969,7 @@ list-style-image: url("chrome://global/skin/icons/delete.svg") !important; } #clearDownloadsButton > .toolbarbutton-icon { + display: inline-flex !important; display: -moz-inline-box !important; margin-top: 0; margin-bottom: 0; @@ -9890,7 +10006,7 @@ :root { --arrowpanel-menuicon-padding: 8px; --arrowpanel-menublank-padding: calc( - var(--arrowpanel-menuicon-padding) * 2 + var(var(--arrowpanel-menuitem-padding-inline)) + var(--arrowpanel-menuicon-padding) * 2 + var(--arrowpanel-menuitem-padding-inline) ) !important; --arrowpanel-menuimageblank-padding: calc(var(--arrowpanel-menuitem-padding-inline) - 2px) !important; --arrowpanel-menuimageblank-padding-block: calc(var(--arrowpanel-menuitem-padding-block) - 2px) !important; @@ -9931,6 +10047,7 @@ } #appMenu-multiView .subviewbutton::before, #appMenu-proton-update-banner::before { + display: inline-flex; display: -moz-inline-box; margin-inline-end: var(--arrowpanel-menuicon-padding); width: 16px; @@ -9983,8 +10100,10 @@ } /*= Panel - Main =============================================================*/ #appMenu-proton-addon-banners > .addon-banner-item > .toolbarbutton-icon { + display: inline-flex !important; display: -moz-inline-box !important; margin-inline-start: var(--arrowpanel-menuicon-padding); + order: -1 !important; -moz-box-ordinal-group: 0 !important; } #appMenu-proton-update-banner::before { @@ -10107,6 +10226,7 @@ /* Default */ #fxa-manage-account-button::before { content: ""; + display: inline-flex; display: -moz-inline-box; width: 32px !important; height: 32px !important; @@ -10117,6 +10237,7 @@ } @supports -moz-bool-pref("userChrome.icon.account_image_to_right") { #fxa-manage-account-button::before { + order: 2 !important; -moz-box-ordinal-group: 2 !important; } } @@ -10128,14 +10249,15 @@ } .syncNowBtn { visibility: visible !important; - -moz-box-ordinal-group: 1 !important; + order: -1 !important; + -moz-box-ordinal-group: 0 !important; margin-inline-end: var(--arrowpanel-menuicon-padding); } #PanelUI-fxa-menu-setup-sync-button { list-style-image: url("chrome://browser/skin/sync.svg"); } #PanelUI-fxa-menu-connect-device-button { - list-style-image: url("chrome://browser/skin/fxa/add-device.svg"); + list-style-image: url("../icons/add-device.svg"); } #PanelUI-fxa-menu-sendtab-button { list-style-image: url("../icons/send-to-device.svg"); @@ -10170,12 +10292,14 @@ /* Change Separator */ #PanelUI-fxa-menu::before { content: ""; + display: flex; display: -moz-box; border-bottom: 1px solid var(--panel-separator-color); margin: var(--panel-separator-margin); padding: 0; } #PanelUI-fxa-menu > :first-child { + order: -1; -moz-box-ordinal-group: 0; } #PanelUI-sign-out-separator { @@ -10322,6 +10446,7 @@ list-style-image: url("chrome://browser/skin/downloads/downloads.svg"); } #downloadsHistory .box-inherit.button-box { + display: inline-flex !important; display: -moz-inline-box !important; } /*= Toolbar - Overflow Menu ==================================================*/ @@ -10351,6 +10476,9 @@ #BMB_viewBookmarksSidebar[data-l10n-args='{"isVisible":true}'] { --menuitem-image: url("chrome://global/skin/icons/close.svg"); } + #BMB_searchBookmarks { + --menuitem-image: url("chrome://global/skin/icons/search-glass.svg"); + } #BMB_bookmarksShowAllTop, #BMB_bookmarksShowAll { --menuitem-image: url("chrome://browser/skin/bookmark-star-on-tray.svg"); @@ -10363,6 +10491,7 @@ list-style-image: url("chrome://browser/skin/bookmark-star-on-tray.svg") !important; } #BMB_bookmarksShowAllTop > .menu-iconic-left { + display: flex !important; display: -moz-box !important; } } @@ -10410,7 +10539,7 @@ list-style-image: url("chrome://browser/skin/history.svg"); } #sidebar-switcher-tabs { - list-style-image: url("chrome://browser/skin/tab.svg"); + list-style-image: url("../icons/synced-tabs.svg"); } #sidebar-reverse-position { list-style-image: var(--uc-sidebar-icon-reverse); @@ -10422,6 +10551,13 @@ #unified-extensions-manage-extensions { list-style-image: url("chrome://mozapps/skin/extensions/extension.svg"); } + /*= Compatibility ============================================================*/ + .sync-engine-tabs .checkbox-icon, + .sync-engine-tabs.sync-engine-image, + #sidebar-box[sidebarcommand="viewTabsSidebar"] > #sidebar-header > #sidebar-switcher-target > #sidebar-icon, + #sync-button { + list-style-image: url("../icons/synced-tabs.svg") !important; + } /*= Tab Mix Plus =============================================================*/ #allTabsMenu_sortTabsButton { list-style-image: url("../icons/text-sort-ascending.svg"); @@ -10437,9 +10573,11 @@ /* Icon */ #main-menubar > menu, :not(menu, #ContentSelectDropdown) - > menupopup + > menupopup:not(.in-menulist) > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), - :not(menu, #ContentSelectDropdown) > menupopup > menu:not(.menu-iconic, .in-menulist, [checked="true"]), + :not(menu, #ContentSelectDropdown) + > menupopup:not(.in-menulist) + > menu:not(.menu-iconic, .in-menulist, [checked="true"]), menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup) menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup) @@ -10456,7 +10594,7 @@ /* Color */ -moz-context-properties: fill, fill-opacity, stroke !important; fill: currentColor !important; - stroke: transparent; + stroke: currentColor; /* Layout */ background-size: 16px !important; background-repeat: no-repeat !important; @@ -10469,9 +10607,11 @@ /* For native context menus */ @supports -moz-bool-pref("widget.macos.native-context-menus") or -moz-bool-pref("widget.gtk.native-context-menus") { :not(menu, #ContentSelectDropdown) - > menupopup + > menupopup:not(.in-menulist) > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), - :not(menu, #ContentSelectDropdown) > menupopup > menu:not(.menu-iconic, .in-menulist, [checked="true"]) { + :not(menu, #ContentSelectDropdown) + > menupopup:not(.in-menulist) + > menu:not(.menu-iconic, .in-menulist, [checked="true"]) { list-style-image: var(--menuitem-image, url("../icons/blank.svg")) !important; } } @@ -10484,13 +10624,15 @@ :root:-moz-locale-dir(rtl) { --uc-menu-background-position: right; } - :not(menu, #ContentSelectDropdown, #context-navigation) > menupopup > menuitem:not(.menuitem-iconic), - :not(menu, #ContentSelectDropdown, #context-navigation) > menupopup > menu:not(.menu-iconic), :not(menu, #ContentSelectDropdown, #context-navigation) - > menupopup + > menupopup:not(.in-menulist) + > menuitem:not(.menuitem-iconic), + :not(menu, #ContentSelectDropdown, #context-navigation) > menupopup:not(.in-menulist) > menu:not(.menu-iconic), + :not(menu, #ContentSelectDropdown, #context-navigation) + > menupopup:not(.in-menulist) > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), :not(menu, #ContentSelectDropdown, #context-navigation) - > menupopup + > menupopup:not(.in-menulist) > menu:not(.menu-iconic, .in-menulist, [checked="true"]), menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup) menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), @@ -10530,128 +10672,169 @@ } } /* Padding - Windows */ - @media (-moz-os-version: windows-win7), (-moz-platform: windows-win7) { + @media (-moz-os-version: windows-win7), + (-moz-platform: windows-win7), + (-moz-os-version: windows-win8), + (-moz-platform: windows-win8), + (-moz-os-version: windows-win10), + (-moz-platform: windows-win10) { :root { - --context-menu-background-padding-default: 2px; + --bookmark-menu-icon-text-padding: calc( + var(--context-menu-text-padding) + var(--arrowpanel-menuitem-padding-inline) + ); + --bookmark-menu-icon-background-padding: calc( + var(--arrowpanel-menuitem-padding-inline) + var(--bookmark-menu-icon-align-padding) + ); } - @media (-moz-windows-classic) { + @media (-moz-windows-non-native-menus) { :root { - --context-menu-background-padding-default: -0.5px; + --context-menu-background-padding: 1em; + --context-menu-text-padding: 24px; + --menu-background-padding-default: calc( + var(--context-menu-background-padding) + var(--context-menu-text-padding) + ); + --bookmark-menu-icon-align-padding: 0px; } } - } - @media (-moz-os-version: windows-win8), (-moz-platform: windows-win8) { - :root { - --context-menu-background-padding-default: 3px; + @media not (-moz-windows-non-native-menus) { + :root { + --context-menu-text-padding: calc(1.45em + 8px); + --bookmark-menu-icon-align-padding: calc((1.45em - 16px) / 2 + 1px); + } + @media (-moz-os-version: windows-win7), (-moz-platform: windows-win7) { + :root { + --context-menu-background-padding-default: 2px; + } + @media (not (-moz-windows-non-native-menus)) and (-moz-windows-classic) { + :root { + --context-menu-background-padding-default: -0.5px; + } + } + } + @media (-moz-os-version: windows-win8), (-moz-platform: windows-win8) { + :root { + --context-menu-background-padding-default: 3px; + } + } + @media (-moz-os-version: windows-win10), (-moz-platform: windows-win10) { + :root { + --context-menu-background-padding: 3px; + --menu-background-padding-default: 0px; + } + @supports -moz-bool-pref("userChrome.compatibility.os.win11") { + :root { + --context-menu-background-padding: 5px; + } + #main-menubar { + --context-menu-background-padding: calc(5px + ((1.45em - 16px) / 2)); + } + menuitem:is([type="checkbox"], [type="radio"]) { + --menu-padding: 0px; + } + menuitem[checked="true"] { + --context-menu-background-padding: 0px; + } + menuitem[checked="true"] > .menu-iconic-left { + transform: translateX(2px); + } + } + menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-iconic > .menu-iconic-left, + menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menuitem-iconic > .menu-iconic-left, + menupopup:not([placespopup="true"]) .menu-iconic > .menu-iconic-left, + menupopup:not([placespopup="true"]) .menuitem-iconic > .menu-iconic-left { + appearance: none !important; + padding-block: 0 !important; + padding-inline-start: 5px !important; + margin-inline-end: 8px !important; + } + @supports -moz-bool-pref("userChrome.compatibility.os.win11") { + menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-iconic > .menu-iconic-left, + menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menuitem-iconic > .menu-iconic-left, + menupopup:not([placespopup="true"]) .menu-iconic > .menu-iconic-left, + menupopup:not([placespopup="true"]) .menuitem-iconic > .menu-iconic-left { + box-sizing: content-box; + } + } + menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-accel, + menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-iconic-accel, + menupopup:not([placespopup="true"]) .menu-accel, + menupopup:not([placespopup="true"]) .menu-iconic-accel { + box-sizing: content-box; + min-height: 16px; + } + menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-accel, + menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-iconic-accel, + menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-text, + menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-iconic-text, + menupopup:not([placespopup="true"]) .menu-accel, + menupopup:not([placespopup="true"]) .menu-iconic-accel, + menupopup:not([placespopup="true"]) .menu-text, + menupopup:not([placespopup="true"]) .menu-iconic-text { + padding-block: 0 !important; + } + } } } @media (-moz-os-version: windows-win7), (-moz-platform: windows-win7), (-moz-os-version: windows-win8), - (-moz-platform: windows-win8) { - :not(menu, #ContentSelectDropdown, #context-navigation) - > menupopup - > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), - :not(menu, #ContentSelectDropdown, #context-navigation) - > menupopup - > menu:not(.menu-iconic, .in-menulist, [checked="true"]), - menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup) - menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), - menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup) - menu:not(.menu-iconic, .in-menulist, [checked="true"]), - menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) - > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), - menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu:not(.menu-iconic, .in-menulist, [checked="true"]), - menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup, #context-sendlinktodevice-popup) - > menuitem, - .openintabs-menuitem, - #blockedPopupDontShowMessage, - #BMB_viewBookmarksToolbar, - #context_openANewTab.tabmix-newtab-menu-icon { - background-position: left var(--context-menu-background-padding) center !important; - padding-inline-start: 0 !important; - } - } - @media (-moz-os-version: windows-win10), (-moz-platform: windows-win10) { - :root { - --context-menu-background-padding: 1em; - --context-menu-text-padding: 24px; /* 16px + 8px */ - --menu-background-padding-default: calc( - var(--context-menu-background-padding) + var(--context-menu-text-padding) - ); - } + (-moz-platform: windows-win8), + (-moz-os-version: windows-win10), + (-moz-platform: windows-win10) { @media not (-moz-windows-non-native-menus) { - :root { - --context-menu-background-padding: 3px; - --menu-background-padding-default: 0px; - } - @supports -moz-bool-pref("userChrome.compatibility.os.win11") { - :root { - --context-menu-background-padding: 5px; - } - } - menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-iconic > .menu-iconic-left, - menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menuitem-iconic > .menu-iconic-left, - menupopup:not([placespopup="true"]) .menu-iconic > .menu-iconic-left, - menupopup:not([placespopup="true"]) .menuitem-iconic > .menu-iconic-left { - appearance: none !important; - padding-block: 0 !important; - padding-inline-start: 5px !important; - margin-inline-end: 8px !important; - } - @supports -moz-bool-pref("userChrome.compatibility.os.win11") { - menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-iconic > .menu-iconic-left, - menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menuitem-iconic > .menu-iconic-left, - menupopup:not([placespopup="true"]) .menu-iconic > .menu-iconic-left, - menupopup:not([placespopup="true"]) .menuitem-iconic > .menu-iconic-left { - box-sizing: content-box; - } - } - menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-accel, - menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-iconic-accel, - menupopup:not([placespopup="true"]) .menu-accel, - menupopup:not([placespopup="true"]) .menu-iconic-accel { - box-sizing: content-box; - min-height: 16px; - } - menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-accel, - menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-iconic-accel, - menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-text, - menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-iconic-text, - menupopup:not([placespopup="true"]) .menu-accel, - menupopup:not([placespopup="true"]) .menu-iconic-accel, - menupopup:not([placespopup="true"]) .menu-text, - menupopup:not([placespopup="true"]) .menu-iconic-text { - padding-block: 0 !important; + :not(menu, #ContentSelectDropdown, #context-navigation) + > menupopup:not(.in-menulist) + > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), + :not(menu, #ContentSelectDropdown, #context-navigation) + > menupopup:not(.in-menulist) + > menu:not(.menu-iconic, .in-menulist, [checked="true"]), + menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup) + menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), + menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup) + menu:not(.menu-iconic, .in-menulist, [checked="true"]), + menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) + > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), + menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu:not(.menu-iconic, .in-menulist, [checked="true"]), + menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup, #context-sendlinktodevice-popup) + > menuitem, + .openintabs-menuitem, + #blockedPopupDontShowMessage, + #BMB_viewBookmarksToolbar, + #context_openANewTab.tabmix-newtab-menu-icon { + background-position: left var(--context-menu-background-padding) center !important; + padding-inline-start: 0 !important; } } - :not(menu, #ContentSelectDropdown, #context-navigation) - > menupopup - > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), - :not(menu, #ContentSelectDropdown, #context-navigation) - > menupopup - > menu:not(.menu-iconic, .in-menulist, [checked="true"]), - menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup) - menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), - menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup) - menu:not(.menu-iconic, .in-menulist, [checked="true"]), - menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) - > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), - menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu:not(.menu-iconic, .in-menulist, [checked="true"]), - menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup, #context-sendlinktodevice-popup) - > menuitem, - .openintabs-menuitem, - #blockedPopupDontShowMessage, - #BMB_viewBookmarksToolbar, - #context_openANewTab.tabmix-newtab-menu-icon { - padding-inline-start: var(--menu-background-padding-default) !important; - margin-left: 0 !important; + @media (-moz-windows-non-native-menus) { + :not(menu, #ContentSelectDropdown, #context-navigation) + > menupopup:not(.in-menulist) + > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), + :not(menu, #ContentSelectDropdown, #context-navigation) + > menupopup:not(.in-menulist) + > menu:not(.menu-iconic, .in-menulist, [checked="true"]), + menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup) + menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), + menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup) + menu:not(.menu-iconic, .in-menulist, [checked="true"]), + menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) + > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), + menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu:not(.menu-iconic, .in-menulist, [checked="true"]), + menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup, #context-sendlinktodevice-popup) + > menuitem, + .openintabs-menuitem, + #blockedPopupDontShowMessage, + #BMB_viewBookmarksToolbar, + #context_openANewTab.tabmix-newtab-menu-icon { + padding-inline-start: var(--menu-background-padding-default) !important; + margin-left: 0 !important; + } } } /* Padding - Linux */ @media (-moz-gtk-csd-available) { :root { --context-menu-background-padding-default: 6px; + --context-menu-text-padding: 21px; } #main-menubar > menu > .menubar-text { padding-inline-start: 3px; @@ -10665,21 +10848,23 @@ } /* context menu width */ :not(menu, #ContentSelectDropdown, #context-navigation) - > menupopup + > menupopup:not(.in-menulist) > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), :not(menu, #ContentSelectDropdown, #context-navigation) - > menupopup + > menupopup:not(.in-menulist) > menu:not(.menu-iconic, .in-menulist, [checked="true"]), #blockedPopupDontShowMessage { padding-inline-end: var(--context-menu-background-padding) !important; } /* text position */ - :not(menu, #ContentSelectDropdown, #context-navigation) > menupopup > menuitem > .menu-text, - :not(menu, #ContentSelectDropdown, #context-navigation) > menupopup > menu > .menu-text { + :not(menu, #ContentSelectDropdown, #context-navigation) > menupopup:not(.in-menulist) > menuitem > .menu-text, + :not(menu, #ContentSelectDropdown, #context-navigation) > menupopup:not(.in-menulist) > menu > .menu-text { padding-inline-start: var(--context-menu-mac-padding) !important; } /* Checkbox menuitem, None iconic menu */ - :not(menu, #ContentSelectDropdown, #context-navigation) > menupopup > menuitem[type="checkbox"] { + :not(menu, #ContentSelectDropdown, #context-navigation) + > menupopup:not(.in-menulist) + > menuitem[type="checkbox"] { padding-inline-start: calc(var(--context-menu-background-padding) + var(--context-menu-mac-padding)) !important; } /* Global Menu */ @@ -10706,6 +10891,23 @@ #PersonalToolbar { --context-menu-background-padding: var(--arrowpanel-menuitem-padding-inline); } + /* Windows */ + @media (-moz-os-version: windows-win7), + (-moz-platform: windows-win7), + (-moz-os-version: windows-win8), + (-moz-platform: windows-win8), + (-moz-os-version: windows-win10), + (-moz-platform: windows-win10) { + /* Bookmark Popup - None icon menu */ + menupopup:is(#BMB_bookmarksPopup)[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]), + menupopup:is(#BMB_bookmarksPopup)[placespopup="true"] menu:not(.menu-iconic), + #PersonalToolbar menupopup[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]), + #PersonalToolbar menupopup[placespopup="true"] menu:not(.menu-iconic) { + margin-inline: var(--arrowpanel-menuitem-margin-inline) !important; + padding-inline-start: var(--bookmark-menu-icon-text-padding) !important; + background-position: var(--uc-menu-background-position) var(--bookmark-menu-icon-background-padding) center !important; + } + } /* Windows 7, 8 */ @media (-moz-os-version: windows-win7), (-moz-platform: windows-win7), @@ -10715,45 +10917,6 @@ menupopup:is(#goPopup, #historyMenuPopup, #bookmarksMenuPopup) .bookmark-item { padding-inline-start: 0 !important; } - /* Bookmark Popup - None icon menu */ - #BMB_bookmarksPopup, - #PersonalToolbar { - --arrowpanel-menuicon-padding: 9px; - } - menupopup:is(#BMB_bookmarksPopup) menuitem:not(.menuitem-iconic, [disabled="true"]), - menupopup:is(#BMB_bookmarksPopup) menu:not(.menu-iconic), - #PersonalToolbar menupopup[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]), - #PersonalToolbar menupopup[placespopup="true"] menu:not(.menu-iconic) { - margin-inline: var(--arrowpanel-menuitem-padding-inline) !important; - background-position: var(--uc-menu-background-position) calc(var(--arrowpanel-menuicon-padding)) center !important; - } - menupopup:is(#BMB_bookmarksPopup) menuitem:not(.menuitem-iconic, [disabled="true"]), - menupopup:is(#BMB_bookmarksPopup) menu:not(.menu-iconic) { - padding-inline-start: calc( - var(--arrowpanel-menuicon-padding) + var(--context-menu-text-padding) + 2px - ) !important; - } - #PersonalToolbar menupopup[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]), - #PersonalToolbar menupopup[placespopup="true"] menu:not(.menu-iconic) { - padding-inline-start: var(--arrowpanel-menuicon-padding) !important; - } - } - /* Windows */ - @media (-moz-os-version: windows-win10), (-moz-platform: windows-win10) { - /* Bookmark Popup - None icon menu */ - menupopup:is(#BMB_bookmarksPopup) menuitem:not(.menuitem-iconic, [disabled="true"]), - menupopup:is(#BMB_bookmarksPopup) menu:not(.menu-iconic), - #PersonalToolbar menupopup[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]), - #PersonalToolbar menupopup[placespopup="true"] menu:not(.menu-iconic) { - --arrowpanel-bookmark-menuicon-padding: calc( - var(--arrowpanel-menuicon-padding) - var(--arrowpanel-menuitem-margin-inline) - ); - margin-inline-start: var(--arrowpanel-menuitem-margin-inline) !important; - padding-inline-start: calc( - var(--arrowpanel-bookmark-menuicon-padding) + var(--context-menu-text-padding) - ) !important; - background-position: var(--uc-menu-background-position) var(--arrowpanel-bookmark-menuicon-padding) center !important; - } } /* Linux */ @media (-moz-gtk-csd-available) { @@ -10764,20 +10927,22 @@ /* Bookmark Popup - Iconic menu */ #BMB_bookmarksPopup .menu-iconic-text, #PersonalToolbar menupopup[placespopup="true"] .bookmark-item .menu-iconic-text { - padding-inline-start: 1px !important; + margin-inline-start: -1px !important; } /* Bookmark Popup - None icon menu */ - menupopup:is(#BMB_bookmarksPopup) menuitem:not(.menuitem-iconic, [disabled="true"]), - menupopup:is(#BMB_bookmarksPopup) menu:not(.menu-iconic), + menupopup:is(#BMB_bookmarksPopup)[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]), + menupopup:is(#BMB_bookmarksPopup)[placespopup="true"] menu:not(.menu-iconic), #PersonalToolbar menupopup[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]), #PersonalToolbar menupopup[placespopup="true"] menu:not(.menu-iconic) { - padding-inline-start: calc(var(--arrowpanel-menuitem-padding-inline) + 1px) !important; + padding-inline-start: calc(var(--context-menu-background-padding) + 2px) !important; } - menupopup:is(#BMB_bookmarksPopup) menuitem:not(.menuitem-iconic, [disabled="true"]) .menu-text, - menupopup:is(#BMB_bookmarksPopup) menu:not(.menu-iconic) .menu-text, + menupopup:is(#BMB_bookmarksPopup)[placespopup="true"] + menuitem:not(.menuitem-iconic, [disabled="true"]) + .menu-text, + menupopup:is(#BMB_bookmarksPopup)[placespopup="true"] menu:not(.menu-iconic) .menu-text, #PersonalToolbar menupopup[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]) .menu-text, #PersonalToolbar menupopup[placespopup="true"] menu:not(.menu-iconic) .menu-text { - margin-inline-start: 21px !important; + margin-inline-start: var(--context-menu-text-padding) !important; } } @supports -moz-bool-pref("layout.css.osx-font-smoothing.enabled") { @@ -10787,16 +10952,18 @@ padding-inline: var(--arrowpanel-menuitem-padding-inline) !important; } /* Bookmark Popup - None icon menu */ - menupopup:is(#BMB_bookmarksPopup) menuitem:not(.menuitem-iconic, [disabled="true"]), - menupopup:is(#BMB_bookmarksPopup) menu:not(.menu-iconic) { + menupopup:is(#BMB_bookmarksPopup)[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]), + menupopup:is(#BMB_bookmarksPopup)[placespopup="true"] menu:not(.menu-iconic) { padding-inline-start: calc(var(--arrowpanel-menuitem-padding-inline) + 3px) !important; } #PersonalToolbar menupopup[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]), #PersonalToolbar menupopup[placespopup="true"] menu:not(.menu-iconic) { padding-inline-start: calc(var(--arrowpanel-menuitem-padding-inline) + 1px) !important; } - menupopup:is(#BMB_bookmarksPopup) menuitem:not(.menuitem-iconic, [disabled="true"]) > .menu-text, - menupopup:is(#BMB_bookmarksPopup) menu:not(.menu-iconic) > .menu-text, + menupopup:is(#BMB_bookmarksPopup)[placespopup="true"] + menuitem:not(.menuitem-iconic, [disabled="true"]) + > .menu-text, + menupopup:is(#BMB_bookmarksPopup)[placespopup="true"] menu:not(.menu-iconic) > .menu-text, #PersonalToolbar menupopup[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]) > .menu-text, #PersonalToolbar menupopup[placespopup="true"] menu:not(.menu-iconic) > .menu-text { padding-inline-start: var(--context-menu-mac-padding) !important; @@ -10832,6 +10999,7 @@ #tabcenter-reborn_ariasuni-menuitem-_contextMenuMuteTab, #sidebartabs_asamuzak_jp-menuitem-_muteTab { --menuitem-image: url("chrome://browser/skin/tabbrowser/tab-audio-muted-small.svg"); + stroke: transparent !important; } #context_toggleMuteTab[muted], #context_toggleMuteSelectedTabs[muted], @@ -11067,7 +11235,7 @@ } #context-viewsource-highlightSyntax { /* checkbox */ - --menuitem-image: url("../icons/code.svg"); + --menuitem-image: url("../icons/highlight.svg"); } #spell-no-suggestions { --menuitem-image: url("../icons/text-proofing-tools.svg"); @@ -11239,6 +11407,9 @@ #context-selectall { --menuitem-image: url("../icons/select-all-on.svg"); } + #context-reveal-password { + --menuitem-image: url("../icons/eye-show.svg"); + } #context-print-selection { --menuitem-image: url("chrome://global/skin/icons/print.svg"); } @@ -11670,6 +11841,9 @@ --menuitem-image: url("chrome://global/skin/icons/settings.svg"); } /*= unified-extensions-context-menu ==========================================*/ + .unified-extensions-context-menu-pin-to-toolbar { + --menuitem-image: url("../icons/pin-tab.svg"); + } .unified-extensions-context-menu-manage-extension { --menuitem-image: url("chrome://global/skin/icons/settings.svg"); } @@ -11817,12 +11991,24 @@ #menu_customizeToolbars { --menuitem-image: url("chrome://browser/skin/customize.svg"); } + /* viewSidebarMenu sub menu */ + #menu_bookmarksSidebar { + --menuitem-image: url("chrome://browser/skin/bookmark.svg"); + } + #menu_historySidebar { + --menuitem-image: url("chrome://browser/skin/history.svg"); + } + #menu_tabsSidebar { + --menuitem-image: url("../icons/synced-tabs.svg"); + } /* viewFullZoomMenu sub menu */ #menu_zoomEnlarge { --menuitem-image: url("chrome://browser/skin/add-circle-fill.svg"); + stroke: transparent !important; } #menu_zoomReduce { --menuitem-image: url("chrome://browser/skin/subtract-circle-fill.svg"); + stroke: transparent !important; } #menu_zoomReset { --menuitem-image: url("../icons/resize.svg"); diff --git a/arch-config/.mozilla/firefox/default-release/chrome/css/leptonContent.css b/arch-config/.mozilla/firefox/default-release/chrome/css/leptonContent.css index 18222c04..d3424755 100644 --- a/arch-config/.mozilla/firefox/default-release/chrome/css/leptonContent.css +++ b/arch-config/.mozilla/firefox/default-release/chrome/css/leptonContent.css @@ -252,7 +252,7 @@ /* Color */ -moz-context-properties: fill, fill-opacity, stroke !important; fill: currentColor !important; - stroke: transparent; + stroke: currentColor; /* Layout */ background-size: 16px !important; background-repeat: no-repeat !important; @@ -410,6 +410,7 @@ } #contentSearchSettingsButton::before { content: url("chrome://global/skin/icons/settings.svg") !important; + display: inline-flex; display: -moz-inline-box; /* Color */ -moz-context-properties: fill, fill-opacity !important; @@ -460,7 +461,7 @@ } /** Error Page - Restore illustrations ****************************************/ @supports -moz-bool-pref("userContent.page.illustration") { - @-moz-document url-prefix("about:neterror"), url("about:restartrequired"), url("chrome://browser/content/aboutRestartRequired.xhtml"), url("about:sessionrestore"), url("chrome://browser/content/aboutSessionRestore.xhtml") + @-moz-document url-prefix("about:neterror"), url-prefix("about:restartrequired"), url("chrome://browser/content/aboutRestartRequired.xhtml"), url("about:sessionrestore"), url("chrome://browser/content/aboutSessionRestore.xhtml") { /* Illustrations Position */ #errorPageContainer, @@ -490,7 +491,7 @@ padding-inline-start: 38%; } } - @-moz-document url-prefix("about:neterror?e=connectionFailure"), url-prefix("about:neterror?e=netInterrupt"), url-prefix("about:neterror?e=netReset"), url-prefix("about:neterror?e=netTimeout"), url-prefix("about:neterror?e=netOffline"), url("about:restartrequired"), url("chrome://browser/content/aboutRestartRequired.xhtml") + @-moz-document url-prefix("about:neterror?e=connectionFailure"), url-prefix("about:neterror?e=netInterrupt"), url-prefix("about:neterror?e=netReset"), url-prefix("about:neterror?e=netTimeout"), url-prefix("about:neterror?e=netOffline"), url-prefix("about:restartrequired"), url("chrome://browser/content/aboutRestartRequired.xhtml") { :root { --uc-error-llustration: url(../icons/error-connection-failure.svg); @@ -554,11 +555,20 @@ } } } + @-moz-document url-prefix("about:preferences") { + #no-results-message::after { + content: url("../icons/no-search-results.svg"); + width: 380px; + height: 293px; + margin-top: 64px; + margin-inline: auto; + } + } } /** Fully Dark Mode ***********************************************************/ /*= Fully Dark Mode - Dark Mode Colors =======================================*/ @supports -moz-bool-pref("userContent.page.proton_color") { - @-moz-document url-prefix("about:"), url-prefix("chrome://browser/content/places/places.xhtml"), url-prefix("https://addons.mozilla.org"), url-prefix("https://support.mozilla.org"), url-prefix("https://accounts.firefox.com"), url-prefix("view-source"), regexp("^(((jar:)?file:///)|(chrome://)).*/$") + @-moz-document url-prefix("about:"), url-prefix("chrome://"), url-prefix("https://addons.mozilla.org"), url-prefix("https://support.mozilla.org"), url-prefix("https://accounts.firefox.com"), url-prefix("view-source"), regexp("^((jar:)?file:///).*/$") { /*= Default Colors - Hard Coded ==============================================*/ /* Based on chrome://global/skin/in-content/common.css */ @@ -665,6 +675,7 @@ --card-shadow: var(--shadow-10); --card-outline-color: var(--grey-30); --card-shadow-hover: var(--card-shadow), 0 0 0 5px var(--card-outline-color); + --uc-warning-icon-bgcolor: #ffa436; } @media (-moz-toolbar-prefers-color-scheme: dark), (prefers-color-scheme: dark) { :host, @@ -701,6 +712,13 @@ --in-content-link-color-visited: var(--in-content-link-color); --card-outline-color: var(--grey-60); --dialog-warning-text-color: var(--red-40); + --uc-warning-icon-bgcolor: #ffbd4f; + } + } + @media (prefers-contrast) { + :host, + :root { + --uc-warning-icon-bgcolor: var(--in-content-page-color); } } @supports -moz-bool-pref("userContent.page.proton_color.dark_blue_accent") { @@ -2004,20 +2022,10 @@ #sanitizeEverythingWarningIcon { list-style-image: url("chrome://global/skin/icons/warning.svg") !important; -moz-context-properties: fill; - fill: #ffa436; + fill: var(--uc-warning-icon-bgcolor); width: 48px; height: 48px; } - @media (-moz-toolbar-prefers-color-scheme: dark), (prefers-color-scheme: dark) { - #sanitizeEverythingWarningIcon { - fill: #ffbd4f; - } - } - @media (prefers-contrast) { - #sanitizeEverythingWarningIcon { - fill: var(--in-content-page-color); - } - } } /*= chrome://browser/content/places/places.xhtml =============================*/ @-moz-document url("chrome://browser/content/places/places.xhtml") @@ -2164,6 +2172,7 @@ list-style-image: url("chrome://global/skin/icons/delete.svg") !important; } #clearDownloadsButton > .toolbarbutton-icon { + display: inline-flex !important; display: -moz-inline-box !important; margin-top: 0; margin-bottom: 0; @@ -2614,6 +2623,7 @@ /* From checkbox.css */ menuitem[type="checkbox"] { appearance: none !important; + align-items: center !important; -moz-box-align: center !important; margin: 0px 2px !important; } @@ -2780,12 +2790,13 @@ } /** Rounding ******************************************************************/ @supports -moz-bool-pref("userChrome.rounding.square_button") { - @-moz-document url-prefix("about:"), url-prefix("chrome://browser/content/"), url-prefix("chrome://pippki/content/") + @-moz-document url-prefix("about:"), regexp("^chrome://\\w+/content/.*.xhtml$") { - button, + button:not(.toggle-button), .close-icon, .action-icon::before, - .web-appearance-choice, + .page-section-header > .twisty, + .closed-tab-li-main, #categories > .category, .sidebar-footer-link { border-radius: 0 !important; @@ -2813,6 +2824,14 @@ border-radius: 0 !important; } } + @-moz-document regexp(".*.pdf$") { + .toolbarButton, + .dropdownToolbarButton, + .secondaryToolbarButton, + .dialogButton { + border-radius: 0 !important; + } + } } @supports -moz-bool-pref("userChrome.rounding.square_dialog") { @-moz-document url-prefix("about:") { @@ -2825,9 +2844,14 @@ border-radius: 0 !important; } } + @-moz-document regexp(".*.pdf$") { + dialog { + border-radius: 0 !important; + } + } } @supports -moz-bool-pref("userChrome.rounding.square_checklabel") { - @-moz-document url-prefix("about:"), url-prefix("chrome://browser/content/"), url-prefix("chrome://pippki/content/") + @-moz-document url-prefix("about:"), regexp("^chrome://\\w+/content/.*.xhtml$") { input[type="checkbox"]:not(.toggle-button), .checkbox-check { @@ -2836,7 +2860,7 @@ } } @supports -moz-bool-pref("userChrome.rounding.square_field") { - @-moz-document url-prefix("about:"), url-prefix("chrome://browser/content/"), url-prefix("chrome://pippki/content/") + @-moz-document url-prefix("about:"), regexp("^chrome://\\w+/content/.*.xhtml$") { input:is([type="color"], [type="email"], [type="tel"], [type="text"], [type="password"], [type="url"], [type="number"]), textarea, @@ -2846,7 +2870,9 @@ treecols, listheader, richlistbox, - search-textbox { + search-textbox, + .web-appearance-choice, + .content-blocking-category { border-radius: 0 !important; } } @@ -2861,6 +2887,12 @@ border-radius: 0 !important; } } + @-moz-document regexp(".*.pdf$") { + .toolbarField, + .thumbnailSelectionRing { + border-radius: 0 !important; + } + } } @supports -moz-bool-pref("userChrome.rounding.square_menupopup") { @-moz-document url-prefix("about:"), url-prefix("chrome://") @@ -2884,6 +2916,34 @@ border-radius: 0 !important; } } + @-moz-document regexp(".*.pdf$") { + .doorHanger, + .doorHangerRight { + border-radius: 0 !important; + } + } +} +@supports -moz-bool-pref("userChrome.rounding.square_infobox") { + @-moz-document url-prefix("about:"), regexp("^chrome://\\w+/content/.*.xhtml$") + { + /* + * .container is inside shadow DOM, + * and it does not have any other classes, + * but there may be other elements with the same class, + * hence the weird selector. + */ + link[href="chrome://global/content/elements/message-bar.css"] + .container, + .info-box-container:not(.content-blocking-category), + .options-container, + #sanitizeEverythingWarningBox { + border-radius: 0 !important; + } + } + @-moz-document url-prefix("about:debugging") { + .message { + border-radius: 0 !important; + } + } } @-moz-document url("chrome://browser/content/places/places.xhtml") { @@ -2906,7 +2966,7 @@ } /** Monospace *****************************************************************/ @supports -moz-bool-pref("userContent.page.monospace") { - @-moz-document url-prefix("about:"), url-prefix("chrome://browser/content/places/places.xhtml"), regexp("^(((jar:)?file:///)|(chrome://)).*/$") + @-moz-document url-prefix("about:"), url-prefix("chrome://"), regexp("^((jar:)?file:///).*/$") { * { font-family: -moz-fixed; @@ -2932,7 +2992,7 @@ /* Color */ -moz-context-properties: fill, fill-opacity, stroke !important; fill: currentColor !important; - stroke: transparent; + stroke: currentColor; /* Layout */ background-size: 16px !important; background-repeat: no-repeat !important; @@ -2941,9 +3001,11 @@ /* For native context menus */ @supports -moz-bool-pref("widget.macos.native-context-menus") or -moz-bool-pref("widget.gtk.native-context-menus") { :not(menu, #ContentSelectDropdown) - > menupopup + > menupopup:not(.in-menulist) > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), - :not(menu, #ContentSelectDropdown) > menupopup > menu:not(.menu-iconic, .in-menulist, [checked="true"]) { + :not(menu, #ContentSelectDropdown) + > menupopup:not(.in-menulist) + > menu:not(.menu-iconic, .in-menulist, [checked="true"]) { list-style-image: var(--menuitem-image, url("../icons/blank.svg")) !important; } } @@ -2967,104 +3029,147 @@ padding-inline-start: var(--context-menu-background-padding) !important; } /* Padding - Windows */ - @media (-moz-os-version: windows-win7), (-moz-platform: windows-win7) { + @media (-moz-os-version: windows-win7), + (-moz-platform: windows-win7), + (-moz-os-version: windows-win8), + (-moz-platform: windows-win8), + (-moz-os-version: windows-win10), + (-moz-platform: windows-win10) { :root { - --context-menu-background-padding-default: 2px; + --bookmark-menu-icon-text-padding: calc( + var(--context-menu-text-padding) + var(--arrowpanel-menuitem-padding-inline) + ); + --bookmark-menu-icon-background-padding: calc( + var(--arrowpanel-menuitem-padding-inline) + var(--bookmark-menu-icon-align-padding) + ); } - @media (-moz-windows-classic) { + @media (-moz-windows-non-native-menus) { :root { - --context-menu-background-padding-default: -0.5px; + --context-menu-background-padding: 1em; + --context-menu-text-padding: 24px; + --menu-background-padding-default: calc( + var(--context-menu-background-padding) + var(--context-menu-text-padding) + ); + --bookmark-menu-icon-align-padding: 0px; } } - } - @media (-moz-os-version: windows-win8), (-moz-platform: windows-win8) { - :root { - --context-menu-background-padding-default: 3px; + @media not (-moz-windows-non-native-menus) { + :root { + --context-menu-text-padding: calc(1.45em + 8px); + --bookmark-menu-icon-align-padding: calc((1.45em - 16px) / 2 + 1px); + } + @media (-moz-os-version: windows-win7), (-moz-platform: windows-win7) { + :root { + --context-menu-background-padding-default: 2px; + } + @media (not (-moz-windows-non-native-menus)) and (-moz-windows-classic) { + :root { + --context-menu-background-padding-default: -0.5px; + } + } + } + @media (-moz-os-version: windows-win8), (-moz-platform: windows-win8) { + :root { + --context-menu-background-padding-default: 3px; + } + } + @media (-moz-os-version: windows-win10), (-moz-platform: windows-win10) { + :root { + --context-menu-background-padding: 3px; + --menu-background-padding-default: 0px; + } + @supports -moz-bool-pref("userChrome.compatibility.os.win11") { + :root { + --context-menu-background-padding: 5px; + } + #main-menubar { + --context-menu-background-padding: calc(5px + ((1.45em - 16px) / 2)); + } + menuitem:is([type="checkbox"], [type="radio"]) { + --menu-padding: 0px; + } + menuitem[checked="true"] { + --context-menu-background-padding: 0px; + } + menuitem[checked="true"] > .menu-iconic-left { + transform: translateX(2px); + } + } + menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-iconic > .menu-iconic-left, + menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menuitem-iconic > .menu-iconic-left, + menupopup:not([placespopup="true"]) .menu-iconic > .menu-iconic-left, + menupopup:not([placespopup="true"]) .menuitem-iconic > .menu-iconic-left { + appearance: none !important; + padding-block: 0 !important; + padding-inline-start: 5px !important; + margin-inline-end: 8px !important; + } + @supports -moz-bool-pref("userChrome.compatibility.os.win11") { + menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-iconic > .menu-iconic-left, + menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menuitem-iconic > .menu-iconic-left, + menupopup:not([placespopup="true"]) .menu-iconic > .menu-iconic-left, + menupopup:not([placespopup="true"]) .menuitem-iconic > .menu-iconic-left { + box-sizing: content-box; + } + } + menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-accel, + menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-iconic-accel, + menupopup:not([placespopup="true"]) .menu-accel, + menupopup:not([placespopup="true"]) .menu-iconic-accel { + box-sizing: content-box; + min-height: 16px; + } + menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-accel, + menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-iconic-accel, + menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-text, + menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-iconic-text, + menupopup:not([placespopup="true"]) .menu-accel, + menupopup:not([placespopup="true"]) .menu-iconic-accel, + menupopup:not([placespopup="true"]) .menu-text, + menupopup:not([placespopup="true"]) .menu-iconic-text { + padding-block: 0 !important; + } + } } } @media (-moz-os-version: windows-win7), (-moz-platform: windows-win7), (-moz-os-version: windows-win8), - (-moz-platform: windows-win8) { - menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu) - menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), - menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu) - menu:not(.menu-iconic, .in-menulist, [checked="true"]), - menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) - > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), - menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu:not(.menu-iconic, .in-menulist, [checked="true"]) { - background-position: left var(--context-menu-background-padding) center !important; - padding-inline-start: 0 !important; - } - } - @media (-moz-os-version: windows-win10), (-moz-platform: windows-win10) { - :root { - --context-menu-background-padding: 1em; - --context-menu-text-padding: 24px; /* 16px + 8px */ - --menu-background-padding-default: calc( - var(--context-menu-background-padding) + var(--context-menu-text-padding) - ); - } + (-moz-platform: windows-win8), + (-moz-os-version: windows-win10), + (-moz-platform: windows-win10) { @media not (-moz-windows-non-native-menus) { - :root { - --context-menu-background-padding: 3px; - --menu-background-padding-default: 0px; - } - @supports -moz-bool-pref("userChrome.compatibility.os.win11") { - :root { - --context-menu-background-padding: 5px; - } - } - menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-iconic > .menu-iconic-left, - menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menuitem-iconic > .menu-iconic-left, - menupopup:not([placespopup="true"]) .menu-iconic > .menu-iconic-left, - menupopup:not([placespopup="true"]) .menuitem-iconic > .menu-iconic-left { - appearance: none !important; - padding-block: 0 !important; - padding-inline-start: 5px !important; - margin-inline-end: 8px !important; - } - @supports -moz-bool-pref("userChrome.compatibility.os.win11") { - menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-iconic > .menu-iconic-left, - menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menuitem-iconic > .menu-iconic-left, - menupopup:not([placespopup="true"]) .menu-iconic > .menu-iconic-left, - menupopup:not([placespopup="true"]) .menuitem-iconic > .menu-iconic-left { - box-sizing: content-box; - } - } - menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-accel, - menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-iconic-accel, - menupopup:not([placespopup="true"]) .menu-accel, - menupopup:not([placespopup="true"]) .menu-iconic-accel { - box-sizing: content-box; - min-height: 16px; - } - menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-accel, - menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-iconic-accel, - menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-text, - menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-iconic-text, - menupopup:not([placespopup="true"]) .menu-accel, - menupopup:not([placespopup="true"]) .menu-iconic-accel, - menupopup:not([placespopup="true"]) .menu-text, - menupopup:not([placespopup="true"]) .menu-iconic-text { - padding-block: 0 !important; + menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu) + menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), + menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu) + menu:not(.menu-iconic, .in-menulist, [checked="true"]), + menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) + > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), + menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) + > menu:not(.menu-iconic, .in-menulist, [checked="true"]) { + background-position: left var(--context-menu-background-padding) center !important; + padding-inline-start: 0 !important; } } - menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu) - menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), - menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu) - menu:not(.menu-iconic, .in-menulist, [checked="true"]), - menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) - > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), - menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu:not(.menu-iconic, .in-menulist, [checked="true"]) { - padding-inline-start: var(--menu-background-padding-default) !important; - margin-left: 0 !important; + @media (-moz-windows-non-native-menus) { + menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu) + menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), + menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu) + menu:not(.menu-iconic, .in-menulist, [checked="true"]), + menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) + > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), + menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) + > menu:not(.menu-iconic, .in-menulist, [checked="true"]) { + padding-inline-start: var(--menu-background-padding-default) !important; + margin-left: 0 !important; + } } } /* Padding - Linux */ @media (-moz-gtk-csd-available) { :root { --context-menu-background-padding-default: 6px; + --context-menu-text-padding: 21px; } /* Contextmenu Checkbox Unset */ menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu) menuitem[type="checkbox"] { @@ -3304,6 +3409,36 @@ } } } + @-moz-document url-prefix("about:addons") { + @supports -moz-bool-pref("userChrome.icon.context_menu") { + button[role="menuitem"] { + background-image: var(--icon, url("../icons/blank.svg")); /* Don't use !important. because of [checked] */ + } + panel-item[action="check-for-updates"] { + --icon: url("../icons/refresh-cw.svg"); + } + panel-item[action="view-recent-updates"] { + --icon: url("chrome://global/skin/icons/info.svg"); + } + panel-item[action="install-from-file"] { + --icon: url("chrome://devtools/skin/images/import.svg"); + } + panel-item[action="debug-addons"] { + --icon: url("../icons/bug.svg"); + } + panel-item[action="set-update-automatically"] { + --icon: url("chrome://devtools/skin/images/profiler-stopwatch.svg"); + } + panel-item[action="reset-update-states"] { + --icon: url("chrome://devtools/skin/images/debugging-workers.svg"); + } + panel-item[action="manage-shortcuts"], + panel-item[data-l10n-id="preferences-addon-button"], + panel-item[data-l10n-id="manage-addon-button"] { + --icon: url("chrome://global/skin/icons/settings.svg"); + } + } + } } } /** Download Panel ************************************************************/ diff --git a/arch-config/.mozilla/firefox/default-release/chrome/icons/add-device.svg b/arch-config/.mozilla/firefox/default-release/chrome/icons/add-device.svg new file mode 100644 index 00000000..10fef2b2 --- /dev/null +++ b/arch-config/.mozilla/firefox/default-release/chrome/icons/add-device.svg @@ -0,0 +1,7 @@ + + + + + diff --git a/arch-config/.mozilla/firefox/default-release/chrome/icons/highlight.svg b/arch-config/.mozilla/firefox/default-release/chrome/icons/highlight.svg new file mode 100644 index 00000000..74105a7b --- /dev/null +++ b/arch-config/.mozilla/firefox/default-release/chrome/icons/highlight.svg @@ -0,0 +1,3 @@ + + + diff --git a/arch-config/.mozilla/firefox/default-release/chrome/icons/link.svg b/arch-config/.mozilla/firefox/default-release/chrome/icons/link.svg index e3a0ae8a..cbc15a24 100644 --- a/arch-config/.mozilla/firefox/default-release/chrome/icons/link.svg +++ b/arch-config/.mozilla/firefox/default-release/chrome/icons/link.svg @@ -1,8 +1,6 @@ - - - - - \ No newline at end of file + + + diff --git a/arch-config/.mozilla/firefox/default-release/chrome/icons/no-search-results.svg b/arch-config/.mozilla/firefox/default-release/chrome/icons/no-search-results.svg new file mode 100644 index 00000000..fcb214ed --- /dev/null +++ b/arch-config/.mozilla/firefox/default-release/chrome/icons/no-search-results.svg @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/arch-config/.mozilla/firefox/default-release/chrome/icons/pin-tab.svg b/arch-config/.mozilla/firefox/default-release/chrome/icons/pin-tab.svg index 719eeed1..2a30c3f9 100644 --- a/arch-config/.mozilla/firefox/default-release/chrome/icons/pin-tab.svg +++ b/arch-config/.mozilla/firefox/default-release/chrome/icons/pin-tab.svg @@ -1,6 +1,6 @@ - - + + diff --git a/arch-config/.mozilla/firefox/default-release/chrome/icons/synced-tabs.svg b/arch-config/.mozilla/firefox/default-release/chrome/icons/synced-tabs.svg new file mode 100644 index 00000000..af172fdc --- /dev/null +++ b/arch-config/.mozilla/firefox/default-release/chrome/icons/synced-tabs.svg @@ -0,0 +1,12 @@ + + + + + + + + + + \ No newline at end of file diff --git a/arch-config/.mozilla/firefox/default-release/chrome/icons/unpin-tab.svg b/arch-config/.mozilla/firefox/default-release/chrome/icons/unpin-tab.svg index 8acf292f..f738efda 100644 --- a/arch-config/.mozilla/firefox/default-release/chrome/icons/unpin-tab.svg +++ b/arch-config/.mozilla/firefox/default-release/chrome/icons/unpin-tab.svg @@ -2,5 +2,7 @@ - License, v. 2.0. If a copy of the MPL was not distributed with this - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> - + + + diff --git a/arch-config/.mozilla/firefox/default-release/user.js b/arch-config/.mozilla/firefox/default-release/user.js index 703bf9e0..4fd69dc4 100644 --- a/arch-config/.mozilla/firefox/default-release/user.js +++ b/arch-config/.mozilla/firefox/default-release/user.js @@ -65,12 +65,12 @@ user_pref("userChrome.rounding.square_tab", true); // user_pref("userChrome.compatibility.os.linux_non_native_titlebar_button", true); // user_pref("userChrome.compatibility.os.windows_maximized", true); +// user_pref("userChrome.compatibility.os.win11", true); // == Theme Custom Settings ==================================================== // -- User Chrome -------------------------------------------------------------- // user_pref("userChrome.theme.proton_color.dark_blue_accent", true); // user_pref("userChrome.theme.monospace", true); -// user_pref("userChrome.compatibility.os.win11", true); // user_pref("userChrome.decoration.disable_panel_animate", true); // user_pref("userChrome.decoration.disable_sidebar_animate", true); @@ -126,6 +126,8 @@ user_pref("userChrome.rounding.square_tab", true); // user_pref("userChrome.rounding.square_panelitem", true); // user_pref("userChrome.rounding.square_menupopup", true); // user_pref("userChrome.rounding.square_menuitem", true); +// user_pref("userChrome.rounding.square_infobox", true); +// user_pref("userChrome.rounding.square_toolbar", true); // user_pref("userChrome.rounding.square_field", true); // user_pref("userChrome.rounding.square_urlView_item", true); // user_pref("userChrome.rounding.square_checklabel", true);