From 10a63d99e3a9739cc4c2211c45ecffb258f7bea4 Mon Sep 17 00:00:00 2001 From: RealStickman Date: Sun, 4 Dec 2022 09:37:08 +0100 Subject: [PATCH] Update Lepton v6.5.0. Update prefs --- .../.mozilla/firefox/default-release/CREDITS | 17 + .../firefox/default-release/chrome/LEPTON | 2 +- .../chrome/css/leptonChrome.css | 2098 ++++------------- .../chrome/css/leptonContent.css | 558 +---- .../chrome/icons/error-malformed-url.svg | 61 + .../default-release/chrome/icons/merge.svg | 3 + .../chrome/icons/new-tab-forward.svg | 4 + .../chrome/icons/new-tab-skip-forward.svg | 3 + .../icons/tab-desktop-multiple-bottom.svg | 3 + .../default-release/chrome/icons/timer10.svg | 3 + .../chrome/icons/toolbarButton-download.svg | 4 + .../chrome/icons/weather-snowflake.svg | 3 + .../firefox/default-release/install.ps1 | 997 ++++++++ .../firefox/default-release/install.sh | 954 ++++++++ .../.mozilla/firefox/default-release/prefs.js | 192 +- .../.mozilla/firefox/default-release/user.js | 4 - 16 files changed, 2772 insertions(+), 2134 deletions(-) create mode 100644 arch-config/.mozilla/firefox/default-release/chrome/icons/error-malformed-url.svg create mode 100644 arch-config/.mozilla/firefox/default-release/chrome/icons/merge.svg create mode 100644 arch-config/.mozilla/firefox/default-release/chrome/icons/new-tab-forward.svg create mode 100644 arch-config/.mozilla/firefox/default-release/chrome/icons/new-tab-skip-forward.svg create mode 100644 arch-config/.mozilla/firefox/default-release/chrome/icons/tab-desktop-multiple-bottom.svg create mode 100644 arch-config/.mozilla/firefox/default-release/chrome/icons/timer10.svg create mode 100644 arch-config/.mozilla/firefox/default-release/chrome/icons/toolbarButton-download.svg create mode 100644 arch-config/.mozilla/firefox/default-release/chrome/icons/weather-snowflake.svg create mode 100644 arch-config/.mozilla/firefox/default-release/install.ps1 create mode 100755 arch-config/.mozilla/firefox/default-release/install.sh diff --git a/arch-config/.mozilla/firefox/default-release/CREDITS b/arch-config/.mozilla/firefox/default-release/CREDITS index 0a4527ed..a192c71f 100644 --- a/arch-config/.mozilla/firefox/default-release/CREDITS +++ b/arch-config/.mozilla/firefox/default-release/CREDITS @@ -19,9 +19,26 @@ N: Yunsup Sim E: pedogunu@gmail.com W: https://ethansup.net +---------- + Sponsors + +N: Jani Haiko +E: haiko.jani@gmail.com +W: https://github.com/ojaha065 + +N: nikkehtine +E: nikkehtine@int.pl +W: https://github.com/nikkehtine + +N: OSS.kr +W: https://www.oss.kr/ + ---------- Contributors +N: 2641a40fd44383320adde4b027a1d0b03bd550 +W: https://github.com/2641a40fd44383320adde4b027a1d0b03bd550 + N: 7k5x E: 7k5xlp0onfire@gmail.com W: https://github.com/7k5x diff --git a/arch-config/.mozilla/firefox/default-release/chrome/LEPTON b/arch-config/.mozilla/firefox/default-release/chrome/LEPTON index ba3fe003..993d0079 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=v6.3.0 +Ver=v6.5.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 e7f5c6ea..376d2a32 100644 --- a/arch-config/.mozilla/firefox/default-release/chrome/css/leptonChrome.css +++ b/arch-config/.mozilla/firefox/default-release/chrome/css/leptonChrome.css @@ -5,10 +5,8 @@ /*= Lightmode - Color darker =================================================*/ :root[lwtheme-mozlightdark]:not([lwthemetextcolor="bright"]), :root[style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"] { - --lwt-accent-color: rgb(229, 229, 235) !important; - /* Original: rgb(240, 240, 244) */ + --lwt-accent-color: rgb(229, 229, 235) !important; /* Original: rgb(240, 240, 244) */ } - @media (-moz-os-version: windows-win10), (-moz-platform: windows-win10) { :root[lwtheme-mozlightdark]:not([lwthemetextcolor="bright"]) #navigator-toolbox, :root[style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"] #navigator-toolbox { @@ -24,8 +22,7 @@ /*= Darkmode - Color lighter =================================================*/ :root[lwtheme-mozlightdark][lwthemetextcolor="bright"], :root[style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"] { - --toolbar-bgcolor: rgba(43, 42, 51, 5) !important; - /* Original: rgba(43, 42, 51, 1) */ + --toolbar-bgcolor: rgba(43, 42, 51, 5) !important; /* Original: rgba(43, 42, 51, 1) */ } } /** Compatibility Fixes *******************************************************/ @@ -37,24 +34,20 @@ margin-inline: 8px; border-radius: 4px; } - /*= Remote Tabs Panel's Bottom Padding =======================================*/ #PanelUI-remotetabs #PanelUI-remotetabs-main { margin-bottom: 6px; } - /*= Identity Popup Icon Crop =================================================*/ .identity-popup-security-connection.identity-button { padding-block: 1px !important; } - /*= Zoom in button's plus icon horizontal rate ===============================*/ #customization-palette-container #zoom-in-button > .toolbarbutton-icon, #customization-panel-container #zoom-in-button > .toolbarbutton-icon, #widget-overflow-mainView #zoom-in-button > .toolbarbutton-icon { padding-inline-start: 0px !important; } - /*= Icon Fill Color ==========================================================*/ :root:-moz-lwtheme { /* Auto create --lwt-toolbarbutton-icon-fill-attention, fix for nightly default theme @@ -62,18 +55,15 @@ */ --lwt-toolbarbutton-icon-fill-attention: var(--button-primary-bgcolor, rgb(0, 120, 215)); } - /*= First visible tab margin at maximized #332 ===============================*/ :root[tabsintitlebar="true"][sizemode="maximized"] #TabsToolbar { margin-left: -1px; } - /*= Disabled menu background color ===========================================*/ menuitem[disabled="true"], menu[disabled="true"] { background-color: transparent !important; } - /*= Remove Tab Border ========================================================*/ @supports -moz-bool-pref("userChrome.tab.connect_to_window") { /* TARGET: original, photon */ @@ -90,12 +80,10 @@ /* Nightly 96: 1px solid var(--tab-line-color, rgba(128,128,142,0.9)); */ border: unset !important; } - #TabsToolbar #firefox-view-button[open] > .toolbarbutton-icon:-moz-lwtheme, .tab-background[selected]:-moz-lwtheme { outline-color: transparent !important; } - .keyboard-focused-tab > .tab-stack > .tab-background, .tabbrowser-tab:focus:not([aria-activedescendant]) > .tab-stack > .tab-background { outline: var(--focus-outline) !important; @@ -103,15 +91,12 @@ } /*= Tab Separator Color ======================================================*/ #TabsToolbar { - --toolbarseparator-color: color-mix(in srgb, currentColor 20%, transparent); - /* 60% at v105 */ + --toolbarseparator-color: color-mix(in srgb, currentColor 20%, transparent); /* 60% at v105 */ } - /*= Light Weight Theme =======================================================*/ /* Header Image */ :root[lwtheme-image] { - background-image: var(--lwt-header-image) !important; - /* Original: var(--lwt-header-image) */ + background-image: var(--lwt-header-image) !important; /* Original: var(--lwt-header-image) */ background-repeat: no-repeat !important; background-position: right top !important; } @@ -129,35 +114,29 @@ background-image: var(--lwt-header-image), var(--lwt-additional-images) !important; background-repeat: var(--lwt-background-tiling) !important; background-position: var(--lwt-background-alignment) !important; - background-color: unset !important; - /* Original: var(--lwt-accent-color) */ + background-color: unset !important; /* Original: var(--lwt-accent-color) */ } - /* Navbar Border */ #navigator-toolbox:-moz-lwtheme { - --tabs-border-color: rgba(0, 0, 0, 0.3); - /* Legacy: v96 */ + --tabs-border-color: rgba(0, 0, 0, 0.3); /* Legacy: v96 */ --lwt-tabs-border-color: rgba(0, 0, 0, 0.3); } - /*= Findbar Border Color =====================================================*/ html|input.findbar-textbox { - border: 1px solid var(--input-border-color, var(--toolbar-field-border-color, ThreeDShadow)) !important; - /* Original: 1px solid var(--input-border-color, var(--toolbar-field-border-color)) */ + border: 1px solid var(--input-border-color, var(--toolbar-field-border-color, ThreeDShadow)) !important; /* Original: 1px solid var(--input-border-color, var(--toolbar-field-border-color)) */ } - /*= Drop Indicator Color #473 ================================================*/ treechildren::-moz-tree-cell-text(primary, dropOn), treechildren::-moz-tree-drop-feedback, vbox[part="drop-indicator-bar"] > image[part="drop-indicator"] { - background-color: var(--button-primary-bgcolor, var(--focus-outline-color)) !important; - /* Original: SelectedItem or AccentColor*/ + background-color: var( + --button-primary-bgcolor, + var(--focus-outline-color) + ) !important; /* Original: SelectedItem or AccentColor*/ } - #bookmarksPanel[lwt-sidebar="true"] { --focus-outline-color: var(--in-content-focus-outline-color, AccentColor) !important; } - /*= Menu color #477 ==========================================================*/ @media (-moz-windows-non-native-menus) { :root { @@ -178,7 +157,6 @@ --dark-menu-border-color: #5b5b66; --dark-menu-icon-opacity: 1; } - /* Override the menu color variables for dark browser themes. */ } @media (-moz-windows-non-native-menus) and (-moz-toolbar-prefers-color-scheme: dark), @@ -193,16 +171,22 @@ --menu-icon-opacity: var(--dark-menu-icon-opacity); } } + /*= Firefox View Border #498 =================================================*/ + :root:not([privatebrowsingmode="temporary"])[firefoxviewhidden] #firefox-view-button + #tabbrowser-tabs { + border-inline-start: none !important; + padding-inline-start: var(--tab-overflow-pinned-tabs-width) !important; + margin-inline-start: 0 !important; + } } /*= OS - Compatibility =======================================================*/ @supports -moz-bool-pref("userChrome.compatibility.os") { /*= Windows 10 - Top border of accent color at ESR #358 ======================*/ @media (-moz-os-version: windows-win10), (-moz-platform: windows-win10) { :root[sizemode="normal"][tabsintitlebar] #navigator-toolbox { - border-top: 0.5px solid #2f2f2f !important; + border-top: 0.5px solid rgb(47, 47, 47) !important; } :root[sizemode="normal"][tabsintitlebar]:-moz-window-inactive #navigator-toolbox { - border-top-color: #393939 !important; + border-top-color: rgb(57, 57, 57) !important; } @media (-moz-windows-accent-color-in-titlebar) { :root[sizemode="normal"][tabsintitlebar] #navigator-toolbox { @@ -250,36 +234,27 @@ menupopup > menu, menupopup > menuitem, #context-navigation > menuitem { - border: 1px solid transparent; - /* Need reduce 2px at menu */ + border: 1px solid transparent; /* Need reduce 2px at menu */ } - #main-menubar > menu[open="true"], #main-menubar > menu[_moz-menuactive="true"] { - background-color: -moz-menuhover !important; - /* Make to original */ + background-color: -moz-menuhover !important; /* Make to original */ } - :root:-moz-lwtheme #main-menubar > menu[open="true"], :root:-moz-lwtheme #main-menubar > menu[_moz-menuactive="true"] { - color: inherit !important; - /* Original: -moz-menubarhovertext */ - background-color: color-mix(in srgb, currentColor 20%, transparent) !important; - /* Original: -moz-menuhover */ + 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 */ + border: none !important; /* Remove border */ } #PlacesToolbar menu:not([disabled], :active)[_moz-menuactive="true"], #PlacesToolbar menuitem:not([disabled], :active)[_moz-menuactive="true"], @@ -299,19 +274,15 @@ 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: unset !important; /* Original: rgba(255, 255, 255, .5) */ + color: unset !important; /* Original: black */ } } @media (-moz-os-version: windows-win8), (-moz-platform: windows-win8) { @@ -330,25 +301,20 @@ /*= Linux - Global Menubar Active Color ====================================*/ #main-menubar > menu[open="true"], #main-menubar > menu[_moz-menuactive="true"] { - color: inherit !important; - /* Original: -moz-menubarhovertext */ - background-color: color-mix(in srgb, currentColor 20%, transparent) !important; - /* Original: -moz-menuhover */ + color: inherit !important; /* Original: -moz-menubarhovertext */ + background-color: color-mix(in srgb, currentColor 20%, transparent) !important; /* Original: -moz-menuhover */ } - /*= Linux - Titlebar button at lwtheme =====================================*/ @supports not -moz-bool-pref("userChrome.compatibility.os.linux_non_native_titlebar_button") { .titlebar-button:-moz-lwtheme { appearance: auto !important; } - .titlebar-min:-moz-lwtheme, .titlebar-max:-moz-lwtheme, .titlebar-restore:-moz-lwtheme, .titlebar-close:-moz-lwtheme { list-style-image: none !important; } - .titlebar-button:-moz-lwtheme:hover, .titlebar-button:-moz-lwtheme:hover:active { background-color: unset !important; @@ -371,7 +337,6 @@ > .tab-background:not(:-moz-lwtheme) { box-shadow: 0 0 4px rgba(128, 128, 142, 0.5) !important; } - #TabsToolbar:not([brighttext]) #tabbrowser-tabs:not([noshadowfortests]) .tabbrowser-tab:is([visuallyselected="true"], [multiselected]) @@ -413,8 +378,7 @@ /*= Others - Compatibility ===================================================*/ @supports -moz-bool-pref("userChrome.compatibility.panel_cutoff") { #appMenu-popup panelview { - width: 24.5em !important; - /* can modify panel width, Original: 22.5em */ + width: 24.5em !important; /* can modify panel width, Original: 22.5em */ } } @supports -moz-bool-pref("userChrome.compatibility.navbar_top_border") { @@ -432,27 +396,30 @@ :root[tabsintitlebar][lwt-default-theme-in-dark-mode]:not(:-moz-window-inactive) { --focus-outline-color: AccentColor !important; } - :root[tabsintitlebar]:not(:-moz-window-inactive, :-moz-lwtheme) #urlbar[open] > #urlbar-background, :root[tabsintitlebar][lwt-default-theme-in-dark-mode]:not(:-moz-window-inactive) #urlbar[open] > #urlbar-background { - border-color: color-mix(in srgb, AccentColor 50%, transparent) !important; - /* Like: --toolbar-field-focus-border-color */ + border-color: color-mix( + in srgb, + AccentColor 50%, + transparent + ) !important; /* Like: --toolbar-field-focus-border-color */ } - @supports -moz-bool-pref("userChrome.compatibility.accent_color") { :root[tabsintitlebar]:not(:-moz-window-inactive, :-moz-lwtheme), :root[tabsintitlebar][lwt-default-theme-in-dark-mode]:not(:-moz-window-inactive) { --focus-outline-color: -moz-accent-color !important; } - :root[tabsintitlebar]:not(:-moz-window-inactive, :-moz-lwtheme) #urlbar[open] > #urlbar-background, :root[tabsintitlebar][lwt-default-theme-in-dark-mode]:not(:-moz-window-inactive) #urlbar[open] > #urlbar-background { - border-color: color-mix(in srgb, -moz-accent-color 50%, transparent) !important; - /* Like: --toolbar-field-focus-border-color */ + border-color: color-mix( + in srgb, + -moz-accent-color 50%, + transparent + ) !important; /* Like: --toolbar-field-focus-border-color */ } } } @@ -462,7 +429,6 @@ --background-color: rgb(229, 229, 235); --toolbarseparator-color: transparent; } - #TabsToolbar:not(:-moz-lwtheme) .tabbrowser-tab > .tab-stack @@ -470,15 +436,16 @@ color: var(--background-color); background-color: color-mix(in srgb, currentColor 60%, transparent); } - #TabsToolbar:not(:-moz-lwtheme) .tabbrowser-tab:hover > .tab-stack > .tab-background:not([selected="true"], [multiselected]) { - background-color: color-mix(in srgb, currentColor 85%, transparent) !important; - /* Original: color-mix(in srgb, currentColor 11%, transparent) */ + background-color: color-mix( + in srgb, + currentColor 85%, + transparent + ) !important; /* Original: color-mix(in srgb, currentColor 11%, transparent) */ } - #scrollbutton-up:not(:-moz-lwtheme), #scrollbutton-down:not(:-moz-lwtheme), #alltabs-button:not(:-moz-lwtheme) > .toolbarbutton-badge-stack, @@ -494,10 +461,8 @@ --win-bgcolor: rgb(204, 204, 204); --win-disabled-color: rgb(145, 145, 145); --win-disabled-bgcolor: transparent; - --win-hover-bgcolor: rgb(218, 218, 218); - /* also button-bgcolor */ - --win-hover-active-bgcolor: #c2c2c2; - /* also button-hover-bgcolor */ + --win-hover-bgcolor: rgb(218, 218, 218); /* also button-bgcolor */ + --win-hover-active-bgcolor: #c2c2c2; /* also button-hover-bgcolor */ --win-button-hover-bgcolor: rgba(218, 218, 218, 0.66); --win-button-active-bgcolor: #aaaaaa; --win-field-bgcolor: #ffffff; @@ -527,7 +492,6 @@ --win-accent-active-color: -moz-accent-color; } } - @media (-moz-toolbar-prefers-color-scheme: dark), (prefers-color-scheme: dark) { :root:not(:-moz-lwtheme), :root[lwt-default-theme-in-dark-mode] { @@ -535,10 +499,8 @@ --win-bgcolor: #2b2b2b; --win-disabled-color: #747474; --win-disabled-bgcolor: transparent; - --win-hover-bgcolor: #2e2e2e; - /* also button-bgcolor */ - --win-hover-active-bgcolor: #454545; - /* also button-active-color */ + --win-hover-bgcolor: #2e2e2e; /* also button-bgcolor */ + --win-hover-active-bgcolor: #454545; /* also button-active-color */ --win-button-hover-bgcolor: rgba(46, 46, 46, 0.66); --win-button-active-bgcolor: #515151; --win-field-bgcolor: #373737; @@ -671,28 +633,23 @@ --download-progress-flare-color: rgba(255, 255, 255, 0.75) !important; --panelview-toolbarbutton-focus-box-shadow: inset 0 0 0 2px var(--focus-outline-color) !important; } - #navigator-toolbox:not(:-moz-lwtheme) { background: var(--lwt-accent-color) !important; } - /*- Separator --------------------------------------------------------------*/ :root:not(:-moz-lwtheme) { --arrowpanel-border-color: var(--win-bgcolor) !important; --panel-separator-color: var(--win-bgcolor) !important; } - :root[lwt-default-theme-in-dark-mode] { --arrowpanel-border-color: var(--win-border-color) !important; --panel-separator-color: var(--win-border-color) !important; } - @supports -moz-bool-pref("userChrome.theme.system_default") { @media (-moz-windows-accent-color-in-titlebar) { :root[tabsintitlebar]:not(:-moz-window-inactive, :-moz-lwtheme), :root[tabsintitlebar][lwt-default-theme-in-dark-mode]:not(:-moz-window-inactive) { - --toolbarseparator-color: color-mix(in srgb, currentColor 20%, transparent) !important; - /* As default */ + --toolbarseparator-color: color-mix(in srgb, currentColor 20%, transparent) !important; /* As default */ } } } @@ -702,11 +659,9 @@ :root[lwt-default-theme-in-dark-mode] { --win-proton-tab-selected-bgcolor: color-mix(in srgb, var(--win-bgcolor) 5%, var(--win-component-bgcolor)); } - :root:not(:-moz-lwtheme) { --tab-selected-color: var(--win-proton-tab-selected-bgcolor) !important; } - :root[lwt-default-theme-in-dark-mode] { --lwt-selected-tab-background-color: var(--win-proton-tab-selected-bgcolor) !important; } @@ -720,7 +675,6 @@ --menu-disabled-color: var(--win-disabled-color) !important; --menuitem-disabled-hover-background-color: var(--win-disabled-bgcolor) !important; } - /*- Toolbar ----------------------------------------------------------------*/ :root:not(:-moz-lwtheme) #titlebar, :root[lwt-default-theme-in-dark-mode] #titlebar { @@ -729,19 +683,16 @@ --toolbarbutton-hover-background: var(--win-sidebar-button-hover-bgcolor); --toolbarbutton-active-background: var(--win-sidebar-button-hover-active-bgcolor); } - /*- Sidebar ----------------------------------------------------------------*/ #sidebar-box:not([lwt-sidebar]) { appearance: none !important; } - :root:not(:-moz-lwtheme) #sidebar-box, :root[lwt-default-theme-in-dark-mode] #sidebar-box { --sidebar-background-color: var(--win-sidebar-bgcolor) !important; --sidebar-text-color: var(--win-text-color) !important; --sidebar-border-color: var(--win-border-color) !important; } - @media (-moz-toolbar-prefers-color-scheme: dark), (prefers-color-scheme: dark) { .sidebar-panel[style="--newtab-background-color: rgba(43, 42, 51, 1); --newtab-text-primary-color: rgba(251, 251, 254, 1); --lwt-sidebar-background-color: rgb(56, 56, 61); --lwt-sidebar-text-color: rgba(249, 249, 250, 1);"], body[lwt-sidebar][style="--newtab-background-color: rgba(43, 42, 51, 1); --newtab-text-primary-color: rgba(251, 251, 254, 1); --lwt-sidebar-background-color: rgb(56, 56, 61); --lwt-sidebar-text-color: rgba(249, 249, 250, 1);"], @@ -758,21 +709,18 @@ --button-hover-bgcolor: var(--win-hover-active-bgcolor) !important; --button-active-bgcolor: var(--win-button-active-bgcolor) !important; } - :root:not(:-moz-lwtheme) toolbarbutton.subviewbutton:not([disabled], [open], :active, #appMenu-fxa-label2, #appMenu-zoomReduce-button2, #appMenu-zoomReset-button2, #appMenu-zoomEnlarge-button2, #appMenu-fullscreen-button2):is(:hover), :root[lwt-default-theme-in-dark-mode] toolbarbutton.subviewbutton:not([disabled], [open], :active, #appMenu-fxa-label2, #appMenu-zoomReduce-button2, #appMenu-zoomReset-button2, #appMenu-zoomEnlarge-button2, #appMenu-fullscreen-button2):is(:hover) { background-color: var(--win-hover-bgcolor) !important; } - :root:not(:-moz-lwtheme) toolbarbutton.subviewbutton:not([disabled], #appMenu-fxa-label2, #appMenu-zoomReduce-button2, #appMenu-zoomReset-button2, #appMenu-zoomEnlarge-button2, #appMenu-fullscreen-button2):is([open], :hover:active), :root[lwt-default-theme-in-dark-mode] toolbarbutton.subviewbutton:not([disabled], #appMenu-fxa-label2, #appMenu-zoomReduce-button2, #appMenu-zoomReset-button2, #appMenu-zoomEnlarge-button2, #appMenu-fullscreen-button2):is([open], :hover:active) { background-color: var(--win-hover-active-bgcolor) !important; } - /*- Others -----------------------------------------------------------------*/ /* For overwrite */ :root[lwtheme-mozlightdark]:not([lwthemetextcolor="bright"]):not(:-moz-lwtheme), @@ -780,11 +728,9 @@ /* Light Theme */ --lwt-accent-color: var(--win-bgcolor) !important; } - @media (-moz-toolbar-prefers-color-scheme: dark), (prefers-color-scheme: dark) { :root[lwt-default-theme-in-dark-mode][lwthemetextcolor="bright"] { - --toolbar-bgcolor: var(--win-component-bgcolor) !important; - /* Original: rgba(43, 42, 51, 1) */ + --toolbar-bgcolor: var(--win-component-bgcolor) !important; /* Original: rgba(43, 42, 51, 1) */ } } #tabbrowser-tabs:not([movingtab]) @@ -850,13 +796,10 @@ --urlbar-popup-url-color: -moz-accent-color; } } - /* Nightly Compatibility */ :root:not(:-moz-lwtheme) #urlbar { - --toolbar-field-focus-color: var(--toolbar-field-color); - /* Nightly: rgba(0, 0, 0, 1) */ - --toolbar-field-focus-background-color: var(--toolbar-field-background-color); - /* Nightly: white */ + --toolbar-field-focus-color: var(--toolbar-field-color); /* Nightly: rgba(0, 0, 0, 1) */ + --toolbar-field-focus-background-color: var(--toolbar-field-background-color); /* Nightly: white */ } } /*= Mac - Default like color =================================================*/ @@ -874,15 +817,15 @@ --mac-sidebar-hover-bgcolor: color-mix(in srgb, ButtonFace 60%, var(--mac-sidebar-bgcolor)); --mac-hover-bgcolor: Window; --mac-disabled-bgcolor: transparent; - --mac-primary-button-color: AccentColorText; - /* or -moz-mac-menutextselect */ - --mac-accent-color: AccentColor; - /* or LinkText */ + --mac-primary-button-color: AccentColorText; /* or -moz-mac-menutextselect */ + --mac-accent-color: AccentColor; /* or LinkText */ --mac-accent-content-color: color-mix(in srgb, rgb(255, 255, 255) 15%, AccentColor); - --mac-accent-hover-color: color-mix(in srgb, rgb(0, 0, 0) 10%, AccentColor); - /* or -moz-mac-menuselect, Highlight */ - --mac-accent-active-color: color-mix(in srgb, rgb(0, 0, 0) 20%, AccentColor); - /* or ActiveBorder */ + --mac-accent-hover-color: color-mix( + in srgb, + rgb(0, 0, 0) 10%, + AccentColor + ); /* or -moz-mac-menuselect, Highlight */ + --mac-accent-active-color: color-mix(in srgb, rgb(0, 0, 0) 20%, AccentColor); /* or ActiveBorder */ /* Text, Icon Color */ --menu-color: var(--mac-text-color) !important; --lwt-text-color: var(--mac-text-color) !important; @@ -991,18 +934,17 @@ @supports -moz-bool-pref("userChrome.compatibility.accent_color") { :root:not(:-moz-lwtheme), :root[lwt-default-theme-in-dark-mode] { - --mac-primary-button-color: -moz-accent-color-foreground; - /* or -moz-mac-menutextselect */ - --mac-accent-color: -moz-accent-color; - /* or LinkText */ + --mac-primary-button-color: -moz-accent-color-foreground; /* or -moz-mac-menutextselect */ + --mac-accent-color: -moz-accent-color; /* or LinkText */ --mac-accent-content-color: color-mix(in srgb, rgb(255, 255, 255) 15%, -moz-accent-color); - --mac-accent-hover-color: color-mix(in srgb, rgb(0, 0, 0) 10%, -moz-accent-color); - /* or -moz-mac-menuselect, Highlight */ - --mac-accent-active-color: color-mix(in srgb, rgb(0, 0, 0) 20%, -moz-accent-color); - /* or ActiveBorder */ + --mac-accent-hover-color: color-mix( + in srgb, + rgb(0, 0, 0) 10%, + -moz-accent-color + ); /* or -moz-mac-menuselect, Highlight */ + --mac-accent-active-color: color-mix(in srgb, rgb(0, 0, 0) 20%, -moz-accent-color); /* or ActiveBorder */ } } - @media (-moz-toolbar-prefers-color-scheme: dark), (prefers-color-scheme: dark) { :root:not(:-moz-lwtheme), :root[lwt-default-theme-in-dark-mode] { @@ -1019,11 +961,9 @@ :root[lwt-default-theme-in-dark-mode] { --mac-proton-tab-selected-bgcolor: color-mix(in srgb, rgb(255, 255, 255) 20%, -moz-dialog); } - :root:not(:-moz-lwtheme) { --tab-selected-color: var(--mac-proton-tab-selected-bgcolor) !important; } - :root[lwt-default-theme-in-dark-mode] { --lwt-selected-tab-background-color: var(--mac-proton-tab-selected-bgcolor) !important; } @@ -1033,11 +973,9 @@ :root[lwt-default-theme-in-dark-mode] #navigator-toolbox { background-color: var(--mac-bgcolor) !important; } - :root:not(:-moz-lwtheme) #titlebar { --mac-hover-bgcolor: ButtonFace; } - :root:not(:-moz-lwtheme) #titlebar, :root[lwt-default-theme-in-dark-mode] #titlebar { --button-hover-bgcolor: var(--mac-hover-bgcolor); @@ -1047,24 +985,20 @@ /* Prevent transparent tabbar at fullscreen hover #312 */ background: var(--mac-bgcolor); } - :root[lwt-default-theme-in-dark-mode] #urlbar { --autocomplete-popup-highlight-background: var(--mac-hover-bgcolor) !important; --autocomplete-popup-hover-background: var(--mac-hover-bgcolor) !important; } - /*- Sidebar ----------------------------------------------------------------*/ #sidebar-box:not([lwt-sidebar]) { appearance: none !important; } - :root:not(:-moz-lwtheme) #sidebar-box, :root[lwt-default-theme-in-dark-mode] #sidebar-box { --sidebar-background-color: var(--mac-sidebar-bgcolor) !important; --sidebar-text-color: var(--mac-text-color) !important; /* --sidebar-border-color: var(--win-sidebar-border-color) !important; */ } - @media (-moz-toolbar-prefers-color-scheme: dark), (prefers-color-scheme: dark) { .sidebar-panel[style="--newtab-background-color: rgba(43, 42, 51, 1); --newtab-text-primary-color: rgba(251, 251, 254, 1); --lwt-sidebar-background-color: rgb(56, 56, 61); --lwt-sidebar-text-color: rgba(249, 249, 250, 1);"], body[lwt-sidebar][style="--newtab-background-color: rgba(43, 42, 51, 1); --newtab-text-primary-color: rgba(251, 251, 254, 1); --lwt-sidebar-background-color: rgb(56, 56, 61); --lwt-sidebar-text-color: rgba(249, 249, 250, 1);"], @@ -1079,7 +1013,6 @@ --button-hover-bgcolor: var(--mac-sidebar-hover-bgcolor); --button-active-bgcolor: var(--mac-sidebar-hover-bgcolor); } - /*- Others -----------------------------------------------------------------*/ /* For Overwrite */ @media (-moz-toolbar-prefers-color-scheme: dark), (prefers-color-scheme: dark) { @@ -1101,14 +1034,14 @@ > .tabbrowser-tab > .tab-stack > .tab-background[selected="true"] { - background: color-mix(in srgb, white 15%, -moz-dialog) !important; + background: color-mix(in srgb, rgb(255, 255, 255) 15%, -moz-dialog) !important; } } :root:not(:-moz-lwtheme):not([customizing="true"]) tab[visuallyselected] > stack::before, :root:not(:-moz-lwtheme):not([customizing="true"]) tab[visuallyselected] > stack::after, :root[lwt-default-theme-in-dark-mode]:not([customizing="true"]) tab[visuallyselected] > stack::before, :root[lwt-default-theme-in-dark-mode]:not([customizing="true"]) tab[visuallyselected] > stack::after { - fill: color-mix(in srgb, white 15%, -moz-dialog) !important; + fill: color-mix(in srgb, rgb(255, 255, 255) 15%, -moz-dialog) !important; } } } @@ -1123,8 +1056,7 @@ --in-content-text-color: var(--in-content-page-color); --in-content-deemphasized-text: rgb(91, 91, 102); --in-content-box-background: #fff; - --in-content-box-background-odd: rgba(12, 12, 13, 0.05); - /* grey 90 a05 */ + --in-content-box-background-odd: rgba(12, 12, 13, 0.05); /* grey 90 a05 */ --in-content-box-border-color: color-mix(in srgb, currentColor 41%, transparent); --in-content-box-info-background: #f0f0f4; --in-content-item-hover: color-mix(in srgb, var(--in-content-primary-button-background) 20%, transparent); @@ -1163,13 +1095,14 @@ --in-content-button-horizontal-padding: 15px; --in-content-button-vertical-padding: 7px; --in-content-table-background: #f8f8fa; - --in-content-table-border-color: var(--in-content-box-border-color); - /* Legacy: #d1d1d1; rgba(249, 249, 250, 0.2) */ + --in-content-table-border-color: var(--in-content-box-border-color); /* Legacy: #d1d1d1; rgba(249, 249, 250, 0.2) */ --in-content-table-border-dark-color: var(--in-content-table-border-color); - --in-content-table-header-background: var(--in-content-primary-button-background); - /* Legacy: #0a84ff; rgb(5, 64, 150); */ - --in-content-table-header-color: var(--in-content-primary-button-text-color); - /* Legacy: #ffffff; var(--in-content-page-color); */ + --in-content-table-header-background: var( + --in-content-primary-button-background + ); /* Legacy: #0a84ff; rgb(5, 64, 150); */ + --in-content-table-header-color: var( + --in-content-primary-button-text-color + ); /* Legacy: #ffffff; var(--in-content-page-color); */ --in-content-sidebar-width: 240px; --dialog-warning-text-color: var(--red-60); --checkbox-border-color: var(--in-content-box-border-color); @@ -1218,7 +1151,6 @@ --card-outline-color: var(--grey-30); --card-shadow-hover: var(--card-shadow), 0 0 0 5px var(--card-outline-color); } - @media (-moz-toolbar-prefers-color-scheme: dark), (prefers-color-scheme: dark) { :host, :root { @@ -1289,12 +1221,9 @@ darken(#0060df, 15.5%): #003e90; darken(#0060df, 28.1%): #002250; */ - --blue-20: #b6d6ff; - /* lighten(#0060df, 42%) - rgb(182, 214, 255), Add for link active color*/ - --blue-30: #74c0ff; - /* rgb(116, 192, 255), Add for active color */ + --blue-20: #b6d6ff; /* lighten(#0060df, 42%) - rgb(182, 214, 255), Add for link active color*/ + --blue-30: #74c0ff; /* rgb(116, 192, 255), Add for active color */ } - :host, :root, dialog { @@ -1314,7 +1243,6 @@ --in-content-link-color-active: var(--blue-20) !important; --in-content-link-color-visited: var(--blue-40) !important; } - :root[lwtheme-mozlightdark][lwthemetextcolor="bright"], :root[style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"] { --button-primary-color: var(--in-content-page-color) !important; @@ -1325,10 +1253,8 @@ --lwt-toolbarbutton-icon-fill-attention: var(--blue-40) !important; --download-progress-fill-color: var(--blue-40) !important; --panel-banner-item-info-icon-bgcolor: var(--blue-30) !important; - --lwt-brighttext-url-color: var(--blue-30) !important; - /* Original: as primary bgcolor */ + --lwt-brighttext-url-color: var(--blue-30) !important; /* Original: as primary bgcolor */ } - @supports -moz-bool-pref("userChrome.decoration.download_panel") { :root[lwtheme-mozlightdark][lwthemetextcolor="bright"] #downloadsListBox, :root[style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"] #downloadsListBox { @@ -1360,7 +1286,6 @@ transparent ) !important; } - @media (-moz-windows-non-native-menus) { html#main-window menupopup:not(.in-menulist) { /* Above FF v105 #466 */ @@ -1411,17 +1336,19 @@ --panel-color: var(--lwt-sidebar-text-color, var(--menu-color)) !important; --panel-background: var(--lwt-sidebar-background-color, var(--menu-background-color)) !important; } - window:is(#bookmarksPanel, #history-panel)[lwt-sidebar="true"] menu[_moz-menuactive="true"]:not([disabled="true"]), window:is(#bookmarksPanel, #history-panel)[lwt-sidebar="true"] menuitem[_moz-menuactive="true"]:not([disabled="true"]) { - --menuitem-hover-background-color: color-mix(in srgb, currentColor 17%, transparent); - /* Looks like toolbar button */ + --menuitem-hover-background-color: color-mix( + in srgb, + currentColor 17%, + transparent + ); /* Looks like toolbar button */ /* or var(--lwt-sidebar-highlight-background-color) If this value is used, unset is required in the default theme. */ + background-color: var(--menuitem-hover-background-color) !important; } - /* Fallback background - Set to Legacy. It will be removed Next update menupopup:not(.cui-widget-panel.cui-widget-panelview, [placespopup="true"]) { background-color: var(--lwt-accent-color, var(--in-content-page-background)) !important; @@ -1436,10 +1363,11 @@ :root:is([style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"], [style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"]) menupopup:is(#goPopup, #historyMenuPopup, #bookmarksMenuPopup) { --menu-color: var(--toolbar-color, var(--in-content-page-color)) !important; - --arrowpanel-background: var(--toolbar-bgcolor, var(--in-content-button-background)) !important; - /* --menu-background-color */ + --arrowpanel-background: var( + --toolbar-bgcolor, + var(--in-content-button-background) + ) !important; /* --menu-background-color */ } - @media not all and (-moz-gtk-csd-available) { window:is(#bookmarksPanel, #history-panel)[style*="--newtab-background-color: rgba(249, 249, 251, 1);"] menupopup, window:is(#bookmarksPanel, #history-panel)[style*="--newtab-background-color: rgba(43, 42, 51, 1);"] menupopup { @@ -1450,34 +1378,29 @@ } /*== Info Bar Color ==========================================================*/ .container.infobar { - background-color: var(--urlbar-box-bgcolor); + background-color: var(--urlbar-box-bgcolor) !important; } - .notification-button { - background-color: var(--button-bgcolor); + background-color: var(--button-bgcolor) !important; } .notification-button:hover { - background-color: var(--button-hover-bgcolor); + background-color: var(--button-hover-bgcolor) !important; } .notification-button:hover:active { - background-color: var(--button-active-bgcolor); + background-color: var(--button-active-bgcolor) !important; } - html|button.ghost-button:not(.semi-transparent):enabled:hover { background-color: var(--button-hover-bgcolor) !important; } - html|button.ghost-button:not(.semi-transparent):enabled:hover:active { background-color: var(--in-content-button-background-active) !important; } - /*== Bookmark Popup Color ====================================================*/ #editBMPanel_folderTree:-moz-lwtheme, #editBMPanel_tagsSelector:-moz-lwtheme { appearance: none !important; border: 0.5px solid var(--button-active-bgcolor, color-mix(in srgb, currentColor 30%, transparent)) !important; } - #editBMPanel_folderTree:-moz-lwtheme, #editBMPanel_folderTree:-moz-lwtheme > treechildren, #editBMPanel_folderTree:-moz-lwtheme > treechildren::-moz-tree-image, @@ -1487,32 +1410,26 @@ #editBMPanel_tagsSelector:-moz-lwtheme > richlistitem { color: var(--lwt-text-color, fieldtext) !important; } - #editBMPanel_folderTree:-moz-lwtheme > treechildren::-moz-tree-cell-text(selected) { font-weight: 600 !important; } - #editBMPanel_folderTree:-moz-lwtheme > treechildren, #editBMPanel_tagsSelector:-moz-lwtheme { background-color: color-mix(in srgb, var(--arrowpanel-background) 35%, var(--in-content-box-background)) !important; } - #editBMPanel_folderTree:-moz-lwtheme > treechildren::-moz-tree-row(hover), #editBMPanel_tagsSelector > richlistitem:hover { background-color: var(--button-hover-bgcolor, color-mix(in srgb, currentColor 17%, transparent)) !important; } - #editBMPanel_folderTree:-moz-lwtheme > treechildren::-moz-tree-row(selected), #editBMPanel_tagsSelector > richlistitem[selected="true"] { background-color: var(--button-active-bgcolor, color-mix(in srgb, currentColor 30%, transparent)) !important; } - #editBMPanel_namePicker, #editBMPanel_tagsField { --input-bgcolor: var(--arrowpanel-background, Field); --input-color: var(--arrowpanel-color, FieldText); } - /*== Sidebar - Field Color ===================================================*/ .sidebar-panel #search-box, xul|search-textbox.tabsFilter { @@ -1524,44 +1441,38 @@ background-color: var(--lwt-sidebar-background-color, Field) !important; color: var(--lwt-sidebar-text-color, FieldText) !important; } - .sidebar-panel:not([lwt-sidebar]) #search-box { --input-bgcolor: ThreeDShadow; } - .sidebar-panel #search-box[focused="true"], xul|search-textbox.tabsFilter[focused="true"] { outline: 1px solid var(--input-bgcolor); } - .sidebar-panel[lwt-sidebar] #search-box[focused="true"], body[lwt-sidebar] xul|search-textbox.tabsFilter[focused="true"] { --input-bgcolor: var(--lwt-sidebar-highlight-background-color, Highlight) !important; } - .sidebar-panel:not([lwt-sidebar]) #search-box[focused="true"], body:not([lwt-sidebar]) xul|search-textbox.tabsFilter[focused="true"] { - border-color: AccentColor !important; - /* Hard Coded */ + border-color: AccentColor !important; /* Hard Coded */ outline-color: AccentColor !important; } @supports -moz-bool-pref("userChrome.compatibility.accent_color") { .sidebar-panel:not([lwt-sidebar]) #search-box[focused="true"], body:not([lwt-sidebar]) xul|search-textbox.tabsFilter[focused="true"] { - border-color: -moz-accent-color !important; - /* Hard Coded */ + border-color: -moz-accent-color !important; /* Hard Coded */ outline-color: -moz-accent-color !important; } } - /*= PopupAutoComplete ========================================================*/ #PopupAutoComplete { --panel-bgcolor: var(--arrowpanel-background, var(--in-content-button-background)); /* overwrite */ - --panel-border-radius: 4px !important; - /* Original: 0 */ - --panel-border-color: var(--arrowpanel-border-color, var(--menu-border-color)) !important; - /* Original: ThreeDShadow */ + --panel-border-radius: 4px !important; /* Original: 0 */ + --panel-border-color: var( + --arrowpanel-border-color, + var(--menu-border-color) + ) !important; /* Original: ThreeDShadow */ appearance: none !important; background: transparent !important; border: none !important; @@ -1569,16 +1480,12 @@ } #PopupAutoComplete > richlistbox { border-radius: var(--panel-border-radius) !important; - background-color: var(--panel-bgcolor) !important; - /* Original: Field */ - color: var(--arrowpanel-color, var(--in-content-page-color)) !important; - /* Original: FiledText */ + background-color: var(--panel-bgcolor) !important; /* Original: Field */ + color: var(--arrowpanel-color, var(--in-content-page-color)) !important; /* Original: FiledText */ } - .autocomplete-richlistitem:hover { background-color: var(--arrowpanel-dimmed) !important; } - #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 { @@ -1586,19 +1493,17 @@ } #PopupAutoComplete > richlistbox > richlistitem[originaltype="loginsFooter"] { --panel-border-color: var(--panel-bgcolor); - color: var(--arrowpanel-color, var(--in-content-page-color)) !important; - /* Original: FieldText */ - background-color: var(--arrowpanel-dimmed, rgba(204, 204, 204, 0.35)) !important; - /* Original: hsla(0,0%,80%,.35) */ - border-color: var(--panel-border-color) !important; - /* Original: rgba(38,38,38,.15) */ + color: var(--arrowpanel-color, var(--in-content-page-color)) !important; /* Original: FieldText */ + background-color: var(--arrowpanel-dimmed, hsla(0deg, 0%, 80%, 0.35)) !important; /* Original: hsla(0,0%,80%,.35) */ + border-color: var(--panel-border-color) !important; /* Original: rgba(38,38,38,.15) */ } #PopupAutoComplete > richlistbox > richlistitem[originaltype="loginsFooter"]:hover, #PopupAutoComplete > richlistbox > richlistitem[originaltype="loginsFooter"][selected] { - background-color: var(--arrowpanel-dimmed-further, rgba(204, 204, 204, 0.5)) !important; - /* Original: hsla(0,0%,80%,.5), match arrowpanel-dimmed-further */ + background-color: var( + --arrowpanel-dimmed-further, + hsla(0deg, 0%, 80%, 0.5) + ) !important; /* Original: hsla(0,0%,80%,.5), match arrowpanel-dimmed-further */ } - /* New Folder Button */ #editBMPanel_newFolderButton { appearance: none; @@ -1631,7 +1536,6 @@ browser[type="content"] > html { background: var(--in-content-page-background) !important; } - /*= Notification =============================================================*/ @-moz-document url("chrome://global/content/alerts/alert.xhtml") { @@ -1642,7 +1546,6 @@ --menu-border-color: #cfcfd8; --menuitem-hover-background-color: #e0e0e6; } - @media (-moz-toolbar-prefers-color-scheme: dark), (prefers-color-scheme: dark) { :root { --menu-border-color: rgba(107, 107, 107, 0.3); @@ -1650,16 +1553,14 @@ --menu-background-color: #2b2a33; --menuitem-hover-background-color: #52525e; } - #alertSourceLabel { - color: #05d1f1 !important; + color: rgb(5, 209, 241) !important; } } /* line below removes background from the notification "window" on linux */ #alertNotification { background: transparent !important; } - #alertBox { color: var(--menu-color) !important; background-color: var(--menu-background-color) !important; @@ -1667,7 +1568,6 @@ border-radius: 6px !important; -moz-window-shadow: cliprounded !important; } - #alertSettings { fill: currentColor !important; color: inherit !important; @@ -1675,17 +1575,14 @@ margin-inline: 0 !important; margin-bottom: -4px !important; } - .close-icon, #alertSettings { background: transparent !important; } - .close-icon:hover > .toolbarbutton-icon, #alertSettings:is(:hover, [open]) > .button-box > .box-inherit { background-color: var(--menuitem-hover-background-color, #e0e0e6) !important; } - /* Shape */ .close-icon > .toolbarbutton-icon, #alertSettings > .button-box > .box-inherit { @@ -1693,7 +1590,6 @@ padding: 2px !important; margin: 2px 2px -2px 0 !important; } - #alertSettings > .button-box > .box-inherit { margin: -4px 4px 3px 0 !important; } @@ -1729,7 +1625,6 @@ --checkbox-checked-hover-bgcolor: var(--in-content-primary-button-background-hover) !important; --checkbox-checked-active-bgcolor: var(--in-content-primary-button-background-active) !important; } - /*- Dialog -----------------------------------------------------------------*/ #commonDialog, #editCaCert, @@ -1739,13 +1634,11 @@ #app-picker, #topBar, #mainDeck { - -moz-appearance: none !important; - /* For Mac */ + -moz-appearance: none !important; /* For Mac */ color: var(--in-content-page-color) !important; background-color: var(--in-content-page-background) !important; /* border-radius: 0 0 8px 8px !important; */ } - /*- Button -----------------------------------------------------------------*/ button { -moz-appearance: none !important; @@ -1755,8 +1648,7 @@ font-size: 1em !important; font-weight: 600 !important; min-height: 32px !important; - border: 1px solid transparent !important; - /* shows up in high-contrast mode */ + border: 1px solid transparent !important; /* shows up in high-contrast mode */ border-radius: var(--in-content-button-border-radius) !important; padding: var(--in-content-button-vertical-padding) var(--in-content-button-horizontal-padding) !important; min-height: 32px !important; @@ -1776,60 +1668,49 @@ min-height: 24px !important; font-size: 0.9em !important; } - /* Remove margin added by button.css */ xul|button > .button-box > .button-text { margin: 0 !important; } - button:not([disabled="true"]):hover { background-color: var(--in-content-button-background-hover) !important; color: var(--in-content-button-text-color-hover) !important; border-color: transparent !important; } - xul|button:not([disabled="true"]):hover:active, xul|button[open], xul|button[open]:hover, xul|menulist[open="true"]:not([disabled="true"]) { background-color: var(--in-content-button-background-active) !important; } - xul|button[default] { background-color: var(--in-content-primary-button-background) !important; color: var(--in-content-primary-button-text-color) !important; } - xul|button[default]:not([disabled="true"]):hover { background-color: var(--in-content-primary-button-background-hover) !important; color: var(--in-content-primary-button-text-color) !important; } - xul|button[default]:not([disabled="true"]):hover:active { background-color: var(--in-content-primary-button-background-active) !important; } - xul|button[disabled="true"], xul|menulist[disabled="true"] { opacity: 0.4 !important; } - xul|button:not([disabled="true"]):hover, xul|menulist:not([disabled="true"]):hover { background-color: var(--in-content-button-background-hover) !important; color: var(--in-content-button-text-color-hover) !important; border-color: transparent !important; } - @media (prefers-contrast) { xul|button[default]:not([disabled="true"]):hover { border-color: currentColor !important; } - button:focus { color: var(--in-content-button-text-color) !important; } - xul|button[default]:focus, button.primary:focus { color: var(--in-content-primary-button-text-color) !important; @@ -1843,13 +1724,11 @@ outline: 2px solid var(--in-content-focus-outline-color) !important; outline-offset: 2px !important; } - /*- Radio Button -----------------------------------------------------------*/ xul|radio { /* margin-inline-start: 0 !important; */ appearance: none !important; } - xul|*.radio-check { appearance: none !important; width: 16px !important; @@ -1858,14 +1737,11 @@ border-radius: 100% !important; padding: 0 !important; margin-inline: 0 6px !important; - margin-block: 2px !important; - /* extend the vertical clicktarget */ + margin-block: 2px !important; /* extend the vertical clicktarget */ background-color: var(--in-content-button-background) !important; background-position: center !important; - flex-shrink: 0 !important; - /* avoid shrinking inside flex container */ + flex-shrink: 0 !important; /* avoid shrinking inside flex container */ } - xul|*.radio-check[selected] { -moz-context-properties: fill !important; fill: currentColor !important; @@ -1876,7 +1752,6 @@ /* Style the button also when printing with "Print Backgrounds" unchecked */ color-adjust: exact !important; } - xul|radio:not([disabled="true"]):hover > xul|*.radio-check { background-color: var(--in-content-button-background-hover) !important; color: var(--in-content-button-text-color-hover) !important; @@ -1884,7 +1759,6 @@ xul|radio:not([disabled="true"]):hover:active > xul|*.radio-check { background-color: var(--in-content-button-background-active) !important; } - xul|radio:not([disabled="true"])[selected]:hover > xul|*.radio-check { background-color: var(--in-content-primary-button-background-hover) !important; color: var(--in-content-primary-button-text-color-hover) !important; @@ -1892,12 +1766,10 @@ xul|radio:not([disabled="true"])[selected]:hover:active > xul|*.radio-check { background-color: var(--in-content-primary-button-background-active) !important; } - xul|*.radio-label-box { margin-inline: 0 8px !important; padding-inline-start: 0 !important; } - /* Disabled checkboxes, radios and labels */ xul|checkbox[disabled="true"], xul|radio[disabled="true"], @@ -1905,7 +1777,6 @@ color: inherit !important; opacity: 0.5 !important; } - /*- Check Box --------------------------------------------------------------*/ /* From checkbox.css */ checkbox { @@ -1913,7 +1784,6 @@ -moz-box-align: center !important; margin: 4px 2px !important; } - .checkbox-check { appearance: none !important; width: 16px !important; @@ -1922,12 +1792,9 @@ border-radius: 2px !important; color: var(--checkbox-border-color, ThreeDDarkShadow) !important; background-color: var(--checkbox-unchecked-bgcolor, Field) !important; - margin-inline-end: 6px !important; - /* or 2px */ - margin-block: 2px !important; - /* From common.css */ + margin-inline-end: 6px !important; /* or 2px */ + margin-block: 2px !important; /* From common.css */ } - .checkbox-check[checked] { -moz-context-properties: fill !important; fill: currentColor !important; @@ -1946,7 +1813,6 @@ background-color: var(--checkbox-checked-bgcolor, -moz-accent-color) !important; } } - checkbox:not([disabled="true"]):hover > .checkbox-check { background-color: var(--checkbox-unchecked-hover-bgcolor, color-mix(in srgb, AccentColor 4%, Field)) !important; } @@ -1997,7 +1863,6 @@ ) !important; } } - checkbox:-moz-focusring > .checkbox-check { outline: 2px solid var(--focus-outline-color, AccentColor) !important; outline-offset: var(--focus-outline-offset, 2px) !important; @@ -2007,7 +1872,6 @@ outline: 2px solid var(--focus-outline-color, -moz-accent-color) !important; } } - @media (prefers-contrast) { checkbox:not([disabled="true"]):hover > .checkbox-check { /* color will set the border-color on the check due to how HCM works for in-content pages. */ @@ -2019,7 +1883,6 @@ color: var(--checkbox-checked-border-color, color-mix(in srgb, -moz-accent-color 4%, Field)) !important; } } - .checkbox-check[checked] { color: var(--checkbox-checked-border-color, currentColor) !important; fill: var(--checkbox-checked-color, AccentColorText) !important; @@ -2029,7 +1892,6 @@ fill: var(--checkbox-checked-color, -moz-accent-color-foreground) !important; } } - checkbox:not([disabled="true"]):hover:active > .checkbox-check[checked] > .checkbox-check[checked], checkbox:not([disabled="true"]):hover > .checkbox-check[checked] > .checkbox-check[checked] { color: var(--checkbox-checked-border-color-hover, AccentColorText) !important; @@ -2046,20 +1908,16 @@ .checkbox-icon[src] { margin-inline-end: 2px !important; } - .checkbox-label { margin: 1px 0 !important; } - checkbox[disabled="true"] { opacity: 0.4 !important; } - /* From common.css */ xul|richlistitem > xul|*.checkbox-check { margin: 3px 6px !important; } - /*- Menulist ---------------------------------------------------------------*/ /* From mulist.css */ xul|menulist { @@ -2094,13 +1952,11 @@ outline: 2px solid var(--focus-outline-color, -moz-accent-color) !important; } } - #label-box { -moz-box-align: center !important; -moz-box-pack: center !important; font-weight: 600 !important; } - dropmarker { display: -moz-box !important; appearance: none !important; @@ -2115,16 +1971,13 @@ -moz-context-properties: fill !important; fill: currentColor !important; } - #highlightable-label:not([highlightable="true"]), #label[highlightable="true"] { display: none !important; } - xul|menuitem > label:not(.menu-text) { margin: 0 3px !important; } - /* From common.css */ xul|menulist > xul|menupopup { appearance: none !important; @@ -2137,7 +1990,6 @@ --panel-color: var(--in-content-text-color) !important; --panel-padding: 0 !important; } - xul|menulist > xul|menupopup xul|menu, xul|menulist > xul|menupopup xul|menuitem { appearance: none !important; @@ -2145,7 +1997,6 @@ padding-block: 0.2em !important; padding-inline: 10px 30px !important; } - xul|menulist > xul|menupopup > xul|menu:not([disabled="true"])[_moz-menuactive="true"], xul|menulist > xul|menupopup > xul|menuitem:not([disabled="true"])[_moz-menuactive="true"] { color: var(--in-content-item-hover-text) !important; @@ -2163,7 +2014,6 @@ global/menu.css */ background-color: transparent !important; } - xul|menulist > xul|menupopup xul|menuseparator { appearance: none !important; margin: 0 !important; @@ -2171,20 +2021,16 @@ border-top: 1px solid var(--in-content-box-border-color) !important; border-bottom: none !important; } - xul|menulist::part(dropmarker) { margin-block: 1px !important; } - /* Override menulist.css */ xul|menulist[disabled="true"] { background-color: var(--in-content-button-background) !important; } - xul|menulist:-moz-focusring > xul|*.menulist-label-box { outline: none !important; } - /*- List Boxes -------------------------------------------------------------*/ html|select[size][multiple], xul|listheader, @@ -2196,24 +2042,20 @@ border-radius: 4px !important; color: var(--in-content-text-color) !important; } - xul|listheader { border-bottom: none !important; border-bottom-left-radius: 0 !important; border-bottom-right-radius: 0 !important; padding-bottom: 1px !important; box-shadow: inset 0 -1px var(--in-content-table-border-color) !important; - overflow: clip !important; - /* Clip border-radius */ + overflow: clip !important; /* Clip border-radius */ } - xul|listheader + xul|richlistbox { margin-top: 0 !important; border-top: none !important; border-top-left-radius: 0 !important; border-top-right-radius: 0 !important; } - html|select[size][multiple] > html|option, xul|treechildren::-moz-tree-row { padding: 0.3em inherit !important; @@ -2222,24 +2064,20 @@ border-radius: 0 !important; background-image: none !important; } - xul|treechildren::-moz-tree-row(multicol, odd) { background-color: var(--in-content-box-background-odd); } - html|select[size][multiple] > html|option:hover, xul|richlistbox > xul|richlistitem:not([disabled="true"], [selected]):hover, xul|treechildren::-moz-tree-row(hover) { background-color: var(--in-content-item-hover) !important; color: var(--in-content-item-hover-text) !important; } - xul|richlistbox > xul|richlistitem[selected], xul|treechildren::-moz-tree-row(selected) { background-color: var(--in-content-item-selected) !important; color: var(--in-content-item-selected-text) !important; } - xul|richlistbox:not(#categories) > xul|richlistitem[selected] { /* Ensure buttons/menulists inside richlistitems (containers, applications) look OK */ --in-content-button-background: color-mix(in srgb, currentColor 15%, transparent) !important; @@ -2249,11 +2087,9 @@ --in-content-button-text-color-hover: var(--in-content-item-selected-text) !important; --in-content-focus-outline-color: var(--in-content-item-selected-text) !important; } - xul|richlistitem[selected] xul|menulist:focus-visible { outline-offset: -2px !important; } - /* Use a 2px border so that selected row highlight is still visible behind an existing high-contrast border that uses the background color */ @media (prefers-contrast) { @@ -2267,7 +2103,6 @@ border: 1px solid var(--in-content-box-border-color) !important; color: var(--in-content-text-color) !important; } - /*- Each OS ----------------------------------------------------------------*/ @media (-moz-os-version: windows-win7), (-moz-platform: windows-win7), @@ -2279,12 +2114,10 @@ xul|radio { padding-inline-start: 0 !important; } - /* Override menulist.css */ xul|menulist[disabled="true"] { background-color: var(--in-content-button-background) !important; } - xul|menulist:-moz-focusring > xul|*.menulist-label-box { outline: none !important; } @@ -2297,20 +2130,16 @@ xul|*.checkbox-label-box { appearance: none !important; } - xul|button[type="menu"] > xul|*.button-box > xul|*.button-menu-dropmarker { appearance: none !important; } - xul|menulist { font-size: inherit !important; } - xul|menulist::part(dropmarker) { display: -moz-box; margin-block: 6px !important; } - xul|menulist:-moz-focusring::part(label-box) { outline: none !important; } @@ -2320,22 +2149,18 @@ xul|menulist > xul|menupopup > xul|menuitem[selected="true"]::before { display: none !important; } - xul|menulist::part(dropmarker) { display: -moz-box !important; margin-block: 1px !important; } - xul|menulist > xul|menupopup xul|menu, xul|menulist > xul|menupopup xul|menuitem { padding-inline-end: 34px !important; } - xul|*.checkbox-icon, xul|*.radio-icon { margin-inline-end: 0 !important; } - xul|*.text-link:-moz-focusring { box-shadow: none !important; } @@ -2366,19 +2191,16 @@ #locationTextBox:focus { border-color: transparent !important; outline: 2px solid var(--in-content-focus-outline-color) !important; - outline-offset: -1px !important; - /* Prevents antialiasing around the corners */ + outline-offset: -1px !important; /* Prevents antialiasing around the corners */ } #locationTextBox:-moz-ui-invalid { border-color: transparent !important; outline: 2px solid var(--in-content-border-invalid) !important; - outline-offset: -1px !important; - /* Prevents antialiasing around the corners */ + outline-offset: -1px !important; /* Prevents antialiasing around the corners */ } #locationTextBox:disabled { opacity: 0.4 !important; } - #exceptiondialog:first-child > hbox > vbox:not([flex="1"]) { width: 48px !important; height: 48px !important; @@ -2398,7 +2220,6 @@ :root { --in-content-border-color: color-mix(in srgb, currentColor 41%, transparent) !important; } - #viewGroup > radio { border-radius: 8px !important; padding: var(--in-content-button-vertical-padding) var(--in-content-button-horizontal-padding) !important; @@ -2410,36 +2231,27 @@ background-size: 32px !important; -moz-context-properties: fill !important; fill: currentColor !important; - color: var(--in-content-deemphasized-text) !important; - /* FieldText */ + color: var(--in-content-deemphasized-text) !important; /* FieldText */ } #viewGroup > radio:hover { - background-color: var(--in-content-button-background-hover) !important; - /* #E0E8F6; */ + background-color: var(--in-content-button-background-hover) !important; /* #E0E8F6; */ } #viewGroup > radio[selected="true"] { - color: var(--in-content-button-text-color) !important; - /* SelectedItemText */ - background-color: var(--in-content-button-background-active) !important; - /* #C1D2EE; */ + color: var(--in-content-button-text-color) !important; /* SelectedItemText */ + background-color: var(--in-content-button-background-active) !important; /* #C1D2EE; */ } - #generalTab { --viewgroup-image: url(chrome://global/skin/icons/page-portrait.svg); } - #mediaTab { --viewgroup-image: url(chrome://browser/skin/canvas.svg); } - #permTab { --viewgroup-image: url(chrome://browser/skin/permissions.svg); } - #securityTab { --viewgroup-image: url(chrome://global/skin/icons/security.svg); } - #viewGroup > radio > .radio-label-box { /* Overwrite */ margin: 0 !important; @@ -2447,30 +2259,24 @@ } @supports -moz-bool-pref("layout.css.osx-font-smoothing.enabled") { #viewGroup > radio > .radio-label-box { - padding-top: 32px !important; - /* as -moz-image-region: rect(0px, 32px, 32px, 0px); */ + padding-top: 32px !important; /* as -moz-image-region: rect(0px, 32px, 32px, 0px); */ } } - #mainDeck input { color: var(--in-content-page-color) !important; } - #permList { -moz-appearance: none !important; color: var(--in-content-page-color) !important; background-color: var(--in-content-box-background) !important; } - .permission:hover { color: var(--in-content-text-color) !important; background-color: var(--in-content-button-background-hover) !important; } - .permission radio[disabled] { color: var(--in-content-deemphasized-text) !important; } - treecols { -moz-appearance: none !important; background: var(--in-content-table-header-background) !important; @@ -2486,7 +2292,6 @@ border-spacing: 0; text-align: center !important; } - tree, treechildren::-moz-tree-row { -moz-appearance: none !important; @@ -2494,7 +2299,6 @@ background-color: var(--in-content-table-background) !important; border: 1px solid var(--in-content-table-border-color) !important; } - treechildren::-moz-tree-row(odd) { background-color: var(--in-content-box-background-odd) !important; } @@ -2518,23 +2322,19 @@ font-weight: 600 !important; color: var(--in-content-item-selected-text) !important; } - #imagecontainerbox { background-color: var(--in-content-box-background) !important; } - #metatree, #imagetree, #imagecontainerbox, #permList { border-radius: 4px !important; } - #metatree, #imagetree { overflow: hidden !important; } - #topBar, #imagecontainerbox, #permList { @@ -2569,10 +2369,8 @@ :root { --organizer-color: var(--in-content-page-color); --organizer-deemphasized-color: var(--in-content-deemphasized-text); - --organizer-toolbar-background: rgb(249, 249, 251); - /* --toolbar-bgcolor */ - --organizer-pane-background: rgb(229, 229, 235); - /* --lwt-accent-color */ + --organizer-toolbar-background: rgb(249, 249, 251); /* --toolbar-bgcolor */ + --organizer-pane-background: rgb(229, 229, 235); /* --lwt-accent-color */ --organizer-content-background: var(--in-content-page-background); --organizer-hover-background: var(--in-content-button-background-hover); --organizer-hover-color: var(--organizer-color); @@ -2581,8 +2379,7 @@ --organizer-outline-color: var(--in-content-focus-outline-color); --organizer-separator-color: var(--organizer-pane-field-border-color); --organizer-border-color: var(--in-content-border-color); - --organizer-toolbar-field-background: rgb(240, 240, 244); - /* --lwt-accent-color */ + --organizer-toolbar-field-background: rgb(240, 240, 244); /* --lwt-accent-color */ --organizer-toolbar-field-background-focused: Field; --organizer-toolbar-field-border-color: transparent; --organizer-toolbar-field-focus-border-color: color-mix( @@ -2608,7 +2405,6 @@ } } } - /*- Toolbar & Menus ------------------------------------------------------*/ #placesToolbar { appearance: none !important; @@ -2633,14 +2429,12 @@ #placesToolbar > toolbarbutton:not([disabled]):hover:active { background-color: var(--organizer-selected-background) !important; } - #placesToolbar > toolbarbutton > .toolbarbutton-icon, #placesMenu > menu > image, #placesMenu > menu > .menubar-text { -moz-context-properties: fill !important; fill: currentColor !important; } - #placesMenu { margin-inline-start: 6px !important; } @@ -2663,11 +2457,9 @@ color: var(--organizer-selected-color) !important; } #placesMenu > menu > .menubar-text { - margin-block: 0 !important; - /* override menu.css */ + margin-block: 0 !important; /* override menu.css */ padding-inline-end: 4px !important; } - /*- Search Bar & Input ---------------------------------------------------*/ #searchFilter, #detailsPane html|input { @@ -2680,7 +2472,6 @@ padding-block: 2px !important; min-height: 24px !important; } - #searchFilter[focused] { box-shadow: var(--organizer-toolbar-field-focus-box-shadow) !important; background-color: var(--organizer-toolbar-field-background-focused) !important; @@ -2688,12 +2479,10 @@ outline: 2px solid var(--organizer-toolbar-field-focus-border-color) !important; outline-offset: -2px !important; } - /*- Sidebar & Splitter ---------------------------------------------------*/ #placesList { background-color: var(--organizer-pane-background) !important; } - #placesView > splitter { border: 0 !important; border-inline-end: 1px solid var(--organizer-border-color) !important; @@ -2703,28 +2492,23 @@ margin-inline-start: -3px !important; position: relative !important; } - /*- Downloads Pane -------------------------------------------------------*/ #downloadsRichListBox, #downloadsListBox { color: var(--organizer-color) !important; background-color: var(--organizer-content-background) !important; } - #clearDownloadsButton:focus-visible { outline: 2px solid var(--organizer-outline-color) !important; } - richlistitem[selected="true"], richlistitem:hover { background-color: var(--organizer-hover-background) !important; color: var(--organizer-color) !important; } - richlistbox:where(:focus) > richlistitem[selected="true"] { background-color: var(--organizer-selected-background) !important; } - /*- Tree -----------------------------------------------------------------*/ #contentView treecol { /* Use box-shadow to draw a bottom border instead of border-bottom @@ -2732,12 +2516,10 @@ * aligned with the items on the sidebar. */ box-shadow: inset 0 -1px var(--organizer-border-color) !important; } - tree { background-color: var(--organizer-content-background) !important; color: var(--organizer-color) !important; } - treecol:not([hideheader="true"]), treecolpicker { appearance: none !important; @@ -2746,7 +2528,6 @@ color: var(--organizer-color, inherit) !important; padding: 5px 10px !important; } - treecol:not([hideheader="true"], [sortable="false"]):hover, treecolpicker:hover { background-color: var(--organizer-hover-background) !important; @@ -2756,7 +2537,6 @@ treecolpicker:hover:active { background-color: var(--organizer-selected-background) !important; } - treecol:not([hideheader="true"], :first-child), treecolpicker { padding-left: 10px !important; @@ -2772,13 +2552,11 @@ ) 1 1 !important; } - treecol[sortDirection]:not([hideheader="true"]) > xul|*.treecol-sortdirection { fill: currentColor !important; width: 18px !important; height: 18px !important; } - treechildren::-moz-tree-row { background-color: transparent !important; } @@ -2814,7 +2592,6 @@ treechildren::-moz-tree-drop-feedback { background-color: var(--organizer-outline-color) !important; } - /*- Info Box -------------------------------------------------------------*/ #detailsPane { background-color: var(--organizer-pane-background) !important; @@ -2822,7 +2599,6 @@ padding: 5px !important; border-top: 1px solid var(--organizer-border-color) !important; } - #editBookmarkPanelRows .expander-up, #editBookmarkPanelRows .expander-down { appearance: none !important; @@ -2856,14 +2632,12 @@ #editBookmarkPanelRows .expander-down > .button-box { padding: 0 !important; } - #editBookmarkPanelRows .expander-up { list-style-image: url("chrome://global/skin/icons/arrow-up-12.svg"); } #editBookmarkPanelRows .expander-down { list-style-image: url("chrome://global/skin/icons/arrow-down-12.svg"); } - #places input { border: 1px solid var(--organizer-pane-field-border-color) !important; border-radius: 4px !important; @@ -2879,12 +2653,10 @@ #places input:not(:read-write):focus { outline: none !important; } - .caption-label { margin-inline-start: 8px !important; color: var(--organizer-deemphasized-color) !important; } - #editBMPanel_tagsSelectorRow > richlistbox { appearance: none !important; color: var(--organizer-color) !important; @@ -2938,10 +2710,11 @@ #protections-popup-footer .protections-popup-footer-button, #protections-popup-multiView .panel-subview-footer-button, #identity-popup-clear-sitedata-button, - #identity-popup-more-info { + #identity-popup-more-info, + #unified-extensions-manage-extensions, + .unified-extensions-item-open-menu { cursor: pointer !important; } - /* TODO: For now, fxa-menu doesn't show any status. (JS required, observe .syncNowBtn status) #PanelUI-fxa-menu-syncnow-button[syncstatus="active"] { @@ -2957,14 +2730,12 @@ #searchbar:hover:not(:focus-within) { --toolbar-field-border-color: var(--toolbar-field-focus-border-color); } - /*- Other Fields -----------------------------------------------------------*/ /* Sidebar */ .sidebar-panel[lwt-sidebar] #search-box:hover, body[lwt-sidebar] xul|search-textbox.tabsFilter:hover { border-color: var(--lwt-sidebar-highlight-background-color, Highlight) !important; } - .sidebar-panel:not([lwt-sidebar]) #search-box:hover, body:not([lwt-sidebar]) xul|search-textbox.tabsFilter:hover { border-color: AccentColor !important; @@ -2975,7 +2746,6 @@ border-color: -moz-accent-color !important; } } - /* Others */ #editBMPanel_namePicker:hover, #editBMPanel_tagsField:hover, @@ -2999,7 +2769,6 @@ #downloadsListBox .download-state[exists] .downloadDetails.downloadDetailsHover { color: var(--button-primary-hover-bgcolor); } - /* File moved or missing */ #downloadsListBox .download-state:not([exists], [state="0"]) .downloadTarget { text-decoration: line-through; @@ -3023,7 +2792,6 @@ #tabs-newtab-button > .toolbarbutton-icon { transition: background-color 1s var(--animation-easing-function) !important; } - button:hover, toolbarbutton:hover, stack:hover, @@ -3032,7 +2800,6 @@ #tabs-newtab-button:hover > .toolbarbutton-icon { transition: background-color 0.25s var(--animation-easing-function) !important; } - @media (-moz-gtk-csd-available) { .tabbrowser-tab:is([visuallyselected], [multiselected], [selected]) .tab-background:not(:-moz-lwtheme) { transition: background-image 0.25s var(--animation-easing-function) !important; @@ -3047,7 +2814,6 @@ .subviewbutton:hover { transition: background-color 0.1s var(--animation-easing-function) !important; } - /*- Pinned Tab -------------------------------------------------------------*/ #tabbrowser-tabs:not([movingtab]) .tabbrowser-tab:not([collapsed]) { /* -moz-box-flex may be caused #tabbrowser-tabs[closebuttons] */ @@ -3055,8 +2821,8 @@ 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] { - transition: -moz-box-flex 0.2s var(--animation-easing-function), - margin-inline-start 0.2s var(--animation-easing-function) !important; + transition: 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]) .tab-content::before, #tabbrowser-tabs:not([movingtab]) .tab-content::after { @@ -3068,7 +2834,6 @@ #tabbrowser-tabs:not([movingtab]) .tab-content .tab-icon-image { transition: all 0.3s var(--animation-easing-function) !important; } - /*- URL / Search Bar -------------------------------------------------------*/ #urlbar-background, #searchbar { @@ -3080,7 +2845,6 @@ transition: border-color 0.5s var(--animation-easing-function), background-color 1s var(--animation-easing-function) !important; } - /* Buttons in URL bar */ #tracking-protection-icon-container, #identity-icon-box, @@ -3096,7 +2860,6 @@ #page-action-buttons > .urlbar-page-action:hover { transition: background-color 1.25s var(--animation-easing-function) !important; } - /*- Border - Other Fields --------------------------------------------------*/ #search-box, xul|search-textbox.tabsFilter, @@ -3112,7 +2875,6 @@ .findbar-container .findbar-textbox:hover { transition: border-color 0.5s var(--animation-easing-function) !important; } - /*- Sidebar ----------------------------------------------------------------*/ @supports not -moz-bool-pref("userChrome.decoration.disable_sidebar_animate") { #sidebar-box { @@ -3150,7 +2912,6 @@ #navigator-toolbox[inFullscreen="true"]:hover { margin-top: 0 !important; } - @keyframes fullscreen { from { margin-top: 0; @@ -3166,7 +2927,6 @@ opacity: 1; max-height: 100%; } - .item.client.closed .item-tabs-list { display: flex !important; transition: transform 0.2s ease-out, opacity 0.2s ease-out, @@ -3197,7 +2957,6 @@ #editBookmarkPanelRows .expander-down .button-icon { transition: transform 0.1s var(--animation-easing-function) !important; } - #editBookmarkPanelRows .expander-up { list-style-image: url("chrome://global/skin/icons/arrow-down.svg") !important; } @@ -3207,8 +2966,7 @@ } @supports -moz-bool-pref("userChrome.decoration.disable_panel_animate") { :root { - --panelui-subview-transition-duration: 1ms !important; - /* Disable top right corner menu sliding animation (0ms will not work!) */ + --panelui-subview-transition-duration: 1ms !important; /* Disable top right corner menu sliding animation (0ms will not work!) */ } } } @@ -3216,17 +2974,15 @@ /** Rounding ******************************************************************/ @supports -moz-bool-pref("userChrome.rounding.square_tab") { :root { - --tab-border-radius: 0 !important; - /* Original: 4px */ + --tab-border-radius: 0 !important; /* Original: 4px */ } } @supports -moz-bool-pref("userChrome.rounding.square_button") { :root { - --toolbarbutton-border-radius: 0 !important; - /* Original: 4px */ + --toolbarbutton-border-radius: 0 !important; /* Original: 4px */ } - - button { + button, + findbar toolbarbutton { border-radius: 0 !important; } } @@ -3270,6 +3026,10 @@ html|input { border-radius: 0 !important; } + #urlbar-background, + #searchbar { + --toolbarbutton-border-radius: 0; + } } @supports -moz-bool-pref("userChrome.rounding.square_checklabel") { .checkbox-check, @@ -3284,10 +3044,8 @@ /*= Tab Bar - Distribution padding, radius ===================================*/ @supports -moz-bool-pref("userChrome.tab.lepton_like_padding") or -moz-bool-pref("userChrome.tab.photon_like_padding") { :root { - --proton-tab-block-margin: var(--tab-block-margin) !important; - /* Original: 4px, Legacy */ + --proton-tab-block-margin: var(--tab-block-margin) !important; /* Original: 4px, Legacy */ } - :root[uidensity="touch"] { /* Like Original */ --tab-block-margin: 4px !important; @@ -3295,8 +3053,7 @@ } @supports -moz-bool-pref("userChrome.tab.lepton_like_padding") { :root { - --tab-block-margin: 2px !important; - /* New version of --proton-tab-block-margin */ + --tab-block-margin: 2px !important; /* New version of --proton-tab-block-margin */ } } @supports -moz-bool-pref("userChrome.tab.photon_like_padding") { @@ -3308,10 +3065,8 @@ @supports -moz-bool-pref("userChrome.padding.first_tab") { /* for First Tab Space */ :root { - --uc-space-left-tabbar: 8px; - /* If the option is not specified, it is equivalent to 0px. */ + --uc-space-left-tabbar: 8px; /* If the option is not specified, it is equivalent to 0px. */ } - @supports not -moz-bool-pref("userChrome.padding.first_tab.always") { :root:not([tabsintitlebar]) #tabbrowser-tabs:not([positionpinnedtabs]), :root:is([sizemode="maximized"], [sizemode="fullscreen"]) #tabbrowser-tabs:not([positionpinnedtabs]) { @@ -3328,21 +3083,17 @@ @supports -moz-bool-pref("userChrome.padding.tabbar_width") { /* Titlebar Space */ :root { - --uc-title-pre-spacer: 30px; - /* Original: 40px */ - --uc-title-post-spacer: 25px; - /* Original: 40px */ + --uc-title-pre-spacer: 30px; /* Original: 40px */ + --uc-title-post-spacer: 25px; /* Original: 40px */ } :root:-moz-locale-dir(rtl) { --uc-title-pre-spacer: 25px; --uc-title-post-spacer: 30px; } - @supports -moz-bool-pref("layout.css.osx-font-smoothing.enabled") { .titlebar-spacer[type="pre-tabs"] { width: var(--uc-title-pre-spacer) !important; } - .titlebar-spacer[type="post-tabs"] { width: var(--uc-title-post-spacer) !important; } @@ -3352,7 +3103,6 @@ .titlebar-spacer[type="pre-tabs"] { width: var(--uc-title-pre-spacer) !important; } - .titlebar-spacer[type="post-tabs"] { width: var(--uc-title-post-spacer) !important; } @@ -3367,7 +3117,6 @@ .titlebar-spacer[type="pre-tabs"] { width: var(--uc-title-post-spacer) !important; } - .titlebar-spacer[type="post-tabs"] { width: var(--uc-title-pre-spacer) !important; } @@ -3377,7 +3126,6 @@ .titlebar-spacer[type="pre-tabs"] { width: var(--uc-title-post-spacer) !important; } - .titlebar-spacer[type="post-tabs"] { width: var(--uc-title-pre-spacer) !important; } @@ -3388,7 +3136,6 @@ --newtab-button-minus-width-padding: 2px; --newtab-button-width-padding: calc(var(--toolbarbutton-inner-padding) - var(--newtab-button-minus-width-padding)); } - #new-tab-button > .toolbarbutton-icon, #alltabs-button > .toolbarbutton-badge-stack { /* Original: calc(2 * var(--toolbarbutton-inner-padding) + 16px) */ @@ -3397,7 +3144,6 @@ padding-left: var(--newtab-button-width-padding) !important; padding-right: var(--newtab-button-width-padding) !important; } - @supports not -moz-bool-pref("userChrome.tab.photon_like_padding") { #tabbrowser-tabs[haspinnedtabs]:not([positionpinnedtabs]) > #tabbrowser-arrowscrollbox @@ -3416,25 +3162,18 @@ --scrollbtn-inner-padding: 1px; --scrollbtn-outer-padding: 3px; } - #scrollbutton-up { - padding-left: var(--scrollbtn-inner-padding, 4px) !important; - /* Original: 4px */ + padding-left: var(--scrollbtn-inner-padding, 4px) !important; /* Original: 4px */ padding-right: var(--scrollbtn-outer-padding, 4px) !important; } - #scrollbutton-down { - padding-left: var(--scrollbtn-outer-padding, 4px) !important; - /* Original: 4px */ + padding-left: var(--scrollbtn-outer-padding, 4px) !important; /* Original: 4px */ padding-right: var(--scrollbtn-inner-padding, 4px) !important; } - :root:not([uidensity="touch"]) #new-tab-button, #alltabs-button { - --toolbarbutton-outer-padding: 1px; - /* Original: 2px*/ + --toolbarbutton-outer-padding: 1px; /* Original: 2px*/ } - /* Tab - Max Size */ @supports not -moz-bool-pref("userChrome.tab.photon_like_padding") { :root { @@ -3460,12 +3199,9 @@ } } } - .tabbrowser-tab[fadein]:not([pinned]):not([style*="max-width"]) { - max-width: var(--tab-max-width) !important; - /* Original: 225px */ + max-width: var(--tab-max-width) !important; /* Original: 225px */ } - /* neighbouring tabs should "pinch" together */ @supports not -moz-bool-pref("userChrome.tab.photon_like_padding") { @supports -moz-bool-pref("userChrome.tab.lepton_like_padding") { @@ -3487,15 +3223,12 @@ @supports -moz-bool-pref("userChrome.padding.drag_space") { /* for Extra Drag Space */ :root { - --uc-space-above-tabbar: 8px; - /* If the option is not specified, it is equivalent to 0px. */ + --uc-space-above-tabbar: 8px; /* If the option is not specified, it is equivalent to 0px. */ } - @media (-moz-os-version: windows-win10), (-moz-platform: windows-win10) { :root[tabsintitlebar][sizemode="normal"] #toolbar-menubar[autohide="true"] { height: calc(var(--tab-min-height) + var(--uc-space-above-tabbar) - var(--tabs-navbar-shadow-size)); } - @supports -moz-bool-pref("userChrome.padding.drag_space.maximized") { :root[tabsintitlebar][sizemode="maximized"] #toolbar-menubar[autohide="true"] { height: calc(var(--tab-min-height) + var(--uc-space-above-tabbar) - var(--tabs-navbar-shadow-size)); @@ -3510,7 +3243,6 @@ :root[tabsintitlebar][sizemode="normal"] #toolbar-menubar[autohide="true"] { height: calc(var(--tab-min-height) + var(--uc-space-above-tabbar)); } - @supports -moz-bool-pref("userChrome.padding.drag_space.maximized") { :root[tabsintitlebar][sizemode="maximized"] #toolbar-menubar[autohide="true"] { height: calc(var(--tab-min-height) + var(--uc-space-above-tabbar)); @@ -3529,7 +3261,6 @@ :root[sizemode="normal"] #toolbar-menubar[autohide="true"][inactive] + #TabsToolbar > .toolbar-items { padding-top: calc(var(--uc-space-above-tabbar) + 4px) !important; } - @supports -moz-bool-pref("userChrome.padding.drag_space.maximized") { :root[sizemode="maximized"][chromehidden~="menubar"] #TabsToolbar > .toolbar-items, :root[sizemode="maximized"] #toolbar-menubar[autohide="true"][inactive] + #TabsToolbar > .toolbar-items { @@ -3547,7 +3278,6 @@ :root[sizemode="normal"] #toolbar-menubar[autohide="true"][inactive] + #TabsToolbar > .toolbar-items { padding-top: var(--uc-space-above-tabbar) !important; } - @supports -moz-bool-pref("userChrome.padding.drag_space.maximized") { :root[sizemode="maximized"][chromehidden~="menubar"] #TabsToolbar > .toolbar-items, :root[sizemode="maximized"] #toolbar-menubar[autohide="true"][inactive] + #TabsToolbar > .toolbar-items { @@ -3579,7 +3309,6 @@ :root[uidensity="touch"] { --tab-min-height: 41px !important; } - /* Top Margin */ .tab-background, .tab-content { @@ -3589,12 +3318,10 @@ @supports not -moz-bool-pref("userChrome.tab.lepton_like_padding") { @supports not -moz-bool-pref("userChrome.tab.photon_like_padding") { :root:not([uidensity]) { - --tab-min-height: 36px !important; - /* 38px -> 36px */ + --tab-min-height: 36px !important; /* 38px -> 36px */ } :root[uidensity="compact"] { - --tab-min-height: 29px !important; - /* 36px -> 29px */ + --tab-min-height: 29px !important; /* 36px -> 29px */ } } } @@ -3604,24 +3331,20 @@ var(--tab-min-height) + 2 * (var(--tab-block-margin, var(--proton-tab-block-margin, 0px))) ) !important; } - #TabsToolbar[multibar] .tabbrowser-tab { - height: unset !important; - /* Original: var(--tab-min-height_mlt) */ + height: unset !important; /* Original: var(--tab-min-height_mlt) */ } - @supports -moz-bool-pref("userChrome.tab.connect_to_window") { :root { --tab-min-height_mlt: calc( var(--tab-min-height) + var(--tab-block-margin, var(--proton-tab-block-margin, 0px)) ) !important; } - #TabsToolbar { - --toolbarbutton-inner-padding: calc((var(--tab-min-height) - 18px) / 2) !important; - /* Prevent overflow pinned tab bottom margin */ + --toolbarbutton-inner-padding: calc( + (var(--tab-min-height) - 18px) / 2 + ) !important; /* Prevent overflow pinned tab bottom margin */ } - :root:not([uidensity="compact"]) #TabsToolbar:not([multibar]) #tabbrowser-arrowscrollbox, #TabsToolbar:not([multibar]) #tabbrowser-arrowscrollbox[overflowing="true"] > .tabbrowser-tab[pinned="true"], #TabsToolbar:not([multibar]) @@ -3632,10 +3355,8 @@ #tabbrowser-arrowscrollbox[overflowing="true"] > .tabbrowser-tab[pinned="true"] .tab-content { - max-height: var(--tab-min-height) !important; - /* Force apply height */ + max-height: var(--tab-min-height) !important; /* Force apply height */ } - :root[uidensity="compact"] #TabsToolbar:not([multibar]) #tabbrowser-arrowscrollbox { height: var(--tab-min-height) !important; } @@ -3646,7 +3367,6 @@ --scrollbtn-vertical-border: 2px; --scrollbtn-border-radius: 7px; } - #scrollbutton-up, #scrollbutton-down { /* Original: var(--toolbarbutton-inner-padding) calc(var(--toolbarbutton-inner-padding) - 6px) = 9px */ @@ -3659,17 +3379,16 @@ /* Original: calc(var(--tab-border-radius) + 4px) = 8px */ border-radius: var(--scrollbtn-border-radius, calc(var(--tab-border-radius) + 4px)) !important; } - :root[tabsintitlebar]:not([uidensity="compact"]) #toolbar-menubar[autohide="true"] { - height: calc(var(--tab-min-height) - var(--tabs-navbar-shadow-size) - 2px); - /* Compact: 28px, Normal: 33px, Touch: 38px */ + height: calc( + var(--tab-min-height) - var(--tabs-navbar-shadow-size) - 2px + ); /* Compact: 28px, Normal: 33px, Touch: 38px */ } } /*= Tool Bar - Button Padding ================================================*/ @supports -moz-bool-pref("userChrome.padding.toolbar_button") { :root[uidensity="compact"] { - --toolbarbutton-outer-padding: 2px !important; - /* Original: 3px, General is 2px */ + --toolbarbutton-outer-padding: 2px !important; /* Original: 3px, General is 2px */ } } /*= Nav Bar - Reduce Width ===================================================*/ @@ -3683,32 +3402,23 @@ @supports -moz-bool-pref("userChrome.padding.urlbar") { :root:not([uidensity="touch"]) #urlbar-container, :root:not([uidensity="touch"]) #search-container { - padding-block: 3px !important; - /* Original: 4px */ - margin-inline: 5px !important; - /* Original: 5px */ + padding-block: 3px !important; /* Original: 4px */ + margin-inline: 5px !important; /* Original: 5px */ } - :root:not([uidensity="compact"]) #urlbar-container, :root:not([uidensity="compact"]) #search-container { padding-block: 2px !important; } - /* spread menu */ :root:not([uidensity]) .urlbarView-row { - padding-block: 1px !important; - /* Original: 2px */ + padding-block: 1px !important; /* Original: 2px */ } - :root[uidensity="compact"] .urlbarView-row { padding-block: 0px !important; } - :root:not([uidensity]) #urlbar .search-one-offs:not([hidden]) { - padding-block: 8px !important; - /* Original: 10px */ + padding-block: 8px !important; /* Original: 10px */ } - :root[uidensity="compact"] #urlbar .search-one-offs:not([hidden]) { padding-block: 2px !important; } @@ -3719,13 +3429,11 @@ left: 0 !important; width: 100% !important; } - #urlbar[breakout][breakout-extend] > #urlbar-input-container { height: var(--urlbar-height) !important; padding-block: 0 !important; - padding-inline: 0 !important; + padding-inline: var(--urlbar-container-padding, 0px) !important; } - #urlbar[breakout][breakout-extend] > #urlbar-background { animation-name: none !important; box-shadow: 0 1px 4px rgba(0, 0, 0, 0.05) !important; @@ -3736,7 +3444,6 @@ margin-inline: 0 !important; width: 100% !important; } - .urlbarView-row { padding-block: 0 !important; } @@ -3744,8 +3451,7 @@ /*= BookMark Bar - Reduce Height =============================================*/ @supports -moz-bool-pref("userChrome.padding.bookmarkbar") { :root[uidensity="compact"] #PersonalToolbar toolbarbutton { - margin-top: 0px; - /* Original: 2px */ + margin-top: 0px !important; /* Original: 2px */ } } /*= Info Bar - Reduce Padding ================================================*/ @@ -3755,44 +3461,33 @@ } } @supports -moz-bool-pref("userChrome.padding.infobar") { - :root:not([uidensity]) #tab-notification-deck { + :root:not([uidensity]) notification-message { --infobar-message-vertical-margin: 3px; --infobar-vertical-margin: 7px; --infobar-button-vertical-margin: 3px; } - - :root[uidensity="compact"] #tab-notification-deck { + :root[uidensity="compact"] notification-message { --infobar-message-vertical-margin: 2px; --infobar-vertical-margin: 6px; --infobar-button-vertical-margin: 2px; } - - :root[uidensity="touch"] #tab-notification-deck { + :root[uidensity="touch"] notification-message { --infobar-message-vertical-margin: 4px; --infobar-vertical-margin: 8px; --infobar-button-vertical-margin: 4px; } - .infobar > .icon { - margin-block: var(--infobar-vertical-margin) !important; - /* Original: 8px */ + margin-block: var(--infobar-vertical-margin) !important; /* Original: 8px */ } - .notification-message { - padding-block: var(--infobar-vertical-margin) !important; - /* Original: 8px */ + padding-block: var(--infobar-vertical-margin) !important; /* Original: 8px */ } - .notification-button-container > .notification-button { - margin-block: var(--infobar-button-vertical-margin) !important; - /* Original: 4px */ + margin-block: var(--infobar-button-vertical-margin) !important; /* Original: 4px */ } - .notification-close { - margin: var(--infobar-button-vertical-margin) 8px !important; - /* Original: 4px 8px */ + margin: var(--infobar-button-vertical-margin) 8px !important; /* Original: 4px 8px */ } - /* Hard coded for compatibility - Disappearing phenomenon */ .container.infobar::before { content: ""; @@ -3810,23 +3505,18 @@ /*= Menu - Reduce Padding ====================================================*/ @supports -moz-bool-pref("userChrome.padding.menu") { :root { - --menu-padding: 0.35em; - /* Win7, 8: 0px */ + --menu-padding: 0.35em; /* Win7, 8: 0px */ } - :root[uidensity="compact"] { --menu-padding: 0.25em; } - :root[uidensity="touch"] { --menu-padding: 0.5em; } - @supports -moz-bool-pref("userChrome.padding.menu_compact") { :root { --menu-padding: 2px; } - :root[uidensity="compact"] { --menu-padding: 0px; } @@ -3836,7 +3526,6 @@ /* Original: 0.5em */ padding-block: var(--menu-padding) !important; } - #ContentSelectDropdown > menupopup > menucaption, #ContentSelectDropdown > menupopup > menuitem { padding-block: 0 !important; @@ -3847,27 +3536,19 @@ padding-block: var(--menu-padding) !important; } } - @supports -moz-bool-pref("layout.css.osx-font-smoothing.enabled") { :root:not([uidensity="touch"]) .menu-text, :root:not([uidensity="touch"]) .menu-iconic-text { - padding-inline-end: 0 !important; - /* Original: 2px */ + padding-inline-end: 0 !important; /* Original: 2px */ } - :root:not([uidensity="touch"]) .menupopup-arrowscrollbox { - padding-block: 1px !important; - /* Original: 4px*/ + padding-block: 1px !important; /* Original: 4px*/ } - :root:not([uidensity="touch"]) #context-navigation:not([hidden]) { - padding: 0 0 1px !important; - /* Original: 0 0 4px*/ + padding: 0 0 1px !important; /* Original: 0 0 4px*/ } - :root:not([uidensity="touch"]) .menu-right { - margin-right: 6px !important; - /* Original: 12px */ + margin-right: 6px !important; /* Original: 12px */ } } @media (-moz-os-version: windows-win7), @@ -3879,7 +3560,6 @@ menupopup > menu { padding-block: calc(var(--menu-padding) - 2px) !important; } - /* Make to original */ :root:not([uidensity="touch"]) #context-navigation:not([hidden]) { padding: 0 0 4px !important; @@ -3900,16 +3580,13 @@ :root { --bookmark-menu-padding: 3px; } - :root[uidensity="compact"] { --bookmark-menu-padding: 1.5px; } - @supports -moz-bool-pref("userChrome.padding.menu_compact") { :root { --bookmark-menu-padding: 2px; } - :root[uidensity="compact"] { --bookmark-menu-padding: 0px; } @@ -3919,12 +3596,10 @@ :root:not([uidensity="touch"]) #PlacesToolbar menupopup[placespopup] .openintabs-menuitem { padding-block: var(--bookmark-menu-padding) !important; } - @supports -moz-bool-pref("userChrome.padding.menu_compact") or -moz-bool-pref("userChrome.padding.bookmark_menu.compact") { :root:not([uidensity="touch"]) #BMB_bookmarksPopup .bookmark-item, :root:not([uidensity="touch"]) #PlacesToolbar menupopup[placespopup] .bookmark-item { - min-height: unset !important; - /* Original: 24px */ + min-height: unset !important; /* Original: 24px */ } } } @@ -3934,29 +3609,23 @@ #main-menubar { -moz-box-flex: 1 !important; } - /* Rounding */ #main-menubar > menu { border-radius: 4px; } - /* Menubar item padding */ :root { --global-menubar-padding: 2px; } - :root[uidensity="compact"] { --global-menubar-padding: 1px; } - :root[uidensity="touch"] { --global-menubar-padding: 4px; } - #main-menubar > menu { padding-block: var(--global-menubar-padding) !important; } - /* Reduce items */ #main-menubar > menu > menupopup menuitem, #main-menubar > menu > menupopup menu { @@ -3966,28 +3635,26 @@ /*= Panel - Reduce padding ===================================================*/ @supports -moz-bool-pref("userChrome.padding.panel") { :root { - --arrowpanel-menuitem-margin: 0 var(--arrowpanel-menuicon-padding) !important; - /* Original: 0 8px */ - --arrowpanel-menuitem-padding-block: 5px !important; - /* Original: 8px */ - --arrowpanel-menuitem-padding-inline: 5px !important; - /* Original: 8px */ - --arrowpanel-menuitem-padding: var(--arrowpanel-menuitem-padding-block) var(--arrowpanel-menuitem-padding-inline) !important; - /* Compatibility */ - --arrowpanel-padding: 0.8em !important; - /* Original: 16px or .cui-widget-panel, .cui-widget-panel::part(arrowcontent) => 4px 0 */ + --arrowpanel-menuitem-margin: 0 var(--arrowpanel-menuicon-padding, 8px) !important; /* Original: 0 8px */ + --arrowpanel-menuitem-padding-block: 5px !important; /* Original: 8px */ + --arrowpanel-menuitem-padding-inline: 5px !important; /* Original: 8px */ + --arrowpanel-menuitem-padding: var(--arrowpanel-menuitem-padding-block) var(--arrowpanel-menuitem-padding-inline) !important; /* Compatibility */ + --arrowpanel-padding: 0.8em !important; /* Original: 16px or .cui-widget-panel, .cui-widget-panel::part(arrowcontent) => 4px 0 */ } - :root[uidensity="compact"] { --arrowpanel-menuitem-padding-block: 3px !important; --arrowpanel-menuitem-padding-inline: 3px !important; } - :root[uidensity="touch"] { - --arrowpanel-menuitem-padding-block: 8px !important; - /* Original: 8px */ - --arrowpanel-menuitem-padding-inline: 8px !important; - /* Original: 8px */ + --arrowpanel-menuitem-padding-block: 8px !important; /* Original: 8px */ + --arrowpanel-menuitem-padding-inline: 8px !important; /* Original: 8px */ + } + @supports not -moz-bool-pref("userChrome.icon.disabled") { + @supports not -moz-bool-pref("userChrome.icon.panel") { + .subviewbutton { + min-height: calc(16px + var(--arrowpanel-menuitem-padding-block) * 2) !important; + } + } } } @supports -moz-bool-pref("userChrome.padding.panel_header") { @@ -3999,62 +3666,49 @@ /*= Popup Panel - Reduce padding =============================================*/ @supports -moz-bool-pref("userChrome.padding.popup_panel") { #protections-popup-main-header-label { - height: unset !important; - /* Original: 37.6px */ + height: unset !important; /* Original: 37.6px */ } - #identity-popup, #permission-popup, #protections-popup { - --vertical-section-padding: 0.8em; - /* Original: 0.9em */ + --vertical-section-padding: 0.8em; /* Original: 0.9em */ } - .protections-popup-footer-button, .protections-popup-category { - min-height: 24px; - /* Original: 32px */ + min-height: 24px; /* Original: 32px */ height: unset !important; } - /** Popup panel - Compact mode */ /* Footer Button Height */ :root[uidensity="compact"] .panel-footer.panel-footer-menulike > button { padding: 3px 8px !important; } - /* Footer Button Height */ :root[uidensity="compact"] #protections-popup-trackersView-settings-button { margin: 4px 8px 0 !important; } - /* not cut off for Protection popup Footer on windows */ :root[uidensity="compact"] #protections-popup-multiView #protections-popup-footer { - padding: 3px 0 10px !important; + padding: 0 !important; } - /* Button and disabled category in Protection popup */ :root[uidensity="compact"] #protections-popup-multiView .protections-popup-footer-button, :root[uidensity="compact"] #protections-popup-multiView .protections-popup-category { height: 20px !important; min-height: 20px !important; } - /* Footer Button in Tracking Content Panel */ :root[uidensity="compact"] #protections-popup-multiView .panel-footer.panel-footer-menulike { margin: 0 0 3px !important; } - /* Identity popup header padding */ :root[uidensity="compact"] #identity-popup-multiView #identity-popup-mainView-panel-header { padding: 2px 5px !important; } - /* Text When There is no trackers */ :root[uidensity="compact"] #protections-popup-no-trackers-found-description { margin: 2em 4em !important; } - /* Download Item margin */ :root[uidensity="compact"] #downloadsListBox { margin: 0 !important; @@ -4065,11 +3719,9 @@ @supports -moz-bool-pref("userChrome.tabbar.on_bottom") or -moz-bool-pref("userChrome.fullscreen.overlap") { /* Don't use display: flex at not fullscreen!! side effect #372 */ :root[sizemode="fullscreen"] #navigator-toolbox { - display: flex !important; - /* Needed for content to take up entire height, compatibility with tabs on bottom */ + display: flex !important; /* Needed for content to take up entire height, compatibility with tabs on bottom */ flex-wrap: wrap; } - :root[sizemode="fullscreen"] #titlebar, :root[sizemode="fullscreen"] #nav-bar, :root[sizemode="fullscreen"] #PersonalToolbar, @@ -4077,7 +3729,6 @@ :root[sizemode="fullscreen"] #tab-notification-deck-template { flex-basis: 100%; } - /* -moz-default-appearance: -moz-window-titlebar */ :root[sizemode="fullscreen"] #titlebar { -moz-appearance: none !important; @@ -4089,30 +3740,23 @@ 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; /* When userChrome.fullscreen.overlap */ -moz-box-ordinal-group: 2; --tabs-navbar-shadow-size: 0px; } - #tab-notification-deck { - order: 2; - /* When userChrome.fullscreen.overlap */ + order: 2; /* When userChrome.fullscreen.overlap */ -moz-box-ordinal-group: 2; } - #TabsToolbar .titlebar-spacer { display: none; } - #TabsToolbar-customization-target > .toolbarbutton-1:last-child { padding-inline-end: var(--toolbar-start-end-padding, 8px); } - @supports -moz-bool-pref("userChrome.tabbar.on_bottom.above_bookmark") { #PersonalToolbar { - order: 2; - /* When userChrome.fullscreen.overlap */ + order: 2; /* When userChrome.fullscreen.overlap */ -moz-box-ordinal-group: 2; } } @@ -4120,8 +3764,9 @@ @supports -moz-bool-pref("userChrome.tab.connect_to_window") { @supports -moz-bool-pref("userChrome.tab.color_like_toolbar") { #navigator-toolbox { - border-bottom-color: var(--toolbar-bgcolor) !important; - /* Original: 1px solid var(--chrome-content-separator-color); */ + border-bottom-color: var( + --toolbar-bgcolor + ) !important; /* Original: 1px solid var(--chrome-content-separator-color); */ } } } @@ -4131,13 +3776,11 @@ #tabbrowser-tabs .tabbrowser-tab:only-of-type { display: none !important; } - #tabbrowser-tabs, #tabbrowser-tabs arrowscrollbox { height: auto !important; min-height: auto !important; } - @media (prefers-reduced-motion: no-preference) { #tabbrowser-tabs { transition: height 0.25s var(--animation-easing-function) var(--uc-autohide-toolbar-delay); @@ -4151,35 +3794,28 @@ :root { /* height if native titlebar is enabled, assumes empty menubar */ --uc-menubar-height: 20px; - --uc-menubar-padding: 1px; - /* FF's menubar padding */ + --uc-menubar-padding: 1px; /* FF's menubar padding */ --uc-menubar-container-height: calc(var(--uc-menubar-height) - (2 * var(--uc-menubar-padding))); } - :root[tabsintitlebar] { /* height when native titlebar is disabled, more roomy so can fit buttons etc. */ --uc-menubar-height: 30px; } - /* Menubar on top patch - use with tabs_on_bottom.css */ /* Only really useful if menubar is ALWAYS visible */ :root:not([sizemode="fullscreen"]) { --uc-window-control-width: 0px !important; } - /* Since menubar is statically at top, remove fake drag-space that might be set by window_control_placeholder_support.css */ :root:not([sizemode="fullscreen"]) #nav-bar { border-inline-width: 0; } - #navigator-toolbox { -moz-window-dragging: drag; } - :root[sizemode="fullscreen"] #navigator-toolbox { padding-top: 0px !important; } - #toolbar-menubar { position: fixed; display: flex; @@ -4188,43 +3824,34 @@ width: 100%; overflow: hidden; } - :root[tabsintitlebar] #toolbar-menubar[autohide="true"]:not([inactive="true"]) { - height: var(--uc-menubar-height) !important; - /* calc(var(--tab-min-height) + 2 * var(--tab-block-margin)) */ + height: var(--uc-menubar-height) !important; /* calc(var(--tab-min-height) + 2 * var(--tab-block-margin)) */ } - #toolbar-menubar > .titlebar-buttonbox-container { height: 100%; order: 100; } - #toolbar-menubar > [flex] { flex-grow: 100; } - #toolbar-menubar > spacer[flex] { order: 99; flex-grow: 1; min-width: var(--uc-window-drag-space-post); } - #toolbar-menubar .toolbarbutton-1 { --toolbarbutton-inner-padding: 3px; } - #toolbar-menubar[autohide="true"] > .titlebar-buttonbox-container, #TabsToolbar > .titlebar-buttonbox-container { height: var(--uc-menubar-container-height); } - :root:not([chromehidden~="menubar"], [sizemode="fullscreen"]) #toolbar-menubar:not([autohide="true"]) + #TabsToolbar > .titlebar-buttonbox-container { visibility: collapse !important; } - :root:not([chromehidden~="menubar"]):not([sizemode="fullscreen"]) #toolbar-menubar:not([autohide="true"]) .titlebar-buttonbox-container { @@ -4239,30 +3866,23 @@ 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; /* When userChrome.fullscreen.overlap */ -moz-box-ordinal-group: 2; --tabs-navbar-shadow-size: 0px; } - #tab-notification-deck { - order: 2; - /* When userChrome.fullscreen.overlap */ + order: 2; /* When userChrome.fullscreen.overlap */ -moz-box-ordinal-group: 2; } - #TabsToolbar .titlebar-spacer { display: none; } - #TabsToolbar-customization-target > .toolbarbutton-1:last-child { padding-inline-end: var(--toolbar-start-end-padding, 8px); } - @supports -moz-bool-pref("userChrome.tabbar.on_bottom.above_bookmark") { #PersonalToolbar { - order: 2; - /* When userChrome.fullscreen.overlap */ + order: 2; /* When userChrome.fullscreen.overlap */ -moz-box-ordinal-group: 2; } } @@ -4270,8 +3890,9 @@ @supports -moz-bool-pref("userChrome.tab.connect_to_window") { @supports -moz-bool-pref("userChrome.tab.color_like_toolbar") { #navigator-toolbox { - border-bottom-color: var(--toolbar-bgcolor) !important; - /* Original: 1px solid var(--chrome-content-separator-color); */ + border-bottom-color: var( + --toolbar-bgcolor + ) !important; /* Original: 1px solid var(--chrome-content-separator-color); */ } } } @@ -4281,13 +3902,11 @@ #tabbrowser-tabs .tabbrowser-tab:only-of-type { display: none !important; } - #tabbrowser-tabs, #tabbrowser-tabs arrowscrollbox { height: auto !important; min-height: auto !important; } - @media screen and (max-width: 1100px) and (prefers-reduced-motion: no-preference) { #tabbrowser-tabs { transition: height 0.25s var(--animation-easing-function) var(--uc-autohide-toolbar-delay); @@ -4301,35 +3920,28 @@ :root { /* height if native titlebar is enabled, assumes empty menubar */ --uc-menubar-height: 20px; - --uc-menubar-padding: 1px; - /* FF's menubar padding */ + --uc-menubar-padding: 1px; /* FF's menubar padding */ --uc-menubar-container-height: calc(var(--uc-menubar-height) - (2 * var(--uc-menubar-padding))); } - :root[tabsintitlebar] { /* height when native titlebar is disabled, more roomy so can fit buttons etc. */ --uc-menubar-height: 30px; } - /* Menubar on top patch - use with tabs_on_bottom.css */ /* Only really useful if menubar is ALWAYS visible */ :root:not([sizemode="fullscreen"]) { --uc-window-control-width: 0px !important; } - /* Since menubar is statically at top, remove fake drag-space that might be set by window_control_placeholder_support.css */ :root:not([sizemode="fullscreen"]) #nav-bar { border-inline-width: 0; } - #navigator-toolbox { -moz-window-dragging: drag; } - :root[sizemode="fullscreen"] #navigator-toolbox { padding-top: 0px !important; } - #toolbar-menubar { position: fixed; display: flex; @@ -4338,43 +3950,34 @@ width: 100%; overflow: hidden; } - :root[tabsintitlebar] #toolbar-menubar[autohide="true"]:not([inactive="true"]) { - height: var(--uc-menubar-height) !important; - /* calc(var(--tab-min-height) + 2 * var(--tab-block-margin)) */ + height: var(--uc-menubar-height) !important; /* calc(var(--tab-min-height) + 2 * var(--tab-block-margin)) */ } - #toolbar-menubar > .titlebar-buttonbox-container { height: 100%; order: 100; } - #toolbar-menubar > [flex] { flex-grow: 100; } - #toolbar-menubar > spacer[flex] { order: 99; flex-grow: 1; min-width: var(--uc-window-drag-space-post); } - #toolbar-menubar .toolbarbutton-1 { --toolbarbutton-inner-padding: 3px; } - #toolbar-menubar[autohide="true"] > .titlebar-buttonbox-container, #TabsToolbar > .titlebar-buttonbox-container { height: var(--uc-menubar-container-height); } - :root:not([chromehidden~="menubar"], [sizemode="fullscreen"]) #toolbar-menubar:not([autohide="true"]) + #TabsToolbar > .titlebar-buttonbox-container { visibility: collapse !important; } - :root:not([chromehidden~="menubar"]):not([sizemode="fullscreen"]) #toolbar-menubar:not([autohide="true"]) .titlebar-buttonbox-container { @@ -4400,28 +4003,22 @@ --uc-navbar-width: 24em; } } - #nav-bar { --uc-navbar-double-block: calc(2 * var(--uc-navbar-block, 0px)); height: calc(var(--uc-tabbar-height) - var(--uc-navbar-double-block)) !important; margin-top: calc(var(--uc-tabbar-hide-height) + var(--uc-navbar-double-block)) !important; margin-bottom: var(--uc-navbar-block, 0px) !important; - transform: translateY(calc(-1 * var(--uc-navbar-block, 0px))); } - #titlebar { transform: translateY(var(--uc-navbar-block, 0px)); } - #TabsToolbar > .titlebar-buttonbox-container { transform: translateY(calc(-1 * var(--uc-navbar-block, 0px))); } - #navigator-toolbox { position: relative; z-index: 2; } - @supports not -moz-bool-pref("userChrome.tabbar.one_liner.combine_navbar") { :root { --uc-navbar-gap: 10px; @@ -4433,28 +4030,22 @@ :root[uidensity="touch"] { --uc-navbar-block: 3px; } - #nav-bar { - --toolbarbutton-inner-padding: 6px; - /* Original: 8px */ + --toolbarbutton-inner-padding: 6px; /* Original: 8px */ border-radius: var(--tab-border-radius, 4px); } - #nav-bar, #nav-bar-customization-target { -moz-box-align: center; } - - #urlbar[breakout] { - top: 0px !important; - /* Original: calc((var(--urlbar-toolbar-height) - var(--urlbar-height)) / 2); */ + #urlbar-container { + min-height: calc(var(--urlbar-container-height) - 2px) !important; } } @supports -moz-bool-pref("userChrome.tabbar.one_liner.combine_navbar") { #navigator-toolbox { background-color: var(--toolbar-bgcolor) !important; } - #nav-bar { --lwt-tabs-border-color: transparent; background-color: unset !important; @@ -4466,25 +4057,23 @@ var(--uc-oneliner-urlbar-base-width, 50px) + 24px + 2 * var(--toolbarbutton-inner-padding) ) !important; } - + #urlbar[breakout][breakout-extend] { + min-width: calc(310px + 2 * (24px + 2 * var(--toolbarbutton-inner-padding))) !important; + } #PersonalToolbar { position: relative; z-index: -1; } - toolbarspring.chromeclass-toolbar-additional { display: none !important; } - @supports not -moz-bool-pref("userChrome.tabbar.one_liner.tabbar_first") { #TabsToolbar { margin-inline-start: var(--uc-navbar-margin) !important; } - #nav-bar { margin-inline-end: var(--uc-tabbar-width) !important; } - .titlebar-spacer[type="pre-tabs"] { display: none !important; } @@ -4493,11 +4082,9 @@ #TabsToolbar { margin-inline-end: var(--uc-navbar-margin) !important; } - #nav-bar { margin-inline-start: var(--uc-tabbar-width) !important; } - .titlebar-spacer[type="post-tabs"] { display: none !important; } @@ -4517,28 +4104,22 @@ --uc-navbar-width: 24em; } } - #nav-bar { --uc-navbar-double-block: calc(2 * var(--uc-navbar-block, 0px)); height: calc(var(--uc-tabbar-height) - var(--uc-navbar-double-block)) !important; margin-top: calc(var(--uc-tabbar-hide-height) + var(--uc-navbar-double-block)) !important; margin-bottom: var(--uc-navbar-block, 0px) !important; - transform: translateY(calc(-1 * var(--uc-navbar-block, 0px))); } - #titlebar { transform: translateY(var(--uc-navbar-block, 0px)); } - #TabsToolbar > .titlebar-buttonbox-container { transform: translateY(calc(-1 * var(--uc-navbar-block, 0px))); } - #navigator-toolbox { position: relative; z-index: 2; } - @supports not -moz-bool-pref("userChrome.tabbar.one_liner.combine_navbar") { :root { --uc-navbar-gap: 10px; @@ -4550,28 +4131,22 @@ :root[uidensity="touch"] { --uc-navbar-block: 3px; } - #nav-bar { - --toolbarbutton-inner-padding: 6px; - /* Original: 8px */ + --toolbarbutton-inner-padding: 6px; /* Original: 8px */ border-radius: var(--tab-border-radius, 4px); } - #nav-bar, #nav-bar-customization-target { -moz-box-align: center; } - - #urlbar[breakout] { - top: 0px !important; - /* Original: calc((var(--urlbar-toolbar-height) - var(--urlbar-height)) / 2); */ + #urlbar-container { + min-height: calc(var(--urlbar-container-height) - 2px) !important; } } @supports -moz-bool-pref("userChrome.tabbar.one_liner.combine_navbar") { #navigator-toolbox { background-color: var(--toolbar-bgcolor) !important; } - #nav-bar { --lwt-tabs-border-color: transparent; background-color: unset !important; @@ -4583,25 +4158,23 @@ var(--uc-oneliner-urlbar-base-width, 50px) + 24px + 2 * var(--toolbarbutton-inner-padding) ) !important; } - + #urlbar[breakout][breakout-extend] { + min-width: calc(310px + 2 * (24px + 2 * var(--toolbarbutton-inner-padding))) !important; + } #PersonalToolbar { position: relative; z-index: -1; } - toolbarspring.chromeclass-toolbar-additional { display: none !important; } - @supports not -moz-bool-pref("userChrome.tabbar.one_liner.tabbar_first") { #TabsToolbar { margin-inline-start: var(--uc-navbar-margin) !important; } - #nav-bar { margin-inline-end: var(--uc-tabbar-width) !important; } - .titlebar-spacer[type="pre-tabs"] { display: none !important; } @@ -4610,11 +4183,9 @@ #TabsToolbar { margin-inline-end: var(--uc-navbar-margin) !important; } - #nav-bar { margin-inline-start: var(--uc-tabbar-width) !important; } - .titlebar-spacer[type="post-tabs"] { display: none !important; } @@ -4628,15 +4199,11 @@ ) or -moz-bool-pref("userChrome.tabbar.as_titlebar") { :root { - --uc-window-control-width: 0px; - /* Same as .titlebar-buttonbox-container - Space reserved for window controls */ - --uc-window-drag-space-pre: 0px; - /* Same as .titlebar-spacer[type="pre-tabs"] - Extra space reserved on both sides of the nav-bar to be able to drag the window */ - --uc-window-drag-space-post: 0px; - /* Same as .titlebar-spacer[type="post-tabs"] */ + --uc-window-control-width: 0px; /* Same as .titlebar-buttonbox-container - Space reserved for window controls */ + --uc-window-drag-space-pre: 0px; /* Same as .titlebar-spacer[type="pre-tabs"] - Extra space reserved on both sides of the nav-bar to be able to drag the window */ + --uc-window-drag-space-post: 0px; /* Same as .titlebar-spacer[type="post-tabs"] */ --uc-window-control-space: calc(var(--uc-window-control-width) + var(--uc-window-drag-space-post)); } - :root:is([tabsintitlebar], [sizemode="fullscreen"]) { --uc-window-drag-space-pre: var(--uc-title-pre-spacer, 40px); --uc-window-drag-space-post: var(--uc-title-post-spacer, 40px); @@ -4676,12 +4243,10 @@ } } } - @supports -moz-bool-pref("layout.css.osx-font-smoothing.enabled") { :root[tabsintitlebar] { --uc-window-control-width: 72px; } - :root[sizemode="fullscreen"] { --uc-window-control-space: 0px; } @@ -4689,7 +4254,6 @@ :root:is([tabsintitlebar][sizemode="maximized"], [sizemode="fullscreen"]) { --uc-window-drag-space-pre: 0px; } - @supports -moz-bool-pref("userChrome.tabbar.one_liner") { @supports not -moz-bool-pref("userChrome.tabbar.one_liner.responsive") { @supports -moz-bool-pref("userChrome.tabbar.one_liner.tabbar_first") { @@ -4839,11 +4403,9 @@ :root { --uc-titlebar-padding: 0px; } - #navigator-toolbox { padding-top: calc(var(--uc-menubar-height, 0px) + var(--uc-titlebar-padding)) !important; } - #toolbar-menubar[autohide="true"] > .titlebar-buttonbox-container, #TabsToolbar > .titlebar-buttonbox-container { position: fixed; @@ -4852,16 +4414,11 @@ right: 0; z-index: 1; } - #toolbar-menubar[autohide="true"] > .titlebar-buttonbox-container { height: var(--uc-titlebar-buttonbox-height, var(--uc-navbar-height, 36px)); } @media (-moz-os-version: windows-win10), (-moz-platform: windows-win10) { - #toolbar-menubar[autohide="true"][inactive="true"] > .titlebar-buttonbox-container .titlebar-button { - stroke: var(--toolbar-color, currentColor) !important; - } } - .titlebar-buttonbox-container > .titlebar-buttonbox { height: 100%; } @@ -4870,7 +4427,6 @@ margin-block: 10px; } } - @supports -moz-bool-pref("layout.css.osx-font-smoothing.enabled") { .titlebar-buttonbox-container { left: 0; @@ -4897,12 +4453,10 @@ :root[sizemode="maximized"][tabsintitlebar] #navigator-toolbox-background { margin-top: calc(-1 * var(--uc-titlebar-padding)); } - :root[sizemode="normal"][tabsintitlebar] #titlebar, :root[sizemode="maximized"][tabsintitlebar] #titlebar { appearance: none !important; } - .browser-toolbar:not(.titlebar-color) { background-clip: border-box !important; } @@ -4931,7 +4485,6 @@ } } } - @supports -moz-bool-pref("userChrome.hidden.tabbar") { @supports -moz-bool-pref("userChrome.autohide.navbar") { #navigator-toolbox:is(:hover, :focus-within) @@ -4942,13 +4495,11 @@ } } } - @media (prefers-reduced-motion: no-preference) { #toolbar-menubar[inactive] > .titlebar-buttonbox-container { transition: opacity 0.25s var(--animation-easing-function) var(--uc-autohide-toolbar-delay, 600ms), visibility 100ms var(--animation-easing-function) 0.25s !important; } - #navigator-toolbox:is(:hover, :focus-within) #toolbar-menubar[inactive]:not([customizing]) > .titlebar-buttonbox-container { @@ -4977,7 +4528,6 @@ > .titlebar-buttonbox-container { display: block !important; } - @supports not -moz-bool-pref("userChrome.hidden.tabbar") { :root:not([chromehidden~="menubar"]) #toolbar-menubar:not([autohide="true"]) .titlebar-buttonbox-container { visibility: hidden; @@ -4995,11 +4545,9 @@ :root { --uc-titlebar-padding: 0px; } - #navigator-toolbox { padding-top: calc(var(--uc-menubar-height, 0px) + var(--uc-titlebar-padding)) !important; } - #toolbar-menubar[autohide="true"] > .titlebar-buttonbox-container, #TabsToolbar > .titlebar-buttonbox-container { position: fixed; @@ -5008,16 +4556,11 @@ right: 0; z-index: 1; } - #toolbar-menubar[autohide="true"] > .titlebar-buttonbox-container { height: var(--uc-titlebar-buttonbox-height, var(--uc-navbar-height, 36px)); } @media (-moz-os-version: windows-win10), (-moz-platform: windows-win10) { - #toolbar-menubar[autohide="true"][inactive="true"] > .titlebar-buttonbox-container .titlebar-button { - stroke: var(--toolbar-color, currentColor) !important; - } } - .titlebar-buttonbox-container > .titlebar-buttonbox { height: 100%; } @@ -5026,7 +4569,6 @@ margin-block: 10px; } } - @supports -moz-bool-pref("layout.css.osx-font-smoothing.enabled") { .titlebar-buttonbox-container { left: 0; @@ -5053,12 +4595,10 @@ :root[sizemode="maximized"][tabsintitlebar] #navigator-toolbox-background { margin-top: calc(-1 * var(--uc-titlebar-padding)); } - :root[sizemode="normal"][tabsintitlebar] #titlebar, :root[sizemode="maximized"][tabsintitlebar] #titlebar { appearance: none !important; } - .browser-toolbar:not(.titlebar-color) { background-clip: border-box !important; } @@ -5087,7 +4627,6 @@ } } } - @supports -moz-bool-pref("userChrome.hidden.tabbar") { @supports -moz-bool-pref("userChrome.autohide.navbar") { #navigator-toolbox:is(:hover, :focus-within) @@ -5098,13 +4637,11 @@ } } } - @media (prefers-reduced-motion: no-preference) { #toolbar-menubar[inactive] > .titlebar-buttonbox-container { transition: opacity 0.25s var(--animation-easing-function) var(--uc-autohide-toolbar-delay, 600ms), visibility 100ms var(--animation-easing-function) 0.25s !important; } - #navigator-toolbox:is(:hover, :focus-within) #toolbar-menubar[inactive]:not([customizing]) > .titlebar-buttonbox-container { @@ -5133,7 +4670,6 @@ > .titlebar-buttonbox-container { display: block !important; } - @supports not -moz-bool-pref("userChrome.hidden.tabbar") { :root:not([chromehidden~="menubar"]) #toolbar-menubar:not([autohide="true"]) .titlebar-buttonbox-container { visibility: hidden; @@ -5148,11 +4684,9 @@ :root { --uc-titlebar-padding: 0px; } - #navigator-toolbox { padding-top: calc(var(--uc-menubar-height, 0px) + var(--uc-titlebar-padding)) !important; } - #toolbar-menubar[autohide="true"] > .titlebar-buttonbox-container, #TabsToolbar > .titlebar-buttonbox-container { position: fixed; @@ -5161,16 +4695,11 @@ right: 0; z-index: 1; } - #toolbar-menubar[autohide="true"] > .titlebar-buttonbox-container { height: var(--uc-titlebar-buttonbox-height, var(--uc-navbar-height, 36px)); } @media (-moz-os-version: windows-win10), (-moz-platform: windows-win10) { - #toolbar-menubar[autohide="true"][inactive="true"] > .titlebar-buttonbox-container .titlebar-button { - stroke: var(--toolbar-color, currentColor) !important; - } } - .titlebar-buttonbox-container > .titlebar-buttonbox { height: 100%; } @@ -5179,7 +4708,6 @@ margin-block: 10px; } } - @supports -moz-bool-pref("layout.css.osx-font-smoothing.enabled") { .titlebar-buttonbox-container { left: 0; @@ -5206,12 +4734,10 @@ :root[sizemode="maximized"][tabsintitlebar] #navigator-toolbox-background { margin-top: calc(-1 * var(--uc-titlebar-padding)); } - :root[sizemode="normal"][tabsintitlebar] #titlebar, :root[sizemode="maximized"][tabsintitlebar] #titlebar { appearance: none !important; } - .browser-toolbar:not(.titlebar-color) { background-clip: border-box !important; } @@ -5240,7 +4766,6 @@ } } } - @supports -moz-bool-pref("userChrome.hidden.tabbar") { @supports -moz-bool-pref("userChrome.autohide.navbar") { #navigator-toolbox:is(:hover, :focus-within) @@ -5251,13 +4776,11 @@ } } } - @media (prefers-reduced-motion: no-preference) { #toolbar-menubar[inactive] > .titlebar-buttonbox-container { transition: opacity 0.25s var(--animation-easing-function) var(--uc-autohide-toolbar-delay, 600ms), visibility 100ms var(--animation-easing-function) 0.25s !important; } - #navigator-toolbox:is(:hover, :focus-within) #toolbar-menubar[inactive]:not([customizing]) > .titlebar-buttonbox-container { @@ -5286,7 +4809,6 @@ > .titlebar-buttonbox-container { display: block !important; } - @supports not -moz-bool-pref("userChrome.hidden.tabbar") { :root:not([chromehidden~="menubar"]) #toolbar-menubar:not([autohide="true"]) .titlebar-buttonbox-container { visibility: hidden; @@ -5304,11 +4826,9 @@ :root { --uc-titlebar-padding: 0px; } - #navigator-toolbox { padding-top: calc(var(--uc-menubar-height, 0px) + var(--uc-titlebar-padding)) !important; } - #toolbar-menubar[autohide="true"] > .titlebar-buttonbox-container, #TabsToolbar > .titlebar-buttonbox-container { position: fixed; @@ -5317,16 +4837,11 @@ right: 0; z-index: 1; } - #toolbar-menubar[autohide="true"] > .titlebar-buttonbox-container { height: var(--uc-titlebar-buttonbox-height, var(--uc-navbar-height, 36px)); } @media (-moz-os-version: windows-win10), (-moz-platform: windows-win10) { - #toolbar-menubar[autohide="true"][inactive="true"] > .titlebar-buttonbox-container .titlebar-button { - stroke: var(--toolbar-color, currentColor) !important; - } } - .titlebar-buttonbox-container > .titlebar-buttonbox { height: 100%; } @@ -5335,7 +4850,6 @@ margin-block: 10px; } } - @supports -moz-bool-pref("layout.css.osx-font-smoothing.enabled") { .titlebar-buttonbox-container { left: 0; @@ -5362,12 +4876,10 @@ :root[sizemode="maximized"][tabsintitlebar] #navigator-toolbox-background { margin-top: calc(-1 * var(--uc-titlebar-padding)); } - :root[sizemode="normal"][tabsintitlebar] #titlebar, :root[sizemode="maximized"][tabsintitlebar] #titlebar { appearance: none !important; } - .browser-toolbar:not(.titlebar-color) { background-clip: border-box !important; } @@ -5396,7 +4908,6 @@ } } } - @supports -moz-bool-pref("userChrome.hidden.tabbar") { @supports -moz-bool-pref("userChrome.autohide.navbar") { #navigator-toolbox:is(:hover, :focus-within) @@ -5407,7 +4918,6 @@ } } } - /* At Activated Menubar */ } @media screen and (max-width: 1100px) and (prefers-reduced-motion: no-preference) { @@ -5415,7 +4925,6 @@ transition: opacity 0.25s var(--animation-easing-function) var(--uc-autohide-toolbar-delay, 600ms), visibility 100ms var(--animation-easing-function) 0.25s !important; } - #navigator-toolbox:is(:hover, :focus-within) #toolbar-menubar[inactive]:not([customizing]) > .titlebar-buttonbox-container { @@ -5466,11 +4975,9 @@ :root { --uc-titlebar-padding: 0px; } - #navigator-toolbox { padding-top: calc(var(--uc-menubar-height, 0px) + var(--uc-titlebar-padding)) !important; } - #toolbar-menubar[autohide="true"] > .titlebar-buttonbox-container, #TabsToolbar > .titlebar-buttonbox-container { position: fixed; @@ -5479,16 +4986,11 @@ right: 0; z-index: 1; } - #toolbar-menubar[autohide="true"] > .titlebar-buttonbox-container { height: var(--uc-titlebar-buttonbox-height, var(--uc-navbar-height, 36px)); } @media (-moz-os-version: windows-win10), (-moz-platform: windows-win10) { - #toolbar-menubar[autohide="true"][inactive="true"] > .titlebar-buttonbox-container .titlebar-button { - stroke: var(--toolbar-color, currentColor) !important; - } } - .titlebar-buttonbox-container > .titlebar-buttonbox { height: 100%; } @@ -5497,7 +4999,6 @@ margin-block: 10px; } } - @supports -moz-bool-pref("layout.css.osx-font-smoothing.enabled") { .titlebar-buttonbox-container { left: 0; @@ -5524,12 +5025,10 @@ :root[sizemode="maximized"][tabsintitlebar] #navigator-toolbox-background { margin-top: calc(-1 * var(--uc-titlebar-padding)); } - :root[sizemode="normal"][tabsintitlebar] #titlebar, :root[sizemode="maximized"][tabsintitlebar] #titlebar { appearance: none !important; } - .browser-toolbar:not(.titlebar-color) { background-clip: border-box !important; } @@ -5558,7 +5057,6 @@ } } } - @supports -moz-bool-pref("userChrome.hidden.tabbar") { @supports -moz-bool-pref("userChrome.autohide.navbar") { #navigator-toolbox:is(:hover, :focus-within) @@ -5569,13 +5067,11 @@ } } } - @media screen and (min-width: 1100px) and (prefers-reduced-motion: no-preference) { #toolbar-menubar[inactive] > .titlebar-buttonbox-container { transition: opacity 0.25s var(--animation-easing-function) var(--uc-autohide-toolbar-delay, 600ms), visibility 100ms var(--animation-easing-function) 0.25s !important; } - #navigator-toolbox:is(:hover, :focus-within) #toolbar-menubar[inactive]:not([customizing]) > .titlebar-buttonbox-container { @@ -5604,7 +5100,6 @@ > .titlebar-buttonbox-container { display: block !important; } - @supports not -moz-bool-pref("userChrome.hidden.tabbar") { :root:not([chromehidden~="menubar"]) #toolbar-menubar:not([autohide="true"]) .titlebar-buttonbox-container { visibility: hidden; @@ -5619,11 +5114,9 @@ :root { --uc-titlebar-padding: 0px; } - #navigator-toolbox { padding-top: calc(var(--uc-menubar-height, 0px) + var(--uc-titlebar-padding)) !important; } - #toolbar-menubar[autohide="true"] > .titlebar-buttonbox-container, #TabsToolbar > .titlebar-buttonbox-container { position: fixed; @@ -5632,16 +5125,11 @@ right: 0; z-index: 1; } - #toolbar-menubar[autohide="true"] > .titlebar-buttonbox-container { height: var(--uc-titlebar-buttonbox-height, var(--uc-navbar-height, 36px)); } @media (-moz-os-version: windows-win10), (-moz-platform: windows-win10) { - #toolbar-menubar[autohide="true"][inactive="true"] > .titlebar-buttonbox-container .titlebar-button { - stroke: var(--toolbar-color, currentColor) !important; - } } - .titlebar-buttonbox-container > .titlebar-buttonbox { height: 100%; } @@ -5650,7 +5138,6 @@ margin-block: 10px; } } - @supports -moz-bool-pref("layout.css.osx-font-smoothing.enabled") { .titlebar-buttonbox-container { left: 0; @@ -5677,12 +5164,10 @@ :root[sizemode="maximized"][tabsintitlebar] #navigator-toolbox-background { margin-top: calc(-1 * var(--uc-titlebar-padding)); } - :root[sizemode="normal"][tabsintitlebar] #titlebar, :root[sizemode="maximized"][tabsintitlebar] #titlebar { appearance: none !important; } - .browser-toolbar:not(.titlebar-color) { background-clip: border-box !important; } @@ -5711,7 +5196,6 @@ } } } - @supports -moz-bool-pref("userChrome.hidden.tabbar") { @supports -moz-bool-pref("userChrome.autohide.navbar") { #navigator-toolbox:is(:hover, :focus-within) @@ -5722,13 +5206,11 @@ } } } - @media screen and (min-width: 1100px) and (prefers-reduced-motion: no-preference) { #toolbar-menubar[inactive] > .titlebar-buttonbox-container { transition: opacity 0.25s var(--animation-easing-function) var(--uc-autohide-toolbar-delay, 600ms), visibility 100ms var(--animation-easing-function) 0.25s !important; } - #navigator-toolbox:is(:hover, :focus-within) #toolbar-menubar[inactive]:not([customizing]) > .titlebar-buttonbox-container { @@ -5757,7 +5239,6 @@ > .titlebar-buttonbox-container { display: block !important; } - @supports not -moz-bool-pref("userChrome.hidden.tabbar") { :root:not([chromehidden~="menubar"]) #toolbar-menubar:not([autohide="true"]) .titlebar-buttonbox-container { visibility: hidden; @@ -5892,7 +5373,6 @@ } } } - @supports -moz-bool-pref("layout.css.osx-font-smoothing.enabled") { @supports not -moz-bool-pref("userChrome.tabbar.one_liner") { #nav-bar { @@ -5948,7 +5428,6 @@ } } } - @supports -moz-bool-pref("userChrome.tabbar.one_liner") { @supports not -moz-bool-pref("userChrome.tabbar.one_liner.combine_navbar") { @supports not -moz-bool-pref("userChrome.tabbar.one_liner.responsive") { @@ -6040,7 +5519,6 @@ } } } - @supports -moz-bool-pref("userChrome.tabbar.one_liner") { @supports not -moz-bool-pref("userChrome.tabbar.one_liner.combine_navbar") { @supports not -moz-bool-pref("userChrome.tabbar.one_liner.responsive") { @@ -6098,7 +5576,6 @@ #tabs-newtab-button { display: none !important; } - .tabbrowser-tab[selected="true"] { -moz-window-dragging: drag; --tab-max-width: 100vw; @@ -6113,23 +5590,18 @@ .tabbrowser-tab[selected="true"] .tab-label-container { margin-inline: 0 !important; } - .tab-content { margin-inline: auto; width: 100%; } - /* Pinned */ #tabbrowser-tabs[positionpinnedtabs] > #tabbrowser-arrowscrollbox > .tabbrowser-tab[pinned][selected="true"] { position: relative !important; } - #tabbrowser-tabs { --tab-overflow-pinned-tabs-width: 0 !important; - padding-inline: 0 !important; - /* Original: var(--tab-overflow-pinned-tabs-width) 0; */ + padding-inline: 0 !important; /* Original: var(--tab-overflow-pinned-tabs-width) 0; */ } - .tab-throbber[pinned], .tab-icon-pending[pinned], .tab-icon-image[pinned], @@ -6137,17 +5609,14 @@ .tab-icon-overlay[pinned] { margin-inline-end: 5.5px; } - .tab-label-container[pinned] { width: unset !important; } - /* Padding */ @supports not -moz-bool-pref("userChrome.centered.tab") { #tabbrowser-arrowscrollbox { margin-inline: 2px !important; } - :root[sizemode="normal"] #tabbrowser-arrowscrollbox { margin-inline: 6px !important; } @@ -6157,7 +5626,6 @@ #tabbrowser-arrowscrollbox { margin-inline: 2px !important; } - :root[sizemode="normal"] #tabbrowser-arrowscrollbox { margin-inline: 6px !important; } @@ -6179,26 +5647,20 @@ border-radius: var(--tab-border-radius) var(--tab-border-radius) 0px 0px !important; margin-bottom: 0px !important; } - .tab-content { margin-top: var(--tab-block-margin); } - .tab-stack { margin-top: 0px !important; margin-bottom: 0px !important; } - /* Remove line at Toolbar's top */ #tabbrowser-tabs { z-index: 1 !important; } - #TabsToolbar:not([multibar]) { - overflow: hidden; - /* Prevent toolbar area over */ + overflow: clip; /* Prevent toolbar area over */ } - /* Pinned Tab - tabbrowser-arrowscrollbox overflowing */ #tabbrowser-tabs[positionpinnedtabs] > #tabbrowser-arrowscrollbox > .tabbrowser-tab[pinned] { z-index: 0 !important; @@ -6209,12 +5671,9 @@ @supports -moz-bool-pref("userChrome.tab.color_like_toolbar") { :root:not(:-moz-lwtheme) { /* Fix for windows's system default theme. Using --toolbar-bgcolor, --toolbar-bgimage fallback */ - --tab-selected-bgcolor: unset !important; - /* Original: rgb(255,255,255); */ - --tab-selected-bgimage: unset !important; - /* Above FF v101 */ + --tab-selected-bgcolor: unset !important; /* Original: rgb(255,255,255); */ + --tab-selected-bgimage: unset !important; /* Above FF v101 */ } - #tabbrowser-tabs:not([movingtab]) > #tabbrowser-arrowscrollbox > .tabbrowser-tab @@ -6236,18 +5695,15 @@ background-image: linear-gradient(var(--toolbar-bgcolor, transparent), var(--toolbar-bgcolor, transparent)), linear-gradient(var(--toolbar-bgcolor), var(--toolbar-bgcolor)), var(--lwt-header-image, none) !important; } - .tab-background[multiselected="true"]:not([selected="true"]) > .tab-loading-burst:not([bursting]) { background: color-mix(in srgb, currentColor 65%, transparent); opacity: 0.3; } - #TabsToolbar[brighttext] .tab-background[multiselected="true"]:not([selected="true"]) > .tab-loading-burst:not([bursting]) { opacity: 0.15; } - @supports -moz-bool-pref("userChrome.tab.connect_to_window") { .tab-background[multiselected="true"] { outline: none !important; @@ -6259,7 +5715,6 @@ outline: 1px solid color-mix(in srgb, var(--focus-outline-color, currentColor) 40%, transparent); outline-offset: -1px; } - .tab-background[multiselected="true"][selected="true"] { outline-width: 2px; outline-offset: -2px; @@ -6277,7 +5732,6 @@ Bright: 0 0 1px var(--tab-line-color, rgba(128,128,142,0.9)), 0 0 4px rgba(128,128,142,0.5) */ box-shadow: 0 0 1px var(--toolbar-color) !important; } - #TabsToolbar[brighttext] #tabbrowser-tabs:not([noshadowfortests]) .tabbrowser-tab[multiselected]:not([visuallyselected]) @@ -6285,7 +5739,6 @@ > .tab-background:-moz-lwtheme { box-shadow: 0 0 1px color-mix(in srgb, var(--toolbar-color) 80%, transparent) !important; } - /* Consider 0 0 4px rgba(128,128,142,0.9) -> 0 0 4px rgba(0,0,0,.4) new default */ #TabsToolbar:not([brighttext]) #tabbrowser-tabs:not([noshadowfortests]) @@ -6295,7 +5748,6 @@ box-shadow: 0 0 1px var(--tab-line-color, var(--lwt-tab-line-color, rgba(128, 128, 142, 0.9))), 0 0 4px rgba(128, 128, 142, 0.5) !important; } - #TabsToolbar[brighttext] #tabbrowser-tabs:not([noshadowfortests]) .tabbrowser-tab:is([visuallyselected="true"], [multiselected]) @@ -6303,7 +5755,6 @@ > .tab-background:-moz-lwtheme { box-shadow: 0 0 1px var(--tab-line-color, var(--lwt-tab-line-color, rgba(128, 128, 142, 0.9))) !important; } - /* For themes outside of Light and Dark (which are curated by Mozilla), show a thicker border around the tab to help themes that are dependent on tab_line to show the selected tab. */ :root:not([lwtheme-mozlightdark], [style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"]) @@ -6316,7 +5767,6 @@ var(--tab-line-color, var(--lwt-tab-line-color, var(--tabs-border-color, rgba(128, 128, 142, 0.9)))), 0 0 4px rgba(128, 128, 142, 0.5) !important; } - :root:not([lwtheme-mozlightdark], [style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"]) #TabsToolbar[brighttext] #tabbrowser-tabs:not([noshadowfortests]) @@ -6330,12 +5780,10 @@ /*= Selected Tab - Bottom Rounded Corner =====================================*/ @supports -moz-bool-pref("userChrome.tab.bottom_rounded_corner") { #tabbrowser-tabs { - --tab-corner-rounding: 3px; - /* 10px looks about like chromium - 17px looks close to Australis tabs */ + --tab-corner-rounding: 3px; /* 10px looks about like chromium - 17px looks close to Australis tabs */ --tab-corner-padding: 0px; --tab-corner-position: calc(var(--tab-corner-padding) - var(--tab-corner-rounding)); } - :root:not([customizing="true"]) tab[visuallyselected] > stack::before, :root:not([customizing="true"]) tab[visuallyselected] > stack::after { content: "" !important; @@ -6355,7 +5803,6 @@ background-repeat: no-repeat; background-position-y: bottom; } - :root:not([customizing="true"]):is([lwtheme-mozlightdark], [style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"]) #TabsToolbar[brighttext] #tabbrowser-tabs:not([noshadowfortests]) @@ -6369,18 +5816,15 @@ /* As Selected Tab - Box Shadow */ stroke: var(--toolbar-color) !important; } - tab[visuallyselected] > stack::before { left: var(--tab-corner-position) !important; background-image: url("../icons/tab-bottom-corner-left.svg"); } - tab[visuallyselected] > stack::after { left: auto; right: var(--tab-corner-position); background-image: url("../icons/tab-bottom-corner-right.svg"); } - @media (-moz-gtk-csd-available) { /* Fill color for GTK */ :root:not([customizing="true"]):not([lwtheme="true"]) tab[visuallyselected] > stack::before, @@ -6389,10 +5833,9 @@ * --toolbar-non-lwt-bgcolor: -moz-dialog; * --toolbar-non-lwt-bgimage: linear-gradient(rgba(255,255,255,.15), rgba(255,255,255,.15)); */ - fill: color-mix(in srgb, white 15%, -moz-dialog) !important; + fill: color-mix(in srgb, rgb(255, 255, 255) 15%, -moz-dialog) !important; stroke: transparent !important; } - :root:not([customizing="true"]):not([lwtheme="true"]) #TabsToolbar[brighttext] tab[visuallyselected] @@ -6419,40 +5862,37 @@ } } /*= Selected Tab - Photon like contextline ===================================*/ -@supports -moz-bool-pref("userChrome.tab.photon_like_contextline") { +@supports -moz-bool-pref("userChrome.tab.photon_like_contextline") or -moz-bool-pref("userChrome.tab.static_separator") { :root[lwtheme-mozlightdark] #tabbrowser-tabs, :root[style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"], :root[style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"] { --tab-line-color: rgb(10, 132, 255) !important; } - @media (-moz-gtk-csd-available) { :root:not(:-moz-lwtheme) #tabbrowser-tabs { - --tab-line-color: Highlight !important; - /* -moz-accent-color */ + --tab-line-color: Highlight !important; /* -moz-accent-color */ } } +} +@supports -moz-bool-pref("userChrome.tab.photon_like_contextline") { .tab-context-line { display: -moz-inline-box !important; height: 2px !important; border-radius: var(--tab-border-radius, 4px) var(--tab-border-radius, 4px) 0 0 !important; } - .tabbrowser-tab:is([selected], [multiselected]) .tab-context-line { /* Photon like color Default: var(--tab-line-color, rgb(10, 132, 255)) Automatic: color-mix(in srgb, var(--button-primary-bgcolor) 80%, transparent) FF v96+ replace by var(--lwt-tab-line-color) */ - background-color: var(--tab-line-color, var(--lwt-tab-line-color, #0a84ff)) !important; + background-color: var(--tab-line-color, var(--lwt-tab-line-color, rgb(10, 132, 255))) !important; } - .tabbrowser-tab:hover:not([selected="true"], [multiselected]) > .tab-stack > .tab-background > .tab-context-line { background-color: rgba(0, 0, 0, 0.2) !important; opacity: 1 !important; transform: none !important; } - #TabsToolbar[brighttext] .tabbrowser-tab:hover:not([selected="true"], [multiselected]) > .tab-stack @@ -6460,28 +5900,23 @@ > .tab-context-line { background-color: rgba(255, 255, 255, 0.2) !important; } - /* Prevent identity color flashing */ .tabbrowser-tab[usercontextid] .tab-context-line { --identity-icon-color: none; } - :root:not([customizing="true"]) #TabsToolbar[brighttext] tab[visuallyselected] > stack::before, :root:not([customizing="true"]) #TabsToolbar[brighttext] tab[visuallyselected] > stack::after { /* As Selected Tab - Box Shadow */ stroke: var(--toolbar-color) !important; } - /* Animation */ .tabbrowser-tab:not([selected="true"], [multiselected]) .tab-context-line { opacity: 0 !important; transform: scaleX(0) !important; } - @media (prefers-reduced-motion: no-preference) { .tabbrowser-tab:not([selected="true"], [multiselected]) .tab-context-line { - transition: transform 250ms var(--animation-easing-function), opacity 250ms var(--animation-easing-function) !important; - /* --animation-easing-function: cubic-bezier(.07, .95, 0, 1); */ + transition: transform 250ms var(--animation-easing-function), opacity 250ms var(--animation-easing-function) !important; /* --animation-easing-function: cubic-bezier(.07, .95, 0, 1); */ } } /* Remove side's background color border */ @@ -6491,19 +5926,15 @@ > .tab-stack > .tab-background:-moz-lwtheme { --tabs-border-color: rgba(0, 0, 0, 0.3) !important; - box-shadow: 0 0 1px var(--tabs-border-color) !important; - /* Original: 0 0 1px var(--tab-line-color, rgba(128,128,142,0.9)) */ + box-shadow: 0 0 1px var(--tabs-border-color) !important; /* Original: 0 0 1px var(--tab-line-color, rgba(128,128,142,0.9)) */ } - #TabsToolbar:not([brighttext]) #tabbrowser-tabs:not([noshadowfortests]) .tabbrowser-tab:is([visuallyselected="true"], [multiselected]) > .tab-stack > .tab-background { - box-shadow: 0 0 1px var(--tabs-border-color), 0 0 4px rgba(128, 128, 142, 0.5) !important; - /* Original: 0 0 1px var(--tab-line-color, rgba(128,128,142,0.9)), 0 0 4px rgba(128,128,142,0.5) */ + box-shadow: 0 0 1px var(--tabs-border-color), 0 0 4px rgba(128, 128, 142, 0.5) !important; /* Original: 0 0 1px var(--tab-line-color, rgba(128,128,142,0.9)), 0 0 4px rgba(128,128,142,0.5) */ } - /* Container Tab */ .tabbrowser-tab[usercontextid] > .tab-stack > .tab-background > .tab-context-line { margin: unset !important; @@ -6523,16 +5954,10 @@ --end-tab-separator-position-x: -1.5px; --tab-separator-position-x: 2.5px; } - #tabbrowser-arrowscrollbox-periphery { position: relative; } - @supports -moz-bool-pref("userChrome.tab.newtab_button_like_tab") { - #TabsToolbar:not([multibar]) #tabbrowser-arrowscrollbox { - position: absolute; - } - .tab-background::before, #tabs-newtab-button::before { /* Box Model */ @@ -6583,11 +6008,9 @@ background-color: var(--tabs-border-color); } } - .tab-background::before { transform: translateX(var(--tab-separator-position-x)) translateY(var(--tab-separator-position-y)) !important; } - .tabbrowser-tab[last-visible-tab] .tab-background::after { right: 0; transform: translateX(var(--end-tab-separator-position-x)) translateY(var(--tab-separator-position-y)) !important; @@ -6596,7 +6019,6 @@ .tabbrowser-tab:not([visuallyselected], [multiselected], :hover, :first-child) .tab-background::before { opacity: var(--tab-separator-opacity); } - @supports -moz-bool-pref("userChrome.tabbar.one_liner") { @supports not -moz-bool-pref("userChrome.tabbar.one_liner.tabbar_first") { @supports not -moz-bool-pref("userChrome.tabbar.one_liner.responsive") { @@ -6637,7 +6059,6 @@ .tab-background::before { opacity: 0 !important; } - @supports -moz-bool-pref("userChrome.tab.newtab_button_like_tab") { #navigator-toolbox:not([movingtab]) .tabbrowser-tab:is([visuallyselected], [multiselected], :hover) @@ -6663,26 +6084,28 @@ .tab-background::before { opacity: 0 !important; } + :root:not([uidensity="compact"]) #tabs-newtab-button > .toolbarbutton-icon { + margin-left: 2px; + } + :root[uidensity="compact"] #tabs-newtab-button > .toolbarbutton-icon { + margin-left: 1px; + } } /* Animate */ @media (prefers-reduced-motion: no-preference) { .tab-background::before { - transition: opacity 0.2s var(--animation-easing-function); - /* cubic-bezier(.07, .95, 0, 1) */ + transition: opacity 0.2s var(--animation-easing-function); /* cubic-bezier(.07, .95, 0, 1) */ } - @supports -moz-bool-pref("userChrome.tab.newtab_button_like_tab") { #tabs-newtab-button::before { - transition: opacity 0.2s var(--animation-easing-function); - /* cubic-bezier(.07, .95, 0, 1) */ + transition: opacity 0.2s var(--animation-easing-function); /* cubic-bezier(.07, .95, 0, 1) */ } } @supports not -moz-bool-pref("userChrome.tab.newtab_button_like_tab") { #tabbrowser-arrowscrollbox:not([overflowing]) .tabbrowser-tab:not([visuallyselected], [multiselected], :hover)[last-visible-tab] .tab-background::after { - transition: opacity 0.2s var(--animation-easing-function); - /* cubic-bezier(.07, .95, 0, 1) */ + transition: opacity 0.2s var(--animation-easing-function); /* cubic-bezier(.07, .95, 0, 1) */ } } } @@ -6697,7 +6120,6 @@ .tab-background::after { content: ""; } - .tab-background::before, .tab-background::after { /* Box Model */ @@ -6713,11 +6135,9 @@ opacity: 0.3; border-right: 1px solid var(--lwt-background-tab-separator-color, currentColor) !important; } - .tab-background::after { right: 0; } - @supports -moz-bool-pref("userChrome.tab.static_separator.selected_accent") { .tabbrowser-tab[visuallyselected] .tab-background::before, .tabbrowser-tab[visuallyselected] .tab-background::after, @@ -6733,13 +6153,11 @@ opacity: 0; } } - /* Animate */ @media (prefers-reduced-motion: no-preference) { .tab-background::before, .tab-background::after { - transition: opacity 0.2s var(--animation-easing-function); - /* cubic-bezier(.07, .95, 0, 1) */ + transition: opacity 0.2s var(--animation-easing-function); /* cubic-bezier(.07, .95, 0, 1) */ } } } @@ -6751,11 +6169,9 @@ margin: 0 0 var(--tabs-navbar-shadow-size) !important => Can't override style. Therefore, we should approach it by bypass. */ - --tabs-navbar-shadow-size: -1px; - /* Original: 1px */ + --tabs-navbar-shadow-size: -1px; /* Original: 1px */ --tabs-navbar-original-shadow-size: 1px; - --tab-corner-rounding: 4px; - /* Hardcoded */ + --tab-corner-rounding: 4px; /* Hardcoded */ /* Size */ -moz-box-align: stretch !important; padding-top: var(--tab-block-margin) !important; @@ -6770,48 +6186,45 @@ fill: transparent !important; -moz-context-properties: fill !important; } - /* Corner Rounding Color */ #tabs-newtab-button:hover { fill: var(--toolbarbutton-hover-background) !important; } - #tabs-newtab-button:hover:active { fill: var(--toolbarbutton-active-background) !important; } - @media (-moz-windows-accent-color-in-titlebar) { :root[tabsintitlebar]:not(:-moz-window-inactive, :-moz-lwtheme) #tabs-newtab-button:hover, :root[tabsintitlebar][lwt-default-theme-in-dark-mode]:not(:-moz-window-inactive) #tabs-newtab-button:hover { - fill: color-mix(in srgb, AccentColorText 10%, transparent) !important; - /* Hardcoded for compatibility */ + fill: color-mix(in srgb, AccentColorText 10%, transparent) !important; /* Hardcoded for compatibility */ } - :root[tabsintitlebar]:not(:-moz-window-inactive, :-moz-lwtheme) #tabs-newtab-button:hover:active, :root[tabsintitlebar][lwt-default-theme-in-dark-mode]:not(:-moz-window-inactive) #tabs-newtab-button:hover:active { - fill: color-mix(in srgb, AccentColorText 15%, transparent) !important; - /* Hardcoded for compatibility */ + fill: color-mix(in srgb, AccentColorText 15%, transparent) !important; /* Hardcoded for compatibility */ } - @supports -moz-bool-pref("userChrome.compatibility.accent_color") { :root[tabsintitlebar]:not(:-moz-window-inactive, :-moz-lwtheme) #tabs-newtab-button:hover, :root[tabsintitlebar][lwt-default-theme-in-dark-mode]:not(:-moz-window-inactive) #tabs-newtab-button:hover { - fill: color-mix(in srgb, -moz-accent-color-foreground 10%, transparent) !important; - /* Hardcoded for compatibility */ + fill: color-mix( + in srgb, + -moz-accent-color-foreground 10%, + transparent + ) !important; /* Hardcoded for compatibility */ } - :root[tabsintitlebar]:not(:-moz-window-inactive, :-moz-lwtheme) #tabs-newtab-button:hover:active, :root[tabsintitlebar][lwt-default-theme-in-dark-mode]:not(:-moz-window-inactive) #tabs-newtab-button:hover:active { - fill: color-mix(in srgb, -moz-accent-color-foreground 15%, transparent) !important; - /* Hardcoded for compatibility */ + fill: color-mix( + in srgb, + -moz-accent-color-foreground 15%, + transparent + ) !important; /* Hardcoded for compatibility */ } } } /* '+'Icon */ #tabs-newtab-button .toolbarbutton-icon { - border-radius: var(--tab-border-radius) var(--tab-border-radius) 0 0 !important; - /* Original: var(--tab-border-radius) */ + border-radius: var(--tab-border-radius) var(--tab-border-radius) 0 0 !important; /* Original: var(--tab-border-radius) */ padding: calc(var(--toolbarbutton-inner-padding) - var(--tab-block-margin) / 4) var(--toolbarbutton-inner-padding) calc(var(--toolbarbutton-inner-padding) + var(--tab-block-margin) / 4 + var(--tabs-navbar-original-shadow-size)) !important; -moz-context-properties: fill, fill-opacity; @@ -6827,15 +6240,11 @@ /* Original: calc((var(--tab-min-height) - 16px) / 2) = 10px */ --toolbarbutton-inner-padding: 6px; } - :root[uidensity="compact"] #tabs-newtab-button > .toolbarbutton-icon { - --toolbarbutton-inner-padding: 4px; - /* Photon: 6px */ + --toolbarbutton-inner-padding: 4px; /* Photon: 6px */ } - :root[uidensity="touch"] #tabs-newtab-button > .toolbarbutton-icon { - --toolbarbutton-inner-padding: 9px; - /* Photon: 9px */ + --toolbarbutton-inner-padding: 9px; /* Photon: 9px */ } } /*= New tab button - Proton like button ======================================*/ @@ -6843,18 +6252,10 @@ :root:not([uidensity="touch"]) #tabs-newtab-button > .toolbarbutton-icon { --toolbarbutton-inner-padding: calc((var(--tab-min-height) - 16px) / 2 - 1px); } - - :root:not([uidensity="compact"]) #tabs-newtab-button > .toolbarbutton-icon { - margin-left: 2px; - } - - :root[uidensity="compact"] #tabs-newtab-button > .toolbarbutton-icon { - margin-left: 1px; - } } /*= Unloaded Tab - Contents Opacity ===========================================*/ @supports -moz-bool-pref("userChrome.tab.unloaded") { - #tabbrowser-tabs .tabbrowser-tab[pending] .tab-content { + .tabbrowser-tab[pending] .tab-content { opacity: 0.7; } } @@ -6862,30 +6263,21 @@ /** Clipped tabs - Letters cleary *********************************************/ @supports -moz-bool-pref("userChrome.tab.letters_cleary") { #tabbrowser-tabs[closebuttons="activetab"] { - --inline-tab-padding: 7px !important; - /* Original: 8px */ + --inline-tab-padding: 7px !important; /* Original: 8px */ } - #tabbrowser-tabs[overflow="true"] { - --inline-tab-padding: 6px !important; - /* Original: 8px */ + --inline-tab-padding: 6px !important; /* Original: 8px */ } - .tab-content[pinned] { - --inline-tab-padding: 10px; - /* Prevent overflow pinned tab's divide line not aligned */ + --inline-tab-padding: 10px; /* Prevent overflow pinned tab's divide line not aligned */ padding-inline: var(--inline-tab-padding) !important; } - :root[uidensity="compact"] .tab-content[pinned] { --inline-tab-padding: 8px; } - .tabbrowser-tab .tab-label-container { - --tab-label-mask-size: 1.8em; - /* Original: 2em */ + --tab-label-mask-size: 1.8em; /* Original: 2em */ } - #tabbrowser-tabs[closebuttons="activetab"] .tabbrowser-tab .tab-label-container { --tab-label-mask-size: 30%; } @@ -6894,14 +6286,12 @@ .tab-label-container { --tab-label-mask-size: 25%; } - .tabbrowser-tab[visuallyselected="true"]:not([labelendaligned]):hover .tab-label-container, #tabbrowser-tabs:not([closebuttons="activetab"]) > #tabbrowser-arrowscrollbox > .tabbrowser-tab:not([visuallyselected="true"], [labelendaligned]):hover .tab-label-container { - --tab-label-mask-size: 0.9em; - /* Original: 1em */ + --tab-label-mask-size: 0.9em; /* Original: 1em */ } } /** Clipped tabs - Show close button at hover *********************************/ @@ -6914,23 +6304,19 @@ > .tab-close-button:not([selected="true"]) { display: -moz-inline-box !important; } - #tabbrowser-tabs[closebuttons="activetab"] .tabbrowser-tab:not([visuallyselected]) .tab-close-button { visibility: collapse !important; opacity: 0; } - #tabbrowser-tabs[closebuttons="activetab"] .tabbrowser-tab:hover .tab-close-button { visibility: visible !important; opacity: 1; } - @supports -moz-bool-pref("userChrome.tab.close_button_at_hover.always") { .tabbrowser-tab:not([visuallyselected]) .tab-close-button { visibility: collapse !important; opacity: 0; } - .tabbrowser-tab:hover .tab-close-button { visibility: visible !important; opacity: 1; @@ -6942,18 +6328,15 @@ #tabbrowser-tabs[closebuttons="activetab"] .tabbrowser-tab:not([visuallyselected]) .tab-close-button { transition: opacity 0.1s var(--animation-easing-function) !important; } - /* Fade in */ #tabbrowser-tabs[closebuttons="activetab"] .tabbrowser-tab:hover .tab-close-button { transition: opacity 0.25s var(--animation-easing-function) !important; } - @supports -moz-bool-pref("userChrome.tab.close_button_at_hover.always") { /* Fade out */ .tabbrowser-tab:not([visuallyselected]) .tab-close-button { transition: opacity 0.1s var(--animation-easing-function) !important; } - /* Fade in */ .tabbrowser-tab:hover .tab-close-button { transition: opacity 0.25s var(--animation-easing-function) !important; @@ -6964,41 +6347,30 @@ .tabbrowser-tab .tab-content > .close-icon { list-style-image: url("../icons/dismiss-filled.svg") !important; } - /* Closed Button's icon larger */ .tab-close-button { - padding: 6px !important; - /* Original: 7px */ + padding: 6px !important; /* Original: 7px */ } - .tabbrowser-tab:not(:hover, [pinned]) > .tab-stack > .tab-content > .tab-close-button { - padding-inline-start: 1px !important; - /* Original: 0px */ - width: 19px !important; - /* Original: 17px */ + padding-inline-start: 1px !important; /* Original: 0px */ + width: 19px !important; /* Original: 17px */ } - /* Closed Button's padding reduce */ #tabbrowser-tabs[closebuttons="activetab"] .tab-content > .tab-close-button { - margin-inline-end: calc(var(--inline-tab-padding) / -2 + 2px) !important; - /* Original: calc(var(--inline-tab-padding) / -2)*/ - padding: 4px !important; - /* Original: 7px */ - width: 20px !important; - /* Original: 24px */ - height: 20px !important; - /* Original: 24px */ + margin-inline-end: calc( + var(--inline-tab-padding) / -2 + 2px + ) !important; /* Original: calc(var(--inline-tab-padding) / -2)*/ + padding: 4px !important; /* Original: 7px */ + width: 20px !important; /* Original: 24px */ + height: 20px !important; /* Original: 24px */ } - #tabbrowser-tabs[closebuttons="activetab"] .tabbrowser-tab:not(:hover) > .tab-stack > .tab-content > .tab-close-button { - padding-inline-start: 3px !important; - /* Original: 0px */ - width: 19px !important; - /* Redefine from 19px !important, Original: 17px = (width - padding) */ + padding-inline-start: 3px !important; /* Original: 0px */ + width: 19px !important; /* Redefine from 19px !important, Original: 17px = (width - padding) */ } } /** Clipped tabs - Show close button at pinned tab ****************************/ @@ -7009,12 +6381,10 @@ --uc-close-button-padding: 6px; --uc-close-button-margin: calc((var(--uc-close-button-size) - 16px) / -2); } - #tabbrowser-tabs[closebuttons="activetab"] { --uc-close-button-size: 20px; --uc-close-button-padding: 4px; } - .tabbrowser-tab[pinned][visuallyselected]:not([style*="transform: translateX"]):hover:not([busy]) .tab-close-button { display: -moz-box !important; @@ -7071,7 +6441,6 @@ display: none !important; } } - #tabbrowser-tabs[closebuttons="activetab"] .tabbrowser-tab[pinned]:not([style*="transform: translateX"]):hover:not([busy]) .tab-close-button { @@ -7106,7 +6475,6 @@ .tab-icon-image:not([pinned]) { opacity: 1 !important; } - /* Makes the speaker icon to always appear if the tab is playing (not only on hover) */ .tabbrowser-tab { --uc-sound-tab-icon-position-x: -0.5px; @@ -7114,7 +6482,6 @@ .tabbrowser-tab:-moz-locale-dir(rtl) { --uc-sound-tab-icon-position-x: 0.5px; } - .tab-icon-overlay:not([crashed]), .tab-icon-overlay[pinned][crashed][selected] { /* Position */ @@ -7128,7 +6495,6 @@ width: 17px !important; height: 17px !important; } - .tab-icon-overlay:not([sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked]) { /* Color */ color: currentColor !important; @@ -7137,7 +6503,6 @@ fill-opacity: 0.8 !important; opacity: 1 !important; } - /* Label */ @supports not -moz-bool-pref("userChrome.hidden.tab_icon") { .tabbrowser-tab:not([pinned], [sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked]) @@ -7187,7 +6552,6 @@ .tab-icon-overlay[pinned][crashed][selected] { transition: 0.1s var(--animation-easing-function); } - .tab-label-container > * { transition: transform 0.25s var(--animation-easing-function); } @@ -7200,7 +6564,7 @@ --uc-sound-tab-no-icon-label-position-x: 3px; } .tabbrowser-tab .tab-label-container[labeldirection="rtl"], - .tabbrowser-tab .tab-label-container :not([labeldirection]):-moz-locale-dir(rtl) { + .tabbrowser-tab .tab-label-container:not([labeldirection]):-moz-locale-dir(rtl) { --uc-sound-tab-no-icon-position-x: 0.5px; --uc-sound-tab-no-icon-label-position-x: -3px; } @@ -7212,8 +6576,7 @@ padding: 0 !important; } .tabbrowser-tab:not([image]):is([soundplaying], [muted], [activemedia-blocked]) .tab-icon-image:not([pinned]) { - opacity: 0 !important; - /* Favicon hidden */ + opacity: 0 !important; /* Favicon hidden */ } .tabbrowser-tab:not([image]):not([image]):not([pinned], [sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked]) .tab-label-container @@ -7230,8 +6593,7 @@ padding: 0 !important; } .tabbrowser-tab:is([soundplaying], [muted], [activemedia-blocked]) .tab-icon-image:not([pinned]) { - opacity: 0 !important; - /* Favicon hidden */ + opacity: 0 !important; /* Favicon hidden */ } .tabbrowser-tab:not([image]):not([pinned], [sharing], [crashed]):is([soundplaying], [muted], [activemedia-blocked]) .tab-label-container @@ -7246,18 +6608,15 @@ .tab-icon-pending[busy] { opacity: 1 !important; } - /* Busy - Overlay Position */ .tabbrowser-tab:not([pinned])[busy] .tab-icon-overlay:is([soundplaying], [muted], [activemedia-blocked]) { transform: translateX(var(--uc-sound-tab-icon-position-x)) translateY(-6px); } - .tabbrowser-tab:not([image]) .tab-icon-overlay:not([pinned], [sharing], [crashed])[busy] { inset-inline-end: -9px !important; margin-inline-end: 9.5px !important; padding: 1.5px !important; } - /* Hover */ .tab-icon-overlay:not([crashed])[soundplaying]:hover, .tab-icon-overlay:not([crashed])[muted]:hover, @@ -7267,13 +6626,11 @@ background-color: var(--lwt-tab-text, var(--toolbar-color)) !important; fill-opacity: 0.95 !important; } - #TabsToolbar[brighttext] .tab-icon-overlay:not([crashed])[soundplaying]:hover, #TabsToolbar[brighttext] .tab-icon-overlay:not([crashed])[muted]:hover, #TabsToolbar[brighttext] .tab-icon-overlay:not([crashed])[activemedia-blocked]:hover { color: var(--toolbar-bgcolor, black) !important; } - .tabbrowser-tab:not([image]) .tab-icon-overlay:not([pinned], [sharing], [crashed]):hover { padding: 0 !important; } @@ -7286,7 +6643,6 @@ .tab-content::after { content: ""; } - .tabbrowser-tab[pictureinpicture]:not([pinned]) .tab-content::after { /* Shape */ display: -moz-inline-box !important; @@ -7301,20 +6657,16 @@ /* Icon */ background-image: url("chrome://global/skin/media/picture-in-picture-open.svg"); } - .tabbrowser-tab[pictureinpicture]:not([pinned])[selected] .tab-content::after { opacity: 0.95; } - /* Close Button's position */ .tabbrowser-tab[pictureinpicture]:not([pinned]) .tab-close-button { -moz-box-ordinal-group: 2 !important; } - #tabbrowser-tabs:not([closebuttons="activetab"]) .tabbrowser-tab[pictureinpicture]:not([pinned]) .tab-close-button { margin-left: 7px !important; } - #tabbrowser-tabs:not([closebuttons="activetab"]) .tabbrowser-tab[pictureinpicture]:not([pinned]):hover .tab-close-button { @@ -7329,56 +6681,53 @@ display: none; } } - .tabbrowser-tab { - --container-position-x: 9px; - --container-position-y: 11px; + #tabbrowser-tabs { + --uc-container-position-x: 9px; + --uc-container-position-y-default: 11.5px; + --uc-container-position-y: calc(50% + var(--uc-container-position-y-default)); + --uc-titlechanged-container-position-x: 32%, 50%, 70%; } - .tabbrowser-tab:-moz-locale-dir(rtl) { - --container-position-x: -9px; + #tabbrowser-tabs:-moz-locale-dir(rtl) { + --uc-container-position-x: -9px; } - - :root[uidensity="compact"] .tabbrowser-tab { - --container-position-y: 10px; + :root[uidensity="compact"] #tabbrowser-tabs { + --uc-container-position-y-default: 10.5px; + --uc-titlechanged-container-position-x: 30%, 50%, 70%; } - - :root[uidensity="touch"] .tabbrowser-tab { - --container-position-y: 12px; + :root[uidensity="touch"] #tabbrowser-tabs { + --uc-container-position-y-default: 12.5px; } - .tab-content:not([titlechanged])::before { /* Box Model */ content: ""; display: block; - position: absolute !important; - transform: translate(var(--container-position-x), var(--container-position-y)) !important; + position: absolute; + top: 50%; + transform: translate(var(--uc-container-position-x), var(--uc-container-position-y)); /* Shape */ border-bottom: 2px solid var(--identity-icon-color); width: 25%; opacity: 0.75; } - .tabbrowser-tab[visuallyselected]:not([pinned]) .tab-content::before { width: calc(100% - 30px); opacity: 1; } - #tabbrowser-tabs[closebuttons="activetab"] .tabbrowser-tab[visuallyselected]:not([pinned]) .tab-content::before { width: calc(100% - 33px); } - /* Animate */ @media (prefers-reduced-motion: no-preference) { .tab-content:not([titlechanged])::before { - transition: 0.15s var(--animation-easing-function) !important; + transition: 0.15s var(--animation-easing-function); transition-property: width, opacity; } } /* Pinned Tab */ .tabbrowser-tab[pinned] .tab-content::before { - transform: translateY(var(--container-position-y)) !important; + transform: translateY(var(--uc-container-position-y)); width: 16px; } - @supports -moz-bool-pref("userChrome.tab.close_button_at_pinned") { .tabbrowser-tab[pinned][visuallyselected]:not([busy]):hover .tab-content::before { opacity: 0; @@ -7395,27 +6744,13 @@ transparent 2px ); background-image: var(--dotted-identity-image), var(--dotted-identity-image), var(--dotted-identity-image) !important; - background-position-x: 32%, 50%, 70% !important; + background-position-x: var(--uc-titlechanged-container-position-x) !important; } - - :root[uidensity="compact"] - .tabbrowser-tab:is([image], [pinned])[usercontextid] - > .tab-stack - > .tab-content[attention]:not([selected="true"]), - :root[uidensity="compact"] - .tabbrowser-tab[usercontextid] - > .tab-stack - > .tab-content[pinned][titlechanged]:not([selected="true"]) { - /* Original: radial-gradient(circle, var(--attention-icon-color), var(--attention-icon-color) 2px, transparent 2px); */ - background-position-x: 30%, 50%, 70% !important; - } - .tabbrowser-tab:is([image], [pinned]) > .tab-stack > .tab-content[attention]:not([selected="true"]), .tabbrowser-tab > .tab-stack > .tab-content[pinned][titlechanged]:not([selected="true"]) { /* Original: center bottom calc(6.5px + var(--tabs-navbar-shadow-size)); */ - background-position-y: top calc(0.5px + 50% + var(--container-position-y)) !important; + background-position-y: top var(--uc-container-position-y) !important; } - /* Pinned Tab - Titlechanged & soundplaying */ .tabbrowser-tab:is([image], [pinned])[usercontextid]:is([soundplaying], [muted], [activemedia-blocked]) > .tab-stack @@ -7423,9 +6758,8 @@ .tabbrowser-tab[usercontextid]:is([soundplaying], [muted], [activemedia-blocked]) > .tab-stack > .tab-content[pinned][titlechanged]:not([selected="true"]) { - background-position-x: calc(32% - 1px), calc(50% - 1px), calc(70% - 1px) !important; + --uc-titlechanged-container-position-x: calc(32% - 1px), calc(50% - 1px), calc(70% - 1px); } - :root[uidensity="compact"] .tabbrowser-tab:is([image], [pinned])[usercontextid]:is([soundplaying], [muted], [activemedia-blocked]) > .tab-stack @@ -7434,7 +6768,7 @@ .tabbrowser-tab[usercontextid]:is([soundplaying], [muted], [activemedia-blocked]) > .tab-stack > .tab-content[pinned][titlechanged]:not([selected="true"]) { - background-position-x: calc(30% - 1px), calc(50% - 1px), calc(70% - 1px) !important; + --uc-titlechanged-container-position-x: calc(30% - 1px), calc(50% - 1px), calc(70% - 1px); } } } @@ -7453,7 +6787,6 @@ margin-block: 0 !important; margin-inline-start: 0 !important; } - .urlbarView-favicon { margin-inline-start: 20px !important; } @@ -7474,8 +6807,7 @@ /** Panel UI ******************************************************************/ @supports -moz-bool-pref("userChrome.panel.remove_strip") { #appMenu-fxa-separator { - --panel-separator-zap-gradient: none; - /* Original: linear-gradient(90deg, #9059FF 0%, #FF4AA2 52.08%, #FFBD4F 100%) */ + --panel-separator-zap-gradient: none; /* Original: linear-gradient(90deg, #9059FF 0%, #FF4AA2 52.08%, #FFBD4F 100%) */ } } @supports -moz-bool-pref("userChrome.panel.full_width_separator") { @@ -7517,8 +6849,7 @@ --uc-sidebar-shadow-color: #28282f; --uc-autohide-sidebar-speed: 750ms; --uc-autohide-fullscreen-sidebar-speed: 1s; - --uc-autohide-sidebar-delay: 600ms; - /* Wait 0.6s before hiding sidebar */ + --uc-autohide-sidebar-delay: 600ms; /* Wait 0.6s before hiding sidebar */ z-index: 1 !important; position: relative !important; box-shadow: 1px 0px 15px -10px var(--uc-sidebar-shadow-color); @@ -7526,11 +6857,9 @@ #sidebar-box[positionend="true"] { box-shadow: -1px 0px 15px -10px var(--uc-sidebar-shadow-color); } - #sidebar { display: block; } - #sidebar-splitter { display: none !important; } @@ -7539,21 +6868,18 @@ #sidebar-box[positionend="true"] { direction: rtl; } - #sidebar-header, #sidebar { background-color: var(--sidebar-background-color) !important; color: var(--sidebar-text-color) !important; overflow: hidden; } - #sidebar-header { font-size: unset !important; } #sidebar-header > #sidebar-switcher-target { font-size: 1.333em; } - @supports not -moz-bool-pref("userChrome.autohide.sidebar") { #sidebar-box, #sidebar-header, @@ -7561,7 +6887,6 @@ min-width: var(--uc-sidebar-activate-width) !important; max-width: var(--uc-sidebar-activate-width) !important; } - #sidebar-box { margin-inline-start: var(--uc-sidebar-activate-width-reverse) !important; will-change: padding-inline; @@ -7581,17 +6906,12 @@ @supports -moz-bool-pref("userChrome.fullscreen.overlap") { @supports -moz-bool-pref("browser.fullscreen.autohide") { :root[sizemode="fullscreen"] #navigator-toolbox { - position: fixed !important; - /* Needed for content to take up entire height */ - z-index: 1000 !important; - /* Puts the UI above the content */ + position: fixed !important; /* Needed for content to take up entire height */ + z-index: 1000 !important; /* Puts the UI above the content */ } - :root[sizemode="fullscreen"] :-moz-any(#navigator-toolbox, #titlebar, #nav-bar, #PersonalToolbar) { - width: 100%; - /* Makes the UI take up the entire width */ + width: 100%; /* Makes the UI take up the entire width */ } - @media (-moz-gtk-csd-available) { /* Fix transparent background */ :root[tabsintitlebar][sizemode="fullscreen"] #TabsToolbar:not(:-moz-lwtheme) { @@ -7603,8 +6923,7 @@ @supports -moz-bool-pref("userChrome.fullscreen.show_bookmarkbar") { :root:not([sizemode="fullscreen"]) #PersonalToolbar[initialized="true"]:not([collapsed="true"]), :root[sizemode="fullscreen"] #PersonalToolbar[initialized="true"] { - visibility: unset !important; - /* Makes the bookmarks toolbar visible if enabled */ + visibility: unset !important; /* Makes the bookmarks toolbar visible if enabled */ } } /** Centered ******************************************************************/ @@ -7614,14 +6933,12 @@ .tabbrowser-tab:not(:hover, [pinned]) .tab-label-container:not([textoverflow]) { margin-inline-end: 5px; } - @supports -moz-bool-pref("userChrome.tab.close_button_at_hover") { #tabbrowser-tabs[closebuttons="activetab"] .tabbrowser-tab:not(:hover, [pinned]) .tab-label-container:not([textoverflow]) { margin-inline-end: 1px; } - #tabbrowser-tabs[closebuttons="activetab"] .tabbrowser-tab:not([selected]):not(:hover, [pinned]) .tab-label-container @@ -7642,12 +6959,10 @@ justify-content: safe center; align-items: safe center; } - .tab-label, .tab-secondary-label { overflow: hidden; } - .tabbrowser-tab[selected]:not(:hover) .tab-label-container:not([textoverflow]), .tabbrowser-tab:not(:hover, [pinned]) .tab-label-container:not([textoverflow]) { margin-inline-end: 5px; @@ -7675,12 +6990,10 @@ opacity: 0 !important; pointer-events: none; } - @media (prefers-reduced-motion: no-preference) { #back-button { transition-property: background-color, opacity, margin-left !important; } - #back-button[disabled="true"] { transition: background-color 1s var(--animation-easing-function), opacity 1s var(--animation-easing-function), margin-left 0.5s ease !important; @@ -7693,12 +7006,10 @@ opacity: 0 !important; pointer-events: none; } - @media (prefers-reduced-motion: no-preference) { #forward-button { transition-property: background-color, opacity, margin-left !important; } - #forward-button[disabled="true"] { transition: background-color 1s var(--animation-easing-function), opacity 1s var(--animation-easing-function), margin-left 0.5s ease !important; @@ -7710,14 +7021,12 @@ margin-inline-end: calc(-16px - 2 * var(--urlbar-icon-padding)); opacity: 0; } - #urlbar-container:is(:hover, :focus-within) #page-action-buttons > .urlbar-page-action, .urlbar-page-action[open], .urlbar-page-action[open] ~ .urlbar-page-action { margin-inline-end: 0px !important; opacity: 1; } - @media (prefers-reduced-motion: no-preference) { #page-action-buttons > .urlbar-page-action { transition: margin-inline-end 50ms var(--animation-easing-function) 900ms, @@ -7729,7 +7038,6 @@ opacity 1.5s var(--animation-easing-function) 600ms, background-color 2.5s var(--animation-easing-function) !important; } } - #urlbar-container:is(:hover, :focus-within) #page-action-buttons > .urlbar-page-action, .urlbar-page-action[open], .urlbar-page-action[open] ~ .urlbar-page-action { @@ -7797,8 +7105,7 @@ --uc-tabbar-hide-height: calc(-1 * var(--uc-tabbar-height)); --uc-navbar-height: calc(16px + 2 * (var(--toolbarbutton-inner-padding) + var(--toolbarbutton-outer-padding))); --uc-navbar-hide-height: calc(-1 * var(--uc-navbar-height)); - --uc-bm-height: calc(20px + (2 * var(--bookmark-block-padding, 4px))); - /* 20px = 16px + (2px * 2) [margin block] */ + --uc-bm-height: calc(20px + (2 * var(--bookmark-block-padding, 4px))); /* 20px = 16px + (2px * 2) [margin block] */ --uc-bm-hide-height: calc(-1 * var(--uc-bm-height)); } @supports -moz-bool-pref("userChrome.hidden.tabbar") { @@ -7822,7 +7129,6 @@ --uc-navbar-height: 0px; } } - @supports selector(:has(a)) { #navigator-toolbox:has(#PersonalToolbar[collapsed="true"]) { --uc-bm-height: 0px; @@ -7835,13 +7141,16 @@ or -moz-bool-pref("userChrome.autohide.infobar") { #navigator-toolbox { position: relative; + } + #navigator-toolbox:is(:hover, :focus-within) { z-index: 2; } - - #navigator-toolbox:not(:hover) { + #navigator-toolbox:is(:hover, :focus-within) #PersonalToolbar { + z-index: -1; + } + #navigator-toolbox:not(:hover):not(:focus-within) { animation: 1s keepfront; } - @keyframes keepfront { from { z-index: 3; @@ -7854,7 +7163,6 @@ position: relative; z-index: 2 !important; } - @supports -moz-bool-pref("userChrome.autohide.toolbar_overlap") { #navigator-toolbox { --uc-toolbar-hide-height: calc(-1 * var(--uc-toolbar-height, 0)); @@ -7980,25 +7288,26 @@ margin-bottom: var(--uc-tabbar-hide-height); will-change: margin-bottom; } - + #TabsToolbar:not([customizing]) { + will-change: opacity; + } @supports not -moz-bool-pref("userChrome.tabbar.on_bottom") { - #TabsToolbar:not([customizing]) { + #TabsToolbar:not([customizing]), + #TabsToolbar:not([customizing]) .titlebar-buttonbox-container { opacity: 0; - will-change: opacity; } } @supports -moz-bool-pref("userChrome.tabbar.on_bottom") { #TabsToolbar:not([customizing]) > *:not(.titlebar-buttonbox-container) { opacity: 0; - will-change: opacity; } } - #navigator-toolbox:is(:hover, :focus-within) > #titlebar { margin-bottom: 0px; } @supports not -moz-bool-pref("userChrome.tabbar.on_bottom") { - #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar { + #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar, + #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar .titlebar-buttonbox-container { opacity: 1; } } @@ -8014,25 +7323,26 @@ margin-bottom: var(--uc-tabbar-hide-height); will-change: margin-bottom; } - + #TabsToolbar:not([customizing]) { + will-change: opacity; + } @supports not -moz-bool-pref("userChrome.tabbar.on_bottom") { - #TabsToolbar:not([customizing]) { + #TabsToolbar:not([customizing]), + #TabsToolbar:not([customizing]) .titlebar-buttonbox-container { opacity: 0; - will-change: opacity; } } @supports -moz-bool-pref("userChrome.tabbar.on_bottom") { #TabsToolbar:not([customizing]) > *:not(.titlebar-buttonbox-container) { opacity: 0; - will-change: opacity; } } - #navigator-toolbox:is(:hover, :focus-within) > #titlebar { margin-bottom: 0px; } @supports not -moz-bool-pref("userChrome.tabbar.on_bottom") { - #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar { + #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar, + #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar .titlebar-buttonbox-container { opacity: 1; } } @@ -8047,25 +7357,26 @@ margin-bottom: var(--uc-tabbar-hide-height); will-change: margin-bottom; } - + #TabsToolbar:not([customizing]) { + will-change: opacity; + } @supports not -moz-bool-pref("userChrome.tabbar.on_bottom") { - #TabsToolbar:not([customizing]) { + #TabsToolbar:not([customizing]), + #TabsToolbar:not([customizing]) .titlebar-buttonbox-container { opacity: 0; - will-change: opacity; } } @supports -moz-bool-pref("userChrome.tabbar.on_bottom") { #TabsToolbar:not([customizing]) > *:not(.titlebar-buttonbox-container) { opacity: 0; - will-change: opacity; } } - #navigator-toolbox:is(:hover, :focus-within) > #titlebar { margin-bottom: 0px; } @supports not -moz-bool-pref("userChrome.tabbar.on_bottom") { - #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar { + #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar, + #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar .titlebar-buttonbox-container { opacity: 1; } } @@ -8082,9 +7393,9 @@ var(--uc-autohide-toolbar-delay), background-color 1s var(--animation-easing-function) !important; } - @supports not -moz-bool-pref("userChrome.tabbar.on_bottom") { - #TabsToolbar:not([customizing]) { + #TabsToolbar:not([customizing]), + #TabsToolbar:not([customizing]) .titlebar-buttonbox-container { transition: opacity var(--uc-autohide-toolbar-speed) var(--animation-easing-function) var(--uc-autohide-toolbar-delay) !important; } @@ -8095,7 +7406,6 @@ var(--uc-autohide-toolbar-delay) !important; } } - #navigator-toolbox:is(:hover, :focus-within) { transition-delay: 0s !important; } @@ -8103,7 +7413,8 @@ transition-delay: 0s !important; } @supports not -moz-bool-pref("userChrome.tabbar.on_bottom") { - #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar:not([customizing]) { + #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar:not([customizing]), + #navigator-toolbox:is(:hover, :focus-within) #TabsToolbar:not([customizing]) .titlebar-buttonbox-container { transition-delay: 0s !important; } } @@ -8124,7 +7435,6 @@ opacity: 0; will-change: margin-bottom, opacity; } - #navigator-toolbox:is(:hover, :focus-within) #nav-bar:not([customizing]) { margin-bottom: 0; opacity: 1; @@ -8138,7 +7448,6 @@ opacity: 0; will-change: margin-bottom, opacity; } - #navigator-toolbox:is(:hover, :focus-within) #nav-bar:not([customizing]) { margin-bottom: 0; opacity: 1; @@ -8164,7 +7473,6 @@ var(--ext-theme-background-transition) !important; } } - #navigator-toolbox:is(:hover, :focus-within) #nav-bar:not([customizing]) { transition-delay: 0s !important; } @@ -8187,12 +7495,10 @@ } } } - #navigator-toolbox:is(:hover, :focus-within) #PersonalToolbar:not([customizing]) { margin-bottom: 0; opacity: 1; } - @media (prefers-reduced-motion: no-preference) { #PersonalToolbar:not([customizing]) { transition: margin-bottom var(--uc-autohide-toolbar-speed) var(--animation-easing-function) @@ -8200,7 +7506,6 @@ opacity var(--uc-autohide-toolbar-speed) var(--animation-easing-function) var(--uc-autohide-toolbar-delay), min-height 170ms ease-out, max-height 170ms ease-out, var(--ext-theme-background-transition) !important; } - #navigator-toolbox:is(:hover, :focus-within) #PersonalToolbar:not([customizing]) { transition-delay: 0s !important; } @@ -8212,13 +7517,11 @@ 25px + (var(--infobar-button-vertical-margin, 4px) * 2) + var(--infobar-message-vertical-margin, 8px) ); } - #tab-notification-deck:not([customizing]) > .notificationbox-stack[slot="selected"] > notification-message { --infobar-message-margin: 0 4px calc(-1 * var(--infobar-height)); opacity: 0; will-change: margin-bottom, opacity; } - #navigator-toolbox:is(:hover, :focus-within) #tab-notification-deck:not([customizing]) > .notificationbox-stack[slot="selected"] @@ -8226,7 +7529,6 @@ --infobar-message-margin: 0 4px var(--infobar-message-vertical-margin, 8px); opacity: 1; } - @supports -moz-bool-pref("userChrome.autohide.toolbar_overlap") { #tab-notification-deck:not([customizing]) { height: 0; @@ -8239,7 +7541,6 @@ opacity var(--uc-autohide-toolbar-speed) var(--animation-easing-function) var(--uc-autohide-toolbar-delay), var(--ext-theme-background-transition) !important; } - #navigator-toolbox:is(:hover, :focus-within) #tab-notification-deck:not([customizing]) > .notificationbox-stack[slot="selected"] @@ -8253,12 +7554,10 @@ min-width: var(--uc-sidebar-width) !important; max-width: var(--uc-sidebar-width) !important; } - :root[inFullscreen="true"] #sidebar-box { min-width: var(--uc-sidebar-activate-width) !important; max-width: var(--uc-sidebar-activate-width) !important; } - @supports -moz-bool-pref("userChrome.sidebar.overlap") { #sidebar-header, #sidebar { @@ -8266,13 +7565,11 @@ max-width: var(--uc-sidebar-width) !important; will-change: min-width, max-width; } - #sidebar-box:is(:hover, :focus-within) > #sidebar-header, #sidebar-box:is(:hover, :focus-within) > #sidebar { min-width: var(--uc-sidebar-activate-width) !important; max-width: var(--uc-sidebar-activate-width) !important; } - :root[inFullscreen="true"] #sidebar-box { margin-inline-start: var(--uc-sidebar-activate-width-reverse) !important; padding-inline-start: var(--uc-sidebar-fullscreen-width); @@ -8287,19 +7584,16 @@ max-width: calc(var(--uc-sidebar-activate-width)) !important; will-change: unset; } - @media (prefers-reduced-motion: no-preference) { #sidebar-header, #sidebar { transition: min-width var(--uc-autohide-sidebar-speed) var(--animation-easing-function) var(--uc-autohide-sidebar-delay) !important; } - #sidebar-box:is(:hover, :focus-within) > #sidebar-header, #sidebar-box:is(:hover, :focus-within) > #sidebar { transition-delay: 0ms !important; } - :root[inFullscreen="true"] #sidebar-box { transition: padding-inline-start var(--uc-autohide-fullscreen-sidebar-speed) var(--animation-easing-function) var(--uc-autohide-sidebar-delay) !important; @@ -8321,7 +7615,6 @@ min-width: var(--uc-sidebar-activate-width) !important; max-width: var(--uc-sidebar-activate-width) !important; } - :root[inFullscreen="true"] #sidebar-box:not([positionend="true"]) { margin-inline-start: var(--uc-sidebar-fullscreen-margin) !important; will-change: margin-inline-start; @@ -8336,7 +7629,6 @@ :root[inFullscreen="true"] #sidebar-box[positionend="true"]:is(:hover, :focus-within) { margin-inline-end: 0 !important; } - @media (prefers-reduced-motion: no-preference) { #sidebar-box { transition: min-width var(--uc-autohide-sidebar-speed) var(--animation-easing-function) @@ -8345,7 +7637,6 @@ #sidebar-box:is(:hover, :focus-within) { transition-delay: 0ms !important; } - :root[inFullscreen="true"] #sidebar-box { transition: margin-inline-start var(--uc-autohide-fullscreen-sidebar-speed) var(--animation-easing-function) var(--uc-autohide-sidebar-delay) !important; @@ -8367,7 +7658,6 @@ (2 * var(--urlbar-margin-inline) + var(--uc-window-drag-space-pre, 0px) + var(--uc-navbar-gap, 0px)) ) !important; } - @supports -moz-bool-pref("userChrome.tabbar.one_liner") { #nav-bar:is(:hover, :focus-within, [urlbar-exceeds-toolbar-bounds="true"]) { --uc-tabbar-width: calc(100vw - var(--uc-navbar-width-origin)); @@ -8381,7 +7671,6 @@ var(--uc-autohide-toolbar-delay), var(--ext-theme-background-transition) !important; } - #nav-bar:is(:hover, :focus-within, [urlbar-exceeds-toolbar-bounds="true"]) { transition-delay: 0s !important; } @@ -8393,7 +7682,6 @@ var(--uc-autohide-toolbar-delay), var(--ext-theme-background-transition) !important; } - #nav-bar:is(:hover, :focus-within, [urlbar-exceeds-toolbar-bounds="true"]) { transition-delay: 0s !important; } @@ -8405,7 +7693,6 @@ transition: min-width var(--uc-autohide-toolbar-speed) var(--animation-easing-function) var(--uc-autohide-toolbar-delay); } - #nav-bar:is(:hover, :focus-within, [urlbar-exceeds-toolbar-bounds="true"]) #urlbar-container { transition-delay: 0s !important; } @@ -8417,7 +7704,6 @@ transition: min-width var(--uc-autohide-toolbar-speed) var(--animation-easing-function) var(--uc-autohide-toolbar-delay); } - #nav-bar:is(:hover, :focus-within, [urlbar-exceeds-toolbar-bounds="true"]) #urlbar-container { transition-delay: 0s !important; } @@ -8435,8 +7721,7 @@ } @supports -moz-bool-pref("userChrome.hidden.navbar") { #nav-bar { - visibility: collapse; - /* display: none is not work */ + visibility: collapse; /* display: none is not work */ } } } @@ -8450,8 +7735,7 @@ } @supports -moz-bool-pref("userChrome.hidden.navbar") { #nav-bar { - visibility: collapse; - /* display: none is not work */ + visibility: collapse; /* display: none is not work */ } } } @@ -8489,8 +7773,7 @@ display: none; } #identity-box[pageproxystate="valid"].notSecureText #identity-icon-box { - padding-inline-end: 5px; - /* Original: 8px */ + padding-inline-end: 5px; /* Original: 8px */ } } @supports -moz-bool-pref("userChrome.hidden.bookmarkbar_icon") { @@ -8500,21 +7783,19 @@ } @supports -moz-bool-pref("userChrome.hidden.bookmarkbar_label") { #PlacesToolbarItems .bookmark-item > .toolbarbutton-text { - visibility: collapse; - /* display: none is not work */ + visibility: collapse; /* display: none is not work */ } } @supports -moz-bool-pref("userChrome.hidden.disabled_menu") { menu[disabled="true"], menuitem:not(#context-back, #context-forward)[disabled="true"] { - display: none !important; + visibility: collapse !important; } - @supports -moz-bool-pref("widget.macos.native-context-menus") or -moz-bool-pref("widget.gtk.native-context-menus") { #context-back[disabled="true"], #context-forward[disabled="true"] { - display: none !important; + visibility: collapse !important; } } } @@ -8533,7 +7814,6 @@ .downloadIconShow > .button-box > .button-icon { list-style-image: url("../icons/folder.svg") !important; } - /* Standard Folder - Open */ :-moz-any(#PlacesToolbar, #BMB_bookmarksPopup, #bookmarksMenu) .bookmark-item[container="true"]:not([query="true"], [tagContainer], [dayContainer])[open="true"], @@ -8541,7 +7821,6 @@ treechildren::-moz-tree-image(title, container, open) { list-style-image: url("../icons/folder-open.svg") !important; } - /*= Other Folder - Inbox Icon ================================================*/ /* on Menus */ #PlacesToolbar #OtherBookmarks, @@ -8555,7 +7834,6 @@ #editBMPanel_folderMenuList[selectedGuid="unfiled_____"] { list-style-image: url("../icons/mail-inbox-all.svg") !important; } - /* Other Folder - Open */ #PlacesToolbar #OtherBookmarks[open="true"], #BMB_bookmarksPopup #BMB_unsortedBookmarks[open="true"], @@ -8566,37 +7844,31 @@ treechildren::-moz-tree-image(container, open, queryFolder_unfiled_____) { list-style-image: url("../icons/mail-inbox.svg") !important; } - /*= Default Icon - Override ===================================================*/ /* https://github.com/mozilla/gecko-dev/blob/master/browser/themes/shared/places/tree-icons.css */ /* Query */ :-moz-any(#historyTree, #placesList, #placeContent) treechildren::-moz-tree-image(title, query) { list-style-image: url("chrome://browser/skin/places/folder-smart.svg") !important; } - /* History */ :-moz-any(#historyTree, #placesList, #placeContent) treechildren::-moz-tree-image(title, query, dayContainer), :-moz-any(#historyTree, #placesList, #placeContent) treechildren::-moz-tree-image(query, OrganizerQuery_history____v) { list-style-image: url("chrome://browser/skin/history.svg") !important; } - /* Downloads */ :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, OrganizerQuery_downloads__v) { list-style-image: url("chrome://browser/skin/downloads/downloads.svg") !important; } - /* Tag */ :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(title, query, tagContainer), :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, OrganizerQuery_tags_______v) { list-style-image: url("chrome://browser/skin/places/tag.svg") !important; } - /* Bookmark */ :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, OrganizerQuery_allbms_____v) { list-style-image: url("chrome://browser/skin/bookmark.svg") !important; } - /* Bookmark Toolbar */ #BMB_bookmarksPopup #BMB_bookmarksToolbar, #bookmarksMenuPopup #bookmarksToolbarFolderMenu, @@ -8604,13 +7876,11 @@ treechildren::-moz-tree-image(container, queryFolder_toolbar_____) { list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.svg") !important; } - /* Bookmark Menu */ :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent) treechildren::-moz-tree-image(container, queryFolder_menu________) { list-style-image: url("chrome://browser/skin/places/bookmarksMenu.svg") !important; } - /*= Default Icon - Open ======================================================*/ /* Query */ :-moz-any(#PlacesToolbar, #BMB_bookmarksPopup, #bookmarksMenu) @@ -8619,14 +7889,12 @@ > .menu-iconic-icon { transform: rotate(15deg) !important; } - /* History */ :-moz-any(#historyTree, #placesList, #placeContent) treechildren::-moz-tree-image(title, query, open, dayContainer), :-moz-any(#historyTree, #placesList, #placeContent) treechildren::-moz-tree-image(query, open, OrganizerQuery_history____v) { list-style-image: url("../icons/history-reverse.svg") !important; } - /* Tag */ :-moz-any(#PlacesToolbar, #BMB_bookmarksPopup, #bookmarksMenu) .bookmark-item[container="true"][tagContainer="true"][open="true"], @@ -8634,12 +7902,10 @@ :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, open, OrganizerQuery_tags_______v) { list-style-image: url("../icons/tag-open.svg") !important; } - /* Bookmark */ :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, open, OrganizerQuery_allbms_____v) { list-style-image: url("chrome://browser/skin/bookmark-hollow.svg") !important; } - /* Bookmark Toolbar */ #BMB_bookmarksPopup #BMB_bookmarksToolbar[open="true"], #bookmarksMenuPopup #bookmarksToolbarFolderMenu[open="true"], @@ -8647,14 +7913,11 @@ treechildren::-moz-tree-image(container, open, queryFolder_toolbar_____) { list-style-image: url("../icons/bookmarksToolbar-open.svg") !important; } - /* Bookmark Menu */ :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent) treechildren::-moz-tree-image(container, open, queryFolder_menu________) { - list-style-image: url("../icons/bookmarksMenu-open.svg") !important; - /* or bookmarksMenu-open2.svg" */ + list-style-image: url("../icons/bookmarksMenu-open.svg") !important; /* or bookmarksMenu-open2.svg" */ } - @-moz-document url("chrome://browser/content/places/places.xhtml") { @media (-moz-gtk-csd-available) { @@ -8666,26 +7929,21 @@ #forward-button, #clearDownloadsButton { fill: currentColor !important; - -moz-context-properties: fill !important; + -moz-context-properties: fill, fill-opacity, stroke !important; } - /* Add */ #organizeButton { list-style-image: url("chrome://global/skin/icons/settings.svg") !important; } - #viewMenu { list-style-image: url("../icons/sort.svg") !important; } - #maintenanceButton { list-style-image: url("../icons/import-export.svg") !important; } - #clearDownloadsButton { list-style-image: url("chrome://global/skin/icons/delete.svg") !important; } - #clearDownloadsButton > .toolbarbutton-icon { display: -moz-inline-box !important; margin-top: 0; @@ -8693,16 +7951,13 @@ margin-inline-start: 0; margin-inline-end: 2px; } - /* Replace */ #back-button { list-style-image: url("chrome://browser/skin/back.svg") !important; } - #forward-button { list-style-image: url("chrome://browser/skin/forward.svg") !important; } - #back-button:-moz-locale-dir(rtl) > .toolbarbutton-icon, #forward-button:-moz-locale-dir(rtl) > .toolbarbutton-icon { transform: scaleX(-1) !important; @@ -8721,12 +7976,10 @@ --arrowpanel-menuimageblank-padding: calc(var(--arrowpanel-menuitem-padding-inline) - 2px) !important; --arrowpanel-menuimageblank-padding-block: calc(var(--arrowpanel-menuitem-padding-block) - 2px) !important; } - .subviewbutton > .toolbarbutton-icon { width: 16px; } - - @supports -moz-bool-pref("userChrome.icon.panel_photon") or -moz-bool-pref("userChrome.icon.panel_sparse") { + @supports not -moz-bool-pref("userChrome.icon.panel_full") { :root { /* Global */ --arrowpanel-menuicon-paddingx2: calc(var(--arrowpanel-menuicon-padding) * 2); @@ -8744,22 +7997,17 @@ .subviewbutton > .toolbarbutton-text { padding-inline-start: var(--arrowpanel-menuicon-padding) !important; } - .toolbaritem-combined-buttons > .subviewbutton:not(.subviewbutton-iconic) > .toolbarbutton-text { padding-inline-start: 0 !important; } - #panelMenu_bookmarksMenu .subviewbutton[disabled="true"] .toolbarbutton-text, #appMenu_historyMenu .subviewbutton[disabled="true"] .toolbarbutton-text { padding-inline-start: var(--arrowpanel-menublank-padding) !important; } - #appMenu-proton-update-banner .toolbarbutton-text { margin-inline-start: 0 !important; - padding-inline-start: 0 !important; - /* FF v107 */ + padding-inline-start: 0 !important; /* FF v107 */ } - #appMenu-multiView .subviewbutton::before, #appMenu-proton-update-banner::before { display: -moz-inline-box; @@ -8767,12 +8015,10 @@ width: 16px; height: 16px; } - #appMenu-proton-update-banner { margin-bottom: 2px !important; padding-inline-start: var(--arrowpanel-menuitem-padding-inline) !important; } - #appMenu-fxa-status2, #appMenu-zoom-controls2, #appMenu-zoom-controls { @@ -8780,23 +8026,19 @@ padding-top: var(--arrowpanel-menuimageblank-padding-block) !important; padding-bottom: var(--arrowpanel-menuimageblank-padding-block) !important; } - #appMenu-zoom-controls2::before, #appMenu-zoom-controls::before { margin-inline-end: 0 !important; } - #appMenu-zoomReduce-button2, #appMenu-zoomReset-button2, #appMenu-zoomEnlarge-button2, #appMenu-fullscreen-button2 { --arrowpanel-menuitem-padding-block: 0px; } - .subviewbutton[type="checkbox"]:not([checked="true"]) > .toolbarbutton-text { margin-left: 16px !important; } - /* Icons Color */ #appMenu-multiView .subviewbutton::before, #appMenu-proton-update-banner::before, @@ -8804,45 +8046,36 @@ .subviewbutton:not(#appMenu-proton-update-banner) > image { fill: currentColor !important; fill-opacity: var(--toolbarbutton-icon-fill-opacity) !important; - -moz-context-properties: fill !important; + -moz-context-properties: fill, fill-opacity, stroke !important; } - #appMenu-zoomReduce-button2 > .toolbarbutton-icon, #appMenu-zoomEnlarge-button2 > .toolbarbutton-icon { stroke: var(--zoom-controls-bgcolor, var(--button-bgcolor, ButtonFace)) !important; - -moz-context-properties: fill, stroke !important; } - #appMenu-zoomReduce-button2:not([disabled], [open], :active):is(:hover) > .toolbarbutton-icon, #appMenu-zoomEnlarge-button2:not([disabled], [open], :active):is(:hover) > .toolbarbutton-icon { stroke: var(--button-hover-bgcolor) !important; } - .subviewbutton[disabled="true"] > image { /* Ghost icons when disabled */ opacity: 0.4; } - /*= Panel - Main =============================================================*/ #appMenu-proton-addon-banners > .addon-banner-item > .toolbarbutton-icon { display: -moz-inline-box !important; margin-inline-start: var(--arrowpanel-menuicon-padding); -moz-box-ordinal-group: 0 !important; } - #appMenu-proton-update-banner::before { content: url("../icons/whatsnew.svg"); } - #appMenu-fxa-status2::before { /* Don't exist img tag */ content: url("chrome://browser/skin/fxa/avatar-empty.svg"); } - #appMenu-fxa-status2:is([fxastatus="signedin"], [fxastatus="unverified"], [fxastatus="login-failed"])::before { display: none; } - #appMenu-fxa-status2:is([fxastatus="signedin"], [fxastatus="unverified"], [fxastatus="login-failed"]) #appMenu-fxa-label2::before { /* url("https://profile.accounts.firefox.com/v1/avatar/a") */ @@ -8851,7 +8084,6 @@ background-size: 16px !important; background-image: var(--avatar-image-url) !important; } - @supports -moz-bool-pref("userChrome.icon.panel_full") or -moz-bool-pref("userChrome.icon.panel_photon") { #appMenu-new-tab-button2 { list-style-image: url("chrome://browser/skin/new-tab.svg"); @@ -8864,55 +8096,49 @@ padding-top: var(--arrowpanel-menuitemblank-padding) !important; padding-bottom: var(--arrowpanel-menuitemblank-padding) !important; } - #appMenu-zoom-controls2, #appMenu-zoom-controls { padding-inline-start: var(--arrowpanel-menuimageblank-padding-horizontal) !important; } } - @supports -moz-bool-pref("userChrome.icon.panel_sparse") { - #appMenu-new-tab-button2, - #appMenu-passwords-button, - #appMenu-extensions-themes-button, - #appMenu-save-file-button2, - #appMenu-find-button2, - #appMenu-more-button2, - #appMenu-help-button2, - #appMenu-quit-button2 { - padding-top: var(--arrowpanel-menuitemblank-padding-block) !important; - padding-bottom: var(--arrowpanel-menuitemblank-padding-block) !important; - } - - #appMenu-zoom-controls2, - #appMenu-zoom-controls { - padding-inline-start: var(--arrowpanel-menuimageblank-padding-horizontal) !important; + @supports not -moz-bool-pref("userChrome.icon.panel_photon") { + @supports not -moz-bool-pref("userChrome.icon.panel_full") { + #appMenu-new-tab-button2, + #appMenu-passwords-button, + #appMenu-extensions-themes-button, + #appMenu-save-file-button2, + #appMenu-find-button2, + #appMenu-more-button2, + #appMenu-help-button2, + #appMenu-quit-button2 { + padding-top: var(--arrowpanel-menuitemblank-padding-block) !important; + padding-bottom: var(--arrowpanel-menuitemblank-padding-block) !important; + } + #appMenu-zoom-controls2, + #appMenu-zoom-controls { + padding-inline-start: var(--arrowpanel-menuimageblank-padding-horizontal) !important; + } } } #appMenu-new-window-button2 { list-style-image: url("chrome://browser/skin/window.svg"); } - #appMenu-new-private-window-button2 { list-style-image: url("chrome://browser/skin/privateBrowsing.svg"); } - #appMenu-bookmarks-button { list-style-image: url("chrome://browser/skin/bookmark.svg"); } - #appMenu-history-button { list-style-image: url("chrome://browser/skin/history.svg"); } - #appMenu-downloads-button { list-style-image: url("chrome://browser/skin/downloads/downloads.svg"); } - @supports -moz-bool-pref("userChrome.icon.panel_full") or -moz-bool-pref("userChrome.icon.panel_photon") { #appMenu-passwords-button { list-style-image: url("chrome://browser/skin/login.svg"); } - #appMenu-extensions-themes-button { list-style-image: url("chrome://mozapps/skin/extensions/extension.svg"); } @@ -8920,16 +8146,13 @@ #appMenu-print-button2 { list-style-image: url("chrome://global/skin/icons/print.svg"); } - @supports -moz-bool-pref("userChrome.icon.panel_full") { #appMenu-save-file-button2 { - list-style-image: url("chrome://browser/skin/save.svg"); + list-style-image: url("../icons/toolbarButton-download.svg"); } - #appMenu-find-button2 { list-style-image: url("chrome://global/skin/icons/search-glass.svg"); } - #appMenu-zoom-controls2::before, #appMenu-zoom-controls::before { content: url("../icons/screenshot.svg"); @@ -8938,7 +8161,6 @@ #appMenu-settings-button { list-style-image: url("chrome://global/skin/icons/settings.svg"); } - @supports -moz-bool-pref("userChrome.icon.panel_full") { #appMenu-more-button2 { list-style-image: url("chrome://browser/skin/ion.svg"); @@ -8948,7 +8170,6 @@ #appMenu-help-button2 { list-style-image: url("chrome://global/skin/icons/help.svg"); } - #appMenu-quit-button2 { list-style-image: url("../icons/quit.svg"); } @@ -8959,7 +8180,6 @@ width: 16px !important; height: 16px !important; } - /* Default */ #fxa-manage-account-button::before { content: ""; @@ -8976,7 +8196,6 @@ -moz-box-ordinal-group: 2 !important; } } - @supports -moz-bool-pref("userChrome.icon.account_label_to_right") { #fxa-menu-header-title, #fxa-menu-header-description { @@ -8988,27 +8207,21 @@ -moz-box-ordinal-group: 1 !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"); } - #PanelUI-fxa-menu-sendtab-button { list-style-image: url("../icons/send-to-device.svg"); } - #PanelUI-fxa-menu-sync-prefs-button { list-style-image: url("chrome://global/skin/icons/settings.svg"); } - #PanelUI-fxa-menu-account-signout-button { list-style-image: url("../icons/sign-out.svg"); } - #PanelUI-remotetabs-view-managedevices::before { /* Box */ content: ""; @@ -9018,20 +8231,18 @@ /* Color */ fill: currentColor; fill-opacity: var(--toolbarbutton-icon-fill-opacity); - -moz-context-properties: fill; + -moz-context-properties: fill, fill-opacity, stroke; background-size: 16px; background-repeat: no-repeat; background-position: left center; background-image: url("chrome://global/skin/icons/settings.svg"); } - .PanelUI-remotetabs-notabsforclient-label { margin-inline-start: calc( var(--arrowpanel-menuicon-padding) + var(--arrowpanel-menuitem-padding-inline) ) !important; padding-inline-start: var(--arrowpanel-menublank-padding) !important; } - /* Change Separator */ #PanelUI-fxa-menu::before { content: ""; @@ -9040,237 +8251,187 @@ margin: var(--panel-separator-margin); padding: 0; } - #PanelUI-fxa-menu > :first-child { -moz-box-ordinal-group: 0; } - #PanelUI-sign-out-separator { display: none; } - .pageAction-sendToDevice-device.subviewbutton.sync-menuitem.sendtab-target[clientType=""], .sendToDevice-device.subviewbutton.sync-menuitem.sendtab-target[clientType=""] { list-style-image: url("../icons/send-to-device.svg"); } - .pageAction-sendToDevice-device.subviewbutton.sync-menuitem.sendtab-target:not([clientType]), .sendToDevice-device.subviewbutton.sync-menuitem.sendtab-target:not([clientType]) { list-style-image: url("chrome://global/skin/icons/settings.svg"); } - /*= Panel - Bookmark =========================================================*/ #panelMenuBookmarkThisPage { list-style-image: url("chrome://browser/skin/bookmark-hollow.svg"); } - panelMenuBookmarkThisPage[starred] { list-style-image: url("chrome://browser/skin/bookmark.svg"); } - #panelMenu_searchBookmarks { list-style-image: url("chrome://global/skin/icons/search-glass.svg"); } - #panelMenu_viewBookmarksToolbar { list-style-image: url("chrome://browser/skin/bookmarks-toolbar.svg"); } - #panelMenu_showAllBookmarks { list-style-image: url("chrome://browser/skin/bookmark-star-on-tray.svg"); } - /*= Panel - History ==========================================================*/ #appMenuRecentlyClosedTabs { list-style-image: url("chrome://browser/skin/tab.svg"); } - #appMenuRecentlyClosedWindows { list-style-image: url("chrome://browser/skin/window.svg"); } - #appMenuRestoreSession, #appMenu-restoreSession { list-style-image: url("../icons/restore-session.svg"); } - #appMenuClearRecentHistory { list-style-image: url("chrome://browser/skin/forget.svg"); } - #PanelUI-historyMore { list-style-image: url("chrome://browser/skin/history.svg"); } - #appMenu-library-recentlyClosedTabs { list-style-image: url("../icons/movetowindow-16.svg"); } - #appMenu-library-recentlyClosedWindows { list-style-image: url("../icons/restore-session.svg"); } - /*= Panel - More tools =======================================================*/ #appmenu-moreTools-button { list-style-image: url("chrome://browser/skin/customize.svg"); } - /* Web Developer Tools */ #appmenu-developer-tools-view .subviewbutton:nth-child(1), #PanelUI-developer-tools-view .subviewbutton:nth-child(1) { list-style-image: url("../icons/developer.svg"); } - /* Task Manager */ #appmenu-developer-tools-view .subviewbutton:nth-child(2), #PanelUI-developer-tools-view .subviewbutton:nth-child(2) { list-style-image: url("../icons/performance.svg"); } - /* Remote Debugging - Edge bug.svg */ #appmenu-developer-tools-view .subviewbutton:nth-child(3), #PanelUI-developer-tools-view .subviewbutton:nth-child(3) { list-style-image: url("../icons/bug.svg"); } - /* Browser Toolbox - Edge webdeveloper.svg */ #appmenu-developer-tools-view .subviewbutton:nth-child(4), #PanelUI-developer-tools-view .subviewbutton:nth-child(4) { list-style-image: url("../icons/window-dev-tools.svg"); } - /* Browser Content Toolbox */ #appmenu-developer-tools-view .subviewbutton:nth-child(5), #PanelUI-developer-tools-view .subviewbutton:nth-child(5) { list-style-image: url("../icons/command-frames.svg"); } - /* Browser Console */ #appmenu-developer-tools-view .subviewbutton:nth-last-child(5), #PanelUI-developer-tools-view .subviewbutton:nth-last-child(5) { list-style-image: url("chrome://devtools/skin/images/command-console.svg"); } - /* Responsive Design Mode */ #appmenu-developer-tools-view .subviewbutton:nth-last-child(4), #PanelUI-developer-tools-view .subviewbutton:nth-last-child(4) { list-style-image: url("../icons/command-responsivemode.svg"); } - /* Eyedropper */ #appmenu-developer-tools-view .subviewbutton:nth-last-child(3), #PanelUI-developer-tools-view .subviewbutton:nth-last-child(3) { list-style-image: url("chrome://devtools/skin/images/command-eyedropper.svg"); } - /* Page Source - Edge file-search.svg */ #appmenu-developer-tools-view .subviewbutton:nth-last-child(2), #PanelUI-developer-tools-view .subviewbutton:nth-last-child(2) { list-style-image: url("../icons/document-search.svg"); } - /* Extensions for Devel */ #appmenu-developer-tools-view .subviewbutton:nth-last-child(1), #PanelUI-developer-tools-view .subviewbutton:nth-last-child(1) { list-style-image: url("chrome://devtools/skin/images/debugging-addons.svg"); } - #appmenu-developer-tools-view .subviewbutton:last-child { margin-bottom: 6px !important; } - /*= Panel - Help =============================================================*/ #appMenu_menu_openHelp { list-style-image: url("chrome://global/skin/icons/help.svg"); } - #appMenu_feedbackPage { list-style-image: url("../icons/send.svg"); } - #appMenu_helpSafeMode { list-style-image: url("chrome://devtools/skin/images/debugging-workers.svg"); } - #appMenu_troubleShooting { list-style-image: url("chrome://global/skin/icons/more.svg"); } - #appMenu_help_reportSiteIssue { list-style-image: url("chrome://global/skin/icons/lightbulb.svg"); } - #appMenu_menu_HelpPopup_reportPhishingtoolmenu { list-style-image: url("chrome://global/skin/icons/warning.svg"); } - #appMenu_aboutName { list-style-image: url("chrome://global/skin/icons/info.svg"); } - /*= Panel - Library ==========================================================*/ #appMenu-library-bookmarks-button { list-style-image: url("chrome://browser/skin/bookmark.svg"); } - #appMenu-library-history-button { list-style-image: url("chrome://browser/skin/history.svg"); } - #appMenu-library-downloads-button { list-style-image: url("chrome://browser/skin/downloads/downloads.svg"); } - /*= Panel - Downloads ========================================================*/ #downloadsHistory { list-style-image: url("chrome://browser/skin/downloads/downloads.svg"); } - #downloadsHistory .box-inherit.button-box { display: -moz-inline-box !important; } - /*= Toolbar - Overflow Menu ==================================================*/ #overflowMenu-customize-button { list-style-image: url("chrome://browser/skin/customize.svg"); } - /*= Tabbar - All Tab Menu ====================================================*/ #allTabsMenu-undoCloseTab { list-style-image: url("../icons/undo.svg"); } - #allTabsMenu-searchTabs { list-style-image: url("chrome://global/skin/icons/search-glass.svg"); } - #allTabsMenu-containerTabsButton { list-style-image: url("../icons/container-openin-16.svg"); } - #allTabsMenu-hiddenTabsButton { list-style-image: url("../icons/eye-hide.svg"); } - #allTabsMenu-containerTabsView .subviewbutton:last-child { list-style-image: url("chrome://global/skin/icons/settings.svg"); } - /*= BMB_bookmarksPopup =======================================================*/ #BMB_bookmarksShowAllTop, #BMB_bookmarksShowAll { --menuitem-image: url("chrome://browser/skin/bookmark-star-on-tray.svg"); } - #BMB_bookmarksToolbar { --menuitem-image: url("chrome://browser/skin/bookmarks-toolbar.svg"); } - @supports -moz-bool-pref("layout.css.osx-font-smoothing.enabled") { #BMB_bookmarksShowAllTop { list-style-image: url("chrome://browser/skin/bookmark-star-on-tray.svg") !important; } - #BMB_bookmarksShowAllTop > .menu-iconic-left { display: -moz-box !important; } @@ -9282,79 +8443,67 @@ #BMB_viewBookmarksToolbar[data-l10n-args='{"isVisible":false}'] { --menuitem-image: url("../icons/eye-show.svg"); } - /*= protections-popup ========================================================*/ #protections-popup-settings-button > .protections-popup-settings-icon, #protections-popup-show-report-button > .protections-popup-show-report-icon { - -moz-context-properties: fill; + -moz-context-properties: fill, fill-opacity, stroke; fill: currentColor; margin-inline-end: 1em; } - #protections-popup-settings-button > .protections-popup-settings-icon, #protections-popup-multiView .panel-subview-footer-button { list-style-image: url("chrome://global/skin/icons/settings.svg"); } - #protections-popup-show-report-button > .protections-popup-show-report-icon { /* chrome://browser/skin/controlcenter/dashboard.svg */ list-style-image: url("../icons/dashboard.svg"); } - /*= identity-popup ===========================================================*/ #identity-popup-clear-sitedata-button, #identity-popup-more-info { padding-inline: 5px !important; } - #identity-popup-securityView-body { - margin-inline-start: 32px !important; - /* Original: 10px */ + margin-inline-start: 32px !important; /* Original: 10px */ } - #identity-popup-clear-sitedata-button { list-style-image: url("../icons/broom.svg"); } - /*= sidebarMenu-popup ========================================================*/ #identity-popup-more-info { list-style-image: url("chrome://global/skin/icons/info.svg"); } - #sidebar-switcher-bookmarks { list-style-image: url("chrome://browser/skin/bookmark.svg"); } - #sidebar-switcher-history { list-style-image: url("chrome://browser/skin/history.svg"); } - #sidebar-switcher-tabs { list-style-image: url("chrome://browser/skin/tab.svg"); } - #sidebar-reverse-position { list-style-image: url("chrome://browser/skin/sidebars-right.svg"); } - #sidebar-box[positionend="true"] #sidebar-reverse-position { /* Can't apply this. shadow dom */ list-style-image: url("chrome://browser/skin/sidebars.svg"); } - #sidebarMenu-popup > .subviewbutton[data-l10n-id="sidebar-menu-close"] { list-style-image: url("chrome://global/skin/icons/close.svg"); } + /*= unified-extensions-view ===================================================*/ + #unified-extensions-manage-extensions { + list-style-image: url("chrome://mozapps/skin/extensions/extension.svg"); + } } /** Menu - Icons Layout *******************************************************/ @supports -moz-bool-pref("userChrome.icon.menu") { menupopup menuitem:not([type="checkbox"][checked="true"], [type="radio"]), menupopup menu:not([type="checkbox"][checked="true"], [type="radio"]), #main-menubar > menu { - -moz-appearance: none !important; - /* Linux: menulist */ + -moz-appearance: none !important; /* Linux: menulist */ } - /* Icon */ #main-menubar > menu, :not(menu, #ContentSelectDropdown) @@ -9372,21 +8521,20 @@ > menuitem, .openintabs-menuitem, #blockedPopupDontShowMessage, - #BMB_viewBookmarksToolbar { + #BMB_viewBookmarksToolbar, + #context_openANewTab.tabmix-newtab-menu-icon { /* Color */ - -moz-context-properties: fill, fill-opacity !important; + -moz-context-properties: fill, fill-opacity, stroke !important; fill: currentColor !important; /* Layout */ background-size: 16px !important; background-repeat: no-repeat !important; background-image: var(--menuitem-image); } - #tabContextMenu > .tabmix-newtab-menu-icon { - -moz-context-properties: fill, fill-opacity !important; + -moz-context-properties: fill, fill-opacity, stroke !important; fill: currentColor !important; } - /* 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) @@ -9396,7 +8544,6 @@ list-style-image: var(--menuitem-image, url("../icons/blank.svg")) !important; } } - /* Padding */ :root { --uc-menu-background-position: left; @@ -9406,7 +8553,6 @@ :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) @@ -9426,11 +8572,11 @@ > menuitem, .openintabs-menuitem, #blockedPopupDontShowMessage, - #BMB_viewBookmarksToolbar { + #BMB_viewBookmarksToolbar, + #context_openANewTab.tabmix-newtab-menu-icon { background-position: var(--uc-menu-background-position) var(--context-menu-background-padding) center !important; padding-inline-start: var(--context-menu-background-padding) !important; } - /* Menubar */ @supports -moz-bool-pref("userChrome.icon.global_menubar") { #main-menubar > menu { @@ -9444,8 +8590,7 @@ padding-inline-start: calc(19px + var(--context-menu-background-padding-default)) !important; } #main-menubar > menu > menupopup { - --menuitem-image: none; - /* Prevent Image Inheritance */ + --menuitem-image: none; /* Prevent Image Inheritance */ } @supports not -moz-bool-pref("userChrome.padding.global_menubar") { #main-menubar > menu { @@ -9485,7 +8630,8 @@ > menuitem, .openintabs-menuitem, #blockedPopupDontShowMessage, - #BMB_viewBookmarksToolbar { + #BMB_viewBookmarksToolbar, + #context_openANewTab.tabmix-newtab-menu-icon { background-position: left var(--context-menu-background-padding) center !important; padding-inline-start: 0 !important; } @@ -9493,13 +8639,11 @@ @media (-moz-os-version: windows-win10), (-moz-platform: windows-win10) { :root { --context-menu-background-padding: 1em; - --context-menu-text-padding: 24px; - /* 16px + 8px */ + --context-menu-text-padding: 24px; /* 16px + 8px */ --menu-background-padding-default: calc( var(--context-menu-background-padding) + var(--context-menu-text-padding) ); } - :not(menu, #ContentSelectDropdown, #context-navigation) > menupopup > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), @@ -9517,7 +8661,8 @@ > menuitem, .openintabs-menuitem, #blockedPopupDontShowMessage, - #BMB_viewBookmarksToolbar { + #BMB_viewBookmarksToolbar, + #context_openANewTab.tabmix-newtab-menu-icon { padding-inline-start: var(--menu-background-padding-default) !important; margin-left: 0 !important; } @@ -9527,7 +8672,6 @@ :root { --context-menu-background-padding-default: 6px; } - #main-menubar > menu > .menubar-text { padding-inline-start: 3px; } @@ -9538,7 +8682,6 @@ --context-menu-background-padding-default: 10px; --context-menu-mac-padding: 21px; } - /* context menu width */ :not(menu, #ContentSelectDropdown, #context-navigation) > menupopup @@ -9549,19 +8692,15 @@ #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 { padding-inline-start: var(--context-menu-mac-padding) !important; } - /* Checkbox menuitem, None iconic menu */ - :not(menu, #ContentSelectDropdown, #context-navigation) > menupopup > menuitem[checked="true"], - :not(menu, #ContentSelectDropdown, #context-navigation) > menupopup > menu:not(.menu-iconic) { + :not(menu, #ContentSelectDropdown, #context-navigation) > menupopup > menuitem[type="checkbox"] { padding-inline-start: calc(var(--context-menu-background-padding) + var(--context-menu-mac-padding)) !important; } - /* Global Menu */ @supports -moz-bool-pref("userChrome.icon.global_menu.mac") { menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup) @@ -9581,13 +8720,11 @@ #PersonalToolbar menupopup[emptyplacesresult] .menu-text { margin-inline-start: 0 !important; } - /* Bookmark Popup - As Arrow Panel */ #BMB_bookmarksPopup, #PersonalToolbar { --context-menu-background-padding: var(--arrowpanel-menuitem-padding-inline); } - /* Windows 7, 8 */ @media (-moz-os-version: windows-win7), (-moz-platform: windows-win7), @@ -9597,13 +8734,11 @@ 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"]), @@ -9611,14 +8746,12 @@ 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; @@ -9642,13 +8775,11 @@ menupopup:is(#goPopup, #historyMenuPopup, #bookmarksMenuPopup) .bookmark-item { padding-inline-start: var(--context-menu-background-padding) !important; } - /* Bookmark Popup - Iconic menu */ #BMB_bookmarksPopup .menu-iconic-text, #PersonalToolbar menupopup[placespopup="true"] .bookmark-item .menu-iconic-text { padding-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), @@ -9656,38 +8787,49 @@ #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, + #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; + } } @supports -moz-bool-pref("layout.css.osx-font-smoothing.enabled") { /* Bookmark Popup - As Arrow Panel */ #PersonalToolbar menupopup menuitem, #PersonalToolbar menupopup menu { - padding-inline: calc(var(--arrowpanel-menuicon-padding) + var(--arrowpanel-menuitem-padding-inline)) !important; + 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) { 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, + #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; + } } @supports -moz-bool-pref("userChrome.icon.context_menu") { - /** Context Menu - Icons ******************************************************/ - /*= tabContextMenu ===========================================================*/ + /** Context Menu - Icons ******************************************************/ /*= tabContextMenu ===========================================================*/ #context_openANewTab, #treestyletab_piro_sakura_ne_jp-menuitem-_context_newTab, #tabcenter-reborn_ariasuni-menuitem-_newTabContextMenuOpenAlternatePosition, #sidebartabs_asamuzak_jp-menuitem-_newTab { --menuitem-image: url("chrome://browser/skin/new-tab.svg"); } - #tabcenter-reborn_ariasuni-menuitem-_newTabContextMenuOpenInWindow { --menuitem-image: url("chrome://browser/skin/window.svg"); } - #tabcenter-reborn_ariasuni-menuitem-_newTabContextMenuOpenInPrivateWindow { --menuitem-image: url("chrome://browser/skin/privateBrowsing.svg"); } - #context_reloadTab, #context_reloadSelectedTabs, #treestyletab_piro_sakura_ne_jp-menuitem-_context_reloadTab, @@ -9698,7 +8840,6 @@ #sidebartabs_asamuzak_jp-menuitem-_reloadAllTabs { --menuitem-image: url("../icons/reload.svg"); } - #context_toggleMuteTab, #context_toggleMuteSelectedTabs, #treestyletab_piro_sakura_ne_jp-menuitem-_context_toggleMuteTab-mute, @@ -9706,7 +8847,6 @@ #sidebartabs_asamuzak_jp-menuitem-_muteTab { --menuitem-image: url("chrome://browser/skin/tabbrowser/tab-audio-muted-small.svg"); } - #context_toggleMuteTab[muted], #context_toggleMuteSelectedTabs[muted], #treestyletab_piro_sakura_ne_jp-menuitem-_context_toggleMuteTab-unmute, @@ -9714,7 +8854,6 @@ #sidebartabs_asamuzak_jp-menuitem-_muteTab[label="Unmute Tab"] { --menuitem-image: url("chrome://browser/skin/tabbrowser/tab-audio-playing-small.svg"); } - #context_pinTab, #context_pinSelectedTabs, #treestyletab_piro_sakura_ne_jp-menuitem-_context_pinTab, @@ -9722,7 +8861,6 @@ #sidebartabs_asamuzak_jp-menuitem-_pinTab { --menuitem-image: url("../icons/pin-tab.svg"); } - #context_unpinTab, #context_unpinSelectedTabs, #treestyletab_piro_sakura_ne_jp-menuitem-_context_unpinTab, @@ -9730,7 +8868,6 @@ #sidebartabs_asamuzak_jp-menuitem-_pinTab[label="Unpin Tab"] { --menuitem-image: url("../icons/unpin-tab.svg"); } - #context_duplicateTab, #context_duplicateTabs, #treestyletab_piro_sakura_ne_jp-menuitem-_context_duplicateTab, @@ -9738,11 +8875,9 @@ #sidebartabs_asamuzak_jp-menuitem-_dupeTab { --menuitem-image: url("../icons/tab-copy.svg"); } - #tabcenter-reborn_ariasuni-menuitem-_contextMenuUnloadTab { --menuitem-image: url("../icons/tab-unload.svg"); } - #context_bookmarkTab, #context_bookmarkSelectedTabs, #treestyletab_piro_sakura_ne_jp-menuitem-_context_bookmarkTab, @@ -9752,25 +8887,21 @@ #sidebartabs_asamuzak_jp-menuitem-_bookmarkAllTabs { --menuitem-image: url("chrome://browser/skin/bookmark.svg"); } - #context_moveTabOptions, #treestyletab_piro_sakura_ne_jp-menuitem-_context_moveTab, #tabcenter-reborn_ariasuni-menuitem-_contextMenuMoveTab, #sidebartabs_asamuzak_jp-menuitem-_moveTab { --menuitem-image: url("../icons/arrow-swap.svg"); } - #context_sendTabToDevice, #treestyletab_piro_sakura_ne_jp-menuitem-_context_sendTabsToDevice { --menuitem-image: url("../icons/send-to-device.svg"); } - #context_sendTabToDevice:is([disabled="true"]) + #context_shareTabURL, #context_sendTabToDevice:is([disabled="true"]) + menuitem.share-tab-url-item { /* At windows */ --menuitem-image: url("../icons/share.svg"); } - @supports -moz-bool-pref("userChrome.icon.menu.full") { #context_shareTabURL, menuitem.share-tab-url-item { @@ -9784,14 +8915,12 @@ #sidebartabs_asamuzak_jp-menuitem-_reopenTabInContainer { --menuitem-image: url("../icons/container-openin-16.svg"); } - #context_selectAllTabs, #treestyletab_piro_sakura_ne_jp-menuitem-_context_selectAllTabs, #treestyletab_piro_sakura_ne_jp-menuitem-_noContextTab\:context_selectAllTabs, #sidebartabs_asamuzak_jp-menuitem-_selectAllTabs { --menuitem-image: url("../icons/tab-multiple.svg"); } - #context_closeTab, #treestyletab_piro_sakura_ne_jp-menuitem-_context_closeTab, #treestyletab_piro_sakura_ne_jp-menuitem-_grouped\:closeTree, @@ -9799,7 +8928,6 @@ #sidebartabs_asamuzak_jp-menuitem-_closeTab { --menuitem-image: url("chrome://global/skin/icons/close.svg"); } - @supports -moz-bool-pref("userChrome.icon.menu.full") { #context_closeTabOptions, #treestyletab_piro_sakura_ne_jp-menuitem-_context_closeMultipleTabs, @@ -9808,7 +8936,6 @@ --menuitem-image: url("../icons/filter-dismiss.svg"); } } - #context_undoCloseTab, #treestyletab_piro_sakura_ne_jp-menuitem-_context_undoCloseTab, #treestyletab_piro_sakura_ne_jp-menuitem-_noContextTab\:context_undoCloseTab, @@ -9816,103 +8943,102 @@ #sidebartabs_asamuzak_jp-menuitem-_undoCloseTab { --menuitem-image: url("../icons/undo.svg"); } - /*= new-tab-button-popup =====================================================*/ #new-tab-button-popup > menuitem[command="Browser:NewUserContextTab"], .new-tab-popup > menuitem[command="Browser:NewUserContextTab"] { --menuitem-image: url("../icons/container-openin-16.svg"); } - #new-tab-button-popup > menuitem[command="Browser:OpenAboutContainers"], .new-tab-popup > menuitem[command="Browser:OpenAboutContainers"] { --menuitem-image: url("chrome://global/skin/icons/settings.svg"); } - /*= toolbar-context-menu =====================================================*/ .customize-context-manageExtension { --menuitem-image: url("chrome://global/skin/icons/settings.svg"); } - .customize-context-removeExtension { --menuitem-image: url("chrome://global/skin/icons/delete.svg"); } - .customize-context-reportExtension { --menuitem-image: url("../icons/send.svg"); } - .customize-context-moveToPanel { --menuitem-image: url("chrome://browser/skin/pin-12.svg"); } - #toolbar-context-autohide-downloads-button { /* checkbox */ --menuitem-image: url("../icons/eye-tracking-off.svg"); } - .customize-context-removeFromToolbar { --menuitem-image: url("chrome://global/skin/icons/delete.svg"); } - #toolbar-context-always-open-downloads-panel { /* checkbox */ --menuitem-image: url("../icons/drawer-arrow-download.svg"); } - #toolbar-context-openANewTab { --menuitem-image: url("chrome://browser/skin/new-tab.svg"); } - #toolbar-context-reloadSelectedTab, #toolbar-context-reloadSelectedTabs { --menuitem-image: url("../icons/reload.svg"); } - #toolbar-context-bookmarkSelectedTab, #toolbar-context-bookmarkSelectedTabs { --menuitem-image: url("chrome://browser/skin/bookmark.svg"); } - #toolbar-context-selectAllTabs { --menuitem-image: url("../icons/tab-multiple.svg"); } - #toolbar-context-undoCloseTab { --menuitem-image: url("../icons/undo.svg"); } - #toggle_toolbar-menubar { /* checkbox */ --menuitem-image: url("../icons/calendar-agenda.svg"); } - #toggle_PersonalToolbar { /* Also placeContext */ --menuitem-image: url("chrome://browser/skin/bookmarks-toolbar.svg"); } - menuitem.viewCustomizeToolbar { --menuitem-image: url("chrome://browser/skin/customize.svg"); } - .fullscreen-context-autohide { /* checkbox */ --menuitem-image: url("../icons/eye-tracking-off.svg"); } - #toolbar-context-menu > menuitem[data-l10n-id="full-screen-exit"] { --menuitem-image: url("chrome://browser/skin/fullscreen-exit.svg"); } - /*= Tab Mix Plus =============================================================*/ - #context_openANewTab.tabmix-newtab-menu-icon { - list-style-image: var(--menuitem-image) !important; + @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) { + #context_openANewTab.tabmix-newtab-menu-icon .menu-iconic-left { + display: none; + } + } + @supports -moz-bool-pref("userChrome.icon.menu.full") { + #tm-duplicateinWin { + --menuitem-image: url("../icons/tab-desktop-multiple-bottom.svg"); + } + #tm-mergeWindowsTab { + --menuitem-image: url("../icons/merge.svg"); + } + } + #tm-renameTab { + --menuitem-image: url("chrome://global/skin/icons/edit.svg"); } - #tm-copyTabUrl { --menuitem-image: url("../icons/link.svg"); } - + #tm-autoreloadTab_menu { + --menuitem-image: url("../icons/timer10.svg"); + } #context_reloadTabOptions { --menuitem-image: url("../icons/reload.svg"); } @@ -9926,382 +9052,330 @@ --menuitem-image: url("../icons/blank.svg"); } } - + #tm-docShell { + --menuitem-image: url("chrome://browser/skin/permissions.svg"); + } + #tm-freezeTab { + --menuitem-image: url("../icons/weather-snowflake.svg"); + } #tm-protectTab { --menuitem-image: url("../icons/shield-task.svg"); } - @supports -moz-bool-pref("userChrome.icon.menu.full") { #tm-lockTab { --menuitem-image: url("../icons/lock-closed.svg"); } } - @supports -moz-bool-pref("userChrome.icon.menu.full") { #context_bookmarkAllTabs { --menuitem-image: url("../icons/bookmark-multiple.svg"); } } - /*= contentAreaContextMenu ===================================================*/ #context-viewsource-goToLine { --menuitem-image: url("../icons/text-number-format.svg"); } - #context-viewsource-wrapLongLines { /* checkbox */ --menuitem-image: url("../icons/arrow-sort-down-lines.svg"); } - #context-viewsource-highlightSyntax { /* checkbox */ --menuitem-image: url("../icons/code.svg"); } - #spell-no-suggestions { --menuitem-image: url("../icons/text-proofing-tools.svg"); } - #spell-add-to-dictionary { --menuitem-image: url("../icons/book-add.svg"); } - #spell-undo-add-to-dictionary { --menuitem-image: url("../icons/undo.svg"); } - #context-openlinkincurrent { --menuitem-image: url("../icons/link-square.svg"); } - #context-openlinkincontainertab { --menuitem-image: url("chrome://browser/skin/new-tab.svg"); } - #context-openlinkintab { --menuitem-image: url("chrome://browser/skin/new-tab.svg"); } - #context-openlinkinusercontext-menu { --menuitem-image: url("../icons/container-openin-16.svg"); } - #context-openlink { --menuitem-image: url("chrome://browser/skin/window.svg"); } - #context-openlinkprivate { --menuitem-image: url("chrome://browser/skin/privateBrowsing.svg"); } - #context-bookmarklink { --menuitem-image: url("chrome://browser/skin/bookmark.svg"); } - #context-savelink { - --menuitem-image: url("chrome://browser/skin/save.svg"); + --menuitem-image: url("../icons/toolbarButton-download.svg"); } - #context-savelinktopocket { --menuitem-image: url("../icons/pocket-outline.svg"); } - #context-copyemail { --menuitem-image: url("chrome://browser/skin/mail.svg"); } - #context-copylink { --menuitem-image: url("../icons/link.svg"); } - #context-sendlinktodevice { --menuitem-image: url("../icons/send-to-device.svg"); } - #context-media-play { --menuitem-image: url("chrome://global/skin/media/play-fill.svg"); } - #context-media-pause { --menuitem-image: url("chrome://global/skin/media/pause-fill.svg"); } - #context-media-mute { --menuitem-image: url("chrome://global/skin/media/audio-muted.svg"); } - #context-media-unmute { --menuitem-image: url("chrome://global/skin/media/audio.svg"); } - #context-media-playbackrate { --menuitem-image: url("../icons/time-picker.svg"); } - #context-media-loop { /* checkbox */ --menuitem-image: url("../icons/arrow-repeat-all.svg"); } - #context-leave-dom-fullscreen { --menuitem-image: url("chrome://global/skin/media/fullscreenExitButton.svg"); } - #context-video-fullscreen { --menuitem-image: url("chrome://global/skin/media/fullscreenEnterButton.svg"); } - #context-media-hidecontrols { --menuitem-image: url("../icons/eye-hide.svg"); } - #context-media-showcontrols { --menuitem-image: url("../icons/eye-show.svg"); } - #context-viewvideo { --menuitem-image: url("../icons/video.svg"); } - #context-video-pictureinpicture { /* checkbox */ --menuitem-image: url("chrome://global/skin/media/picture-in-picture-open.svg"); } - #context-reloadimage { --menuitem-image: url("../icons/image-arrow-counterclockwise.svg"); } - #context-viewimage { --menuitem-image: url("../icons/image-add.svg"); } - #context-saveimage { --menuitem-image: url("../icons/image.svg"); } - #context-video-saveimage { --menuitem-image: url("../icons/video-snapshot.svg"); } - #context-savevideo { --menuitem-image: url("../icons/video.svg"); } - #context-saveaudio { --menuitem-image: url("chrome://global/skin/media/audio.svg"); } - #context-copyimage-contents { --menuitem-image: url("../icons/image-copy.svg"); } - #context-copyimage, #context-copyvideourl, #context-copyaudiourl { --menuitem-image: url("../icons/link.svg"); } - #context-sendimage, #context-sendvideo, #context-sendaudio { --menuitem-image: url("chrome://browser/skin/mail.svg"); } - #context-viewimageinfo { --menuitem-image: url("chrome://global/skin/icons/info.svg"); } - #context-viewimagedesc { --menuitem-image: url("../icons/image-alt-text.svg"); } - #context-setDesktopBackground { --menuitem-image: url("../icons/resize-image.svg"); } - #context-ctp-play { --menuitem-image: url("chrome://global/skin/icons/plugin.svg"); } - #context-ctp-hide { --menuitem-image: url("chrome://global/skin/icons/plugin-blocked.svg"); } - #context-savepage { - --menuitem-image: url("chrome://browser/skin/save.svg"); + --menuitem-image: url("../icons/toolbarButton-download.svg"); } - #context-pocket { --menuitem-image: url("../icons/pocket-outline.svg"); } - #context-sendpagetodevice { --menuitem-image: url("../icons/send-to-device.svg"); } - #fill-login { --menuitem-image: url("../icons/password.svg"); } - #fill-login-generated-password { --menuitem-image: url("chrome://browser/skin/login.svg"); } - #manage-saved-logins { --menuitem-image: url("../icons/key-multiple.svg"); } - #context-undo { --menuitem-image: url("../icons/undo.svg"); } - @supports -moz-bool-pref("userChrome.icon.menu.full") { #context-redo { --menuitem-image: url("../icons/redo.svg"); } } - #context-cut { --menuitem-image: url("chrome://browser/skin/edit-cut.svg"); } - #context-copy { --menuitem-image: url("../icons/edit-copy.svg"); } - #context-paste { --menuitem-image: url("chrome://browser/skin/edit-paste.svg"); } - #context-delete { --menuitem-image: url("chrome://global/skin/icons/delete.svg"); } - #context-selectall { --menuitem-image: url("../icons/select-all-on.svg"); } - #context-print-selection { --menuitem-image: url("chrome://global/skin/icons/print.svg"); } - #context-take-screenshot { --menuitem-image: url("chrome://browser/skin/screenshot.svg"); } - #context-keywordfield { --menuitem-image: url("chrome://browser/skin/bookmark.svg"); } - #context-searchselect, #context-searchselect-private { --menuitem-image: url("chrome://global/skin/icons/search-glass.svg"); } - #frame { --menuitem-image: url("../icons/command-frames.svg"); } - #spell-check-enabled { /* checkbox */ --menuitem-image: url("../icons/text-proofing-tools.svg"); } - #spell-add-dictionaries-main { --menuitem-image: url("../icons/book-add.svg"); } - #spell-dictionaries { --menuitem-image: url("../icons/book.svg"); } - #context-bidi-text-direction-toggle { --menuitem-image: url("../icons/text-direction-horizontal-ltr.svg"); } - #context-bidi-page-direction-toggle { --menuitem-image: url("../icons/document-landscape-split-hint.svg"); } - #context-viewpartialsource-selection, #context-viewsource { --menuitem-image: url("../icons/document-search.svg"); } - #context-inspect-a11y { --menuitem-image: url("chrome://devtools/skin/images/tool-accessibility.svg"); } - #context-inspect { --menuitem-image: url("../icons/command-pick.svg"); } - #context-media-eme-learnmore { /* iconic */ } - - @supports -moz-bool-pref("widget.macos.native-context-menus") or -moz-bool-pref("widget.gtk.native-context-menus") { + @supports -moz-bool-pref("layout.css.osx-font-smoothing.enabled") { #context-back { --menuitem-image: url("chrome://browser/skin/back.svg"); } - #context-forward { --menuitem-image: url("chrome://browser/skin/forward.svg"); } - #context-reload { --menuitem-image: url("../icons/reload.svg"); } - #context-stop { --menuitem-image: url("chrome://global/skin/icons/close.svg"); } - #context-bookmarkpage { --menuitem-image: url("chrome://browser/skin/bookmark.svg"); } } /*= Tab Mix Plus =============================================================*/ #tm-autoreload_menu { - --menuitem-image: url("../icons/reload-auto.svg"); + --menuitem-image: url("../icons/timer10.svg"); + } + #tm-linkWithhistory { + --menuitem-image: url("../icons/new-tab-skip-forward.svg"); } - #tm-openAllLinks { --menuitem-image: url("../icons/new-tab-multiple.svg"); } - + #tm-openinverselink { + --menuitem-image: url("../icons/new-tab-forward.svg"); + } + #tm-content-closetab { + --menuitem-image: url("../icons/dismiss-filled.svg"); + } + #tm-duplicateTabContext { + --menuitem-image: url("../icons/tab-copy.svg"); + } + #tm-duplicateinWinContext { + --menuitem-image: url("../icons/tab-desktop-multiple-bottom.svg"); + } + #tm-detachTabContext { + --menuitem-image: url("../icons/convert-range.svg"); + } + #tm-mergeWindows { + --menuitem-image: url("../icons/merge.svg"); + } + #tm-content-freezeTab { + --menuitem-image: url("../icons/weather-snowflake.svg"); + } + #tm-content-protectTab { + --menuitem-image: url("../icons/shield-task.svg"); + } + #tm-content-lockTab { + --menuitem-image: url("../icons/lock-closed.svg"); + } #tm-content-undoCloseTab { --menuitem-image: url("../icons/undo.svg"); } - /*= downloadsContextMenu =====================================================*/ .downloadPauseMenuItem { --menuitem-image: url("chrome://global/skin/media/pause-fill.svg"); } - .downloadResumeMenuItem { --menuitem-image: url("chrome://global/skin/media/play-fill.svg"); } - .downloadUnblockMenuItem { --menuitem-image: url("../icons/checkmark-circle.svg"); } - .downloadUseSystemDefaultMenuItem { --menuitem-image: url("chrome://browser/skin/open.svg"); } - .downloadAlwaysUseSystemDefaultMenuItem { /* checkbox */ --menuitem-image: url("../icons/folder-globe.svg"); } - .downloadAlwaysOpenSimilarFilesMenuItem { /* checkbox */ --menuitem-image: url("../icons/fluid.svg"); } - .downloadShowMenuItem { --menuitem-image: url("chrome://global/skin/icons/folder.svg"); } @@ -10310,7 +9384,6 @@ --menuitem-image: url("../icons/folder.svg"); } } - #downloadsContextMenu > menuitem.downloadOpenReferrerMenuItem, #downloadsContextMenu > menuitem[command="downloadsCmd_openReferrer"] { --menuitem-image: url("../icons/link-square.svg"); @@ -10319,85 +9392,67 @@ #downloadsContextMenu > menuitem[command="downloadsCmd_copyLocation"] { --menuitem-image: url("../icons/link.svg"); } - .downloadDeleteFileMenuItem { --menuitem-image: url("chrome://global/skin/icons/delete.svg"); } - .downloadRemoveFromHistoryMenuItem { --menuitem-image: url("../icons/eraser.svg"); } - #downloadsContextMenu > menuitem[command="downloadsCmd_clearList"], #downloadsContextMenu > menuitem[command="downloadsCmd_clearDownloads"] { --menuitem-image: url("../icons/broom.svg"); } - /*= placeContext =============================================================*/ #placesContext_open { --menuitem-image: url("../icons/link-square.svg"); } - #placesContext_openBookmarkContainer\:tabs, #placesContext_openBookmarkLinks\:tabs { --menuitem-image: url("../icons/movetowindow-16.svg"); } - #placesContext_open\:newtab, #placesContext_openContainer\:tabs, #placesContext_openLinks\:tabs { --menuitem-image: url("chrome://browser/skin/new-tab.svg"); } - #placesContext_open\:newcontainertab { --menuitem-image: url("../icons/container-openin-16.svg"); } - #placesContext_open\:newwindow { --menuitem-image: url("chrome://browser/skin/window.svg"); } - #placesContext_open\:newprivatewindow { --menuitem-image: url("chrome://browser/skin/privateBrowsing.svg"); } - #placesContext_show_bookmark\:info, #placesContext_show\:info, #placesContext_show_folder\:info { --menuitem-image: url("chrome://global/skin/icons/edit.svg"); } - #placesContext_deleteBookmark, #placesContext_deleteFolder, #placesContext_delete, #placesContext_delete_history { --menuitem-image: url("chrome://global/skin/icons/delete.svg"); } - #placesContext_deleteHost { --menuitem-image: url("../icons/eye-hide.svg"); } - #placesContext_sortBy\:name { --menuitem-image: url("../icons/text-sort-ascending.svg"); } - #placesContext_cut { --menuitem-image: url("chrome://browser/skin/edit-cut.svg"); } - #placesContext_copy { --menuitem-image: url("../icons/edit-copy.svg"); } - #placesContext_paste_group { --menuitem-image: url("chrome://browser/skin/edit-paste.svg"); } - #placesContext_new\:bookmark { --menuitem-image: url("chrome://browser/skin/bookmark.svg"); } - #placesContext_showInFolder, #placesContext_new\:folder { --menuitem-image: url("chrome://global/skin/icons/folder.svg"); @@ -10408,61 +9463,58 @@ --menuitem-image: url("../icons/folder.svg"); } } - #placesContext_new\:separator { --menuitem-image: url("../icons/vertical-line.svg"); } - #placesContext_paste { --menuitem-image: url("chrome://browser/skin/edit-paste.svg"); } - #placesContext_createBookmark { --menuitem-image: url("chrome://browser/skin/bookmark.svg"); } - #show-other-bookmarks_PersonalToolbar { /* checkbox */ --menuitem-image: url("../icons/star-line-horizontal.svg"); } - #placesContext_showAllBookmarks { --menuitem-image: url("chrome://browser/skin/bookmark-star-on-tray.svg"); } - .openintabs-menuitem { --menuitem-image: url("../icons/movetowindow-16.svg"); } - + /*= Notification =============================================================*/ + #doNotDisturbMenuItem { + --menuitem-image: url(chrome://global/skin/media/pause-fill.svg); + } + #disableForOriginMenuItem { + --menuitem-image: url("chrome://global/skin/icons/blocked.svg"); + } + #openSettingsMenuItem { + --menuitem-image: url("chrome://global/skin/icons/settings.svg"); + } /*= blockedPopupOptions ======================================================*/ #blockedPopupAllowSite { --menuitem-image: url("chrome://global/skin/icons/check.svg"); } - #blockedPopupOptions > menuitem[oncommand="gPopupBlockerObserver.editPopupSettings();"] { --menuitem-image: url("chrome://global/skin/icons/edit.svg"); } - #blockedPopupDontShowMessage { /* checkbox */ --menuitem-image: url("chrome://global/skin/icons/blocked.svg"); } - /*= autohide-context =========================================================*/ #autohide-context > menuitem[data-l10n-id="full-screen-autohide"] { /* checkbox */ --menuitem-image: url("../icons/eye-tracking-off.svg"); } - #autohide-context > menuitem[data-l10n-id="full-screen-exit"] { --menuitem-image: url("chrome://browser/skin/fullscreen-exit.svg"); } - /*= pictureInPictureToggleContextMenu ========================================*/ #pictureInPictureToggleContextMenu > menuitem[oncommand="PictureInPicture.hideToggle();"] { --menuitem-image: url("../icons/eye-hide.svg"); } - /*= pageActionContextMenu ====================================================*/ .pageActionContextMenuItem.extensionPinned.extensionUnpinned.manageExtensionItem { --menuitem-image: url("chrome://global/skin/icons/settings.svg"); @@ -10470,182 +9522,142 @@ .pageActionContextMenuItem.extensionPinned.extensionUnpinned .removeExtensionItem { --menuitem-image: url("chrome://global/skin/icons/delete.svg"); } - /*= customizationPanelItemContextMenu ========================================*/ #customizationPanelItemContextMenuUnpin { --menuitem-image: url("../icons/unpin-tab.svg"); } - .customize-context-removeFromPanel { --menuitem-image: url("chrome://global/skin/icons/delete.svg"); } - /*= customizationPaletteItemContextMenu ======================================*/ .customize-context-addToToolbar { --menuitem-image: url("chrome://devtools/skin/images/dock-bottom.svg"); } - .customize-context-addToPanel { --menuitem-image: url("chrome://browser/skin/menu.svg"); } - /*= customizationPanelContextMenu ============================================*/ #customizationPanelContextMenu > menuitem[command="cmd_CustomizeToolbars"] { --menuitem-image: url("chrome://browser/skin/customize.svg"); } - /*= downloads-button-autohide-panel ==========================================*/ #downloads-button-autohide-checkbox { /* checkbox */ --menuitem-image: url("../icons/eye-tracking-off.svg"); } - /*= SyncedTabsSidebarContext =================================================*/ #syncedTabsOpenSelected { --menuitem-image: url("../icons/link-square.svg"); } - #syncedTabsOpenSelectedInTab { --menuitem-image: url("chrome://browser/skin/new-tab.svg"); } - #syncedTabsOpenSelectedInWindow { --menuitem-image: url("chrome://browser/skin/window.svg"); } - #syncedTabsOpenSelectedInPrivateWindow { --menuitem-image: url("chrome://browser/skin/privateBrowsing.svg"); } - #syncedTabsBookmarkSelected { --menuitem-image: url("chrome://browser/skin/bookmark.svg"); } - #syncedTabsCopySelected { --menuitem-image: url("../icons/link.svg"); } - #syncedTabsOpenAllInTabs { --menuitem-image: url("../icons/movetowindow-16.svg"); } - #syncedTabsManageDevices { --menuitem-image: url("chrome://global/skin/icons/settings.svg"); } - #syncedTabsRefresh { --menuitem-image: url("chrome://browser/skin/sync.svg"); } - /*= SyncedTabsSidebarTabsFilterContext =======================================*/ #SyncedTabsSidebarTabsFilterContext > menuitem[cmd="cmd_undo"] { --menuitem-image: url("../icons/undo.svg"); } - #SyncedTabsSidebarTabsFilterContext > menuitem[cmd="cmd_cut"] { --menuitem-image: url("chrome://browser/skin/edit-cut.svg"); } - #SyncedTabsSidebarTabsFilterContext > menuitem[cmd="cmd_copy"] { --menuitem-image: url("../icons/edit-copy.svg"); } - #SyncedTabsSidebarTabsFilterContext > menuitem[cmd="cmd_paste"] { --menuitem-image: url("chrome://browser/skin/edit-paste.svg"); } - #SyncedTabsSidebarTabsFilterContext > menuitem[cmd="cmd_delete"] { --menuitem-image: url("chrome://global/skin/icons/delete.svg"); } - #SyncedTabsSidebarTabsFilterContext > menuitem[cmd="cmd_selectAll"] { --menuitem-image: url("../icons/select-all-on.svg"); } - #syncedTabsRefreshFilter { --menuitem-image: url("chrome://browser/skin/sync.svg"); } - /*= urlbar-input-container ===================================================*/ #urlbar-input-container .textbox-contextmenu menuitem[cmd="cmd_undo"] { --menuitem-image: url("../icons/undo.svg"); } - @supports -moz-bool-pref("userChrome.icon.menu.full") { #urlbar-input-container .textbox-contextmenu menuitem[cmd="cmd_redo"] { --menuitem-image: url("../icons/redo.svg"); } } - #urlbar-input-container .textbox-contextmenu menuitem[cmd="cmd_cut"] { --menuitem-image: url("chrome://browser/skin/edit-cut.svg"); } - #urlbar-input-container .textbox-contextmenu menuitem[cmd="cmd_copy"] { --menuitem-image: url("../icons/edit-copy.svg"); } - #urlbar-input-container .textbox-contextmenu menuitem[cmd="cmd_paste"] { --menuitem-image: url("chrome://browser/skin/edit-paste.svg"); } - @supports -moz-bool-pref("userChrome.icon.menu.full") { #paste-and-go { --menuitem-image: url("../icons/edit-paste-go.svg"); } } - #urlbar-input-container .textbox-contextmenu menuitem[cmd="cmd_delete"] { --menuitem-image: url("chrome://global/skin/icons/delete.svg"); } - #urlbar-input-container .textbox-contextmenu menuitem[cmd="cmd_selectAll"] { --menuitem-image: url("../icons/select-all-on.svg"); } - /*= textbox-contextmenu ======================================================*/ /* Browser's Searchbar, Library's Searchbar, Page Info */ .textbox-contextmenu > menuitem[data-l10n-id="text-action-undo"] { --menuitem-image: url("../icons/undo.svg"); } - @supports -moz-bool-pref("userChrome.icon.menu.full") { .textbox-contextmenu > menuitem[data-l10n-id="text-action-redo"] { --menuitem-image: url("../icons/redo.svg"); } } - .textbox-contextmenu > menuitem[data-l10n-id="text-action-cut"] { --menuitem-image: url("chrome://browser/skin/edit-cut.svg"); } - .textbox-contextmenu > menuitem[data-l10n-id="text-action-copy"] { --menuitem-image: url("../icons/edit-copy.svg"); } - .textbox-contextmenu > menuitem[data-l10n-id="text-action-paste"] { --menuitem-image: url("chrome://browser/skin/edit-paste.svg"); } - .textbox-contextmenu > menuitem[data-l10n-id="text-action-delete"] { --menuitem-image: url("chrome://global/skin/icons/delete.svg"); } - .textbox-contextmenu > menuitem[data-l10n-id="text-action-select-all"] { --menuitem-image: url("../icons/select-all-on.svg"); } - /* Only searchbar */ @supports -moz-bool-pref("userChrome.icon.menu.full") { menuitem.searchbar-paste-and-search { --menuitem-image: url("../icons/edit-paste-search.svg"); } } - menuitem.searchbar-clear-history { --menuitem-image: url("chrome://browser/skin/forget.svg"); } - /*= context_sendTabToDevicePopupMenu =========================================*/ .sync-menuitem.sendtab-target[clientType="phone"] { --menuitem-image: url("chrome://browser/skin/device-phone.svg"); @@ -10668,37 +9680,40 @@ .sync-menuitem.sendtab-target:not([clientType]) { --menuitem-image: url("chrome://global/skin/icons/settings.svg"); } - #treestyletab_piro_sakura_ne_jp-menuitem-_context_sendTabsToDevice\:manage { --menuitem-image: url("chrome://global/skin/icons/settings.svg"); } + /*= unified-extensions-context-menu ==========================================*/ + .unified-extensions-context-menu-manage-extension { + --menuitem-image: url("chrome://global/skin/icons/settings.svg"); + } + .unified-extensions-context-menu-remove-extension { + --menuitem-image: url("chrome://global/skin/icons/delete.svg"); + } + .unified-extensions-context-menu-report-extension { + --menuitem-image: url("../icons/send.svg"); + } } @supports -moz-bool-pref("userChrome.icon.global_menubar") { /*= main-menubar =============================================================*/ #file-menu { --menuitem-image: url("../icons/mail-inbox-all.svg"); } - #edit-menu { --menuitem-image: url("chrome://global/skin/icons/edit.svg"); } - #view-menu { --menuitem-image: url("../icons/content-view.svg"); } - #history-menu { --menuitem-image: url("chrome://browser/skin/history.svg"); } - #bookmarksMenu { --menuitem-image: url("chrome://browser/skin/bookmark.svg"); } - #tools-menu { --menuitem-image: url("../icons/toolbox.svg"); } - #helpMenu { --menuitem-image: url("chrome://global/skin/icons/help.svg"); } @@ -10709,290 +9724,223 @@ #menu_newNavigatorTab { --menuitem-image: url("chrome://browser/skin/new-tab.svg"); } - #menu_newUserContext { --menuitem-image: url("../icons/container-openin-16.svg"); } - #menu_newNavigator { --menuitem-image: url("chrome://browser/skin/window.svg"); } - #menu_newPrivateWindow { --menuitem-image: url("chrome://browser/skin/privateBrowsing.svg"); } - #menu_openFile { --menuitem-image: url("chrome://browser/skin/open.svg"); } - #menu_savePage { - --menuitem-image: url("chrome://browser/skin/save.svg"); + --menuitem-image: url("../icons/toolbarButton-download.svg"); } - #menu_sendLink { --menuitem-image: url("chrome://browser/skin/mail.svg"); } - menu.share-tab-url-item { --menuitem-image: url("chrome://browser/skin/share.svg"); } - #menu_print { --menuitem-image: url("chrome://global/skin/icons/print.svg"); } - #menu_importFromAnotherBrowser { --menuitem-image: url("chrome://browser/skin/import.svg"); } - #goOfflineMenuitem { /* checkbox */ --menuitem-image: url("../icons/plug-disconnected.svg"); } - #menu_FileQuitItem { --menuitem-image: url("../icons/quit.svg"); } - /* Mange Containers */ #menu_newUserContext menupopup menuitem:last-child { --menuitem-image: url("chrome://global/skin/icons/settings.svg"); } - /*= menu_EditPopup ===========================================================*/ #menu_undo { --menuitem-image: url("../icons/undo.svg"); } - @supports -moz-bool-pref("userChrome.icon.menu.full") { #menu_redo { --menuitem-image: url("../icons/redo.svg"); } } - #menu_cut { --menuitem-image: url("chrome://browser/skin/edit-cut.svg"); } - #menu_copy { --menuitem-image: url("../icons/edit-copy.svg"); } - #menu_paste { --menuitem-image: url("chrome://browser/skin/edit-paste.svg"); } - #menu_delete { --menuitem-image: url("chrome://global/skin/icons/delete.svg"); } - #menu_selectAll { --menuitem-image: url("../icons/select-all-on.svg"); } - #menu_find { --menuitem-image: url("chrome://global/skin/icons/search-glass.svg"); } - #menu_preferences { --menuitem-image: url("chrome://global/skin/icons/settings.svg"); } - /*= menu_viewPopup ===========================================================*/ #viewToolbarsMenu { --menuitem-image: url("../icons/toolbar.svg"); } - #viewSidebarMenuMenu { --menuitem-image: url("chrome://browser/skin/sidebars.svg"); } - #viewFullZoomMenu { --menuitem-image: url("../icons/screenshot.svg"); } - #pageStyleMenu { --menuitem-image: url("../icons/document-css.svg"); } - #repair-text-encoding { --menuitem-image: url("chrome://browser/skin/characterEncoding.svg"); } - #enterFullScreenItem { --menuitem-image: url("chrome://browser/skin/fullscreen.svg"); } - #exitFullScreenItem { --menuitem-image: url("chrome://browser/skin/fullscreen-exit.svg"); } - #fullScreenItem { /* checkbox */ --menuitem-image: url("chrome://browser/skin/fullscreen.svg"); } - #menu_readerModeItem { --menuitem-image: url("chrome://browser/skin/reader-mode.svg"); } - #menu_showAllTabs { --menuitem-image: url("../icons/tab.svg"); } - #documentDirection-swap { --menuitem-image: url("../icons/text-direction-horizontal-ltr.svg"); } - /* view-menu-popup sub menu */ #menu_customizeToolbars { --menuitem-image: url("chrome://browser/skin/customize.svg"); } - /* viewFullZoomMenu sub menu */ #menu_zoomEnlarge { --menuitem-image: url("chrome://browser/skin/add-circle-fill.svg"); } - #menu_zoomReduce { --menuitem-image: url("chrome://browser/skin/subtract-circle-fill.svg"); } - #menu_zoomReset { --menuitem-image: url("../icons/resize.svg"); } - #toggle_zoom { --menuitem-image: url("../icons/screenshot.svg"); } - /*= goPopup ==================================================================*/ #menu_showAllHistory { --menuitem-image: url("chrome://browser/skin/history.svg"); } - #sanitizeItem { --menuitem-image: url("chrome://browser/skin/forget.svg"); } - #sync-tabs-menuitem { --menuitem-image: url("chrome://browser/skin/sync.svg"); } - #historyRestoreLastSession { --menuitem-image: url("../icons/restore-session.svg"); } - #hiddenTabsMenu { --menuitem-image: url("../icons/eye-hide.svg"); } - #historyUndoMenu { --menuitem-image: url("chrome://browser/skin/tab.svg"); } - #historyUndoWindowMenu { --menuitem-image: url("chrome://browser/skin/window.svg"); } - /* sub menu */ #historyUndoPopup .restoreallitem { --menuitem-image: url("../icons/movetowindow-16.svg"); } - #historyUndoWindowPopup .restoreallitem { --menuitem-image: url("../icons/restore-session.svg"); } - /*= bookmarksMenuPopup =======================================================*/ #bookmarksShowAll { --menuitem-image: url("chrome://browser/skin/bookmark-star-on-tray.svg"); } - #menu_bookmarkThisPage, #menu_bookmarkAllTabs { --menuitem-image: url("chrome://browser/skin/bookmark-hollow.svg"); } - #menu_bookmarkThisPage[data-l10n-id="menu-bookmark-edit"] { --menuitem-image: url("chrome://browser/skin/bookmark.svg"); } - /*= menu_ToolsPopup ==========================================================*/ #menu_openDownloads { --menuitem-image: url("chrome://browser/skin/downloads/downloads.svg"); } - #menu_openAddons { --menuitem-image: url("chrome://mozapps/skin/extensions/extension.svg"); } - #sync-setup { --menuitem-image: url("chrome://browser/skin/fxa/avatar-empty.svg"); } - #sync-syncnowitem { --menuitem-image: url("chrome://browser/skin/sync.svg"); } - #menu_openFirefoxView { --menuitem-image: url("chrome://branding/content/icon32.png"); } - #webDeveloperMenu, #browserToolsMenu { --menuitem-image: url("../icons/developer.svg"); } - #menu_pageInfo { --menuitem-image: url("../icons/document-endnote.svg"); } - /* menuWebDeveloperPopup sub menu */ #menu_devToolbox { /* checkbox */ --menuitem-image: url("../icons/developer.svg"); } - #menu_taskManager { --menuitem-image: url("../icons/performance.svg"); } - #menu_devtools_remotedebugging { --menuitem-image: url("../icons/bug.svg"); } - #menu_browserToolbox { --menuitem-image: url("../icons/window-dev-tools.svg"); } - #menu_browserContentToolbox { --menuitem-image: url("../icons/command-frames.svg"); } - #menu_browserConsole { --menuitem-image: url("chrome://devtools/skin/images/command-console.svg"); } - #menu_responsiveUI { /* checkbox */ --menuitem-image: url("../icons/command-responsivemode.svg"); } - #menu_eyedropper { /* checkbox */ --menuitem-image: url("chrome://devtools/skin/images/command-eyedropper.svg"); } - #menu_pageSource { --menuitem-image: url("../icons/document-search.svg"); } - #extensionsForDevelopers { --menuitem-image: url("chrome://devtools/skin/images/debugging-addons.svg"); } - /*= windowPopup ==============================================================*/ #windowPopup > menuitem[command="minimizeWindow"] { --menuitem-image: url("../icons/arrow-between-down.svg"); @@ -11000,45 +9948,34 @@ #windowPopup > menuitem[command="zoomWindow"] { --menuitem-image: url("../icons/auto-fit-width.svg"); } - /*= menu_HelpPopup ===========================================================*/ #menu_openHelp { --menuitem-image: url("chrome://global/skin/icons/help.svg"); } - #feedbackPage { --menuitem-image: url("../icons/send.svg"); } - #helpSafeMode { --menuitem-image: url("chrome://devtools/skin/images/debugging-workers.svg"); } - #troubleShooting { --menuitem-image: url("chrome://global/skin/icons/more.svg"); } - #help_reportSiteIssue { --menuitem-image: url("chrome://global/skin/icons/lightbulb.svg"); } - #menu_HelpPopup_reportPhishingtoolmenu { --menuitem-image: url("chrome://global/skin/icons/warning.svg"); } - #aboutName { --menuitem-image: url("chrome://global/skin/icons/info.svg"); } } - } - /** Library Menu **************************************************************/ - @supports -moz-bool-pref("userChrome.icon.library") { - @supports -moz-bool-pref("userChrome.icon.menu") { + @supports -moz-bool-pref("userChrome.icon.library") { /*= organizeButtonPopup ======================================================*/ #newbookmark { --menuitem-image: url("chrome://browser/skin/bookmark.svg"); } - #newfolder { --menuitem-image: url("chrome://global/skin/icons/folder.svg"); } @@ -11047,61 +9984,47 @@ --menuitem-image: url("../icons/folder.svg"); } } - #newseparator { --menuitem-image: url("../icons/vertical-line.svg"); } - #orgUndo { --menuitem-image: url("../icons/undo.svg"); } - #orgCut { --menuitem-image: url("chrome://browser/skin/edit-cut.svg"); } - #orgCopy { --menuitem-image: url("../icons/edit-copy.svg"); } - #orgPaste { --menuitem-image: url("chrome://browser/skin/edit-paste.svg"); } - #orgDelete { --menuitem-image: url("chrome://global/skin/icons/delete.svg"); } - #orgSelectAll { --menuitem-image: url("../icons/select-all-on.svg"); } - #orgClose { --menuitem-image: url("chrome://global/skin/icons/close.svg"); } - /*= viewMenuPopup ============================================================*/ #viewColumns { --menuitem-image: url("chrome://global/skin/icons/columnpicker.svg"); } - #viewSort { --menuitem-image: url("../icons/text-sort-ascending.svg"); } - /*= maintenanceButtonPopup ===================================================*/ #backupBookmarks { --menuitem-image: url("chrome://devtools/skin/images/datastore.svg"); } - #fileImport { - --menuitem-image: url("chrome://browser/skin/save.svg"); + --menuitem-image: url("../icons/toolbarButton-download.svg"); } - #fileExport { --menuitem-image: url("chrome://browser/skin/open.svg"); } - #browserImport { --menuitem-image: url("chrome://browser/skin/import.svg"); } @@ -11117,7 +10040,6 @@ #menu_FileRestartItem { --menuitem-image: url("../icons/refresh-cw.svg"); } - menuitem.privatetab-icon { --menuitem-image: url("../icons/private-favicon.svg"); } @@ -11127,11 +10049,9 @@ #appMenuNewIdentity { list-style-image: url("chrome://browser/skin/new_identity.svg"); } - #appMenuNewCircuit { list-style-image: url("chrome://browser/skin/new_circuit.svg"); } - #appMenu_torBrowserUserManual { list-style-image: url("chrome://browser/skin/onion.svg"); } @@ -11140,11 +10060,9 @@ #menu_newIdentity { --menuitem-image: url("chrome://browser/skin/new_identity.svg"); } - #menu_newCircuit { --menuitem-image: url("chrome://browser/skin/new_circuit.svg"); } - #torBrowserUserManual { --menuitem-image: url("chrome://browser/skin/onion.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 d42e866b..18ebc630 100644 --- a/arch-config/.mozilla/firefox/default-release/chrome/css/leptonContent.css +++ b/arch-config/.mozilla/firefox/default-release/chrome/css/leptonContent.css @@ -4,35 +4,24 @@ /* Control Bar Size */ @supports -moz-bool-pref("userContent.player.size") { #controlsContainer { - --controlBar-height: 40px; - /* Original: 40px, Replace to this value */ + --controlBar-height: 40px; /* Original: 40px, Replace to this value */ } #controlsContainer .touch { - --button-size: 48px !important; - /* Original: 40px */ - --controlBar-height: 52px; - /* Original: 52px */ + --button-size: 48px !important; /* Original: 40px */ + --controlBar-height: 52px; /* Original: 52px */ } #controlsContainer .controlBar { - height: var(--controlBar-height) !important; - /* Original: 40px */ + height: var(--controlBar-height) !important; /* Original: 40px */ } - .videocontrols[inDOMFullscreen] #controlsContainer { - --button-size: 64px !important; - /* Original: 30px */ - --track-size: 6px !important; - /* Original: 5px, Touch: 7px */ - --thumb-size: 15px !important; - /* Original: 13px, Touch: 16px */ - --controlBar-height: 64px; - /* Original: 40px */ + --button-size: 64px !important; /* Original: 30px */ + --track-size: 6px !important; /* Original: 5px, Touch: 7px */ + --thumb-size: 15px !important; /* Original: 13px, Touch: 16px */ + --controlBar-height: 64px; /* Original: 40px */ } .videocontrols[inDOMFullscreen] #controlsContainer .touch { - --button-size: 72px !important; - /* Original: 40px */ - --controlBar-height: 64px; - /* Original: 52px */ + --button-size: 72px !important; /* Original: 40px */ + --controlBar-height: 64px; /* Original: 52px */ } .videocontrols[inDOMFullscreen] #controlsContainer .controlBar { padding-bottom: 8px !important; @@ -41,10 +30,8 @@ /* Control Bar UI */ @supports -moz-bool-pref("userContent.player.ui") { audio { - --duration-color: #929292; - /* Like Original */ - --media-background: rgba(26, 26, 26, 0.8); - /* Like Original */ + --duration-color: #929292; /* Like Original */ + --media-background: rgba(26, 26, 26, 0.8); /* Like Original */ border-radius: 8px; --box-shadow1: rgba(14, 13, 26, 0.12); --box-shadow2: rgba(7, 48, 114, 0.12); @@ -59,28 +46,22 @@ --box-shadow3: rgba(82, 82, 94, 0.04); } } - video { --duration-color: #eee; --media-background: linear-gradient(transparent, rgba(26, 26, 26, 0.85)); } @media (prefers-contrast) { video { - --duration-color: #929292; - /* Like Original */ - --media-background: rgba(26, 26, 26, 0.8); - /* Like Original */ + --duration-color: #929292; /* Like Original */ + --media-background: rgba(26, 26, 26, 0.8); /* Like Original */ } } - #controlsContainer .controlBar { background: var(--media-background) !important; } #controlsContainer .duration { - color: var(--duration-color) !important; - /* Original: #929292 */ + color: var(--duration-color) !important; /* Original: #929292 */ } - @supports -moz-bool-pref("userContent.player.ui.twoline") { audio { /* #controlsContainer .controlBar */ @@ -103,20 +84,17 @@ /* Others */ --button-outside-margin: 0; } - video { /* #scrubber .scrubber::-moz-range-thumb */ --scrubber-thumb-scale: 0; - --scrubber-thumb-color: #48a0f7; - /* Color as hover, Prevent flashing */ + --scrubber-thumb-color: #48a0f7; /* Color as hover, Prevent flashing */ /* .progressBar::-moz-progress-bar */ --progressBar-scale: 0.65; /* #controlsContainer .controlBar */ --controlBar-flex-wrap: wrap; --controlBar-justify-content: space-between; --controlBar-align-content: space-around; - --controlBar-padding-inline: 0 !important; - /* Original: 9px */ + --controlBar-padding-inline: 0 !important; /* Original: 9px */ /* #controlsContainer .scrubberStack */ /* .scrubberStack - Vertical */ --scrubberStack-order: -1; @@ -132,29 +110,24 @@ --duration-color: #dadada; --button-outside-margin: 9px; } - .scrubber:not(:hover)::-moz-range-thumb { transform: scale(var(--scrubber-thumb-scale, 1)); background-color: var(--scrubber-thumb-color, currentColor) !important; } - .progressStack { transform-origin: bottom; transform: scaleY(var(--progressBar-scale, 1)); } - .scrubber:hover::-moz-range-thumb, .progressContainer:hover .progressStack { transform: scale(1); } - #controlsContainer .controlBar { flex-wrap: var(--controlBar-flex-wrap); justify-content: var(--controlBar-justify-content); align-content: var(--controlBar-align-content); height: calc(var(--controlBar-height) + var(--controlBar-twoline-more-height, var(--thumb-size))) !important; - padding-inline: var(--controlBar-padding-inline) !important; - /* Original: 9px */ + padding-inline: var(--controlBar-padding-inline) !important; /* Original: 9px */ } #controlsContainer .scrubberStack { /* Vertical */ @@ -171,11 +144,9 @@ margin-left: var(--positionDurationBox-margin-left); text-align: var(--positionDurationBox-text-align) !important; } - #playButton { margin-left: var(--button-outside-margin) !important; } - #fullscreenButton { margin-right: var(--button-outside-margin) !important; } @@ -206,8 +177,7 @@ } #controlsContainer .controlsSpacerStack:hover > .clickToPlay:hover { opacity: 1 !important; - fill: #48a0f7 !important; - /* color as .scrubber */ + fill: #48a0f7 !important; /* color as .scrubber */ } } /* Animation */ @@ -229,13 +199,11 @@ opacity: 0.55; transition: opacity 150ms ease 50ms; } - /* Two line Control Bar */ .scrubber::-moz-range-thumb, .progressStack { transition: transform 0.1s cubic-bezier(0, 0, 0.2, 1); } - /* Click to play */ #controlsContainer .clickToPlay { transition: opacity 150ms ease-in-out, fill 150ms ease-in-out; @@ -253,10 +221,13 @@ body[style*="--newtab-background-color: rgba(43, 42, 51, 1);"], body[style*="--newtab-background-color: rgb(43, 42, 51);"] { /* inner */ - --newtab-focus-border: rgba(0, 221, 255, 0.5) !important; - /* Original: #B5D3FF, Better color-mix(in srgb, #B5D3FF 70%, transparent) */ - --newtab-focus-border-selected: var(--newtab-focus-border) !important; - /* Original: #B5D3FF */ + --newtab-focus-border: rgba( + 0, + 221, + 255, + 0.5 + ) !important; /* Original: #B5D3FF, Better color-mix(in srgb, #B5D3FF 70%, transparent) */ + --newtab-focus-border-selected: var(--newtab-focus-border) !important; /* Original: #B5D3FF */ /* For Nightly */ --newtab-primary-action-background: var(--newtab-focus-border) !important; } @@ -271,57 +242,46 @@ } } } - } - /** Activity Stream - Menu Icons ********************************************/ + } /** Activity Stream - Menu Icons ********************************************/ @supports -moz-bool-pref("userChrome.icon.context_menu") { .context-menu-list .context-menu-item button { padding-inline-start: 0 !important; } - .context-menu-list .context-menu-item button span { /* Color */ - -moz-context-properties: fill, fill-opacity !important; + -moz-context-properties: fill, fill-opacity, stroke !important; fill: currentColor !important; /* Layout */ background-size: 16px !important; background-repeat: no-repeat !important; background-image: var(--menuitem-image); - padding-inline-start: 24px; - /* 16p + (4px * 2) */ + padding-inline-start: 24px; /* 16p + (4px * 2) */ background-position: var(--uc-menu-background-position, left) 4px center; } .context-menu-list .context-menu-item button span:dir(rtl) { --uc-menu-background-position: right; } - .context-menu-item span[data-l10n-id="newtab-menu-pin"] { --menuitem-image: url("../icons/pin-tab.svg"); } - .context-menu-item span[data-l10n-id="newtab-menu-unpin"] { --menuitem-image: url("../icons/unpin-tab.svg"); } - .context-menu-item span[data-l10n-id="newtab-menu-edit-topsites"] { --menuitem-image: url("chrome://global/skin/icons/edit.svg"); } - .context-menu-item span[data-l10n-id="newtab-menu-bookmark"] { --menuitem-image: url("chrome://browser/skin/bookmark.svg"); } - .context-menu-item span[data-l10n-id="newtab-menu-remove-bookmark"] { --menuitem-image: url("chrome://browser/skin/bookmark-hollow.svg"); } - .context-menu-item span[data-l10n-id="newtab-menu-save-to-pocket"] { --menuitem-image: url("../icons/pocket-outline.svg"); } - .context-menu-item span[data-l10n-id="newtab-menu-open-file"] { --menuitem-image: url("../icons/fluid.svg"); } - .context-menu-item span[data-l10n-id="newtab-menu-show-file"] { --menuitem-image: url("chrome://global/skin/icons/folder.svg"); } @@ -330,19 +290,15 @@ --menuitem-image: url("../icons/folder.svg"); } } - .context-menu-item span[data-l10n-id="newtab-menu-open-new-window"] { --menuitem-image: url("chrome://browser/skin/window.svg"); } - .context-menu-item span[data-l10n-id="newtab-menu-open-new-private-window"] { --menuitem-image: url("chrome://browser/skin/privateBrowsing.svg"); } - .context-menu-item span[data-l10n-id="newtab-menu-dismiss"] { --menuitem-image: url("chrome://global/skin/icons/delete.svg"); } - .context-menu-item span[data-l10n-id="newtab-menu-delete-history"] { --menuitem-image: url("../icons/eraser.svg"); } @@ -353,10 +309,8 @@ overflow: hidden; } .top-site-outer .tile .icon-wrapper { - width: 100% !important; - /* Original: 48px */ - height: 100% !important; - /* Original: 48px */ + width: 100% !important; /* Original: 48px */ + height: 100% !important; /* Original: 48px */ } } /** Activity Stream - Animate ***********************************************/ @@ -365,7 +319,6 @@ :root { --animation-easing-function: cubic-bezier(0.07, 0.95, 0, 1); } - /* Background */ .top-site-outer, #searchSubmit, @@ -379,18 +332,15 @@ button.close-button:hover { transition: background 0.5s var(--animation-easing-function); } - /* Search Bar */ .search-inner-wrapper input { transition: 1s var(--animation-easing-function); transition-property: border-color, box-shadow; } - .search-wrapper .search-inner-wrapper:active input, .search-wrapper input:focus { transition: border-color 0.5s var(--animation-easing-function), box-shadow 1s var(--animation-easing-function); } - @supports -moz-bool-pref("userContent.page.field_border") { .search-wrapper .search-inner-wrapper:hover input { border-color: var(--newtab-primary-action-background) !important; @@ -408,7 +358,6 @@ .body-wrapper.on > .discovery-stream.ds-layout { flex-basis: 100%; } - .body-wrapper.on > .collapsible-section[data-section-id="topstories"], .home-section > #pocket-section, .home-section > .divider, @@ -417,11 +366,10 @@ } } /** Activity Stream - Home Search Bar looks like proton *********************/ - @supports -moz-bool-pref("userContent.newTab.animate") { + @supports -moz-bool-pref("userContent.newTab.searchbar") { /* Dropdown Colors */ #root { - --newtab-search-background-color: rgba(255, 255, 255, 1); - /* Same as light theme's --panel-background */ + --newtab-search-background-color: rgba(255, 255, 255, 1); /* Same as light theme's --panel-background */ /* Set search dropdown background */ --newtab-search-dropdown-header-color: var(--newtab-search-background-color) !important; --newtab-search-dropdown-color: var(--newtab-search-background-color) !important; @@ -430,22 +378,18 @@ @media (-moz-toolbar-prefers-color-scheme: dark), (prefers-color-scheme: dark) { #root { /* Default Dark Mode */ - --newtab-search-background-color: rgba(66, 65, 77, 1); - /* Same as dark theme's --panel-background */ + --newtab-search-background-color: rgba(66, 65, 77, 1); /* Same as dark theme's --panel-background */ } } - .activity-stream[lwt-sidebar]:not([style*="--newtab-background-color: rgba(43, 42, 51, 1);"]) #root { /* Light weight theme */ --newtab-search-background-color: var(--lwt-sidebar-background-color); } - /* Padding */ #searchSuggestionTable { border-radius: 4px !important; -moz-window-shadow: cliprounded; } - .contentSearchSuggestionTable .contentSearchOneOffItem { width: 32px !important; height: 32px !important; @@ -455,12 +399,9 @@ margin-inline-end: 8px !important; /* Border */ border-radius: 4px !important; - border-image: none !important; - /* Original: linear-gradient(transparent 18%, var(--newtab-border-secondary-color) 18%, var(--newtab-border-secondary-color) 82%, transparent 82%) 1; */ - border-inline-end: none !important; - /* Original: 1px solid; */ + border-image: none !important; /* Original: linear-gradient(transparent 18%, var(--newtab-border-secondary-color) 18%, var(--newtab-border-secondary-color) 82%, transparent 82%) 1; */ + border-inline-end: none !important; /* Original: 1px solid; */ } - #contentSearchSettingsButton::before { content: url("chrome://global/skin/icons/settings.svg") !important; display: -moz-inline-box; @@ -471,13 +412,11 @@ margin-inline-end: 5px; vertical-align: -25%; } - /* Pointer */ .contentSearchSuggestionTable .contentSearchOneOffItem, #contentSearchSettingsButton { cursor: pointer; } - /*- Fix Color For Nightly ------------------------------------------------*/ .contentSearchSuggestionTable, .contentSearchHeaderRow, @@ -486,7 +425,6 @@ color: var(--newtab-text-primary-color) !important; background: var(--newtab-search-background-color) !important; } - .contentSearchSuggestionTable .contentSearchSuggestionRow.selected, .contentSearchSuggestionTable .contentSearchSettingsButton:hover { color: var(--newtab-text-primary-color) !important; @@ -513,30 +451,26 @@ { /* Illustrations Position */ #errorPageContainer, + .neterror > .container, .description-wrapper { min-height: 300px; background-position: left center; background-repeat: no-repeat; background-size: 38%; + background-image: var(--uc-error-llustration); } - #errorPageContainer { display: flex; flex-direction: column; } - .description-wrapper { padding-inline-start: 38%; } - /* Container */ .container { - min-width: var(--in-content-container-min-width); - /* 13em */ - max-width: var(--in-content-container-max-width); - /* 52em */ + min-width: var(--in-content-container-min-width); /* 13em */ + max-width: var(--in-content-container-max-width); /* 52em */ } - /* Text Position */ #text-container { margin: auto; @@ -545,36 +479,41 @@ } @-moz-document url-prefix("about:neterror?e=connectionFailure"), url-prefix("about:neterror?e=netInterrupt"), - url-prefix("about:neterror?e=netTimeout"), 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") { - #errorPageContainer { - background-image: url("../icons/error-connection-failure.svg"); + :root { + --uc-error-llustration: url(../icons/error-connection-failure.svg); } } @-moz-document url-prefix("about:neterror?e=dnsNotFound") { - #errorPageContainer { - background-image: url("../icons/error-server-not-found.svg"); + :root { + --uc-error-llustration: url(../icons/error-server-not-found.svg); } } - @-moz-document url-prefix("about:neterror?e=malformedURI") { - #errorPageContainer { - background-image: url("chrome://browser/skin/illustrations/error-malformed-url.svg"); + @-moz-document url-prefix("about:neterror?e=blockedByPolicy"), + url-prefix("about:neterror?e=deniedPortAccess"), + url-prefix("about:neterror?e=malformedURI") { + :root { + --uc-error-llustration: url(chrome://browser/skin/illustrations/error-malformed-url.svg); } } @-moz-document url-prefix("about:neterror?e=clockSkewError"), url-prefix("about:neterror?e=nssFailure") { - #errorPageContainer { - background-image: url("../icons/blue-berror.svg"); + :root { + --uc-error-llustration: url(../icons/blue-berror.svg); + } + #errorPageContainer, + .neterror > .container { background-size: 18.5em; } } @-moz-document url("about:sessionrestore"), url("chrome://browser/content/aboutSessionRestore.xhtml") { - .description-wrapper { - background-image: url("../icons/error-session-restore.svg"); + :root { + --uc-error-llustration: url(../icons/error-session-restore.svg); } } @-moz-document url-prefix("about:neterror?e=fileNotFound") { @@ -631,8 +570,7 @@ --in-content-text-color: var(--in-content-page-color); --in-content-deemphasized-text: rgb(91, 91, 102); --in-content-box-background: #fff; - --in-content-box-background-odd: rgba(12, 12, 13, 0.05); - /* grey 90 a05 */ + --in-content-box-background-odd: rgba(12, 12, 13, 0.05); /* grey 90 a05 */ --in-content-box-border-color: color-mix(in srgb, currentColor 41%, transparent); --in-content-box-info-background: #f0f0f4; --in-content-item-hover: color-mix(in srgb, var(--in-content-primary-button-background) 20%, transparent); @@ -671,13 +609,16 @@ --in-content-button-horizontal-padding: 15px; --in-content-button-vertical-padding: 7px; --in-content-table-background: #f8f8fa; - --in-content-table-border-color: var(--in-content-box-border-color); - /* Legacy: #d1d1d1; rgba(249, 249, 250, 0.2) */ + --in-content-table-border-color: var( + --in-content-box-border-color + ); /* Legacy: #d1d1d1; rgba(249, 249, 250, 0.2) */ --in-content-table-border-dark-color: var(--in-content-table-border-color); - --in-content-table-header-background: var(--in-content-primary-button-background); - /* Legacy: #0a84ff; rgb(5, 64, 150); */ - --in-content-table-header-color: var(--in-content-primary-button-text-color); - /* Legacy: #ffffff; var(--in-content-page-color); */ + --in-content-table-header-background: var( + --in-content-primary-button-background + ); /* Legacy: #0a84ff; rgb(5, 64, 150); */ + --in-content-table-header-color: var( + --in-content-primary-button-text-color + ); /* Legacy: #ffffff; var(--in-content-page-color); */ --in-content-sidebar-width: 240px; --dialog-warning-text-color: var(--red-60); --checkbox-border-color: var(--in-content-box-border-color); @@ -726,7 +667,6 @@ --card-outline-color: var(--grey-30); --card-shadow-hover: var(--card-shadow), 0 0 0 5px var(--card-outline-color); } - @media (-moz-toolbar-prefers-color-scheme: dark), (prefers-color-scheme: dark) { :host, :root { @@ -797,12 +737,9 @@ darken(#0060df, 15.5%): #003e90; darken(#0060df, 28.1%): #002250; */ - --blue-20: #b6d6ff; - /* lighten(#0060df, 42%) - rgb(182, 214, 255), Add for link active color*/ - --blue-30: #74c0ff; - /* rgb(116, 192, 255), Add for active color */ + --blue-20: #b6d6ff; /* lighten(#0060df, 42%) - rgb(182, 214, 255), Add for link active color*/ + --blue-30: #74c0ff; /* rgb(116, 192, 255), Add for active color */ } - :host, :root { --in-content-primary-button-text-color: var(--in-content-page-color) !important; @@ -856,7 +793,6 @@ color: var(--in-content-page-color) !important; background: var(--in-content-page-background) !important; } - /* Text */ input, textarea, @@ -883,7 +819,6 @@ .blogpost-nav * { color: var(--in-content-text-color) !important; } - .AutoSearchInput-suggestions-item:is(:active, :focus, :hover), .AutoSearchInput-suggestions-item--highlighted, .SecondaryHero-message-link, @@ -920,7 +855,6 @@ .blogpost-nav-next:hover p { color: var(--in-content-link-color) !important; } - .SearchResult--meta-section, .MetadataCard-title, .MetadataCard-title a, @@ -948,11 +882,9 @@ .PromotedBadge-label--line { color: var(--in-content-deemphasized-text) !important; } - .PromotedBadge-label--recommended { color: color-mix(in srgb, #712b00 15%, #ff9400) !important; } - /* Background */ .Button--action, .DevHub-Navigation ul li.DevHub-Navigation-Register .Button, @@ -960,7 +892,6 @@ color: var(--in-content-primary-button-text-color) !important; background: var(--in-content-primary-button-background) !important; } - select, .Select, .Button--primary, @@ -970,25 +901,21 @@ .AMInstallButton .AMInstallButton-loading-button { background-color: var(--in-content-button-background) !important; } - .Button--primary:hover, .Button--neutral.Button--micro:not(.Button--disabled):hover, .Button--neutral:not(.Button--disabled):hover, .Notice-button:hover { background: var(--in-content-button-background-hover) !important; } - .Button--action.Button--micro:not(.Button--disabled):hover, .Button--action:not(.Button--disabled):hover, .DevHub-Navigation ul li.DevHub-Navigation-Register .Button:hover, .DevHub-MyAddons-item-buttons-submit .Button:hover { background: var(--in-content-primary-button-background-hover) !important; } - .ShowMoreCard-contents::after { - background: linear-gradient(rgba(255, 255, 255, 0), var(--in-content-table-background)) !important; + background: linear-gradient(hsla(0deg, 0%, 100%, 0), var(--in-content-table-background)) !important; } - input, textarea, .AutoSearchInput-query, @@ -1010,11 +937,9 @@ .blogpost-nav * { background: var(--in-content-table-background) !important; } - .Paginate .Button.Paginate-item:is(:active, :hover) { background: var(--in-content-button-background-hover) !important; } - .Notice-generic, .Notice-genericWarning { background: color-mix( @@ -1023,64 +948,51 @@ var(--in-content-table-background) ) !important; } - .LanguageTools-header-row { color: var(--in-content-table-header-color) !important; background: var(--in-content-table-header-background) !important; } - .LanguageTools-table.responsiveTable tbody tr:nth-child(2n) { background-color: var(--in-content-box-background-odd) !important; } - /* Fill */ .Icon-arrow-blue.SearchSuggestion-icon-arrow { filter: hue-rotate(330deg) brightness(1.3) !important; } - .SecondaryHero-module-icon { filter: invert(85%) !important; } - .Icon-magnifying-glass, .Notice-icon { filter: invert(65%) !important; } - .PermissionsCard-learn-more .Icon, .Permission .Icon { filter: invert(100%) !important; } - .Icon-heart { filter: brightness(0) !important; } - /* Others */ .DropdownMenu-items { box-shadow: 0 0 2px var(--in-content-border-color) !important; } - input, textarea, select { border-color: var(--in-content-box-border-color) !important; } - .UserProfileEdit input:disabled, .UserProfileEdit textarea:disabled { background-color: var(--in-content-box-background-odd) !important; } - .AutoSearchInput-query { border: 1px solid var(--in-content-table-background) !important; } - .AutoSearchInput-query:is(:hover, :focus), .UserProfileEditNotifications .UserProfileEditNotification-input:checked ~ .UserProfileEditNotification-checkbox { border-color: var(--in-content-primary-button-background) !important; } - .UserProfileEdit input:focus, .UserProfileEdit textarea:focus, .AutoSearchInput-query:focus, @@ -1088,31 +1000,25 @@ box-shadow: inset 0 0 0 1px var(--in-content-primary-button-background), 0 0 0 1px var(--in-content-primary-button-background), 0 0 0 4px rgba(0, 211, 255, 0.3) !important; } - .PromotedBadge-link--line { border-color: var(--in-content-deemphasized-text) !important; } - .PromotedBadge-link--line:hover { border-color: var(--in-content-button-background-hover) !important; } - .blog-entry-read-more-link { border-color: var(--in-content-link-color) !important; } - .blogpost-nav-arrow-left .cls-1, .blogpost-nav-arrow-right .cls-1 { stroke: var(--in-content-text-color) !important; } - /* /developers/ */ .DevHub-Navigation-Logo > .Logo::before { -moz-context-properties: fill !important; fill: var(--in-content-primary-button-background) !important; background-image: url("../icons/addons-logo.svg") !important; } - .DevHub-Navigation, .DevHub-submit-addon, .DevHub-get-involved, @@ -1120,17 +1026,14 @@ background: var(--in-content-page-background) !important; color: var(--in-content-page-color) !important; } - .DevHub-Footer { background: var(--in-content-box-background) !important; color: var(--in-content-page-color) !important; } - .DevHub-callout-box { background: var(--in-content-box-background-odd) !important; color: var(--in-content-page-color) !important; } - .DevHub-Navigation.scheme-light ul li a, .DevHub-Footer-sections-header, .DevHub-Footer-section h4, @@ -1138,12 +1041,10 @@ .DevHub-content-copy h2 { color: var(--in-content-page-color) !important; } - .DevHub-content-copy p, .DevHub-callout-box p { color: var(--in-content-deemphasized-text) !important; } - .DevHub-Banner a, .DevHub-Footer a, .DevHub-MyAddons-list a, @@ -1152,7 +1053,6 @@ .DevHub-callout-box a { color: var(--in-content-link-color) !important; } - body:is(.developer-hub, .statistics) { /* Elements */ /* .developer-hub */ @@ -1453,11 +1353,9 @@ --focus-shadow: 0 0 0 4px color-mix(in srgb, var(--in-content-primary-button-background) 30%, transparent), 0 0 0 2px var(--in-content-primary-button-background-active); } - .warning { --color-link: rgb(55, 255, 255) !important; } - body, #main-content, #instant-search-content, @@ -1467,24 +1365,19 @@ color: var(--in-content-page-color) !important; background: var(--in-content-page-background) !important; } - #editor { border: 2px solid var(--in-content-border-color) !important; } - .CodeMirror-linenumbers { background: var(--in-content-table-background); } - .CodeMirror-lines { color: var(--in-content-deemphasized-text) !important; background: var(--in-content-page-background) !important; } - .CodeMirror-scroll { background: var(--in-content-page-background) !important; } - /* Text */ .mzp-c-menu-category .mzp-c-menu-title, .mzp-c-menu-item .mzp-c-menu-item-link, @@ -1496,7 +1389,6 @@ .tag-name a { color: var(--in-content-page-color) !important; } - .ts-select-trigger, input[type="date"], input[type="email"], @@ -1517,54 +1409,43 @@ .forum--entry-content .key { color: var(--in-content-deemphasized-text) !important; } - .tag-list a { color: var(--color-marketing-gray-10) !important; } - .tag-list a:hover, .sidebar-nav a:hover { color: var(--color-link) !important; } - .tag-list li { background: var(--in-content-page-color) !important; } - .tag-list li:hover { background: var(--in-content-deemphasized-text) !important; } - #remaining-characters { color: var(--in-content-page-color) !important; } - /* Background */ .sidebar-nav.topics, .sidebar-nav.topics > li { background: var(--in-content-page-background) !important; } - .mzp-c-menu-panel { color: var(--in-content-page-color) !important; background: var(--in-content-page-background) !important; } - .mzp-c-menu-list-list, .mzp-c-menu-list-list:hover { color: var(--in-content-page-color) !important; background: var(--in-content-box-background) !important; } - .mzp-c-menu-list-item:focus, .mzp-c-menu-list-item:hover { background: var(--in-content-button-background-hover) !important; } - .cm-bold { color: var(--in-content-page-color) !important; } - /* Fill */ .sumo-nav--logo, .sumo-nav--search-button, @@ -1581,33 +1462,26 @@ .search-button { filter: invert(95%) !important; } - button.markup-toolbar-button { /*using 0.5 because in middle*/ filter: invert(0.5) !important; } - /* Others */ .support-callouts > .card.is-inverse { background: #20133a !important; } - .support-callouts > .card.is-inverse :is(h1, h2, h3, h4, h5, h6, li, p) { color: var(--in-content-page-color) !important; } - .sumo-button.secondary-button { border-color: transparent !important; } - .mzp-c-menu-panel { border-color: var(--in-content-button-background-hover) !important; } - .mzp-c-menu-item:is(:focus, :hover, :active) .mzp-c-menu-item-link .mzp-c-menu-item-title { border-color: var(--in-content-page-color) !important; } - @media screen and (-moz-toolbar-prefers-color-scheme: dark) and (min-width: 768px), screen and (prefers-color-scheme: dark) and (min-width: 768px) { .mzp-c-menu-panel { @@ -1629,7 +1503,6 @@ color: var(--in-content-page-color) !important; background: var(--in-content-page-background) !important; } - .button.primary-button, .button[type="submit"]:not(.secondary-button), .settings-button.primary-button, @@ -1639,7 +1512,6 @@ color: var(--in-content-primary-button-text-color) !important; background: var(--in-content-primary-button-background) !important; } - /* Text */ header h1, .info, @@ -1649,18 +1521,15 @@ .cta-neutral:hover { color: var(--in-content-page-color) !important; } - #main-content.panel a, .links a, .link-blue, .text-blue-500 { color: var(--in-content-link-color) !important; } - .link-blue:hover { color: var(--in-content-link-color-hover) !important; } - .signed-in-email-message, .verification-email-message, .verification-message, @@ -1672,22 +1541,20 @@ .input-row input[type="tel"], .input-row input[type="text"], .input-row input::placeholder, + .input-text, .firefox-family-services > ul > .firefox-service, .faint, .faint a, .text-grey-400 { color: var(--in-content-deemphasized-text) !important; } - /* Background */ .flex .flex-wrap { background: var(--in-content-page-background); } - .password-row .show-password-label { background-color: unset !important; } - #main-content, .modal, .firefox-family-services, @@ -1696,32 +1563,29 @@ .input-row input[type="password"], .input-row input[type="tel"], .input-row input[type="text"], + .input-text, header, + .card, .bg-white:not(nav) { background: var(--in-content-box-background) !important; } - #suggest-sync, .cta-neutral { background: var(--in-content-button-background) !important; } - .cta-neutral:hover, .bg-grey-50:hover, .hover\:bg-grey-100:hover { background: var(--in-content-button-background-hover) !important; } - .text-blue-500 .cta-neutral, .text-blue-500 .bg-grey-50, .text-blue-500 .hover\:bg-grey-100 { background: var(--in-content-button-background) !important; } - .hover\:bg-grey-200:hover { background: var(--in-content-button-background-active) !important; } - .button.primary-button:hover:enabled, .button[type="submit"]:not(.secondary-button):hover:enabled, .settings-button.primary-button:hover:enabled, @@ -1730,12 +1594,10 @@ button[type="submit"]:not(.secondary-button):hover:enabled { background: var(--in-content-primary-button-background-hover) !important; } - .tooltip, .tooltip::before { background: var(--in-content-danger-button-background) !important; } - /* Fill */ .dismiss, #about-mozilla, @@ -1743,18 +1605,15 @@ footer a[data-testid="link-mozilla"] { filter: invert(95%) !important; } - header button svg, header .rounded svg, #service svg { filter: brightness(15) !important; } - button.relative, #fxa-settings nav svg { filter: brightness(2) !important; } - /* Others */ .input-row input[type="email"], .input-row input[type="number"], @@ -1764,7 +1623,6 @@ .unit-row-hr .border-grey-100 { border-color: var(--in-content-border-color) !important; } - .input-row input[type="email"]:hover, .input-row input[type="number"]:hover, .input-row input[type="password"]:hover, @@ -1772,12 +1630,10 @@ .input-row input[type="text"]:hover { border-color: var(--in-content-border-hover) !important; } - #main-content { box-shadow: 0 12px 18px 2px rgba(249, 249, 250, 0.12), 0 6px 22px 4px rgba(91, 91, 102, 0.12), 0 6px 10px -4px rgba(82, 82, 94, 0.04) !important; } - .input-row input[type="email"]:focus, .input-row input[type="number"]:focus, .input-row input[type="password"]:focus, @@ -1790,8 +1646,7 @@ } /** Fully Proton Mode *********************************************************/ @supports -moz-bool-pref("userContent.page.proton") { - /*= Common contents ==========================================================*/ - /*= abouts' common ===========================================================*/ + /*= Common contents ==========================================================*/ /*= abouts' common ===========================================================*/ @-moz-document url-prefix("about:plugins"), url-prefix("about:cache"), url-prefix("about:checkerboard"), @@ -1807,61 +1662,50 @@ background-color: var(--in-content-page-background) !important; color: var(--in-content-page-color) !important; } - body { font-size: 15px !important; font-weight: normal !important; margin: 0 !important; } - h1 { line-height: 1.2 !important; } - h2 { line-height: 1.4em !important; } - /* Link */ a { color: var(--in-content-link-color) !important; } - a:hover, .text-link:hover { color: var(--in-content-link-color-hover) !important; text-decoration: underline !important; } - a:visited { color: var(--in-content-link-color-visited) !important; } - a:hover:active, .text-link:hover:active { color: var(--in-content-link-color-active) !important; } - a:-moz-focusring, .text-link:-moz-focusring { outline: 2px solid var(--in-content-focus-outline-color) !important; outline-offset: 1px !important; border-radius: 4px !important; } - /* Button */ button { font: inherit; } - button, select, input[type="color"] { appearance: none !important; min-height: 32px !important; color: var(--in-content-button-text-color, inherit) !important; - border: 1px solid transparent !important; - /* shows up in high-contrast mode */ + border: 1px solid transparent !important; /* shows up in high-contrast mode */ border-radius: var(--in-content-button-border-radius) !important; background-color: var(--in-content-button-background) !important; font-weight: 400 !important; @@ -1871,14 +1715,12 @@ /* Ensure font-size isn't overridden by widget styling (e.g. in forms.css) */ font-size: 1em !important; } - button { font-weight: 600 !important; /* Use the same margin of other elements for the alignment */ margin-inline: 4px !important; min-width: 6.3em !important; } - /* Medium and small buttons get sized to 7/14 and 6/12px padding (when adding * the 1px border): */ button.medium { @@ -1887,66 +1729,55 @@ min-height: 28px !important; font-size: 0.95em !important; } - button.small { --in-content-button-vertical-padding: 5px; --in-content-button-horizontal-padding: 11px; min-height: 24px !important; font-size: 0.9em !important; } - ::-moz-focus-inner { border: none !important; } - button:-moz-focusring { box-shadow: none !important; outline: 2px solid var(--in-content-focus-outline-color) !important; outline-offset: 2px !important; } - button:enabled:hover, input[type="color"]:hover { background-color: var(--in-content-button-background-hover) !important; color: var(--in-content-button-text-color-hover) !important; border-color: transparent !important; } - button:enabled:hover:active, input[type="color"]:enabled:hover:active { background-color: var(--in-content-button-background-active) !important; } - button:disabled, input[type="color"]:disabled { opacity: 0.4 !important; } - button[autofocus], button[type="submit"], button.primary { background-color: var(--in-content-primary-button-background) !important; color: var(--in-content-primary-button-text-color) !important; } - button[autofocus]:enabled:hover, button[type="submit"]:enabled:hover, button.primary:enabled:hover { background-color: var(--in-content-primary-button-background-hover) !important; color: var(--in-content-primary-button-text-color-hover) !important; } - button[autofocus]:enabled:hover:active, button[type="submit"]:enabled:hover:active, button.primary:enabled:hover:active { background-color: var(--in-content-primary-button-background-active) !important; } - /* Checkbox */ input[type="checkbox"] { margin-block: 2px !important; } - input[type="checkbox"] { appearance: none !important; height: 16px !important; @@ -1955,18 +1786,14 @@ background-color: var(--checkbox-unchecked-bgcolor) !important; border-radius: 2px !important; margin-inline: 0 6px !important; - flex-shrink: 0 !important; - /* avoid shrinking inside flex container */ + flex-shrink: 0 !important; /* avoid shrinking inside flex container */ } - input[type="checkbox"]:enabled:hover { background-color: var(--checkbox-unchecked-hover-bgcolor) !important; } - input[type="checkbox"]:enabled:hover:active { background-color: var(--checkbox-unchecked-active-bgcolor) !important; } - input[type="checkbox"]:checked { border-color: var(--checkbox-checked-border-color) !important; background-color: var(--checkbox-checked-bgcolor) !important; @@ -1979,15 +1806,12 @@ /* Style the button also when printing with "Print Backgrounds" unchecked */ color-adjust: exact !important; } - input[type="checkbox"]:enabled:checked:hover { background-color: var(--checkbox-checked-hover-bgcolor) !important; } - input[type="checkbox"]:enabled:checked:hover:active { background-color: var(--checkbox-checked-active-bgcolor) !important; } - /* Textarea */ input:is([type="email"], [type="tel"], [type="text"], [type="password"], [type="url"], [type="number"]), textarea { @@ -1997,7 +1821,6 @@ color: inherit !important; background-color: var(--in-content-box-background) !important; } - input:is([type="email"], [type="tel"], [type="text"], [type="password"], [type="url"], [type="number"]), textarea { font-family: inherit !important; @@ -2005,7 +1828,6 @@ padding: 8px !important; margin: 2px 4px !important; } - input:is([type="email"], [type="tel"], [type="text"], [type="password"], [type="url"], [type="number"]):focus, textarea:focus, search-textbox[focused], @@ -2013,24 +1835,19 @@ richlistbox:focus-visible { border-color: transparent !important; outline: 2px solid var(--in-content-focus-outline-color) !important; - outline-offset: -1px !important; - /* Prevents antialiasing around the corners */ + outline-offset: -1px !important; /* Prevents antialiasing around the corners */ } - input:is([type="email"], [type="tel"], [type="text"], [type="password"], [type="url"], [type="number"]):-moz-ui-invalid, textarea:-moz-ui-invalid { border-color: transparent !important; outline: 2px solid var(--in-content-border-invalid) !important; - outline-offset: -1px !important; - /* Prevents antialiasing around the corners */ + outline-offset: -1px !important; /* Prevents antialiasing around the corners */ } - input:is([type="email"], [type="tel"], [type="text"], [type="password"], [type="url"], [type="number"]):disabled, textarea:disabled, search-textbox[disabled="true"] { opacity: 0.4 !important; } - /* Table */ table { width: 100% !important; @@ -2050,7 +1867,6 @@ td { border: 1px solid var(--in-content-table-border-color) !important; } - th { background-color: var(--in-content-table-header-background) !important; color: var(--in-content-table-header-color) !important; @@ -2072,16 +1888,12 @@ /*= View Source ==============================================================*/ @-moz-document url-prefix("view-source") { :root { - background-color: var(--in-content-page-background) !important; - /* Original: white */ - color: var(--in-content-page-color) !important; - /* Original: black */ + background-color: var(--in-content-page-background) !important; /* Original: white */ + color: var(--in-content-page-color) !important; /* Original: black */ /* Colors */ --view-source-green: var(--green-80); - --view-source-purple: #800080; - /* Like alphenglow */ + --view-source-purple: #800080; /* Like alphenglow */ } - @media (-moz-toolbar-prefers-color-scheme: dark), (prefers-color-scheme: dark) { :root { --view-source-green: var(--green-60); @@ -2090,62 +1902,45 @@ } pre[id]::before, span[id]::before { - color: color-mix(in srgb, var(--in-content-page-color) 70%, var(--in-content-page-background)) !important; - /* Original: #ccc */ + color: color-mix( + in srgb, + var(--in-content-page-color) 70%, + var(--in-content-page-background) + ) !important; /* Original: #ccc */ } - .highlight .start-tag, .highlight .end-tag { - color: var(--view-source-purple) !important; - /* Original: purple */ + color: var(--view-source-purple) !important; /* Original: purple */ } - .highlight .comment { - color: var(--view-source-green) !important; - /* Original: green */ + color: var(--view-source-green) !important; /* Original: green */ } - .highlight .cdata { - color: var(--in-content-border-invalid) !important; - /* Original: #CC0066 */ + color: var(--in-content-border-invalid) !important; /* Original: #CC0066 */ } - .highlight .doctype { - color: #4682b4 !important; - /* Original: steelblue */ + color: #4682b4 !important; /* Original: steelblue */ } - .highlight .pi { - color: orchid !important; - /* Original: orchid */ + color: orchid !important; /* Original: orchid */ } - .highlight .entity { - color: #ff4500 !important; - /* Original: #FF4500 */ + color: #ff4500 !important; /* Original: #FF4500 */ } - .highlight .attribute-name { - color: var(--view-source-green) !important; - /* Original: black */ + color: var(--view-source-green) !important; /* Original: black */ } - .highlight .attribute-value { - color: var(--in-content-link-color) !important; - /* Original: blue */ + color: var(--in-content-link-color) !important; /* Original: blue */ } - .highlight .markupdeclaration { - color: #4682b4 !important; - /* Original: steelblue */ + color: #4682b4 !important; /* Original: steelblue */ } - .highlight .error, .highlight .error > :-moz-any(.start-tag, .end-tag, .comment, .cdata, .doctype, .pi, .entity, .attribute-name, .attribute-value) { - color: var(--in-content-error-text-color) !important; - /* Original: red */ + color: var(--in-content-error-text-color) !important; /* Original: red */ } } /*= Directory View ===========================================================*/ @@ -2154,14 +1949,11 @@ { body { background-color: var(--in-content-box-background) !important; - margin: 4em auto !important; - /* Override to default */ + margin: 4em auto !important; /* Override to default */ } - thead a { color: var(--in-content-page-color) !important; } - td ::before { vertical-align: top !important; } @@ -2178,7 +1970,6 @@ table { padding: 0 !important; } - th, td { padding: 4px !important; @@ -2190,7 +1981,6 @@ #canvas { border: 1px solid var(--in-content-border-color) !important; } - #excludePageFromZoom { vertical-align: bottom !important; } @@ -2202,7 +1992,6 @@ background-color: var(--in-content-box-background) !important; color: var(--in-content-page-color) !important; } - .opsRowLabel input { vertical-align: bottom !important; } @@ -2223,7 +2012,6 @@ .downloadIconShow > .button-box > .button-icon { list-style-image: url("../icons/folder.svg") !important; } - /* Standard Folder - Open */ :-moz-any(#PlacesToolbar, #BMB_bookmarksPopup, #bookmarksMenu) .bookmark-item[container="true"]:not([query="true"], [tagContainer], [dayContainer])[open="true"], @@ -2231,7 +2019,6 @@ treechildren::-moz-tree-image(title, container, open) { list-style-image: url("../icons/folder-open.svg") !important; } - /*= Other Folder - Inbox Icon ================================================*/ /* on Menus */ #PlacesToolbar #OtherBookmarks, @@ -2245,7 +2032,6 @@ #editBMPanel_folderMenuList[selectedGuid="unfiled_____"] { list-style-image: url("../icons/mail-inbox-all.svg") !important; } - /* Other Folder - Open */ #PlacesToolbar #OtherBookmarks[open="true"], #BMB_bookmarksPopup #BMB_unsortedBookmarks[open="true"], @@ -2256,37 +2042,31 @@ treechildren::-moz-tree-image(container, open, queryFolder_unfiled_____) { list-style-image: url("../icons/mail-inbox.svg") !important; } - /*= Default Icon - Override ===================================================*/ /* https://github.com/mozilla/gecko-dev/blob/master/browser/themes/shared/places/tree-icons.css */ /* Query */ :-moz-any(#historyTree, #placesList, #placeContent) treechildren::-moz-tree-image(title, query) { list-style-image: url("chrome://browser/skin/places/folder-smart.svg") !important; } - /* History */ :-moz-any(#historyTree, #placesList, #placeContent) treechildren::-moz-tree-image(title, query, dayContainer), :-moz-any(#historyTree, #placesList, #placeContent) treechildren::-moz-tree-image(query, OrganizerQuery_history____v) { list-style-image: url("chrome://browser/skin/history.svg") !important; } - /* Downloads */ :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, OrganizerQuery_downloads__v) { list-style-image: url("chrome://browser/skin/downloads/downloads.svg") !important; } - /* Tag */ :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(title, query, tagContainer), :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, OrganizerQuery_tags_______v) { list-style-image: url("chrome://browser/skin/places/tag.svg") !important; } - /* Bookmark */ :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, OrganizerQuery_allbms_____v) { list-style-image: url("chrome://browser/skin/bookmark.svg") !important; } - /* Bookmark Toolbar */ #BMB_bookmarksPopup #BMB_bookmarksToolbar, #bookmarksMenuPopup #bookmarksToolbarFolderMenu, @@ -2294,13 +2074,11 @@ treechildren::-moz-tree-image(container, queryFolder_toolbar_____) { list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.svg") !important; } - /* Bookmark Menu */ :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent) treechildren::-moz-tree-image(container, queryFolder_menu________) { list-style-image: url("chrome://browser/skin/places/bookmarksMenu.svg") !important; } - /*= Default Icon - Open ======================================================*/ /* Query */ :-moz-any(#PlacesToolbar, #BMB_bookmarksPopup, #bookmarksMenu) @@ -2309,7 +2087,6 @@ > .menu-iconic-icon { transform: rotate(15deg) !important; } - /* History */ :-moz-any(#historyTree, #placesList, #placeContent) treechildren::-moz-tree-image(title, query, open, dayContainer), @@ -2317,7 +2094,6 @@ treechildren::-moz-tree-image(query, open, OrganizerQuery_history____v) { list-style-image: url("../icons/history-reverse.svg") !important; } - /* Tag */ :-moz-any(#PlacesToolbar, #BMB_bookmarksPopup, #bookmarksMenu) .bookmark-item[container="true"][tagContainer="true"][open="true"], @@ -2325,12 +2101,10 @@ :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, open, OrganizerQuery_tags_______v) { list-style-image: url("../icons/tag-open.svg") !important; } - /* Bookmark */ :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, open, OrganizerQuery_allbms_____v) { list-style-image: url("chrome://browser/skin/bookmark-hollow.svg") !important; } - /* Bookmark Toolbar */ #BMB_bookmarksPopup #BMB_bookmarksToolbar[open="true"], #bookmarksMenuPopup #bookmarksToolbarFolderMenu[open="true"], @@ -2338,14 +2112,11 @@ treechildren::-moz-tree-image(container, open, queryFolder_toolbar_____) { list-style-image: url("../icons/bookmarksToolbar-open.svg") !important; } - /* Bookmark Menu */ :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent) treechildren::-moz-tree-image(container, open, queryFolder_menu________) { - list-style-image: url("../icons/bookmarksMenu-open.svg") !important; - /* or bookmarksMenu-open2.svg" */ + list-style-image: url("../icons/bookmarksMenu-open.svg") !important; /* or bookmarksMenu-open2.svg" */ } - /*= Menubar - Icons ==========================================================*/ #organizeButton, #viewMenu, @@ -2354,26 +2125,21 @@ #forward-button, #clearDownloadsButton { fill: currentColor !important; - -moz-context-properties: fill !important; + -moz-context-properties: fill, fill-opacity, stroke !important; } - /* Add */ #organizeButton { list-style-image: url("chrome://global/skin/icons/settings.svg") !important; } - #viewMenu { list-style-image: url("../icons/sort.svg") !important; } - #maintenanceButton { list-style-image: url("../icons/import-export.svg") !important; } - #clearDownloadsButton { list-style-image: url("chrome://global/skin/icons/delete.svg") !important; } - #clearDownloadsButton > .toolbarbutton-icon { display: -moz-inline-box !important; margin-top: 0; @@ -2381,16 +2147,13 @@ margin-inline-start: 0; margin-inline-end: 2px; } - /* Replace */ #back-button { list-style-image: url("chrome://browser/skin/back.svg") !important; } - #forward-button { list-style-image: url("chrome://browser/skin/forward.svg") !important; } - #back-button:-moz-locale-dir(rtl) > .toolbarbutton-icon, #forward-button:-moz-locale-dir(rtl) > .toolbarbutton-icon { transform: scaleX(-1) !important; @@ -2401,14 +2164,11 @@ menupopup menu { padding-block: 4px; } - .menu-right { - width: 16px !important; - /* Original: 1ex */ + width: 16px !important; /* Original: 1ex */ background-image: url("chrome://global/skin/icons/arrow-right.svg"); background-position: right center; } - /*= Proton ===============================================================*/ @supports -moz-bool-pref("userContent.page.proton") { :root { @@ -2435,10 +2195,8 @@ :root { --organizer-color: var(--in-content-page-color); --organizer-deemphasized-color: var(--in-content-deemphasized-text); - --organizer-toolbar-background: rgb(249, 249, 251); - /* --toolbar-bgcolor */ - --organizer-pane-background: rgb(229, 229, 235); - /* --lwt-accent-color */ + --organizer-toolbar-background: rgb(249, 249, 251); /* --toolbar-bgcolor */ + --organizer-pane-background: rgb(229, 229, 235); /* --lwt-accent-color */ --organizer-content-background: var(--in-content-page-background); --organizer-hover-background: var(--in-content-button-background-hover); --organizer-hover-color: var(--organizer-color); @@ -2447,8 +2205,7 @@ --organizer-outline-color: var(--in-content-focus-outline-color); --organizer-separator-color: var(--organizer-pane-field-border-color); --organizer-border-color: var(--in-content-border-color); - --organizer-toolbar-field-background: rgb(240, 240, 244); - /* --lwt-accent-color */ + --organizer-toolbar-field-background: rgb(240, 240, 244); /* --lwt-accent-color */ --organizer-toolbar-field-background-focused: Field; --organizer-toolbar-field-border-color: transparent; --organizer-toolbar-field-focus-border-color: color-mix( @@ -2474,7 +2231,6 @@ } } } - /*- Toolbar & Menus ------------------------------------------------------*/ #placesToolbar { appearance: none !important; @@ -2499,14 +2255,12 @@ #placesToolbar > toolbarbutton:not([disabled]):hover:active { background-color: var(--organizer-selected-background) !important; } - #placesToolbar > toolbarbutton > .toolbarbutton-icon, #placesMenu > menu > image, #placesMenu > menu > .menubar-text { -moz-context-properties: fill !important; fill: currentColor !important; } - #placesMenu { margin-inline-start: 6px !important; } @@ -2529,11 +2283,9 @@ color: var(--organizer-selected-color) !important; } #placesMenu > menu > .menubar-text { - margin-block: 0 !important; - /* override menu.css */ + margin-block: 0 !important; /* override menu.css */ padding-inline-end: 4px !important; } - /*- Search Bar & Input ---------------------------------------------------*/ #searchFilter, #detailsPane html|input { @@ -2546,7 +2298,6 @@ padding-block: 2px !important; min-height: 24px !important; } - #searchFilter[focused] { box-shadow: var(--organizer-toolbar-field-focus-box-shadow) !important; background-color: var(--organizer-toolbar-field-background-focused) !important; @@ -2554,12 +2305,10 @@ outline: 2px solid var(--organizer-toolbar-field-focus-border-color) !important; outline-offset: -2px !important; } - /*- Sidebar & Splitter ---------------------------------------------------*/ #placesList { background-color: var(--organizer-pane-background) !important; } - #placesView > splitter { border: 0 !important; border-inline-end: 1px solid var(--organizer-border-color) !important; @@ -2569,28 +2318,23 @@ margin-inline-start: -3px !important; position: relative !important; } - /*- Downloads Pane -------------------------------------------------------*/ #downloadsRichListBox, #downloadsListBox { color: var(--organizer-color) !important; background-color: var(--organizer-content-background) !important; } - #clearDownloadsButton:focus-visible { outline: 2px solid var(--organizer-outline-color) !important; } - richlistitem[selected="true"], richlistitem:hover { background-color: var(--organizer-hover-background) !important; color: var(--organizer-color) !important; } - richlistbox:where(:focus) > richlistitem[selected="true"] { background-color: var(--organizer-selected-background) !important; } - /*- Tree -----------------------------------------------------------------*/ #contentView treecol { /* Use box-shadow to draw a bottom border instead of border-bottom @@ -2598,12 +2342,10 @@ * aligned with the items on the sidebar. */ box-shadow: inset 0 -1px var(--organizer-border-color) !important; } - tree { background-color: var(--organizer-content-background) !important; color: var(--organizer-color) !important; } - treecol:not([hideheader="true"]), treecolpicker { appearance: none !important; @@ -2612,7 +2354,6 @@ color: var(--organizer-color, inherit) !important; padding: 5px 10px !important; } - treecol:not([hideheader="true"], [sortable="false"]):hover, treecolpicker:hover { background-color: var(--organizer-hover-background) !important; @@ -2622,7 +2363,6 @@ treecolpicker:hover:active { background-color: var(--organizer-selected-background) !important; } - treecol:not([hideheader="true"], :first-child), treecolpicker { padding-left: 10px !important; @@ -2638,13 +2378,11 @@ ) 1 1 !important; } - treecol[sortDirection]:not([hideheader="true"]) > xul|*.treecol-sortdirection { fill: currentColor !important; width: 18px !important; height: 18px !important; } - treechildren::-moz-tree-row { background-color: transparent !important; } @@ -2680,7 +2418,6 @@ treechildren::-moz-tree-drop-feedback { background-color: var(--organizer-outline-color) !important; } - /*- Info Box -------------------------------------------------------------*/ #detailsPane { background-color: var(--organizer-pane-background) !important; @@ -2688,7 +2425,6 @@ padding: 5px !important; border-top: 1px solid var(--organizer-border-color) !important; } - #editBookmarkPanelRows .expander-up, #editBookmarkPanelRows .expander-down { appearance: none !important; @@ -2722,14 +2458,12 @@ #editBookmarkPanelRows .expander-down > .button-box { padding: 0 !important; } - #editBookmarkPanelRows .expander-up { list-style-image: url("chrome://global/skin/icons/arrow-up-12.svg"); } #editBookmarkPanelRows .expander-down { list-style-image: url("chrome://global/skin/icons/arrow-down-12.svg"); } - #places input { border: 1px solid var(--organizer-pane-field-border-color) !important; border-radius: 4px !important; @@ -2745,12 +2479,10 @@ #places input:not(:read-write):focus { outline: none !important; } - .caption-label { margin-inline-start: 8px !important; color: var(--organizer-deemphasized-color) !important; } - #editBMPanel_tagsSelectorRow > richlistbox { appearance: none !important; color: var(--organizer-color) !important; @@ -2769,7 +2501,6 @@ background-color: var(--organizer-selected-background) !important; color: var(--organizer-selected-color) !important; } - /*- Radio Button -------------------------------------------------------------*/ menuitem[type="radio"] { /* margin-inline-start: 0 !important; */ @@ -2783,12 +2514,10 @@ border-radius: 100% !important; padding: 0 !important; margin-inline: 0 6px !important; - margin-block: 2px !important; - /* extend the vertical clicktarget */ + margin-block: 2px !important; /* extend the vertical clicktarget */ background-color: var(--in-content-button-background) !important; background-position: center !important; - flex-shrink: 0 !important; - /* avoid shrinking inside flex container */ + flex-shrink: 0 !important; /* avoid shrinking inside flex container */ } menuitem[type="radio"] > .menu-iconic-left[checked="true"] > .menu-iconic-icon { -moz-context-properties: fill !important; @@ -2820,14 +2549,12 @@ margin-inline: 0 8px !important; padding-inline-start: 0 !important; } - /* Disabled checkboxes, radios and labels */ menuitem[type="radio"][disabled="true"], menuitem[type="checkbox"][disabled="true"] { color: inherit !important; opacity: 0.5 !important; } - /*- Check Box ----------------------------------------------------------------*/ /* From checkbox.css */ menuitem[type="checkbox"] { @@ -2843,10 +2570,8 @@ border-radius: 2px !important; color: var(--checkbox-border-color, ThreeDDarkShadow) !important; background-color: var(--checkbox-unchecked-bgcolor, Field) !important; - margin-inline-end: 6px !important; - /* or 2px */ - margin-block: 2px !important; - /* From common.css */ + margin-inline-end: 6px !important; /* or 2px */ + margin-block: 2px !important; /* From common.css */ } menuitem[type="checkbox"] > .menu-iconic-left[checked="true"] > .menu-iconic-icon { -moz-context-properties: fill !important; @@ -2984,7 +2709,6 @@ menuitem[type="checkbox"][disabled="true"] { opacity: 0.4 !important; } - /*- Menu Separator -----------------------------------------------------------*/ menuseparator { appearance: none !important; @@ -3017,10 +2741,8 @@ url("about:downloads") { menupopup menuitem:not([type="checkbox"][checked="true"], [type="radio"]), menupopup menu:not([type="checkbox"][checked="true"], [type="radio"]) { - -moz-appearance: none !important; - /* Linux: menulist */ + -moz-appearance: none !important; /* Linux: menulist */ } - menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu) menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu) @@ -3029,14 +2751,13 @@ > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu:not(.menu-iconic, .in-menulist, [checked="true"]) { /* Color */ - -moz-context-properties: fill, fill-opacity !important; + -moz-context-properties: fill, fill-opacity, stroke !important; fill: currentColor !important; /* Layout */ background-size: 16px !important; background-repeat: no-repeat !important; background-image: var(--menuitem-image); } - /* 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) @@ -3046,7 +2767,6 @@ list-style-image: var(--menuitem-image, url("../icons/blank.svg")) !important; } } - /* Padding */ :root { --uc-menu-background-position: left; @@ -3056,7 +2776,6 @@ :root:-moz-locale-dir(rtl) { --uc-menu-background-position: right; } - menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu) menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu) @@ -3067,7 +2786,6 @@ background-position: var(--uc-menu-background-position) var(--context-menu-background-padding) center !important; padding-inline-start: var(--context-menu-background-padding) !important; } - /* Padding - Windows */ @media (-moz-os-version: windows-win7), (-moz-platform: windows-win7) { :root { @@ -3097,13 +2815,11 @@ @media (-moz-os-version: windows-win10), (-moz-platform: windows-win10) { :root { --context-menu-background-padding: 1em; - --context-menu-text-padding: 24px; - /* 16px + 8px */ + --context-menu-text-padding: 24px; /* 16px + 8px */ --menu-background-padding-default: calc( var(--context-menu-background-padding) + var(--context-menu-text-padding) ); } - menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu) menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu) @@ -3120,7 +2836,6 @@ :root { --context-menu-background-padding-default: 6px; } - /* Contextmenu Checkbox Unset */ menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu) menuitem[type="checkbox"] { margin-inline: 0 !important; @@ -3145,7 +2860,6 @@ --context-menu-background-padding-default: 10px; --context-menu-mac-padding: 21px; } - /* context menu width */ menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu) menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), @@ -3162,7 +2876,6 @@ /* text position */ padding-inline-start: var(--context-menu-mac-padding) !important; } - /* Checkbox menuitem, None iconic menu */ menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu) menuitem[checked="true"], menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu) menu:not(.menu-iconic) { @@ -3178,29 +2891,23 @@ .downloadPauseMenuItem { --menuitem-image: url("chrome://global/skin/media/pause-fill.svg"); } - .downloadResumeMenuItem { --menuitem-image: url("chrome://global/skin/media/play-fill.svg"); } - .downloadUnblockMenuItem { --menuitem-image: url("../icons/checkmark-circle.svg"); } - .downloadUseSystemDefaultMenuItem { --menuitem-image: url("chrome://browser/skin/open.svg"); } - .downloadAlwaysUseSystemDefaultMenuItem { /* checkbox */ --menuitem-image: url("../icons/folder-globe.svg"); } - .downloadAlwaysOpenSimilarFilesMenuItem { /* checkbox */ --menuitem-image: url("../icons/fluid.svg"); } - .downloadShowMenuItem { --menuitem-image: url("chrome://global/skin/icons/folder.svg"); } @@ -3209,7 +2916,6 @@ --menuitem-image: url("../icons/folder.svg"); } } - #downloadsContextMenu > menuitem.downloadOpenReferrerMenuItem, #downloadsContextMenu > menuitem[command="downloadsCmd_openReferrer"] { --menuitem-image: url("../icons/link-square.svg"); @@ -3218,85 +2924,67 @@ #downloadsContextMenu > menuitem[command="downloadsCmd_copyLocation"] { --menuitem-image: url("../icons/link.svg"); } - .downloadDeleteFileMenuItem { --menuitem-image: url("chrome://global/skin/icons/delete.svg"); } - .downloadRemoveFromHistoryMenuItem { --menuitem-image: url("../icons/eraser.svg"); } - #downloadsContextMenu > menuitem[command="downloadsCmd_clearList"], #downloadsContextMenu > menuitem[command="downloadsCmd_clearDownloads"] { --menuitem-image: url("../icons/broom.svg"); } - /*= placeContext =============================================================*/ #placesContext_open { --menuitem-image: url("../icons/link-square.svg"); } - #placesContext_openBookmarkContainer\:tabs, #placesContext_openBookmarkLinks\:tabs { --menuitem-image: url("../icons/movetowindow-16.svg"); } - #placesContext_open\:newtab, #placesContext_openContainer\:tabs, #placesContext_openLinks\:tabs { --menuitem-image: url("chrome://browser/skin/new-tab.svg"); } - #placesContext_open\:newcontainertab { --menuitem-image: url("../icons/container-openin-16.svg"); } - #placesContext_open\:newwindow { --menuitem-image: url("chrome://browser/skin/window.svg"); } - #placesContext_open\:newprivatewindow { --menuitem-image: url("chrome://browser/skin/privateBrowsing.svg"); } - #placesContext_show_bookmark\:info, #placesContext_show\:info, #placesContext_show_folder\:info { --menuitem-image: url("chrome://global/skin/icons/edit.svg"); } - #placesContext_deleteBookmark, #placesContext_deleteFolder, #placesContext_delete, #placesContext_delete_history { --menuitem-image: url("chrome://global/skin/icons/delete.svg"); } - #placesContext_deleteHost { --menuitem-image: url("../icons/eye-hide.svg"); } - #placesContext_sortBy\:name { --menuitem-image: url("../icons/text-sort-ascending.svg"); } - #placesContext_cut { --menuitem-image: url("chrome://browser/skin/edit-cut.svg"); } - #placesContext_copy { --menuitem-image: url("../icons/edit-copy.svg"); } - #placesContext_paste_group { --menuitem-image: url("chrome://browser/skin/edit-paste.svg"); } - #placesContext_new\:bookmark { --menuitem-image: url("chrome://browser/skin/bookmark.svg"); } - #placesContext_showInFolder, #placesContext_new\:folder { --menuitem-image: url("chrome://global/skin/icons/folder.svg"); @@ -3307,28 +2995,22 @@ --menuitem-image: url("../icons/folder.svg"); } } - #placesContext_new\:separator { --menuitem-image: url("../icons/vertical-line.svg"); } - #placesContext_paste { --menuitem-image: url("chrome://browser/skin/edit-paste.svg"); } - #placesContext_createBookmark { --menuitem-image: url("chrome://browser/skin/bookmark.svg"); } - #show-other-bookmarks_PersonalToolbar { /* checkbox */ --menuitem-image: url("../icons/star-line-horizontal.svg"); } - #placesContext_showAllBookmarks { --menuitem-image: url("chrome://browser/skin/bookmark-star-on-tray.svg"); } - .openintabs-menuitem { --menuitem-image: url("../icons/movetowindow-16.svg"); } @@ -3338,7 +3020,6 @@ #newbookmark { --menuitem-image: url("chrome://browser/skin/bookmark.svg"); } - #newfolder { --menuitem-image: url("chrome://global/skin/icons/folder.svg"); } @@ -3347,61 +3028,47 @@ --menuitem-image: url("../icons/folder.svg"); } } - #newseparator { --menuitem-image: url("../icons/vertical-line.svg"); } - #orgUndo { --menuitem-image: url("../icons/undo.svg"); } - #orgCut { --menuitem-image: url("chrome://browser/skin/edit-cut.svg"); } - #orgCopy { --menuitem-image: url("../icons/edit-copy.svg"); } - #orgPaste { --menuitem-image: url("chrome://browser/skin/edit-paste.svg"); } - #orgDelete { --menuitem-image: url("chrome://global/skin/icons/delete.svg"); } - #orgSelectAll { --menuitem-image: url("../icons/select-all-on.svg"); } - #orgClose { --menuitem-image: url("chrome://global/skin/icons/close.svg"); } - /*= viewMenuPopup ============================================================*/ #viewColumns { --menuitem-image: url("chrome://global/skin/icons/columnpicker.svg"); } - #viewSort { --menuitem-image: url("../icons/text-sort-ascending.svg"); } - /*= maintenanceButtonPopup ===================================================*/ #backupBookmarks { --menuitem-image: url("chrome://devtools/skin/images/datastore.svg"); } - #fileImport { - --menuitem-image: url("chrome://browser/skin/save.svg"); + --menuitem-image: url("../icons/toolbarButton-download.svg"); } - #fileExport { --menuitem-image: url("chrome://browser/skin/open.svg"); } - #browserImport { --menuitem-image: url("chrome://browser/skin/import.svg"); } @@ -3420,7 +3087,6 @@ #downloadsListBox .download-state[exists] .downloadDetails.downloadDetailsHover { color: var(--button-primary-hover-bgcolor); } - /* File moved or missing */ #downloadsListBox .download-state:not([exists], [state="0"]) .downloadTarget { text-decoration: line-through; diff --git a/arch-config/.mozilla/firefox/default-release/chrome/icons/error-malformed-url.svg b/arch-config/.mozilla/firefox/default-release/chrome/icons/error-malformed-url.svg new file mode 100644 index 00000000..831328d3 --- /dev/null +++ b/arch-config/.mozilla/firefox/default-release/chrome/icons/error-malformed-url.svg @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/arch-config/.mozilla/firefox/default-release/chrome/icons/merge.svg b/arch-config/.mozilla/firefox/default-release/chrome/icons/merge.svg new file mode 100644 index 00000000..e6060cd3 --- /dev/null +++ b/arch-config/.mozilla/firefox/default-release/chrome/icons/merge.svg @@ -0,0 +1,3 @@ + + + diff --git a/arch-config/.mozilla/firefox/default-release/chrome/icons/new-tab-forward.svg b/arch-config/.mozilla/firefox/default-release/chrome/icons/new-tab-forward.svg new file mode 100644 index 00000000..6c876421 --- /dev/null +++ b/arch-config/.mozilla/firefox/default-release/chrome/icons/new-tab-forward.svg @@ -0,0 +1,4 @@ + + + + diff --git a/arch-config/.mozilla/firefox/default-release/chrome/icons/new-tab-skip-forward.svg b/arch-config/.mozilla/firefox/default-release/chrome/icons/new-tab-skip-forward.svg new file mode 100644 index 00000000..9ab9e8a8 --- /dev/null +++ b/arch-config/.mozilla/firefox/default-release/chrome/icons/new-tab-skip-forward.svg @@ -0,0 +1,3 @@ + + + diff --git a/arch-config/.mozilla/firefox/default-release/chrome/icons/tab-desktop-multiple-bottom.svg b/arch-config/.mozilla/firefox/default-release/chrome/icons/tab-desktop-multiple-bottom.svg new file mode 100644 index 00000000..97457b4a --- /dev/null +++ b/arch-config/.mozilla/firefox/default-release/chrome/icons/tab-desktop-multiple-bottom.svg @@ -0,0 +1,3 @@ + + + diff --git a/arch-config/.mozilla/firefox/default-release/chrome/icons/timer10.svg b/arch-config/.mozilla/firefox/default-release/chrome/icons/timer10.svg new file mode 100644 index 00000000..e6311bb5 --- /dev/null +++ b/arch-config/.mozilla/firefox/default-release/chrome/icons/timer10.svg @@ -0,0 +1,3 @@ + + + diff --git a/arch-config/.mozilla/firefox/default-release/chrome/icons/toolbarButton-download.svg b/arch-config/.mozilla/firefox/default-release/chrome/icons/toolbarButton-download.svg new file mode 100644 index 00000000..6d647578 --- /dev/null +++ b/arch-config/.mozilla/firefox/default-release/chrome/icons/toolbarButton-download.svg @@ -0,0 +1,4 @@ + + + + diff --git a/arch-config/.mozilla/firefox/default-release/chrome/icons/weather-snowflake.svg b/arch-config/.mozilla/firefox/default-release/chrome/icons/weather-snowflake.svg new file mode 100644 index 00000000..fe7c53fb --- /dev/null +++ b/arch-config/.mozilla/firefox/default-release/chrome/icons/weather-snowflake.svg @@ -0,0 +1,3 @@ + + + diff --git a/arch-config/.mozilla/firefox/default-release/install.ps1 b/arch-config/.mozilla/firefox/default-release/install.ps1 new file mode 100644 index 00000000..eb5ef71b --- /dev/null +++ b/arch-config/.mozilla/firefox/default-release/install.ps1 @@ -0,0 +1,997 @@ +<# + +.SYNOPSIS +Installer for Lepton + +.DESCRIPTION +Installs Lepton onto selected Firefox profiles + +.INPUTS +TODO: input directories for installation? +Would need to discuss a non-interactive install system + +.OUTPUTS +TODO: output directories that Lepton has been installed to? + +.PARAMETER u +Specifies whether to update a current installation +Defaults to false + +.PARAMETER f +Specifies a custom path to look for Firefox profiles in + +.PARAMETER p +Specifies a custom name to use when creating a profile + +.PARAMETER h +Shows this help message + +.PARAMETER ? +Shows this help message + +.PARAMETER WhatIf +Runs the installer without actioning any file copies/moves +Equivalent to a dry-run + +.EXAMPLE +PS> .\Install.ps1 -u -f C:\Users\someone\ff-profiles +Updates current installations in the profile directory 'C:\Users\someone\ff-profiles' + +.LINK +https://github.com/black7375/Firefox-UI-Fix#readme + +#> + +[CmdletBinding( + SupportsShouldProcess = $true, + PositionalBinding = $false +)] + +param( + [Alias("u")] + [switch]$updateMode, + [Alias("f")] + [string]$profileDir, + [Alias("p")] + [string]$profileName, + [Alias("h")] + [switch]$help = $false +) + +#** Helper Utils *************************************************************** +#== Message ==================================================================== +function Lepton-ErrorMessage() { + Write-Error "FAILED: ${args}" + exit -1 +} + +function Lepton-OKMessage() { + $local:SIZE = 50 + $local:FILLED = "" + for ($i = 0; $i -le ($SIZE - 2); $i++) { + $FILLED += "." + } + $FILLED += "OK" + + $local:message = "${args}" + Write-Host ${message}(${FILLED}.Substring(${message}.Length)) +} + +$PSMinSupportedVersion = 2 +function Verify-PowerShellVersion { + Write-Host -NoNewline "Checking PowerShell version... " + $PSVersion = [int](Select-Object -Property Major -First 1 -ExpandProperty Major -InputObject $PSVersionTable.PSVersion) + + Write-Host "[$PSVersion]" + if ($PSVersion -lt $PSMinSupportedVersion) { + Write-Error -Category NotInstalled "You need a minimum PowerShell version of [$PSMinSupportedVersion] to use this installer" + exit -1 + } +} + +#== Required Tools ============================================================= +function Install-Choco() { + # https://chocolatey.org/install + # https://docs.chocolatey.org/en-us/choco/setup#non-administrative-install + $InstallDir='C:\ProgramData\chocoportable' + $env:ChocolateyInstall="$InstallDir" + + Set-ExecutionPolicy Bypass -Scope Process -Force + [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072 + iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1')) + $env:Path += ";C:\ProgramData\chocoportable" # Adimin: ";C:\ProgramData\chocolatey" + refreshenv +} + +function Check-Git() { + if ( -Not (Get-Command git -errorAction SilentlyContinue) ) { + if ( -Not (Get-Command choco -errorAction SilentlyContinue) ) { + Install-Choco + } + choco install git.commandline -y + $env:Path += ";C:\tools\git\bin" # Adimin: ";C:\Program Files\Git\bin" + refreshenv + } + + Lepton-OKMessage "Required - git" +} + +#== PATH / File ================================================================ +$PSDefaultParameterValues['Out-File:Encoding'] = 'utf8' + +$currentDir = (Get-Location).path + +function Filter-Path() { + Param ( + [Parameter(Mandatory=$true, Position=0)] + [string[]] $pathList, + [Parameter(Position=1)] + [string] $option = "Any" + ) + + return $pathList.Where({ Test-Path -Path "$_" -PathType "${option}" }) +} + +function Copy-Auto() { + Param ( + [Parameter(Mandatory=$true, Position=0)] + [string] $file, + [Parameter(Mandatory=$true, Position=1)] + [string] $target + ) + + if ( "${file}" -eq "${target}" ) { + Write-Host "'${file}' and ${target} are same file" + return 0 + } + + if ( Test-Path -Path "${target}" ) { + Write-Host "${target} already exists." + Write-Host "Now making a backup.." + Copy-Auto "${target}" "${target}.bak" + Remove-Item "${target}" -Recurse -Force + Write-Host "" + } + + Copy-Item -Path "${file}" -Destination "${target}" -Force -Recurse +} + +function Move-Auto() { + Param ( + [Parameter(Mandatory=$true, Position=0)] + [string] $file, + [Parameter(Mandatory=$true, Position=1)] + [string] $target + ) + + if ( "${file}" -eq "${target}" ) { + Write-Host "'${file}' and ${target} are same file" + return 0 + } + + if ( Test-Path -Path "${target}" ) { + Write-Host "${target} already exists." + Write-Host "Now making a backup.." + Move-Auto "${target}" "${target}.bak" + Write-Host "" + } + + Get-ChildItem -Path "${target}" -Recurse | Move-Item -Path "${file}" -Destination "${target}" -Force +} + + function Restore-Auto() { + Param ( + [Parameter(Mandatory=$true, Position=0)] + [string] $file + ) + $local:target = "${file}.bak" + + if ( Test-Path -Path "${file}" ) { + Remove-Item "${file}" -Recurse -Force + } + Get-ChildItem -Path "${target}" -Recurse | Move-Item -Destination "${file}" -Force + + $local:lookupTarget = "${target}.bak" + if ( Test-Path -Path "${lookupTarget}" ) { + Restore-Auto "${target}" + } +} + +function Write-File() { + Param ( + [Parameter(Mandatory=$true, Position=0)] + [string] $filePath, + [Parameter(Position=1)] + [string] $fileContent = "" + ) + + if ( "${fileContent}" -eq "" ) { + New-Item -Path "${filePath}" -Force + } + else { + Out-File -FilePath "${filePath}" -InputObject "${fileContent}" -Force + } +} + +#== INI File ================================================================ +# https://devblogs.microsoft.com/scripting/use-powershell-to-work-with-any-ini-file/ +function Get-IniContent () { + Param ( + [Parameter(Mandatory=$true, Position=0)] + [string] $filePath + ) + + $ini = @{} + switch -regex -file $filePath { + "^\[(.+)\]" { + # Section + $section = $matches[1] + $ini[$section] = @{} + $CommentCount = 0 + } + "^(;.*)$" { + # Comment + $value = $matches[1] + $CommentCount = $CommentCount + 1 + $name = “Comment” + $CommentCount + $ini[$section][$name] = $value + } + "(.+?)\s*=(.*)" { + # For compatibility + if ( $section -eq $null ) { + $section = "Info" + $ini[$section] = @{} + } + + # Key + $name,$value = $matches[1..2] + $ini[$section][$name] = $value + } + } + return $ini +} + +function Out-IniFile() { + Param ( + [Parameter(Mandatory=$true, Position=0)] + [string] $filePath, + [Parameter(Position=1)] + [hashtable] $iniObject = @{} + ) + + # Create new file + $local:outFile = New-Item -ItemType file -Path "${filepath}" -Force + + foreach ($i in $iniObject.keys) { + if (!($($iniObject[$i].GetType().Name) -eq "Hashtable")) { + #No Sections + Add-Content -Path $outFile -Value "$i=$($iniObject[$i])" + } + else { + #Sections + Add-Content -Path $outFile -Value "[$i]" + Foreach ($j in ($iniObject[$i].keys | Sort-Object)) { + if ($j -match "^Comment[\d]+") { + Add-Content -Path $outFile -Value "$($iniObject[$i][$j])" + } + else { + Add-Content -Path $outFile -Value "$j=$($iniObject[$i][$j])" + } + + } + Add-Content -Path $outFile -Value "" + } + } +} + +#** Select Menu **************************************************************** +# https://github.com/chrisseroka/ps-menu +function Check-PsMenu() { + if(-Not (Get-InstalledModule ps-menu -ErrorAction silentlycontinue)) { + Set-PSRepository PSGallery -InstallationPolicy Trusted + Install-Module -Name ps-menu -Confirm:$False -Force + } +} + +function DrawMenu { + param ($menuItems, $menuPosition, $Multiselect, $selection) + $l = $menuItems.length + for ($i = 0; $i -le $l; $i++) { + if ($menuItems[$i] -ne $null){ + $item = $menuItems[$i] + if ($Multiselect) { + if ($selection -contains $i){ + $item = '[x] ' + $item + } + else { + $item = '[ ] ' + $item + } + } + if ($i -eq $menuPosition) { + Write-Host "> $($item)" -ForegroundColor Green + } + else { + Write-Host " $($item)" + } + } + } +} + +function Toggle-Selection { + param ($pos, [array]$selection) + if ($selection -contains $pos){ + $result = $selection | where {$_ -ne $pos} + } + else { + $selection += $pos + $result = $selection + } + $result +} + +function Menu { + param ([array]$menuItems, [switch]$ReturnIndex=$false, [switch]$Multiselect) + $vkeycode = 0 + $pos = 0 + $selection = @() + if ($menuItems.Length -gt 0) { + try { + [console]::CursorVisible=$false #prevents cursor flickering + DrawMenu $menuItems $pos $Multiselect $selection + While ($vkeycode -ne 13 -and $vkeycode -ne 27) { + $press = $host.ui.rawui.readkey("NoEcho,IncludeKeyDown") + $vkeycode = $press.virtualkeycode + If ($vkeycode -eq 38 -or $press.Character -eq 'k') {$pos--} + If ($vkeycode -eq 40 -or $press.Character -eq 'j') {$pos++} + If ($vkeycode -eq 36) { $pos = 0 } + If ($vkeycode -eq 35) { $pos = $menuItems.length - 1 } + If ($press.Character -eq ' ') { $selection = Toggle-Selection $pos $selection } + if ($pos -lt 0) {$pos = 0} + If ($vkeycode -eq 27) {$pos = $null } + if ($pos -ge $menuItems.length) {$pos = $menuItems.length -1} + if ($vkeycode -ne 27) { + $startPos = [System.Console]::CursorTop - $menuItems.Length + [System.Console]::SetCursorPosition(0, $startPos) + DrawMenu $menuItems $pos $Multiselect $selection + } + } + } + finally { + [System.Console]::SetCursorPosition(0, $startPos + $menuItems.Length) + [console]::CursorVisible = $true + } + } + else { + $pos = $null + } + + if ($ReturnIndex -eq $false -and $pos -ne $null) { + if ($Multiselect){ + return $menuItems[$selection] + } + else { + return $menuItems[$pos] + } + } + else { + if ($Multiselect) { + return $selection + } + else { + return $pos + } + } +} + +#** Profile ******************************************************************** +#== Profile Dir ================================================================ +# $HOME = (get-psprovider 'FileSystem').Home +$firefoxProfileDirPaths = @( + "${HOME}\AppData\Roaming\Mozilla\Firefox", + "${HOME}\AppData\Roaming\Waterfox", + "${HOME}\AppData\Roaming\librewolf", + "${HOME}\AppData\Roaming\Ghostery Browser", + "${HOME}\Desktop\Tor Browser\Browser\TorBrowser\Data\Browser" +) + +function Check-ProfileDir() { + Param ( + [Parameter(Position=0)] + [string] $profileDir = "" + ) + + if ( "${profileDir}" -ne "" ) { + $global:firefoxProfileDirPaths = @("${profileDir}") + } + + + $global:firefoxProfileDirPaths = Filter-Path $global:firefoxProfileDirPaths "Container" + + if ( $firefoxProfileDirPaths.Length -eq 0 ) { + Lepton-ErrorMessage "Unable to find firefox profile dir." + } + + Lepton-OKMessage "Profiles dir found" +} + +#== Profile Info =============================================================== +$PROFILEINFOFILE="profiles.ini" +function Check-ProfileIni() { + foreach ( $profileDir in $global:firefoxProfileDirPaths ) { + if ( -Not (Test-Path -Path "${profileDir}\${PROFILEINFOFILE}" -PathType "Leaf") ) { + Lepton-ErrorMessage "Unable to find ${PROFILEINFOFILE} at ${profileDir}" + } + } + + Lepton-OKMessage "Profiles info file found" +} + +#== Profile PATH =============================================================== +$firefoxProfilePaths = @() +function Update-ProfilePaths() { + foreach ( $profileDir in $global:firefoxProfileDirPaths ) { + $local:iniContent = Get-IniContent "${profileDir}\${PROFILEINFOFILE}" + $global:firefoxProfilePaths += $iniContent.Values.Path | ForEach-Object { "${profileDir}\${PSItem}" } + } + + if ( $firefoxProfilePaths.Length -ne 0 ) { + Lepton-OkMessage "Profile paths updated" + } + else { + Lepton-ErrorMessage "Doesn't exist profiles" + } +} + +# TODO: Multi select support +function Select-Profile() { + Param ( + [Parameter(Position=0)] + [string] $profileName = "" + ) + + if ( "${profileName}" -ne "" ) { + $local:targetPath = "" + foreach ( $profilePath in $global:firefoxProfilePaths ) { + if ( "${profilePath}" -like "*${profileName}" ) { + $targetPath = "${profilePath}" + break + } + } + + if ( "${targetPath}" -ne "" ) { + Lepton-OkMessage "Profile, `"${profileName}`" found" + $global:firefoxProfilePaths = @("${targetPath}") + } + else { + Lepton-ErrorMessage "Unable to find ${profileName}" + } + } + else { + if ( $firefoxProfilePaths.Length -eq 1 ) { + Lepton-OkMessage "Auto detected profile" + } + else { + $global:firefoxProfilePaths = Menu $firefoxProfilePaths + + if ( $firefoxProfilePaths.Length -eq 0 ) { + Lepton-ErrorMessage "Please select profiles" + } + + Lepton-OkMessage "Selected profile" + } + } +} + +#** Lepton Info File *********************************************************** +# If you interst RFC, see install.sh + +#== Lepton Info ================================================================ +$LEPTONINFOFILE ="lepton.ini" +function Check-LeptonIni() { + foreach ( $profileDir in $global:firefoxProfileDirPaths ) { + if ( -Not (Test-Path -Path "${profileDir}\${LEPTONINFOFILE}") ) { + Lepton-ErrorMessage "Unable to find ${LEPTONINFOFILE} at ${profileDir}" + } + } + + Lepton-OkMessage "Lepton info file found" +} + +#== Create info file =========================================================== +# We should always create a new one, as it also takes into account the possibility of setting it manually. +# Updates happen infrequently, so the creation overhead is less significant. + +function Get-ProfileDir() { + Param ( + [Parameter(Mandatory=$true, Position=0)] + [string] $profilePath + ) + foreach ( $profileDir in $firefoxProfileDirPaths ) { + if ( "$profilePath" -like "${profileDir}*" ) { + return "$profileDir" + } + } +} + +$CHROMEINFOFILE="LEPTON" +function Write-LeptonInfo() { + # Init info + $local:output = @{} + $local:prevDir = $firefoxProfileDirPaths[0] + $local:latestPath = ( $firefoxProfilePaths | Select-Object -Last 1 ) + foreach ( $profilePath in $global:firefoxProfilePaths ) { + $local:LEPTONINFOPATH = "${profilePath}\chrome\${CHROMEINFOFILE}" + $local:LEPTONGITPATH = "${profilePath}\chrome\.git" + + # Profile info + $local:Type = "" + $local:Ver = "" + $local:Branch = "" + $local:Path = "" + if ( Test-Path -Path "${LEPTONINFOPATH}" ) { + if ( Test-Path -Path "${LEPTONGITPATH}" -PathType "Container" ) { + $Type = "Git" + $Ver = $(git --git-dir "${LEPTONGITPATH}" rev-parse HEAD) + $Branch = $(git --git-dir "${LEPTONGITPATH}" rev-parse --abbrev-ref HEAD) + } + else { + $local:iniContent = Get-IniContent "${LEPTONINFOPATH}" + $Type = $iniContent["Info"]["Type"] + $Ver = $iniContent["Info"]["Ver"] + $Branch = $iniContent["Info"]["Branch"] + + if ( "${Type}" -eq "" ) { + $Type = "Local" + } + } + + $Path = "${profilePath}" + } + + # Flushing + $local:profileDir = Get-ProfileDir "${profilePath}" + $local:profileName = Split-Path "${profilePath}" -Leaf + if ( "${prevDir}" -ne "${profileDir}" ) { + Out-IniFile "${prevDir}\${LEPTONINFOFILE}" $output + $output = @{} + } + + # Make output contents + foreach ( $key in @("Type", "Branch", "Ver", "Path") ) { + $local:value = (Get-Variable -Name "${key}").Value + if ( "$value" -ne "" ) { + $output["${profileName}"] += @{"${key}" = "${value}"} + } + } + + # Latest element flushing + if ( "${profilePath}" -eq "${latestPath}" ) { + Out-IniFile "${profileDir}\${LEPTONINFOFILE}" $output + } + $prevDir = "${profileDir}" + } + + # Verify + Check-LeptonIni + Lepton-OkMessage "Lepton info file created" +} + +#** Install ******************************************************************** +#== Install Types ============================================================== +$updateMode = $false +$leptonBranch = "master" +function Select-Distribution() { + while ( $true ) { + $local:selected = $false + $local:selectedDistribution = Menu @("Original(default)", "Photon-Style", "Proton-Style", "Update") + switch ( $selectedDistribution ) { + "Original(default)" { $global:leptonBranch = "master" ; $selected = $true } + "Photon-Style" { $global:leptonBranch = "photon-style"; $selected = $true } + "Proton-Style" { $global:leptonBranch = "proton-style"; $selected = $true } + "Update" { $global:updateMode = $true ; $selected = $true } + default { Write-Host "Invalid option, reselect please." } + } + + if ( $selected -eq $true ) { + break + } + } + Lepton-OkMessage "Selected ${selectedDistribution}" +} + +$leptonInstallType = "Network" # Other types: Local, Release +function Check-InstallType() { + Param ( + [Parameter(Mandatory=$true, Position=0)] + [string[]] $targetList, + [Parameter(Mandatory=$true, Position=1)] + [string] $installType + ) + + $local:targetCount = $targetList.Length + $local:foundCount = (Filter-Path $targetList ).Length + + if ( "${targetCount}" -eq "${foundCount}" ) { + $global:leptonInstallType="${installType}" + } +} + +$checkLocalFiles = @( + "userChrome.css", + "userContent.css", + "icons" +) +$checkReleaseFiles = @( + "user.js" + "chrome\userChrome.css" + "chrome\userContent.css" + "chrome\icons" +) +function Check-InstallTypes() { + Check-InstallType $checkLocalFiles "Local" + Check-InstallType $checkReleaseFiles "Release" + + Lepton-OkMessage "Checked install type: ${leptonInstallType}" + if ( "${leptonInstallType}" -eq "Network" ) { + Select-Distribution + } + if ( "${leptonInstallType}" -eq "Local" ) { + if ( Test-Path -Path ".git" -PathType "Container" ) { + Select-Distribution + git checkout "${leptonBranch}" + } + } +} + +#== Custom Install ============================================================= +$customFiles = @( + "user-overrides.js", + "userChrome-overrides.css", + "userContent-overrides.css" +) +$localCustomFiles = $customFiles.Clone() + +$customFileExist = $false +function Check-CustomFiles() { + $global:localCustomFiles = Filter-Path $localCustomFiles + + if ( $global:localCustomFiles.Length -gt 0 ) { + $global:customFileExist = $true + Lepton-OKMessage "Check custom file detected" + + foreach ( $customFile in $global:localCustomFiles ) { + Write-Host "- ${customFile}" + } + } +} + +function Copy-CustomFiles() { + if ( "${customFileExist}" -eq $true ) { + # If Release or Network mode, Local is passed (Already copied) + if ( "${leptonInstallType}" -ne "Local" ) { + foreach ( $profilePath in $global:firefoxProfilePaths ) { + foreach ( $customFile in $global:localCustomFiles ) { + if ( "${customFile}" -eq "user-overrides.js" ) { + Copy-Auto "${customFile}" "${profilePath}\${customFile}" + } + else { + Copy-Auto "${customFile}" "${profilePath}\chrome\${customFile}" + } + } + } + } + + Lepton-OKMessage "End custom file copy" + } +} + +$customMethod = "" +$customReset = $false +$customAppend = $false +function Set-CustomMethod() { + $local:menuAppend="Append - Maintain changes in existing files and apply custom" + $local:menuOverwrite="Overwrite - After initializing the change, apply only custom" + $local:menuNone="None - Maintain changes in existing files" + $local:menuReset="Reset- Reset to pure lepton theme without custom" + + Write-Host "Select custom method" + while ( "${customMethod}" -eq "" ) { + $local:applyMethod = Menu @("${menuAppend}", "${menuOverwrite}", "${menuNone}", "${menuReset}") + switch ( $applyMethod ) { + "${menuAppend}" { + $global:customMethod = "Append" + $global:customAppend = $true + } + "${menuOverwrite}" { + $global:customMethod = "Overwrite" + $global:customReset = $true + $global:customAppend = $true + } + "${menuNone}" { + $global:customMethod = "None" + } + "${menuReset}" { + $global:customMethod = "Reset" + $global:customReset = $true + } + default { Write-Host "Invalid option, reselect please." } + } + } + + Lepton-OKMessage "Selected ${customMethod}" +} + +$customFileApplied = $false +function Apply-CustomFile() { + Param ( + [Parameter(Mandatory=$true, Position=0)] + [string] $profilePath, + [Parameter(Mandatory=$true, Position=1)] + [string] $targetPath, + [Parameter(Mandatory=$true, Position=2)] + [string] $customPath, + [Parameter(Position=3)] + [string] $otherCustomPath = "" + ) + + $local:leptonDir = "${profilePath}\chrome" + $local:gitDir = "${leptonDir}\.git" + if ( Test-Path -Path "${customPath}" -PathType leaf ) { + $global:customFileApplied = $true + + if ( "${customMethod}" -eq "" ) { + Set-CustomMethod + } + + if ( "${customReset}" -eq $true ) { + if ( "${targetPath}" -like "*user.js" ) { + Copy-Item -Path "${leptonDir}\user.js" -Destination "${targetPath}" -Force + } + else { + git --git-dir "${gitDir}" --work-tree "${leptonDir}" checkout HEAD -- "${targetPath}" + } + } + if ( "${customAppend}" -eq $true ) { + # Apply without duplication + if ( -not (Write-Output "$(Write-Output $(Get-Content -Path "${targetPath}"))" | Select-String -Pattern "$(Write-Output $(Get-Content -Path "${customPath}"))" -SimpleMatch -Quiet) ) { + Get-Content -Path "${customPath}" | Out-File -FilePath "${targetPath}" -Append + } + } + } + elseif ( "${otherCustomPath}" -ne "" ) { + Apply-CustomFile "${profilePath}" "${targetPath}" "${otherCustomPath}" + } +} + +function Apply-CustomFiles() { + foreach ( $profilePath in $global:firefoxProfilePaths ) { + foreach ( $customFile in $global:customFiles ) { + $local:targetFile = $customFile.Replace("-overrides", "") + if ( "${customFile}" -eq "user-overrides.js" ) { + $local:targetPath = "${profilePath}\${targetFile}" + $local:customPath = "${profilePath}\user-overrides.js" + $local:otherCustomPath = "${profilePath}\chrome\user-overrides.js" + Apply-CustomFile "${profilePath}" "${targetPath}" "${customPath}" "${otherCustomPath}" + } + else { + Apply-CustomFile "${profilePath}" "${profilePath}\chrome\${targetFile}" "${profilePath}\chrome\${customFile}" + } + } + } + + if ( "${customFileApplied}" -eq $true ) { + Lepton-OKMessage "End custom file applied" + } +} + +#== Install Helpers ============================================================ +$chromeDuplicate = $false +function Check-ChromeExist() { + if ( (Test-Path -Path "chrome") -and (-Not (Test-Path -Path "chrome\${LEPTONINFOFILE}")) ) { + $global:chromeDuplicate = $true + Move-Auto "chrome" "chrome.bak" + Lepton-OkMessage "Backup files" + } +} +function Check-ChromeRestore() { + if ( "${chromeDuplicate}" -eq $true ) { + Restore-Auto "chrome" + Lepton-OkMessage "End restore files" + } + Lepton-OkMessage "End check restore files" +} + +function Clean-Lepton() { + if ( ($chromeDuplicate -ne $true) -and (Test-Path -Path "chrome") ) { + Remove-Item -Path "chrome" -Recurse -Force + } + Lepton-OkMessage "End clean files" +} +function Clone-Lepton() { + Param ( + [Parameter(Position=0)] + [string] $branch = "" + ) + + if ( "${branch}" -eq "" ) { + $branch = "${leptonBranch}" + } + + git clone -b "${branch}" https://github.com/black7375/Firefox-UI-Fix.git chrome + if ( -Not (Test-Path -Path "chrome" -PathType "Container") ) { + Lepton-ErrorMessage "Unable to find downloaded files" + } +} + +function Copy-Lepton() { + Param ( + [Parameter(Position=0)] + [string] $chromeDir = "chrome", + [Parameter(Position=1)] + [string] $userJSPath = "${chromeDir}\user.js" + ) + + foreach ( $profilePath in $global:firefoxProfilePaths ) { + Copy-Auto "${userJSPath}" "${profilePath}\user.js" + Copy-Auto "${chromeDir}" "${profilePath}\chrome" + } + + Lepton-OkMessage "End profile copy" +} + +#== Each Install =============================================================== +function Install-Local() { + Copy-Lepton "${currentDir}" "user.js" + Copy-CustomFiles + + Apply-CustomFiles +} + +function Install-Release() { + Copy-Lepton "chrome" "user.js" + Copy-CustomFiles + + Apply-CustomFiles +} + +function Install-Network() { + Check-ChromeExist + Check-Git + + Clone-Lepton + Copy-Lepton + Copy-CustomFiles + + Clean-Lepton + Check-ChromeRestore + + Apply-CustomFiles +} + +function Install-Profile() { + Lepton-OkMessage "Started install" + + switch ( "${leptonInstallType}" ) { + "Local" { Install-Local } + "Release" { Install-Release } + "Network" { Install-Network } + } + + Lepton-OkMessage "End install" +} + +#** Update ********************************************************************* +function Stash-File() { + Param ( + [Parameter(Mandatory=$true, Position=0)] + [string] $leptonDir, + [Parameter(Mandatory=$true, Position=1)] + [string] $gitDir + ) + + if ( "$(git --git-dir "${gitDir}" --work-tree "${leptonDir}" diff --stat)" -ne '' ) { + git --git-dir "${gitDir}" --work-tree "${leptonDir}" stash --quiet + return $true + } + return $false +} +function Restore-File() { + Param ( + [Parameter(Mandatory=$true, Position=0)] + [string] $leptonDir, + [Parameter(Mandatory=$true, Position=1)] + [string] $gitDir, + [Parameter(Position=2)] + [string] $gitDirty = "$false" + ) + + if ( "${gitDirty}" -eq $true ) { + git --git-dir "${gitDir}" --work-tree "${leptonDir}" stash pop --quiet + } +} + +function Update-Profile() { + Check-Git + foreach ( $profileDir in $global:firefoxProfileDirPaths ) { + $local:LEPTONINFOPATH = "${profileDir}\${LEPTONINFOFILE}" + $local:LEPTONINFO = Get-IniContent "${LEPTONINFOPATH}" + $local:sections = $LEPTONINFO.Keys + if ( $sections.Length -ne 0 ) { + foreach ( $section in $sections ) { + $local:Type = $LEPTONINFO["${section}"]["Type"] + $local:Branch = $LEPTONINFO["${section}"]["Branch"] + $local:Path = $LEPTONINFO["${section}"]["Path"] + + $local:leptonDir = "${Path}\chrome" + $local:gitDir = "${leptonDir}\.git" + if ( "${Type}" -eq "Git" ) { + $local:gitDirty = $(Stash-File "${leptonDir}" "${gitDir}") + + git --git-dir "${gitDir}" --work-tree "${leptonDir}" checkout "${Branch}" + git --git-dir "${gitDir}" --work-tree "${leptonDir}" pull --no-edit + + Restore-File "${leptonDir}" "${gitDir}" "$gitDirty" + } + elseif ( "${Type}" -eq "Local" -or "${Type}" -eq "Release" ) { + Check-ChromeExist + Clone-Lepton + + $firefoxProfilePaths = @("${Path}") + Copy-Lepton + + if ( "${Branch}" -eq $null ) { + $Branch = "${leptonBranch}" + } + git --git-dir "${gitDir}" --work-tree "${leptonDir}" checkout "${Branch}" + + if ( "${Type}" -eq "Release" ) { + $local:Ver=$(git --git-dir "${gitDir}" describe --tags --abbrev=0) + git --git-dir "${gitDir}" --work-tree "${leptonDir}" checkout "tags/${Ver}" + } + + Clean-Lepton + Check-ChromeRestore + } + else { + Lepton-ErrorMessage "Unable to find update type, ${Type} at ${section}" + } + } + } + } + + Apply-CustomFiles +} + +#** Main *********************************************************************** +function Check-Help { + # Cheap and dirty way of getting the same output as '-?' for '-h' and '-Help' + if ($help) { + Get-Help "$PSCommandPath" + exit 0 + } +} + +function Install-Lepton { + Verify-PowerShellVersion # Check installed version meets minimum + Check-InstallTypes + + Check-ProfileDir $profileDir + Check-ProfileIni + Update-ProfilePaths + Write-LeptonInfo + + Check-CustomFiles + + if ( $updateMode ) { + Update-Profile + } + else { + Select-Profile $profileName + Install-Profile + } + + Write-LeptonInfo +} + +Check-Help +Install-Lepton diff --git a/arch-config/.mozilla/firefox/default-release/install.sh b/arch-config/.mozilla/firefox/default-release/install.sh new file mode 100755 index 00000000..185af73f --- /dev/null +++ b/arch-config/.mozilla/firefox/default-release/install.sh @@ -0,0 +1,954 @@ +#!/usr/bin/env bash + +#** Helper Utils *************************************************************** +#== Message ==================================================================== +lepton_error_message() { + >&2 echo "FAILED: ${@}" + exit 1 +} + +lepton_ok_message() { + local SIZE=50 + local FILLED="" + for ((i=0; i<=$((SIZE - 2)); i++)); do + FILLED+="." + done + FILLED+="OK" + + local message="${@}" + echo "${message}${FILLED:${#message}}" +} + +lepton_spinner() { + local chars="/-\|" + + for (( i=0; i<${#chars}; i++ )); do + sleep 0.5 + echo -en "${chars:$i:1}" "\r" + done +} + +#== Required Tools ============================================================= +PACAPT_PATH="/usr/local/bin/pacapt" +PACAPT_INSTALLED=true +pacapt_install() { + if ! [ -x "$(command -v pacapt)" ]; then + echo "Universal Package Manager(icy/pacapt) Download && Install(need sudo permission)" + echo "It is installed temporarily and will be removed when installation is complete." + sudo curl https://github.com/icy/pacapt/raw/ng/pacapt -Lo "${PACAPT_PATH}" + sudo chmod 755 "${PACAPT_PATH}" + sudo ln -sv "${PACAPT_PATH}" /usr/local/bin/pacman || true + PACAPT_INSTALLED=false + fi + sudo pacapt -Sy +} + +pacapt_uninstall() { + if [[ "${PACAPT_INSTALLED}" == false ]]; then + sudo rm -rf "${PACAPT}" + fi +} + +mac_command_line_developer_tools() { + # https://unix.stackexchange.com/questions/408280/until-statement-waiting-for-process-to-finish-being-ignored + XCODE_MESSAGE="$(osascript -e 'tell app "System Events" to display dialog "Please click install when Command Line Developer Tools appears"')" + if [ "$XCODE_MESSAGE" = "button returned:OK" ]; then + xcode-select --install + else + lepton_error_message "You have cancelled the installation, please rerun the installer." + fi + + until [ "$(xcode-select -p 1>/dev/null 2>&1; echo $?)" -eq 0 ]; do + lepton_spinner + done + echo "" + lepton_ok_message "Installed Command Line Developer Tools" +} + +check_git() { + if ! [ -x "$(command -v git)" ]; then + if [[ "${OSTYPE}" == "linux"* || "${OSTYPE}" == "FreeBSD" ]]; then + pacapt_install + sudo pacapt -S git + pacapt_uninstall + elif [[ "${OSTYPE}" == "darwin"* ]]; then + mac_command_line_developer_tools + else + lepton_error_message "OS NOT DETECTED, couldn't install required packages. Please manually install git." + fi + fi + + if [[ "${OSTYPE}" == "darwin"* ]]; then + if ! [ "$(git --help 1>/dev/null 2>&1; echo $?)" -eq 0 ]; then + mac_command_line_developer_tools + fi + fi + lepton_ok_message "Required - git" +} + +#== PATH / File ================================================================ +currentDir=$( cd "$(dirname $0)" ; pwd ) + +paths_filter() { + local pathListName="$1" # array name + local option="$2" + + # Set array + eval "local pathList=(\"\${${pathListName}[@]}\")" + + # Set default option + if [ -z "$option" ]; then + option="-e" + fi + + # Check path + local foundedTargets=() + for checkTarget in "${pathList[@]}"; do + if [ "$option" "$checkTarget" ]; then + foundedTargets+=("$checkTarget") + fi + done + + # Replace + eval "${pathListName}=(\"\${foundedTargets[@]}\")" +} + +autocp() { + local file="${1}" + local target="${2}" + + if [ "${file}" == "${target}" ]; then + echo "'${file}' and ${target} are same file" + return 0 + fi + + if [ -e "${target}" ]; then + echo "${target} already exists." + echo "Now making a backup.." + autocp "${target}" "${target}.bak" + rm -rf "${target}" + echo "" + fi + + cp -rf "${file}" "${target}" +} + +automv() { + local file="${1}" + local target="${2}" + + if [ "${file}" == "${target}" ]; then + echo "'${file}' and ${target} are same file" + return 0 + fi + + if [ -e "${target}" ]; then + echo "${target} already exists." + echo "Now making a backup.." + automv "${target}" "${target}.bak" + echo "" + fi + + mv -f "${file}" "${target}" +} + +autorestore() { + local file="${1}" + local target="${file}.bak" + + if [ -e "${file}" ]; then + rm -rf "${file}" + fi + mv -f "${target}" "${file}" + + local lookupTarget="${target}.bak" + if [ -e "${lookupTarget}" ]; then + autorestore "${target}" + fi +} + +write_file() { + local filePath="$1" + local fileContent="$2" + + if [ -z "${fileContent}" ]; then + if [ -e "${filePath}" ]; then + rm -rf "${filePath}" + fi + touch "${filePath}" + else + echo -e "${fileContent}" | tee "${filePath}" > /dev/null + fi +} + +#== INI File ================================================================ +get_ini_section() { + local filePath="$1" + + local output=$(grep -E "^\[" "${filePath}" |sed -e "s/^\[//g" -e "s/\]$//g") + echo "${output}" +} +get_ini_value() { + local filePath="$1" + local key="$2" + local section="$3" + + local output="" + if [ "${section}" == "" ]; then + output=$(grep -E "^${key}" "${filePath}" | cut -f 2 -d"=") + echo "${output}" + else + local sectionStart="" + for line in $(cat "${filePath}"); do + if [[ "${sectionStart}" == "true" && "${line}" == "["* ]]; then + return 0 + fi + + if [ "${line}" == "[${section}]" ]; then + sectionStart="true" + fi + + if [ "${sectionStart}" == "true" ]; then + output=$(echo "${line}" | grep -E "^${key}" | cut -f 2 -d"=" ) + if [ "${output}" != "" ]; then + echo "${output}" + fi + fi + done + fi +} + +set_ini_section() { + local section="$1" + echo "[${section}]\n" +} +set_ini_value() { + local key="$1" + local value="$2" + + if [ "${value}" == "" ]; then + echo "" + else + echo "${key}=${value}\n" + fi +} + +#== Multiselect ================================================================ +# https://stackoverflow.com/questions/45382472/bash-select-multiple-answers-at-once/54261882 +multiselect() { + echo 'Select with , confirm with ' + + # little helpers for terminal print control and key input + ESC=$( printf "\033") + cursor_blink_on() { printf "$ESC[?25h"; } + cursor_blink_off() { printf "$ESC[?25l"; } + cursor_to() { printf "$ESC[$1;${2:-1}H"; } + print_inactive() { printf "$2 $1 "; } + print_active() { printf "$2 $ESC[7m $1 $ESC[27m"; } + get_cursor_row() { IFS=';' read -sdR -p $'\E[6n' ROW COL; echo ${ROW#*[}; } + key_input() { + local key + IFS= read -rsn1 key 2>/dev/null >&2 + if [[ $key = "" ]]; then echo enter; fi; + if [[ $key = $'\x20' ]]; then echo space; fi; + if [[ $key = $'\x1b' ]]; then + read -rsn2 key + if [[ $key = [A ]]; then echo up; fi; + if [[ $key = [B ]]; then echo down; fi; + fi + } + toggle_option() { + local arr_name=$1 + eval "local arr=(\"\${${arr_name}[@]}\")" + local option=$2 + if [[ ${arr[option]} == true ]]; then + arr[option]= + else + arr[option]=true + fi + eval $arr_name='("${arr[@]}")' + } + + local retval=$1 + local options + local defaults + + IFS=';' read -r -a options <<< "$2" + if [[ -z $3 ]]; then + defaults=() + else + IFS=';' read -r -a defaults <<< "$3" + fi + local selected=() + + for ((i=0; i<${#options[@]}; i++)); do + selected+=("${defaults[i]}") + printf "\n" + done + + # determine current screen position for overwriting the options + local lastrow=`get_cursor_row` + local startrow=$(($lastrow - ${#options[@]})) + + # ensure cursor and input echoing back on upon a ctrl+c during read -s + trap "cursor_blink_on; stty echo; printf '\n'; exit" 2 + cursor_blink_off + + local active=0 + while true; do + # print options by overwriting the last lines + local idx=0 + for option in "${options[@]}"; do + local prefix="[ ]" + if [[ ${selected[idx]} == true ]]; then + prefix="[x]" + fi + + cursor_to $(($startrow + $idx)) + if [ $idx -eq $active ]; then + print_active "$option" "$prefix" + else + print_inactive "$option" "$prefix" + fi + ((idx++)) + done + + # user key control + case `key_input` in + space) toggle_option selected $active;; + enter) break;; + up) ((active--)); + if [ $active -lt 0 ]; then active=$((${#options[@]} - 1)); fi;; + down) ((active++)); + if [ $active -ge ${#options[@]} ]; then active=0; fi;; + esac + done + + # cursor position back to normal + cursor_to $lastrow + printf "\n" + cursor_blink_on + + eval $retval='("${selected[@]}")' +} + +#** Profile ******************************************************************** +#== Profile Dir ================================================================ +firefoxProfileDirPaths=( + "${HOME}/.mozilla/firefox" + "${HOME}/.waterfox" + "${HOME}/.librewolf" + "${HOME}/.ghostery browser" + "${HOME}/.pulse-browser" + "${HOME}/.firedragon" + "${HOME}/.local/opt/tor-browser/app/Browser/TorBrowser/Data/Browser" + "${HOME}/.var/app/org.mozilla.firefox/.mozilla/firefox" + "${HOME}/snap/firefox/common/.mozilla/firefox" + "${HOME}/Library/Application Support/Firefox" + "${HOME}/Library/Application Support/Waterfox" + "${HOME}/Library/Application Support/libreWolf" + "${HOME}/Library/Application Support/Ghostery Browser" + "${HOME}/Library/Application Support/pulse-browser" + "${HOME}/Library/Application Support/TorBrowser/Browser" +) + +check_profile_dir() { + local profileDir="$1" + if [ "${profileDir}" != "" ]; then + firefoxProfileDirPaths=("${profileDir}") + fi + + paths_filter firefoxProfileDirPaths -d + + local foundCount="${#firefoxProfileDirPaths[@]}" + if [ "${foundCount}" -eq 0 ]; then + lepton_error_message "Unable to find firefox profile dir." + fi + + lepton_ok_message "Profiles dir found" +} + +#== Profile Info =============================================================== +PROFILEINFOFILE="profiles.ini" +check_profile_ini() { + for profileDir in "${firefoxProfileDirPaths[@]}"; do + if [ ! -f "${profileDir}/${PROFILEINFOFILE}" ]; then + lepton_error_message "Unable to find ${PROFILEINFOFILE} at ${profileDir}" + fi + done + + lepton_ok_message "Profiles info file found" +} + +#== Profile PATH =============================================================== +firefoxProfilePaths=() +update_profile_paths() { + local IFS=$'\n' + for profileDir in "${firefoxProfileDirPaths[@]}"; do + local escapeDir=$(echo "${profileDir}" | sed "s|\/|\\\/|g") + firefoxProfilePaths+=($( + get_ini_value "${profileDir}/${PROFILEINFOFILE}" "Path" | + sed "s/^/${escapeDir}\//" + )) + done + + local foundCount="${#firefoxProfilePaths[@]}" + if ! [ "${foundCount}" -eq 0 ]; then + lepton_ok_message "Profile paths updated" + else + lepton_error_message "Doesn't exist profiles" + fi +} + +select_profile() { + local profileName="$1" + + if [ "${profileName}" != "" ]; then + local targetPath="" + for profilePath in "${firefoxProfilePaths[@]}"; do + if [[ "${profilePath}" == *"${profileName}" ]]; then + targetPath="${profilePath}" + break + fi + done + + if [ "${targetPath}" != "" ]; then + lepton_ok_message "Profile, \"${profileName}\" found" + firefoxProfilePaths=("${targetPath}") + else + lepton_error_message "Unable to find ${profileName}" + fi + else + local foundCount="${#firefoxProfilePaths[@]}" + if [ "${foundCount}" -eq 1 ]; then + lepton_ok_message "Auto detected profile" + else + local multiPaths="" + for profilePath in "${firefoxProfilePaths[@]}"; do + multiPaths+="${profilePath};" + done + multiselect profileSelected "${multiPaths}" + + local targetPaths=() + for ((i=0; i<"${#profileSelected[@]}"; i++)); do + local result="${profileSelected[${i}]}" + if [ "$result" == "true" ]; then + targetPaths+=("${firefoxProfilePaths[${i}]}") + fi + done + + firefoxProfilePaths=("${targetPaths[@]}") + foundCount="${#firefoxProfilePaths[@]}" + if [ "${foundCount}" -eq 0 ]; then + lepton_error_message "Please select profiles" + fi + + lepton_ok_message "Multi selected profiles" + fi + fi +} + +#** Lepton Info File *********************************************************** +#== Info File format & update policy =========================================== +## `LEPTON` file format +# If this file exist in same directory as the `userChrome.css` file, +# it is recognized as the "Lepton" installation directory. +# [Info] +# Branch=master | photon-style | proton-style +# Ver= | | [NULL] + +## `lepton.ini` file Format +# [Profile Name] +# Type=Local | Release | Git +# Branch=master | photon-style | proton-style +# Ver= | | [NULL] +# Path= + +## Update Policy +# Type +# - Local(unknown): force latest commit update +# - Release(): force latest tag update +# - Git: latest commit update + +#== Lepton Info ================================================================ +LEPTONINFOFILE="lepton.ini" +check_lepton_ini() { + for profileDir in "${firefoxProfileDirPaths[@]}"; do + if [ ! -f "${profileDir}/${LEPTONINFOFILE}" ]; then + lepton_error_message "Unable to find ${LEPTONINFOFILE} at ${profileDir}" + fi + done + + lepton_ok_message "Lepton info file found" +} + +#== Create info file =========================================================== +# We should always create a new one, as it also takes into account the possibility of setting it manually. +# Updates happen infrequently, so the creation overhead is less significant. + +get_profile_dir() { + local profilePath="$1" + for profileDir in "${firefoxProfileDirPaths[@]}"; do + if [[ "${profilePath}" == "${profileDir}"* ]]; then + echo "${profileDir}" + return 0 + fi + done +} + +CHROMEINFOFILE="LEPTON" +write_lepton_info() { + # Init info + local output="" + local prevDir="${firefoxProfileDirPaths[0]}" + local latestPath="${firefoxProfilePaths[${#firefoxProfilePaths[@]} - 1]}" + for profilePath in "${firefoxProfilePaths[@]}"; do + local LEPTONINFOPATH="${profilePath}/chrome/${CHROMEINFOFILE}" + local LEPTONGITPATH="${profilePath}/chrome/.git" + + # Profile info + local Type="" + local Ver="" + local Branch="" + local Path="" + if [ -f "${LEPTONINFOPATH}" ]; then + if [ -d "${LEPTONGITPATH}" ]; then + Type="Git" + Ver=$( git --git-dir "${LEPTONGITPATH}" rev-parse HEAD) + Branch=$(git --git-dir "${LEPTONGITPATH}" rev-parse --abbrev-ref HEAD) + else + Type=$( get_ini_value "${LEPTONINFOPATH}" "TYPE" ) + Ver=$( get_ini_value "${LEPTONINFOPATH}" "Ver" ) + Branch=$(get_ini_value "${LEPTONINFOPATH}" "Branch") + + if [ "${Type}" == "" ]; then + Type="Local" + fi + fi + + Path="${profilePath}" + fi + + # Flushing + local profileDir=$(get_profile_dir "${profilePath}") + local profileName=$(basename "${profilePath}") + if [ "${prevDir}" != "${profileDir}" ]; then + write_file "${prevDir}/${LEPTONINFOFILE}" "${output}" + output="" + fi + + # Make output contents + if [ -f "${LEPTONINFOPATH}" ]; then + output="${output}$(set_ini_section ${profileName})" + fi + for key in "Type" "Branch" "Ver" "Path"; do + eval "local value=\${${key}}" + output="${output}$(set_ini_value ${key} ${value})" + done + + # Latest element flushing + if [ "${profilePath}" == "${latestPath}" ]; then + write_file "${profileDir}/${LEPTONINFOFILE}" "${output}" + fi + prevDir="${profileDir}" + done + + # Verify + check_lepton_ini + lepton_ok_message "Lepton info file created" +} + +#** Install ******************************************************************** +#== Install Types ============================================================== +updateMode="" +leptonBranch="master" +select_distribution() { + local selectedDistribution="" + select distribution in "Original(default)" "Photon-Style" "Proton-Style" "Update"; do + selectedDistribution="${distribution}" + case "${distribution}" in + "Original(default)") leptonBranch="master"; break;; + "Photon-Style") leptonBranch="photon-style"; break;; + "Proton-Style") leptonBranch="proton-style"; break;; + "Update") updateMode="true"; break;; + *) echo "Invalid option, reselect please.";; + esac + done + lepton_ok_message "Selected ${selectedDistribution}" +} + +leptonInstallType="Network" # Other types: Local, Release +check_install_type() { + local targetListName="${1}" + local installType="${2}" + + eval "local targetCount=\${#${targetListName}[@]}" + paths_filter "${targetListName}" + eval "local foundCount=\${#${targetListName}[@]}" + + if [ "${targetCount}" -eq "${foundCount}" ]; then + leptonInstallType="${installType}" + fi +} + +checkLocalFiles=( + userChrome.css + userContent.css + icons +) +checkReleaseFiles=( + user.js + chrome/userChrome.css + chrome/userContent.css + chrome/icons +) +check_install_types() { + check_install_type checkLocalFiles "Local" + check_install_type checkReleaseFiles "Release" + + lepton_ok_message "Checked install type: ${leptonInstallType}" + if [ "${leptonInstallType}" == "Network" ]; then + select_distribution + fi + if [ "${leptonInstallType}" == "Local" ]; then + if [ -d ".git" ]; then + select_distribution + git checkout "${leptonBranch}" + fi + fi +} + +#== Custom Install ============================================================= +customFiles=( + user-overrides.js + userChrome-overrides.css + userContent-overrides.css +) +localCustomFiles=("${customFiles[@]}") + +customFileExist="" +check_custom_files() { + paths_filter localCustomFiles + + if [ "${#localCustomFiles[@]}" -gt 0 ]; then + customFileExist="true" + lepton_ok_message "Check custom file detected" + + for customFile in "${localCustomFiles[@]}"; do + echo "- ${customFile}" + done + fi +} + +copy_custom_files() { + if [ "${customFileExist}" == "true" ]; then + # If Release or Network mode, Local is passed (Already copied) + if [ "${leptonInstallType}" != "Local" ]; then + for profilePath in "${firefoxProfilePaths[@]}"; do + for customFile in "${localCustomFiles[@]}"; do + if [ "${customFile}" == "user-overrides.js" ]; then + autocp "${customFile}" "${profilePath}/${customFile}" + else + autocp "${customFile}" "${profilePath}/chrome/${customFile}" + fi + done + done + fi + + lepton_ok_message "End custom file copy" + fi +} + +customMethod="" +customReset="" +customAppend="" +set_custom_method() { + local menuAppend="Append - Maintain changes in existing files and apply custom" + local menuOverwrite="Overwrite - After initializing the change, apply only custom" + local menuNone="None - Maintain changes in existing files" + local menuReset="Reset- Reset to pure lepton theme without custom" + + echo "Select custom method" + select applyMethod in "${menuAppend}" "${menuOverwrite}" "${menuNone}" "${menuReset}"; do + case "${applyMethod}" in + "${menuAppend}") + customMethod="Append" + customAppend="true" + break;; + "${menuOverwrite}") + customMethod="Overwrite" + customReset="true" + customAppend="true" + break;; + "${menuNone}") + customMethod="None" + break;; + "${menuReset}") + customMethod="Reset" + customReset="true" + break;; + *) + echo "Invalid option, reselect please.";; + esac + done + + lepton_ok_message "Selected ${customMethod}" +} + +customFileApplied="" +apply_custom_file() { + local profilePath=$1 + local targetPath=$2 + local customPath=$3 + local otherCustomPath=$4 + + local leptonDir="${profilePath}/chrome" + local gitDir="${leptonDir}/.git" + if [ -f "${customPath}" ]; then + customPathApplied="true" + + if [ -z "${customMethod}" ]; then + set_custom_method + fi + + if [ "${customReset}" == "true" ]; then + if [[ "${targetPath}" == *"user.js" ]]; then + \cp -f "${leptonDir}/user.js" "${targetPath}" + else + git --git-dir "${gitDir}" --work-tree "${leptonDir}" checkout HEAD -- "${targetPath}" + fi + fi + if [ "${customAppend}" == "true" ]; then + # Apply without duplication + if ! grep -Fq "$(echo $(cat "${customPath}"))" <(echo "$(echo $(cat "${targetPath}"))"); then + cat "${customPath}" >> "${targetPath}" + fi + fi + elif [ -n "${otherCustomPath}" ]; then + apply_custom_file "${profilePath}" "${targetPath}" "${otherCustomPath}" + fi +} + +apply_custom_files() { + for profilePath in "${firefoxProfilePaths[@]}"; do + for customFile in "${customFiles[@]}"; do + local targetFile="${customFile//-overrides/}" + if [ "${customFile}" == "user-overrides.js" ]; then + local targetPath="${profilePath}/${targetFile}" + local customPath="${profilePath}/user-overrides.js" + local otherCustomPath="${profilePath}/chrome/user-overrides.js" + apply_custom_file "${profilePath}" "${targetPath}" "${customPath}" "${otherCustomPath}" + else + apply_custom_file "${profilePath}" "${profilePath}/chrome/${targetFile}" "${profilePath}/chrome/${customFile}" + fi + done + done + + if [ "${customFileApplied}" == "true" ]; then + lepton_ok_message "End custom file applied" + fi +} + +#== Install Helpers ============================================================ +chromeDuplicate="" +check_chrome_exist() { + if [ -e "chrome" ] && [ ! -f "chrome/${LEPTONINFOFILE}" ]; then + chromeDuplicate="true" + automv chrome chrome.bak + lepton_ok_message "Backup files" + fi +} +check_chrome_restore() { + if [ "${chromeDuplicate}" == "true" ]; then + autorestore chrome + lepton_ok_message "End restore files" + fi + lepton_ok_message "End check restore files" +} + +clean_lepton() { + if [ ! "${chromeDuplicate}" == "true" ] && [ -e "chrome" ]; then + rm -rf chrome + fi + lepton_ok_message "End clean files" +} +clone_lepton() { + local branch="$1" + + if [ -z "${branch}" ]; then + branch="${leptonBranch}" + fi + + git clone -b "${branch}" https://github.com/black7375/Firefox-UI-Fix.git chrome + if ! [ -d "chrome" ]; then + lepton_error_message "Unable to find downloaded files" + fi +} + +copy_lepton() { + local chromeDir="$1" + local userJSPath="$2" + + if [ -z "${chromeDir}" ]; then + chromeDir="chrome" + fi + if [ -z "${userJSPath}" ]; then + userJSPath="${chromeDir}/user.js" + fi + + for profilePath in "${firefoxProfilePaths[@]}"; do + autocp "${userJSPath}" "${profilePath}/user.js" + autocp "${chromeDir}" "${profilePath}/chrome" + done + lepton_ok_message "End profile copy" +} + +#== Each Install =============================================================== +install_local() { + copy_lepton "${currentDir}" "user.js" + copy_custom_files + + apply_custom_files +} + +install_release() { + copy_lepton "chrome" "user.js" + copy_custom_files + + apply_custom_files +} + +install_network() { + check_chrome_exist + check_git + + clone_lepton + copy_lepton + copy_custom_files + + clean_lepton + check_chrome_restore + apply_custom_files +} + +install_profile() { + lepton_ok_message "Started install" + + case "${leptonInstallType}" in + "Local") install_local ;; + "Release") install_release ;; + "Network") install_network ;; + esac + + lepton_ok_message "End install" +} + +#** Update ********************************************************************* +file_stash() { + local leptonDir=$1 + local gitDir=$2 + if [[ $(git --git-dir "${gitDir}" --work-tree "${leptonDir}" diff --stat) != '' ]]; then + git --git-dir "${gitDir}" --work-tree "${leptonDir}" stash + fi +} +file_restore() { + local leptonDir=$1 + local gitDir=$2 + local gitDirty=$3 + if [ -n "${gitDirty}" ]; then + git --git-dir "${gitDir}" --work-tree "${leptonDir}" stash pop --quiet + fi +} + +update_profile() { + check_git + for profileDir in "${firefoxProfileDirPaths[@]}"; do + local LEPTONINFOPATH="${profileDir}/${LEPTONINFOFILE}" + local sections=($(get_ini_section "${LEPTONINFOPATH}")) + if [ ! -z "${sections}" ]; then + for section in "${sections[@]}"; do + local Type=$( get_ini_value "${LEPTONINFOPATH}" "Type" "${section}") + local Branch=$(get_ini_value "${LEPTONINFOPATH}" "Branch" "${section}") + local Path=$( get_ini_value "${LEPTONINFOPATH}" "Path" "${section}") + + local leptonDir="${Path}/chrome" + local gitDir="${leptonDir}/.git" + if [ "${Type}" == "Git" ]; then + local gitDirty=$(file_stash "${leptonDir}" "${gitDir}") + + git --git-dir "${gitDir}" --work-tree "${leptonDir}" checkout "${Branch}" + git --git-dir "${gitDir}" --work-tree "${leptonDir}" pull --no-edit + + file_restore "${leptonDir}" "${gitDir}" "${gitDirty}" + elif [ "${Type}" == "Local" ] || [ "${Type}" == "Release" ]; then + check_chrome_exist + clone_lepton + + firefoxProfilePaths=("${Path}") + copy_lepton + + if [ -z "${Branch}" ]; then + Branch="${leptonBranch}" + fi + git --git-dir "${gitDir}" --work-tree "${leptonDir}" checkout "${Branch}" + + if [ "${Type}" == "Release" ]; then + local Ver=$(git --git-dir "${LEPTONINFOFILE}" describe --tags --abbrev=0) + git --git-dir "${gitDir}" --work-tree "${leptonDir}" checkout "tags/${Ver}" + fi + + clean_lepton + check_chrome_restore + else + lepton_error_message "Unable to find update type, ${Type} at ${section}" + fi + done + fi + done + + apply_custom_files +} + +#** Main *********************************************************************** +install_lepton() { + local profileDir="" + local profileName="" + + # Get options. + while getopts 'u:f:p:h' flag; do + case "${flag}" in + u) updateMode="true" ;; + f) profileDir="${OPTARG}" ;; + p) profileName="${OPTARG}" ;; + h) + echo "Lepton Theme Install Script:" + echo " -u run to update mode" + echo " -f . Set custom Firefox profile folder path." + echo " -p . Set custom profile name." + echo " -h to show this message." + exit 0 + ;; + esac + done + + check_install_types + + check_profile_dir "${profileDir}" + check_profile_ini + update_profile_paths + write_lepton_info + + check_custom_files + + # Install Mode + if [ "${updateMode}" == true ]; then + update_profile + else # Install Mode + select_profile "${profileName}" + install_profile + fi + + write_lepton_info +} + +install_lepton "$@" diff --git a/arch-config/.mozilla/firefox/default-release/prefs.js b/arch-config/.mozilla/firefox/default-release/prefs.js index fef5f3cd..eb0bfb91 100644 --- a/arch-config/.mozilla/firefox/default-release/prefs.js +++ b/arch-config/.mozilla/firefox/default-release/prefs.js @@ -16,6 +16,7 @@ user_pref("app.normandy.startupRolloutPrefs.browser.migrate.showBookmarksToolbar user_pref("app.normandy.startupRolloutPrefs.extensions.formautofill.creditCards.available", true); user_pref("app.normandy.startupRolloutPrefs.extensions.formautofill.creditCards.enabled", true); user_pref("app.normandy.startupRolloutPrefs.extensions.formautofill.creditCards.hideui", false); +user_pref("app.normandy.startupRolloutPrefs.extensions.webcompat.disabled_shims.AdvertisingDotCom", true); user_pref("app.normandy.startupRolloutPrefs.media.videocontrols.picture-in-picture.video-toggle.mode", 2); user_pref("app.normandy.startupRolloutPrefs.network.http.http2.websockets", false); user_pref("app.normandy.startupRolloutPrefs.network.http.spdy.websockets", false); @@ -23,16 +24,16 @@ user_pref("app.normandy.startupRolloutPrefs.pdfjs.renderInteractiveForms", true) user_pref("app.normandy.startupRolloutPrefs.security.bad_cert_domain_error.url_fix_enabled", true); user_pref("app.normandy.startupRolloutPrefs.security.remote_settings.intermediates.downloads_per_poll", 3000); user_pref("app.normandy.user_id", "e43b400f-0f20-4ae3-9dfa-ee00b787e18a"); -user_pref("app.update.lastUpdateTime.addon-background-update-timer", 1665996575); +user_pref("app.update.lastUpdateTime.addon-background-update-timer", 1670092720); user_pref("app.update.lastUpdateTime.blocklist-background-update-timer", 1588944333); -user_pref("app.update.lastUpdateTime.browser-cleanup-thumbnails", 1666028375); -user_pref("app.update.lastUpdateTime.recipe-client-addon-run", 1666017935); -user_pref("app.update.lastUpdateTime.region-update-timer", 1665831226); -user_pref("app.update.lastUpdateTime.rs-experiment-loader-timer", 1666017815); -user_pref("app.update.lastUpdateTime.search-engine-update-timer", 1666017695); -user_pref("app.update.lastUpdateTime.services-settings-poll-changes", 1665996455); -user_pref("app.update.lastUpdateTime.telemetry_modules_ping", 1665831346); -user_pref("app.update.lastUpdateTime.xpi-signature-verification", 1665996695); +user_pref("app.update.lastUpdateTime.browser-cleanup-thumbnails", 1670142904); +user_pref("app.update.lastUpdateTime.recipe-client-addon-run", 1670084741); +user_pref("app.update.lastUpdateTime.region-update-timer", 1669547801); +user_pref("app.update.lastUpdateTime.rs-experiment-loader-timer", 1670142875); +user_pref("app.update.lastUpdateTime.search-engine-update-timer", 1670084501); +user_pref("app.update.lastUpdateTime.services-settings-poll-changes", 1670092600); +user_pref("app.update.lastUpdateTime.telemetry_modules_ping", 1669547921); +user_pref("app.update.lastUpdateTime.xpi-signature-verification", 1670092480); user_pref("browser.aboutConfig.showWarning", false); user_pref("browser.bookmarks.defaultLocation", "Sf1F8MX-syPh"); user_pref("browser.bookmarks.editDialog.confirmationHintShowCount", 3); @@ -53,9 +54,11 @@ user_pref("browser.download.viewableInternally.typeWasRegistered.xml", true); user_pref("browser.eme.ui.firstContentShown", true); user_pref("browser.engagement.downloads-button.has-used", true); user_pref("browser.engagement.home-button.has-used", true); +user_pref("browser.firefox-view.feature-tour", "{\"message\":\"FIREFOX_VIEW_FEATURE_TOUR\",\"screen\":\"\",\"complete\":true}"); +user_pref("browser.firefox-view.view-count", 10); user_pref("browser.laterrun.bookkeeping.profileCreationTime", 1582977688); user_pref("browser.laterrun.bookkeeping.sessionCount", 51); -user_pref("browser.migration.version", 128); +user_pref("browser.migration.version", 132); user_pref("browser.newtab.extensionControlled", true); user_pref("browser.newtab.privateAllowed", false); user_pref("browser.newtabpage.activity-stream.feeds.section.topstories", false); @@ -72,33 +75,32 @@ user_pref("browser.protections_panel.infoMessage.seen", true); user_pref("browser.proton.enabled", true); user_pref("browser.proton.places-tooltip.enabled", true); user_pref("browser.proton.toolbar.version", 3); -user_pref("browser.region.update.updated", 1665831229); +user_pref("browser.region.update.updated", 1669547802); user_pref("browser.rights.3.shown", true); user_pref("browser.safebrowsing.downloads.remote.enabled", false); user_pref("browser.safebrowsing.malware.enabled", false); user_pref("browser.safebrowsing.phishing.enabled", false); user_pref("browser.safebrowsing.provider.google4.lastupdatetime", "1654774495409"); user_pref("browser.safebrowsing.provider.google4.nextupdatetime", "1654776285409"); -user_pref("browser.safebrowsing.provider.mozilla.lastupdatetime", "1666017554083"); -user_pref("browser.safebrowsing.provider.mozilla.nextupdatetime", "1666039154083"); +user_pref("browser.safebrowsing.provider.mozilla.lastupdatetime", "1670142883807"); +user_pref("browser.safebrowsing.provider.mozilla.nextupdatetime", "1670164483807"); user_pref("browser.search.region", "CH"); user_pref("browser.search.separatePrivateDefault.urlbarResult.enabled", false); user_pref("browser.sessionstore.upgradeBackup.latestBuildID", "20211121002925"); user_pref("browser.shell.checkDefaultBrowser", true); -user_pref("browser.shell.mostRecentDateSetAsDefault", "1665995949"); +user_pref("browser.shell.mostRecentDateSetAsDefault", "1670142875"); user_pref("browser.slowStartup.averageTime", 614); user_pref("browser.slowStartup.samples", 2); user_pref("browser.startup.couldRestoreSession.count", 1); -user_pref("browser.startup.homepage_override.buildID", "20221007233509"); -user_pref("browser.startup.homepage_override.mstone", "105.0.3"); -user_pref("browser.startup.lastColdStartupCheck", 1665995948); -user_pref("browser.startup.upgradeDialog.version", 100); -user_pref("browser.theme.content-theme", 0); -user_pref("browser.theme.toolbar-theme", 0); +user_pref("browser.startup.homepage_override.buildID", "20221128222455"); +user_pref("browser.startup.homepage_override.mstone", "107.0.1"); +user_pref("browser.startup.lastColdStartupCheck", 1670142875); +user_pref("browser.startup.upgradeDialog.version", 106); +user_pref("browser.tabs.firefox-view.ui-state.tab-pickup.open", true); user_pref("browser.toolbars.bookmarks.showOtherBookmarks", false); user_pref("browser.toolbars.bookmarks.visibility", "always"); user_pref("browser.translation.neverForLanguages", "de"); -user_pref("browser.uiCustomization.state", "{\"placements\":{\"widget-overflow-fixed-list\":[\"https-everywhere_eff_org-browser-action\",\"jid1-mnnxcxisbpnsxq_jetpack-browser-action\",\"cookieautodelete_kennydo_com-browser-action\",\"enhancerforyoutube_maximerf_addons_mozilla_org-browser-action\",\"jid1-ciklkkpvkw6ipw_jetpack-browser-action\",\"_b86e4813-687a-43e6-ab65-0bde4ab75758_-browser-action\",\"sponsorblocker_ajay_app-browser-action\",\"_9a41dee2-b924-4161-a971-7fb35c053a4a_-browser-action\",\"languagetool-webextension_languagetool_org-browser-action\",\"_762f9885-5a13-4abd-9c77-433dcd38b8fd_-browser-action\",\"_884679b9-5d6b-48b2-90a7-15ae26ce568a_-browser-action\",\"_f5ffc648-66fb-4aae-bd47-fe9b87b1f408_-browser-action\",\"_6706d386-2d33-4e1e-bbf1-51b9e1ce47e1_-browser-action\",\"jid1-kkzogwgsw3ao4q_jetpack-browser-action\",\"addon_fastforward_team-browser-action\",\"contact_nhentaidownloader_zirk_eu-browser-action\",\"_12cf650b-1822-40aa-bff0-996df6948878_-browser-action\",\"search_kagi_com-browser-action\"],\"nav-bar\":[\"back-button\",\"forward-button\",\"stop-reload-button\",\"home-button\",\"customizableui-special-spring1\",\"urlbar-container\",\"customizableui-special-spring2\",\"downloads-button\",\"_73a6fe31-595d-460b-a920-fcc0f8843232_-browser-action\",\"ublock0_raymondhill_net-browser-action\",\"keepassxc-browser_keepassxc_org-browser-action\",\"_446900e4-71c2-419f-a6a7-df9c091e268b_-browser-action\",\"wayback_machine_mozilla_org-browser-action\",\"_529b261b-df0b-4e3b-bf42-07b462da0ee8_-browser-action\",\"_b7f9d2cd-d772-4302-8c3f-eb941af36f76_-browser-action\",\"_a6c4a591-f1b2-4f03-b3ff-767e5bedf4e7_-browser-action\",\"_testpilot-containers-browser-action\",\"webtoepub_baka-tsuki_org-browser-action\",\"_c8f79b34-c3ff-4ce4-bdf4-eefa15c87f98_-browser-action\",\"_036a55b4-5e72-4d05-a06c-cba2dfcc134a_-browser-action\",\"adnauseam_rednoise_org-browser-action\",\"clearcache_michel_de_almeida-browser-action\",\"7esoorv3_alefvanoon_anonaddy_me-browser-action\",\"_ad0d925d-88f8-47f1-85ea-8463569e756e_-browser-action\"],\"toolbar-menubar\":[\"menubar-items\"],\"TabsToolbar\":[\"tabbrowser-tabs\",\"new-tab-button\",\"alltabs-button\"],\"PersonalToolbar\":[\"personal-bookmarks\"]},\"seen\":[\"developer-button\",\"enhancerforyoutube_maximerf_addons_mozilla_org-browser-action\",\"cookieautodelete_kennydo_com-browser-action\",\"jid1-mnnxcxisbpnsxq_jetpack-browser-action\",\"https-everywhere_eff_org-browser-action\",\"_73a6fe31-595d-460b-a920-fcc0f8843232_-browser-action\",\"ublock0_raymondhill_net-browser-action\",\"keepassxc-browser_keepassxc_org-browser-action\",\"_446900e4-71c2-419f-a6a7-df9c091e268b_-browser-action\",\"_9a41dee2-b924-4161-a971-7fb35c053a4a_-browser-action\",\"jid1-ciklkkpvkw6ipw_jetpack-browser-action\",\"save-to-pocket-button\",\"wayback_machine_mozilla_org-browser-action\",\"jid1-kkzogwgsw3ao4q_jetpack-browser-action\",\"languagetool-webextension_languagetool_org-browser-action\",\"sponsorblocker_ajay_app-browser-action\",\"_12cf650b-1822-40aa-bff0-996df6948878_-browser-action\",\"_529b261b-df0b-4e3b-bf42-07b462da0ee8_-browser-action\",\"_b7f9d2cd-d772-4302-8c3f-eb941af36f76_-browser-action\",\"_a6c4a591-f1b2-4f03-b3ff-767e5bedf4e7_-browser-action\",\"_b86e4813-687a-43e6-ab65-0bde4ab75758_-browser-action\",\"_testpilot-containers-browser-action\",\"webtoepub_baka-tsuki_org-browser-action\",\"addon_fastforward_team-browser-action\",\"_6706d386-2d33-4e1e-bbf1-51b9e1ce47e1_-browser-action\",\"_762f9885-5a13-4abd-9c77-433dcd38b8fd_-browser-action\",\"_884679b9-5d6b-48b2-90a7-15ae26ce568a_-browser-action\",\"_c8f79b34-c3ff-4ce4-bdf4-eefa15c87f98_-browser-action\",\"7esoorv3_alefvanoon_anonaddy_me-browser-action\",\"_f5ffc648-66fb-4aae-bd47-fe9b87b1f408_-browser-action\",\"_036a55b4-5e72-4d05-a06c-cba2dfcc134a_-browser-action\",\"adnauseam_rednoise_org-browser-action\",\"clearcache_michel_de_almeida-browser-action\",\"contact_nhentaidownloader_zirk_eu-browser-action\",\"search_kagi_com-browser-action\",\"_ad0d925d-88f8-47f1-85ea-8463569e756e_-browser-action\"],\"dirtyAreaCache\":[\"nav-bar\",\"toolbar-menubar\",\"TabsToolbar\",\"PersonalToolbar\",\"widget-overflow-fixed-list\"],\"currentVersion\":17,\"newElementCount\":21}"); +user_pref("browser.uiCustomization.state", "{\"placements\":{\"widget-overflow-fixed-list\":[\"https-everywhere_eff_org-browser-action\",\"jid1-mnnxcxisbpnsxq_jetpack-browser-action\",\"cookieautodelete_kennydo_com-browser-action\",\"enhancerforyoutube_maximerf_addons_mozilla_org-browser-action\",\"jid1-ciklkkpvkw6ipw_jetpack-browser-action\",\"_b86e4813-687a-43e6-ab65-0bde4ab75758_-browser-action\",\"sponsorblocker_ajay_app-browser-action\",\"_9a41dee2-b924-4161-a971-7fb35c053a4a_-browser-action\",\"languagetool-webextension_languagetool_org-browser-action\",\"_762f9885-5a13-4abd-9c77-433dcd38b8fd_-browser-action\",\"_884679b9-5d6b-48b2-90a7-15ae26ce568a_-browser-action\",\"_f5ffc648-66fb-4aae-bd47-fe9b87b1f408_-browser-action\",\"_6706d386-2d33-4e1e-bbf1-51b9e1ce47e1_-browser-action\",\"jid1-kkzogwgsw3ao4q_jetpack-browser-action\",\"addon_fastforward_team-browser-action\",\"contact_nhentaidownloader_zirk_eu-browser-action\",\"_12cf650b-1822-40aa-bff0-996df6948878_-browser-action\",\"search_kagi_com-browser-action\"],\"nav-bar\":[\"back-button\",\"forward-button\",\"stop-reload-button\",\"home-button\",\"customizableui-special-spring1\",\"urlbar-container\",\"customizableui-special-spring2\",\"downloads-button\",\"_73a6fe31-595d-460b-a920-fcc0f8843232_-browser-action\",\"ublock0_raymondhill_net-browser-action\",\"keepassxc-browser_keepassxc_org-browser-action\",\"_446900e4-71c2-419f-a6a7-df9c091e268b_-browser-action\",\"wayback_machine_mozilla_org-browser-action\",\"_529b261b-df0b-4e3b-bf42-07b462da0ee8_-browser-action\",\"_b7f9d2cd-d772-4302-8c3f-eb941af36f76_-browser-action\",\"_a6c4a591-f1b2-4f03-b3ff-767e5bedf4e7_-browser-action\",\"_testpilot-containers-browser-action\",\"webtoepub_baka-tsuki_org-browser-action\",\"_c8f79b34-c3ff-4ce4-bdf4-eefa15c87f98_-browser-action\",\"_036a55b4-5e72-4d05-a06c-cba2dfcc134a_-browser-action\",\"adnauseam_rednoise_org-browser-action\",\"clearcache_michel_de_almeida-browser-action\",\"7esoorv3_alefvanoon_anonaddy_me-browser-action\",\"_ad0d925d-88f8-47f1-85ea-8463569e756e_-browser-action\",\"firefox-translations-addon_mozilla_org-browser-action\"],\"toolbar-menubar\":[\"menubar-items\"],\"TabsToolbar\":[\"firefox-view-button\",\"tabbrowser-tabs\",\"new-tab-button\",\"alltabs-button\"],\"PersonalToolbar\":[\"personal-bookmarks\"]},\"seen\":[\"developer-button\",\"enhancerforyoutube_maximerf_addons_mozilla_org-browser-action\",\"cookieautodelete_kennydo_com-browser-action\",\"jid1-mnnxcxisbpnsxq_jetpack-browser-action\",\"https-everywhere_eff_org-browser-action\",\"_73a6fe31-595d-460b-a920-fcc0f8843232_-browser-action\",\"ublock0_raymondhill_net-browser-action\",\"keepassxc-browser_keepassxc_org-browser-action\",\"_446900e4-71c2-419f-a6a7-df9c091e268b_-browser-action\",\"_9a41dee2-b924-4161-a971-7fb35c053a4a_-browser-action\",\"jid1-ciklkkpvkw6ipw_jetpack-browser-action\",\"save-to-pocket-button\",\"wayback_machine_mozilla_org-browser-action\",\"jid1-kkzogwgsw3ao4q_jetpack-browser-action\",\"languagetool-webextension_languagetool_org-browser-action\",\"sponsorblocker_ajay_app-browser-action\",\"_12cf650b-1822-40aa-bff0-996df6948878_-browser-action\",\"_529b261b-df0b-4e3b-bf42-07b462da0ee8_-browser-action\",\"_b7f9d2cd-d772-4302-8c3f-eb941af36f76_-browser-action\",\"_a6c4a591-f1b2-4f03-b3ff-767e5bedf4e7_-browser-action\",\"_b86e4813-687a-43e6-ab65-0bde4ab75758_-browser-action\",\"_testpilot-containers-browser-action\",\"webtoepub_baka-tsuki_org-browser-action\",\"addon_fastforward_team-browser-action\",\"_6706d386-2d33-4e1e-bbf1-51b9e1ce47e1_-browser-action\",\"_762f9885-5a13-4abd-9c77-433dcd38b8fd_-browser-action\",\"_884679b9-5d6b-48b2-90a7-15ae26ce568a_-browser-action\",\"_c8f79b34-c3ff-4ce4-bdf4-eefa15c87f98_-browser-action\",\"7esoorv3_alefvanoon_anonaddy_me-browser-action\",\"_f5ffc648-66fb-4aae-bd47-fe9b87b1f408_-browser-action\",\"_036a55b4-5e72-4d05-a06c-cba2dfcc134a_-browser-action\",\"adnauseam_rednoise_org-browser-action\",\"clearcache_michel_de_almeida-browser-action\",\"contact_nhentaidownloader_zirk_eu-browser-action\",\"search_kagi_com-browser-action\",\"_ad0d925d-88f8-47f1-85ea-8463569e756e_-browser-action\",\"firefox-translations-addon_mozilla_org-browser-action\"],\"dirtyAreaCache\":[\"nav-bar\",\"toolbar-menubar\",\"TabsToolbar\",\"PersonalToolbar\",\"widget-overflow-fixed-list\"],\"currentVersion\":18,\"newElementCount\":21}"); user_pref("browser.urlbar.placeholderName.private", "DuckDuckGo"); user_pref("browser.urlbar.quicksuggest.migrationVersion", 2); user_pref("browser.urlbar.quicksuggest.scenario", "history"); @@ -122,17 +124,18 @@ user_pref("devtools.netmonitor.panes-network-details-height", 447); user_pref("devtools.performance.recording.entries", 134217728); user_pref("devtools.performance.recording.features", "[\"screenshots\",\"js\",\"cpu\"]"); user_pref("devtools.performance.recording.threads", "[\"GeckoMain\",\"Compositor\",\"Renderer\",\"DOM Worker\"]"); -user_pref("devtools.selfxss.count", 3); +user_pref("devtools.selfxss.count", 5); user_pref("devtools.theme.show-auto-theme-info", false); user_pref("devtools.toolbox.footer.height", 382); user_pref("devtools.toolbox.host", "right"); user_pref("devtools.toolbox.previousHost", "bottom"); +user_pref("devtools.toolbox.selectedTool", "webconsole"); user_pref("devtools.toolbox.sidebar.width", 664); -user_pref("devtools.toolsidebar-height.inspector", 350); +user_pref("devtools.toolsidebar-height.inspector", 550); user_pref("devtools.toolsidebar-width.inspector", 700); user_pref("devtools.toolsidebar-width.inspector.splitsidebar", 250); user_pref("distribution.archlinux.bookmarksProcessed", true); -user_pref("distribution.iniFile.exists.appversion", "105.0.3"); +user_pref("distribution.iniFile.exists.appversion", "107.0.1"); user_pref("distribution.iniFile.exists.value", true); user_pref("doh-rollout.balrog-migration-done", true); user_pref("doh-rollout.disable-heuristics", true); @@ -143,19 +146,19 @@ user_pref("dom.push.userAgentID", "ec6c9c3a356340e9b8352e1cb2cb9264"); user_pref("dom.security.https_only_mode", true); user_pref("dom.security.https_only_mode_ever_enabled", true); user_pref("dom.storage.next_gen_auto_enabled_by_cause1", true); -user_pref("extensions.activeThemeID", "firefox-compact-dark@mozilla.org"); +user_pref("extensions.activeThemeID", "default-theme@mozilla.org"); user_pref("extensions.blocklist.lastModified", "Fri, 28 Feb 2020 19:02:07 GMT"); user_pref("extensions.blocklist.pingCountTotal", 2); user_pref("extensions.blocklist.pingCountVersion", -1); user_pref("extensions.databaseSchema", 35); user_pref("extensions.fxmonitor.enabled", false); user_pref("extensions.fxmonitor.firstAlertShown", true); -user_pref("extensions.getAddons.cache.lastUpdate", 1665996576); +user_pref("extensions.getAddons.cache.lastUpdate", 1670092721); user_pref("extensions.getAddons.databaseSchema", 6); user_pref("extensions.incognito.migrated", true); -user_pref("extensions.lastAppBuildId", "20221007233509"); -user_pref("extensions.lastAppVersion", "105.0.3"); -user_pref("extensions.lastPlatformVersion", "105.0.3"); +user_pref("extensions.lastAppBuildId", "20221128222455"); +user_pref("extensions.lastAppVersion", "107.0.1"); +user_pref("extensions.lastPlatformVersion", "107.0.1"); user_pref("extensions.pendingOperations", false); user_pref("extensions.pictureinpicture.enable_picture_in_picture_overrides", true); user_pref("extensions.reset_default_search.runonce.3", true); @@ -176,7 +179,6 @@ user_pref("extensions.webextensions.ExtensionStorageIDB.migrated.CookieAutoDelet user_pref("extensions.webextensions.ExtensionStorageIDB.migrated.addon@fastforward.team", true); user_pref("extensions.webextensions.ExtensionStorageIDB.migrated.adnauseam@rednoise.org", true); user_pref("extensions.webextensions.ExtensionStorageIDB.migrated.clearcache@michel.de.almeida", true); -user_pref("extensions.webextensions.ExtensionStorageIDB.migrated.contact.nhentaidownloader@zirk.eu", true); user_pref("extensions.webextensions.ExtensionStorageIDB.migrated.doh-rollout@mozilla.org", true); user_pref("extensions.webextensions.ExtensionStorageIDB.migrated.enhancerforyoutube@maximerf.addons.mozilla.org", true); user_pref("extensions.webextensions.ExtensionStorageIDB.migrated.firefox-translations-addon@mozilla.org", true); @@ -199,9 +201,8 @@ user_pref("extensions.webextensions.ExtensionStorageIDB.migrated.{6706d386-2d33- user_pref("extensions.webextensions.ExtensionStorageIDB.migrated.{73a6fe31-595d-460b-a920-fcc0f8843232}", true); user_pref("extensions.webextensions.ExtensionStorageIDB.migrated.{884679b9-5d6b-48b2-90a7-15ae26ce568a}", true); user_pref("extensions.webextensions.ExtensionStorageIDB.migrated.{a6c4a591-f1b2-4f03-b3ff-767e5bedf4e7}", true); -user_pref("extensions.webextensions.ExtensionStorageIDB.migrated.{ad0d925d-88f8-47f1-85ea-8463569e756e}", true); user_pref("extensions.webextensions.ExtensionStorageIDB.migrated.{b86e4813-687a-43e6-ab65-0bde4ab75758}", true); -user_pref("extensions.webextensions.uuids", "{\"doh-rollout@mozilla.org\":\"946257eb-c1c3-4490-a34d-f99988aa0ef4\",\"formautofill@mozilla.org\":\"fda477fb-fa39-4a5e-9b39-ad7c2dbc21b6\",\"screenshots@mozilla.org\":\"c3731a22-38f4-4020-b831-748aaf4e885c\",\"webcompat-reporter@mozilla.org\":\"3b0b67d7-a376-4bef-bd35-72667423201c\",\"webcompat@mozilla.org\":\"0a7d9067-bcfe-497e-9a73-d3cdfc35f1ad\",\"default-theme@mozilla.org\":\"75d80d13-a640-4fa4-a9a7-4e40994ecfcb\",\"google@search.mozilla.org\":\"64646f90-cdbd-4953-8645-a938d19d385a\",\"amazondotcom@search.mozilla.org\":\"4e301f5d-d015-48b1-872a-5fe674d37c97\",\"bing@search.mozilla.org\":\"07a4e3d3-08f8-4711-8629-3a9b0c20d065\",\"ddg@search.mozilla.org\":\"ac7e84a4-e12e-4740-a28e-a25b6a2c7732\",\"ebay@search.mozilla.org\":\"fc65b37c-f1ef-4795-9b26-6d2101e7886b\",\"twitter@search.mozilla.org\":\"f4ae5772-f6fc-4f1b-9a3c-06be3e4e6bfc\",\"wikipedia@search.mozilla.org\":\"a40f7749-837a-4ed9-86ca-d94589a888cb\",\"firefox-compact-dark@mozilla.org\":\"d37f1bd5-0d34-4810-89d2-a5d2801d3237\",\"enhancerforyoutube@maximerf.addons.mozilla.org\":\"4db84fe2-753b-47eb-895a-1896e3843a51\",\"CookieAutoDelete@kennydo.com\":\"bc93ebe3-0486-41a9-bff7-5041fc95d7ec\",\"jid1-MnnxcxisBPnSXQ@jetpack\":\"3b66fcbb-2540-49bb-8a59-af7872dd9a27\",\"https-everywhere@eff.org\":\"409abe36-7e59-4334-a9fb-ad95ff8bbc46\",\"{73a6fe31-595d-460b-a920-fcc0f8843232}\":\"43d9308d-3fb6-48da-9ac1-13833f64d5d9\",\"uBlock0@raymondhill.net\":\"22cba72f-3105-445e-9609-10a6e318b49d\",\"{446900e4-71c2-419f-a6a7-df9c091e268b}\":\"3e76ff93-a4cc-4e9d-9bdb-40487f4f9d95\",\"firefox-compact-light@mozilla.org\":\"02b120c7-ce82-4969-84ff-50c8aeffb99a\",\"{b743f56d-1cc1-4048-8ba6-f9c2ab7aa54d}\":\"46d076b2-4d1f-4a94-af48-98098bf6d1ed\",\"jid1-CikLKKPVkw6ipw@jetpack\":\"45886005-f608-462e-b99b-09a85dff5346\",\"{1be309c5-3e4f-4b99-927d-bb500eb4fa88}\":\"3ad23b35-5c56-44dd-a4a2-fc52ab5489df\",\"tridactyl.vim@cmcaine.co.uk\":\"b04e0832-b8b7-42ce-a11d-18b8322949a8\",\"jid0-3GUEt1r69sQNSrca5p8kx9Ezc3U@jetpack\":\"9acf76e7-e965-4f68-ad9a-26c86889bfc1\",\"languagetool-webextension@languagetool.org\":\"9e00252e-8da9-45cd-89fc-6761bcc145ff\",\"pictureinpicture@mozilla.org\":\"927666b6-4218-4378-9948-bcf32a9cb065\",\"amazon@search.mozilla.org\":\"bf61dd00-234d-427d-a10a-fa37de8bf4e9\",\"sponsorBlocker@ajay.app\":\"aca61cf3-9cdd-47e7-898d-9122b9619125\",\"wayback_machine@mozilla.org\":\"865e8f8e-1bb3-48ad-8b35-39f7655e5d91\",\"{12cf650b-1822-40aa-bff0-996df6948878}\":\"1b69c98a-d3c5-4923-aa02-5d436481c74d\",\"{529b261b-df0b-4e3b-bf42-07b462da0ee8}\":\"643d8767-295e-430c-bee4-a9de6e5861ea\",\"{a6c4a591-f1b2-4f03-b3ff-767e5bedf4e7}\":\"95bf6dcd-2a80-4ff6-a755-db2d898e3dfe\",\"{b86e4813-687a-43e6-ab65-0bde4ab75758}\":\"985239a4-64cc-4bea-8852-c21dcd055c50\",\"reset-search-defaults@mozilla.com\":\"de62a459-bbd3-4a6f-b581-1f8a38bfd755\",\"addons-search-detection@mozilla.com\":\"d3897d76-eea5-4b48-aed4-4bc4862c8764\",\"proxy-failover@mozilla.com\":\"bab72ded-f85b-4973-ac69-9d463c8dfba6\",\"@testpilot-containers\":\"26e1521b-8857-4a2e-b495-122be4670393\",\"WebToEpub@Baka-tsuki.org\":\"3fc3336e-97a0-48ab-b2b1-d726088bff16\",\"addon@fastforward.team\":\"463e561e-87cf-45d7-a51a-66eab00e27fd\",\"{6706d386-2d33-4e1e-bbf1-51b9e1ce47e1}\":\"2073d74a-2468-4f90-b3ba-e661f9071fe3\",\"nhentaidownloader.ext@gmail.com\":\"8be38d5e-e036-41c2-8e05-53ae2ae1969f\",\"{762f9885-5a13-4abd-9c77-433dcd38b8fd}\":\"be15551e-892a-43b4-af53-cc0c3ffa5ace\",\"{884679b9-5d6b-48b2-90a7-15ae26ce568a}\":\"77ebe5d7-43a8-4ab1-aae0-79c5397f5afe\",\"7esoorv3@alefvanoon.anonaddy.me\":\"c7c324fe-cf04-418b-9687-513e6a05c54a\",\"{f5ffc648-66fb-4aae-bd47-fe9b87b1f408}\":\"b07cd034-85f2-4b15-945b-f10c43fe8a48\",\"{036a55b4-5e72-4d05-a06c-cba2dfcc134a}\":\"20bb1352-3dca-46a0-a1b1-d167117e0335\",\"adnauseam@rednoise.org\":\"453ec669-6875-4e90-a942-9e1e7849db87\",\"clearcache@michel.de.almeida\":\"3f343c46-9561-4bf6-8e00-d2552db42530\",\"ecosia@search.mozilla.org\":\"5ffdc3f4-e700-4965-ac2d-7b0a31ff52ef\",\"leo_ende_de@search.mozilla.org\":\"7ff62cde-024e-4ab7-b4b1-f14bd35f5675\",\"firefox-translations-addon@mozilla.org\":\"88a0a4ce-fa63-4e89-be5b-814f27b30840\",\"contact.nhentaidownloader@zirk.eu\":\"7127d5f9-e56a-4ef6-b353-895ca364ca0a\",\"search@kagi.com\":\"a8055368-661d-4a6c-b3bf-0638ee0454a2\",\"{ad0d925d-88f8-47f1-85ea-8463569e756e}\":\"2f6db314-96ff-491f-b175-75f7048386de\"}"); +user_pref("extensions.webextensions.uuids", "{\"doh-rollout@mozilla.org\":\"946257eb-c1c3-4490-a34d-f99988aa0ef4\",\"formautofill@mozilla.org\":\"fda477fb-fa39-4a5e-9b39-ad7c2dbc21b6\",\"screenshots@mozilla.org\":\"c3731a22-38f4-4020-b831-748aaf4e885c\",\"webcompat-reporter@mozilla.org\":\"3b0b67d7-a376-4bef-bd35-72667423201c\",\"webcompat@mozilla.org\":\"0a7d9067-bcfe-497e-9a73-d3cdfc35f1ad\",\"default-theme@mozilla.org\":\"75d80d13-a640-4fa4-a9a7-4e40994ecfcb\",\"google@search.mozilla.org\":\"64646f90-cdbd-4953-8645-a938d19d385a\",\"amazondotcom@search.mozilla.org\":\"4e301f5d-d015-48b1-872a-5fe674d37c97\",\"bing@search.mozilla.org\":\"07a4e3d3-08f8-4711-8629-3a9b0c20d065\",\"ddg@search.mozilla.org\":\"ac7e84a4-e12e-4740-a28e-a25b6a2c7732\",\"ebay@search.mozilla.org\":\"fc65b37c-f1ef-4795-9b26-6d2101e7886b\",\"twitter@search.mozilla.org\":\"f4ae5772-f6fc-4f1b-9a3c-06be3e4e6bfc\",\"wikipedia@search.mozilla.org\":\"a40f7749-837a-4ed9-86ca-d94589a888cb\",\"firefox-compact-dark@mozilla.org\":\"d37f1bd5-0d34-4810-89d2-a5d2801d3237\",\"enhancerforyoutube@maximerf.addons.mozilla.org\":\"4db84fe2-753b-47eb-895a-1896e3843a51\",\"CookieAutoDelete@kennydo.com\":\"bc93ebe3-0486-41a9-bff7-5041fc95d7ec\",\"jid1-MnnxcxisBPnSXQ@jetpack\":\"3b66fcbb-2540-49bb-8a59-af7872dd9a27\",\"https-everywhere@eff.org\":\"409abe36-7e59-4334-a9fb-ad95ff8bbc46\",\"{73a6fe31-595d-460b-a920-fcc0f8843232}\":\"43d9308d-3fb6-48da-9ac1-13833f64d5d9\",\"uBlock0@raymondhill.net\":\"22cba72f-3105-445e-9609-10a6e318b49d\",\"{446900e4-71c2-419f-a6a7-df9c091e268b}\":\"3e76ff93-a4cc-4e9d-9bdb-40487f4f9d95\",\"firefox-compact-light@mozilla.org\":\"02b120c7-ce82-4969-84ff-50c8aeffb99a\",\"{b743f56d-1cc1-4048-8ba6-f9c2ab7aa54d}\":\"46d076b2-4d1f-4a94-af48-98098bf6d1ed\",\"jid1-CikLKKPVkw6ipw@jetpack\":\"45886005-f608-462e-b99b-09a85dff5346\",\"{1be309c5-3e4f-4b99-927d-bb500eb4fa88}\":\"3ad23b35-5c56-44dd-a4a2-fc52ab5489df\",\"tridactyl.vim@cmcaine.co.uk\":\"b04e0832-b8b7-42ce-a11d-18b8322949a8\",\"jid0-3GUEt1r69sQNSrca5p8kx9Ezc3U@jetpack\":\"9acf76e7-e965-4f68-ad9a-26c86889bfc1\",\"languagetool-webextension@languagetool.org\":\"9e00252e-8da9-45cd-89fc-6761bcc145ff\",\"pictureinpicture@mozilla.org\":\"927666b6-4218-4378-9948-bcf32a9cb065\",\"amazon@search.mozilla.org\":\"bf61dd00-234d-427d-a10a-fa37de8bf4e9\",\"sponsorBlocker@ajay.app\":\"aca61cf3-9cdd-47e7-898d-9122b9619125\",\"wayback_machine@mozilla.org\":\"865e8f8e-1bb3-48ad-8b35-39f7655e5d91\",\"{12cf650b-1822-40aa-bff0-996df6948878}\":\"1b69c98a-d3c5-4923-aa02-5d436481c74d\",\"{529b261b-df0b-4e3b-bf42-07b462da0ee8}\":\"643d8767-295e-430c-bee4-a9de6e5861ea\",\"{a6c4a591-f1b2-4f03-b3ff-767e5bedf4e7}\":\"95bf6dcd-2a80-4ff6-a755-db2d898e3dfe\",\"{b86e4813-687a-43e6-ab65-0bde4ab75758}\":\"985239a4-64cc-4bea-8852-c21dcd055c50\",\"reset-search-defaults@mozilla.com\":\"de62a459-bbd3-4a6f-b581-1f8a38bfd755\",\"addons-search-detection@mozilla.com\":\"d3897d76-eea5-4b48-aed4-4bc4862c8764\",\"proxy-failover@mozilla.com\":\"bab72ded-f85b-4973-ac69-9d463c8dfba6\",\"@testpilot-containers\":\"26e1521b-8857-4a2e-b495-122be4670393\",\"WebToEpub@Baka-tsuki.org\":\"3fc3336e-97a0-48ab-b2b1-d726088bff16\",\"addon@fastforward.team\":\"463e561e-87cf-45d7-a51a-66eab00e27fd\",\"{6706d386-2d33-4e1e-bbf1-51b9e1ce47e1}\":\"2073d74a-2468-4f90-b3ba-e661f9071fe3\",\"nhentaidownloader.ext@gmail.com\":\"8be38d5e-e036-41c2-8e05-53ae2ae1969f\",\"{762f9885-5a13-4abd-9c77-433dcd38b8fd}\":\"be15551e-892a-43b4-af53-cc0c3ffa5ace\",\"{884679b9-5d6b-48b2-90a7-15ae26ce568a}\":\"77ebe5d7-43a8-4ab1-aae0-79c5397f5afe\",\"7esoorv3@alefvanoon.anonaddy.me\":\"c7c324fe-cf04-418b-9687-513e6a05c54a\",\"{f5ffc648-66fb-4aae-bd47-fe9b87b1f408}\":\"b07cd034-85f2-4b15-945b-f10c43fe8a48\",\"{036a55b4-5e72-4d05-a06c-cba2dfcc134a}\":\"20bb1352-3dca-46a0-a1b1-d167117e0335\",\"adnauseam@rednoise.org\":\"453ec669-6875-4e90-a942-9e1e7849db87\",\"clearcache@michel.de.almeida\":\"3f343c46-9561-4bf6-8e00-d2552db42530\",\"ecosia@search.mozilla.org\":\"5ffdc3f4-e700-4965-ac2d-7b0a31ff52ef\",\"leo_ende_de@search.mozilla.org\":\"7ff62cde-024e-4ab7-b4b1-f14bd35f5675\",\"firefox-translations-addon@mozilla.org\":\"88a0a4ce-fa63-4e89-be5b-814f27b30840\",\"search@kagi.com\":\"a8055368-661d-4a6c-b3bf-0638ee0454a2\",\"playmaker-bold-colorway@mozilla.org\":\"bd83bb7d-8d20-4e7d-8c36-cda4d721de10\",\"expressionist-bold-colorway@mozilla.org\":\"290fc40a-a070-4663-8c18-35c5e45662e9\",\"visionary-bold-colorway@mozilla.org\":\"e7052c6a-7f3c-4372-ba6d-06eb8ffa5e87\",\"activist-bold-colorway@mozilla.org\":\"25e3ceb5-e296-492f-98bc-e71aa38ce5a6\",\"dreamer-bold-colorway@mozilla.org\":\"64f0a852-5ba8-4e1e-968a-48b96937c5a9\",\"innovator-bold-colorway@mozilla.org\":\"7d5acfd4-640f-48e7-9eaa-f6e0fe6a45b8\"}"); user_pref("findbar.highlightAll", true); user_pref("fission.experiment.max-origins.last-disqualified", 0); user_pref("fission.experiment.max-origins.last-qualified", 1626291179); @@ -233,11 +234,11 @@ user_pref("general.smoothScroll.scrollbars.durationMinMS", 0); user_pref("general.smoothScroll.stopDecelerationWeighting", "0.6"); user_pref("gfx.blacklist.webrender.failureid", "FEATURE_FAILURE_DDX_INTEL"); user_pref("identity.fxaccounts.account.device.name", "marc’s Firefox on lupusregina"); -user_pref("identity.fxaccounts.account.telemetry.sanitized_uid", "7d43bb2e98e00c17c235782ba1e87861"); -user_pref("identity.fxaccounts.commands.missed.last_fetch", 1665996046); +user_pref("identity.fxaccounts.account.telemetry.sanitized_uid", "d350307667f63e9014fdea909adeb9f8"); +user_pref("identity.fxaccounts.commands.missed.last_fetch", 1670093194); user_pref("identity.fxaccounts.lastSignedInUserHash", "8BRA9+6sRIqGXRuNxzfOnvsueJGliFd7TfEFww9llO8="); user_pref("identity.fxaccounts.toolbar.accessed", true); -user_pref("idle.lastDailyNotification", 1665996883); +user_pref("idle.lastDailyNotification", 1670094725); user_pref("javascript.options.wasm_simd_wormhole", true); user_pref("layout.css.color-mix.enabled", true); user_pref("layout.css.has-selector.enabled", true); @@ -246,17 +247,19 @@ user_pref("media.benchmark.vp9.versioncheck", 5); user_pref("media.eme.enabled", true); user_pref("media.gmp-gmpopenh264.abi", "x86_64-gcc3"); user_pref("media.gmp-gmpopenh264.lastDownload", 1656608575); -user_pref("media.gmp-gmpopenh264.lastInstallStart", 1656608575); +user_pref("media.gmp-gmpopenh264.lastDownloadFailReason", "Error: Failed downloading via ServiceRequest, status: 0, reason: error"); +user_pref("media.gmp-gmpopenh264.lastDownloadFailed", 1667412654); +user_pref("media.gmp-gmpopenh264.lastInstallStart", 1667412654); user_pref("media.gmp-gmpopenh264.lastUpdate", 1656608575); user_pref("media.gmp-gmpopenh264.version", "1.8.1.2"); -user_pref("media.gmp-manager.buildID", "20221007233509"); -user_pref("media.gmp-manager.lastCheck", 1665996724); -user_pref("media.gmp-manager.lastEmptyCheck", 1665996724); +user_pref("media.gmp-manager.buildID", "20221128222455"); +user_pref("media.gmp-manager.lastCheck", 1670062661); +user_pref("media.gmp-manager.lastEmptyCheck", 1670062661); user_pref("media.gmp-widevinecdm.abi", "x86_64-gcc3"); -user_pref("media.gmp-widevinecdm.lastDownload", 1665241954); -user_pref("media.gmp-widevinecdm.lastInstallStart", 1665241952); -user_pref("media.gmp-widevinecdm.lastUpdate", 1665241954); -user_pref("media.gmp-widevinecdm.version", "4.10.2449.0"); +user_pref("media.gmp-widevinecdm.lastDownload", 1669919207); +user_pref("media.gmp-widevinecdm.lastInstallStart", 1669919205); +user_pref("media.gmp-widevinecdm.lastUpdate", 1669919207); +user_pref("media.gmp-widevinecdm.version", "4.10.2557.0"); user_pref("media.gmp.storage.version.observed", 1); user_pref("media.peerconnection.enabled", false); user_pref("media.peerconnection.ice.default_address_only", true); @@ -280,7 +283,7 @@ user_pref("pdfjs.enabledCache.state", true); user_pref("pdfjs.migrationVersion", 2); user_pref("pdfjs.previousHandler.alwaysAskBeforeHandling", true); user_pref("pdfjs.previousHandler.preferredAction", 4); -user_pref("places.database.lastMaintenance", 1665996884); +user_pref("places.database.lastMaintenance", 1670094725); user_pref("places.history.expiration.transient_current_max_pages", 112348); user_pref("pref.general.disable_button.default_browser", false); user_pref("pref.privacy.disable_button.cookie_exceptions", false); @@ -366,51 +369,52 @@ user_pref("services.blocklist.addons.checked", 1591867368); user_pref("services.blocklist.gfx.checked", 1654758333); user_pref("services.blocklist.pinning.checked", 1591805812); user_pref("services.blocklist.plugins.checked", 1591867368); -user_pref("services.settings.blocklists.addons-bloomfilters.last_check", 1666011863); -user_pref("services.settings.blocklists.gfx.last_check", 1666011863); +user_pref("services.settings.blocklists.addons-bloomfilters.last_check", 1670142877); +user_pref("services.settings.blocklists.gfx.last_check", 1670142877); user_pref("services.settings.clock_skew_seconds", 0); -user_pref("services.settings.last_etag", "\"1666022930482\""); -user_pref("services.settings.last_update_seconds", 1666023272); -user_pref("services.settings.main.addons-manager-settings.last_check", 1666011863); -user_pref("services.settings.main.anti-tracking-url-decoration.last_check", 1666011863); +user_pref("services.settings.last_etag", "\"1670122633854\""); +user_pref("services.settings.last_update_seconds", 1670142877); +user_pref("services.settings.main.addons-manager-settings.last_check", 1670142877); +user_pref("services.settings.main.anti-tracking-url-decoration.last_check", 1670142877); user_pref("services.settings.main.cfr-fxa.last_check", 1629621510); -user_pref("services.settings.main.cfr.last_check", 1666011863); -user_pref("services.settings.main.devtools-compatibility-browsers.last_check", 1666011863); -user_pref("services.settings.main.devtools-devices.last_check", 1666011863); -user_pref("services.settings.main.doh-config.last_check", 1666011863); -user_pref("services.settings.main.doh-providers.last_check", 1666011863); -user_pref("services.settings.main.fxmonitor-breaches.last_check", 1666011863); -user_pref("services.settings.main.hijack-blocklists.last_check", 1666011863); -user_pref("services.settings.main.language-dictionaries.last_check", 1666011863); -user_pref("services.settings.main.message-groups.last_check", 1666011863); +user_pref("services.settings.main.cfr.last_check", 1670142877); +user_pref("services.settings.main.devtools-compatibility-browsers.last_check", 1670142877); +user_pref("services.settings.main.devtools-devices.last_check", 1670142877); +user_pref("services.settings.main.doh-config.last_check", 1670142877); +user_pref("services.settings.main.doh-providers.last_check", 1670142877); +user_pref("services.settings.main.fxmonitor-breaches.last_check", 1670142877); +user_pref("services.settings.main.hijack-blocklists.last_check", 1670142877); +user_pref("services.settings.main.language-dictionaries.last_check", 1670142877); +user_pref("services.settings.main.message-groups.last_check", 1670142877); user_pref("services.settings.main.messaging-experiments.last_check", 1591867368); -user_pref("services.settings.main.nimbus-desktop-defaults.last_check", 1666011863); -user_pref("services.settings.main.nimbus-desktop-experiments.last_check", 1666023272); -user_pref("services.settings.main.normandy-recipes-capabilities.last_check", 1666011863); -user_pref("services.settings.main.partitioning-exempt-urls.last_check", 1666011863); -user_pref("services.settings.main.password-recipes.last_check", 1666011863); -user_pref("services.settings.main.password-rules.last_check", 1666011863); -user_pref("services.settings.main.personality-provider-models.last_check", 1666011863); -user_pref("services.settings.main.personality-provider-recipe.last_check", 1666011863); -user_pref("services.settings.main.pioneer-study-addons-v1.last_check", 1666011863); -user_pref("services.settings.main.pioneer-study-addons.last_check", 1666011863); -user_pref("services.settings.main.public-suffix-list.last_check", 1666011863); -user_pref("services.settings.main.query-stripping.last_check", 1666011863); -user_pref("services.settings.main.search-config.last_check", 1666011863); -user_pref("services.settings.main.search-default-override-allowlist.last_check", 1666011863); -user_pref("services.settings.main.search-telemetry-v2.last_check", 1666011863); -user_pref("services.settings.main.search-telemetry.last_check", 1666011863); -user_pref("services.settings.main.sites-classification.last_check", 1666011863); -user_pref("services.settings.main.tippytop.last_check", 1666011863); -user_pref("services.settings.main.top-sites.last_check", 1666011863); -user_pref("services.settings.main.url-classifier-skip-urls.last_check", 1666011863); -user_pref("services.settings.main.websites-with-shared-credential-backends.last_check", 1666011863); -user_pref("services.settings.main.whats-new-panel.last_check", 1666011863); -user_pref("services.settings.security-state.cert-revocations.last_check", 1666011863); -user_pref("services.settings.security-state.intermediates.last_check", 1666011863); -user_pref("services.settings.security-state.onecrl.last_check", 1666011863); +user_pref("services.settings.main.ms-images.last_check", 1670142877); +user_pref("services.settings.main.nimbus-desktop-defaults.last_check", 1670142877); +user_pref("services.settings.main.nimbus-desktop-experiments.last_check", 1670142877); +user_pref("services.settings.main.normandy-recipes-capabilities.last_check", 1670142877); +user_pref("services.settings.main.partitioning-exempt-urls.last_check", 1670142877); +user_pref("services.settings.main.password-recipes.last_check", 1670142877); +user_pref("services.settings.main.password-rules.last_check", 1670142877); +user_pref("services.settings.main.personality-provider-models.last_check", 1670142877); +user_pref("services.settings.main.personality-provider-recipe.last_check", 1670142877); +user_pref("services.settings.main.pioneer-study-addons-v1.last_check", 1670142877); +user_pref("services.settings.main.pioneer-study-addons.last_check", 1670142877); +user_pref("services.settings.main.public-suffix-list.last_check", 1670142877); +user_pref("services.settings.main.query-stripping.last_check", 1670142877); +user_pref("services.settings.main.search-config.last_check", 1670142877); +user_pref("services.settings.main.search-default-override-allowlist.last_check", 1670142877); +user_pref("services.settings.main.search-telemetry-v2.last_check", 1670142877); +user_pref("services.settings.main.search-telemetry.last_check", 1670142877); +user_pref("services.settings.main.sites-classification.last_check", 1670142877); +user_pref("services.settings.main.tippytop.last_check", 1670142877); +user_pref("services.settings.main.top-sites.last_check", 1670142877); +user_pref("services.settings.main.url-classifier-skip-urls.last_check", 1670142877); +user_pref("services.settings.main.websites-with-shared-credential-backends.last_check", 1670142877); +user_pref("services.settings.main.whats-new-panel.last_check", 1670142877); +user_pref("services.settings.security-state.cert-revocations.last_check", 1670079776); +user_pref("services.settings.security-state.intermediates.last_check", 1670079776); +user_pref("services.settings.security-state.onecrl.last_check", 1670079776); user_pref("services.settings.security.onecrl.checked", 1654758333); -user_pref("services.sync.addons.lastSync", "1664993052.83"); +user_pref("services.sync.addons.lastSync", "1669360924.79"); user_pref("services.sync.addons.syncID", "L7k31iPXEMk6"); user_pref("services.sync.bookmarks.lastSync", "1591894790.66"); user_pref("services.sync.bookmarks.syncID", "3C9StXXGztPe"); @@ -418,8 +422,8 @@ user_pref("services.sync.client.GUID", "-S_pn8VT4ZCp"); user_pref("services.sync.client.syncID", "MtJM9DyW2j2m"); user_pref("services.sync.clients.devices.desktop", 2); user_pref("services.sync.clients.devices.mobile", 1); -user_pref("services.sync.clients.lastRecordUpload", 1665995955); -user_pref("services.sync.clients.lastSync", "1666027368.11"); +user_pref("services.sync.clients.lastRecordUpload", 1670142880); +user_pref("services.sync.clients.lastSync", "1670142880.57"); user_pref("services.sync.clients.syncID", "-UKRQIkr1Rru"); user_pref("services.sync.creditcards.lastSync", "0"); user_pref("services.sync.creditcards.syncID", "yp8F-l4YaopB"); @@ -434,13 +438,14 @@ user_pref("services.sync.extension-storage.lastSync", "0"); user_pref("services.sync.forms.lastSync", "0"); user_pref("services.sync.globalScore", 0); user_pref("services.sync.history.lastSync", "0"); -user_pref("services.sync.lastPing", 1665995954); -user_pref("services.sync.lastSync", "Mon Oct 17 2022 19:44:33 GMT+0200 (Central European Summer Time)"); +user_pref("services.sync.lastPing", 1670093193); +user_pref("services.sync.lastSync", "Sun Dec 04 2022 09:34:41 GMT+0100 (Central European Standard Time)"); user_pref("services.sync.lastTabFetch", 1586120826); user_pref("services.sync.nextSync", 0); user_pref("services.sync.passwords.syncID", "-WeMPm6W3NJC"); -user_pref("services.sync.prefs.lastSync", "1665241943.00"); +user_pref("services.sync.prefs.lastSync", "1669710933.94"); user_pref("services.sync.prefs.sync-seen.browser.contentblocking.category", true); +user_pref("services.sync.prefs.sync-seen.browser.firefox-view.feature-tour", true); user_pref("services.sync.prefs.sync-seen.browser.newtabpage.activity-stream.feeds.section.topstories", true); user_pref("services.sync.prefs.sync-seen.browser.newtabpage.activity-stream.feeds.topsites", true); user_pref("services.sync.prefs.sync-seen.browser.newtabpage.activity-stream.section.highlights.includePocket", true); @@ -468,13 +473,13 @@ user_pref("services.sync.username", "mrcfrm01@protonmail.com"); user_pref("signon.importedFromSqlite", true); user_pref("signon.rememberSignons", false); user_pref("storage.vacuum.last.index", 1); -user_pref("storage.vacuum.last.places.sqlite", 1664016696); +user_pref("storage.vacuum.last.places.sqlite", 1669316476); user_pref("svg.context-properties.content.enabled", true); user_pref("toolkit.legacyUserProfileCustomizations.stylesheets", true); user_pref("toolkit.scrollbox.horizontalScrollDistance", 4); -user_pref("toolkit.startup.last_success", 1665995942); +user_pref("toolkit.startup.last_success", 1670142873); user_pref("toolkit.telemetry.cachedClientID", "27215ebf-b618-4b9c-bd32-ceb6347e229a"); -user_pref("toolkit.telemetry.previousBuildID", "20221007233509"); +user_pref("toolkit.telemetry.previousBuildID", "20221128222455"); user_pref("toolkit.telemetry.reportingpolicy.firstRun", false); user_pref("trailhead.firstrun.didSeeAboutWelcome", true); user_pref("userChrome.compatibility.os", true); @@ -514,6 +519,7 @@ user_pref("userChrome.tab.color_like_toolbar", true); user_pref("userChrome.tab.connect_to_window", true); user_pref("userChrome.tab.container", true); user_pref("userChrome.tab.crashed", true); +user_pref("userChrome.tab.dynamic_separator", false); user_pref("userChrome.tab.dynamic_separtor", false); user_pref("userChrome.tab.lepton_like_padding", false); user_pref("userChrome.tab.letters_cleary", true); diff --git a/arch-config/.mozilla/firefox/default-release/user.js b/arch-config/.mozilla/firefox/default-release/user.js index 06e92bd1..66f4c3c1 100644 --- a/arch-config/.mozilla/firefox/default-release/user.js +++ b/arch-config/.mozilla/firefox/default-release/user.js @@ -5,9 +5,6 @@ user_pref("toolkit.legacyUserProfileCustomizations.stylesheets", true); // Proton Enabled #127 || Removed at 97 #328 (Maintained for compatibility with ESR) user_pref("browser.proton.enabled", true); -// Proton Tooltip -user_pref("browser.proton.places-tooltip.enabled", true); - // Fill SVG Color user_pref("svg.context-properties.content.enabled", true); @@ -49,7 +46,6 @@ user_pref("userChrome.tab.newtab_button_proton", false); // Proton user_pref("userChrome.icon.panel_full", false); // Original, Proton user_pref("userChrome.icon.panel_photon", true); // Photon -user_pref("userChrome.icon.panel_sparse", false); // Just option // Original Only user_pref("userChrome.tab.box_shadow", false);