diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4fb1d66..06d708a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -41,18 +41,3 @@ jobs: - name: Test run: yarn test - - prettier: - runs-on: ubuntu-latest - - steps: - - name: Checkout - uses: actions/checkout@v2 - - - name: Prettify code - uses: creyD/prettier_action@v4.1.1 - with: - # This part is also where you can pass other options, for example: - prettier_options: --write . - only_changed: True - commit_message: "Clean: Prettified Code!" diff --git a/.prettierignore b/.prettierignore index 682b771..64a1b0a 100644 --- a/.prettierignore +++ b/.prettierignore @@ -5,7 +5,7 @@ # User.js user.js -# Prettier error exeption +# Prettier error exception src/utils/_each.scss # [error] src/utils/_each.scss: SyntaxError: CssSyntaxError: At-rule without name (28:7) # [error] 26 | } diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 282649a..a7abba4 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -90,7 +90,7 @@ Even if you copy the code snippet, it is recommended that you leave a link. **FAQ** -If you have any questions about other licenses, please see [Moailla's MPL 2.0 FAQ](https://www.mozilla.org/en-US/MPL/2.0/FAQ/). +If you have any questions about other licenses, please see [Mozilla's MPL 2.0 FAQ](https://www.mozilla.org/en-US/MPL/2.0/FAQ/). ## References diff --git a/__tests__/each.test.scss b/__tests__/each.test.scss index 5f8c3da..9838760 100644 --- a/__tests__/each.test.scss +++ b/__tests__/each.test.scss @@ -68,7 +68,7 @@ @include test("prefix custom option") { @include assert { @include output { - @include each.AtEach("supports", "userChrome.tab.photon", "-moz-bool-pref", ("seperator": " or ", "quoted": true)) { + @include each.AtEach("supports", "userChrome.tab.photon", "-moz-bool-pref", ("separator": " or ", "quoted": true)) { @include example; } } @@ -84,7 +84,7 @@ @include assert { @include output { $input: "userChrome.tab.photon" "userChrome.padding.photon"; - @include each.AtEach("supports", $input, "-moz-bool-pref", ("seperator": " or ", "quoted": true)) { + @include each.AtEach("supports", $input, "-moz-bool-pref", ("separator": " or ", "quoted": true)) { @include example; } } diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 0e0a801..e7f5c6e 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -1,6 +1,6 @@ @namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"; @namespace html "http://www.w3.org/1999/xhtml"; -/** Default Thme - Contrast ***************************************************/ +/** Default Theme - Contrast **************************************************/ @supports -moz-bool-pref("userChrome.theme.built_in_contrast") { /*= Lightmode - Color darker =================================================*/ :root[lwtheme-mozlightdark]:not([lwthemetextcolor="bright"]), @@ -87,7 +87,7 @@ .tabbrowser-tab:is([visuallyselected="true"], [multiselected]) > .tab-stack > .tab-background { - /* Nigtly 96: 1px solid var(--tab-line-color, rgba(128,128,142,0.9)); */ + /* Nightly 96: 1px solid var(--tab-line-color, rgba(128,128,142,0.9)); */ border: unset !important; } @@ -393,6 +393,14 @@ /* -moz-default-appearance: -moz-window-titlebar */ appearance: none !important; } + @media (-moz-os-version: windows-win7), + (-moz-platform: windows-win7), + (-moz-os-version: windows-win8), + (-moz-platform: windows-win8) { + :root[tabsintitlebar][sizemode="maximized"] #titlebar { + padding-top: 8px; + } + } } @supports -moz-bool-pref("userChrome.compatibility.os.windows_maximized") { :root[tabsintitlebar][sizemode="maximized"] #titlebar { @@ -495,16 +503,16 @@ --win-field-bgcolor: #ffffff; --win-component-bgcolor: #f2f2f2; --win-border-color: #8a8a8a; - --win-tab-seperator-color: #a3a3a3; + --win-tab-separator-color: #a3a3a3; --win-sidebar-bgcolor: #e6e6e6; --win-sidebar-hover-bgcolor: #cfcfcf; --win-sidebar-button-hover-bgcolor: #b8b8b8; --win-sidebar-button-hover-active-bgcolor: #a3a3a3; --win-button-border: #747474; - --win-shorcut-text-color: #757575; + --win-shortcut-text-color: #757575; --win-error-color: #b31616; --win-red-border-color: #ff4343; - --win-accent-forground-color: AccentColorText; + --win-accent-foreground-color: AccentColorText; --win-accent-color: color-mix(in srgb, rgba(0, 0, 0, 0.8) 10%, AccentColor); --win-accent-content-color: color-mix(in srgb, rgba(255, 255, 255, 0.8) 15%, AccentColor); --win-accent-hover-color: color-mix(in srgb, rgba(255, 255, 255, 0.8) 27%, AccentColor); @@ -512,7 +520,7 @@ } @supports -moz-bool-pref("userChrome.compatibility.accent_color") { :root:not(:-moz-lwtheme) { - --win-accent-forground-color: -moz-accent-color-foreground; + --win-accent-foreground-color: -moz-accent-color-foreground; --win-accent-color: color-mix(in srgb, rgba(0, 0, 0, 0.8) 10%, -moz-accent-color); --win-accent-content-color: color-mix(in srgb, rgba(255, 255, 255, 0.8) 15%, -moz-accent-color); --win-accent-hover-color: color-mix(in srgb, rgba(255, 255, 255, 0.8) 27%, -moz-accent-color); @@ -536,13 +544,13 @@ --win-field-bgcolor: #373737; --win-component-bgcolor: #171717; --win-border-color: #5b5b5b; - --win-tab-seperator-color: #555555; + --win-tab-separator-color: #555555; --win-sidebar-bgcolor: #1f1f1f; --win-sidebar-hover-bgcolor: #353535; --win-sidebar-button-hover-bgcolor: #353535; --win-sidebar-button-hover-active-bgcolor: #4c4c4c; --win-button-border: #8f8f8f; - --win-shorcut-text-color: #adadad; + --win-shortcut-text-color: #adadad; --win-error-color: #ffb900; --win-red-border-color: #ff4343; --win-accent-color: color-mix(in srgb, rgba(255, 255, 255, 0.8) 20%, AccentColor); @@ -584,8 +592,8 @@ --panel-disabled-color: var(--win-disabled-color) !important; --download-progress-paused-color: var(--win-disabled-color) !important; /* Text Shortcut Color */ - --panel-shortcut-color: var(--win-shorcut-text-color) !important; - --panel-description-color: var(--win-shorcut-text-color) !important; + --panel-shortcut-color: var(--win-shortcut-text-color) !important; + --panel-description-color: var(--win-shortcut-text-color) !important; /* Title Background */ --lwt-accent-color: var(--win-bgcolor) !important; --toolbar-field-border-color: var(--win-bgcolor) !important; @@ -597,9 +605,9 @@ --arrowpanel-background: var(--win-component-bgcolor) !important; --autocomplete-popup-background: var(--win-component-bgcolor) !important; /* Border Color */ - /* Seperator */ - --toolbarseparator-color: var(--win-tab-seperator-color) !important; - /* Field Backround Color */ + /* Separator */ + --toolbarseparator-color: var(--win-tab-separator-color) !important; + /* Field Background Color */ --input-bgcolor: var(--win-field-bgcolor) !important; --toolbar-field-background-color: var(--win-field-bgcolor) !important; --toolbar-field-focus-background-color: var(--win-field-bgcolor) !important; @@ -631,9 +639,9 @@ --checkbox-border-color: var(--win-button-border) !important; --input-border-color: var(--win-button-border) !important; --autocomplete-popup-separator-color: var(--win-button-border) !important; - /* Accent Forground Color */ - --button-primary-color: var(--win-accent-forground-color) !important; - --checkbox-checked-color: var(--win-accent-forground-color) !important; + /* Accent Foreground Color */ + --button-primary-color: var(--win-accent-foreground-color) !important; + --checkbox-checked-color: var(--win-accent-foreground-color) !important; /* Accent Color */ --button-primary-bgcolor: var(--win-accent-color) !important; --focus-outline-color: var(--win-accent-color) !important; @@ -906,11 +914,11 @@ /* Selected Background Color */ --toolbar-bgcolor: var(--mac-selected-bgcolor) !important; --toolbar-non-lwt-bgcolor: var(--mac-selected-bgcolor) !important; - /* Field Backround Color */ + /* Field Background Color */ --input-bgcolor: var(--mac-field-bgcolor) !important; --toolbar-field-background-color: var(--mac-field-bgcolor) !important; --tab-icon-overlay-stroke: var(--mac-field-bgcolor) !important; - /* Panel Backround Color */ + /* Panel Background Color */ --arrowpanel-background: var(--mac-panel-bgcolor) !important; /* Hover Background Color */ --menuitem-hover-background-color: var(--mac-hover-bgcolor) !important; @@ -947,7 +955,7 @@ --input-border-color: var(--mac-bgcolor) !important; --autocomplete-popup-separator-color: var(--mac-bgcolor) !important; */ - /* Accent Color Forground */ + /* Accent Color Foreground */ --button-primary-color: var(--mac-primary-button-color) !important; --checkbox-checked-color: var(--mac-primary-button-color) !important; /* Accent Color */ @@ -1134,7 +1142,7 @@ --in-content-link-color-hover: var(--blue-70); --in-content-link-color-active: var(--blue-80); --in-content-link-color-visited: var(--blue-60); - /* button background states are also used for checkboxes and radiobuttons */ + /* button background states are also used for checkboxes and radio buttons */ --in-content-button-text-color: var(--in-content-text-color); --in-content-button-text-color-hover: var(--in-content-text-color); --in-content-button-background: rgba(207, 207, 216, 0.33); @@ -1590,6 +1598,29 @@ background-color: var(--arrowpanel-dimmed-further, rgba(204, 204, 204, 0.5)) !important; /* Original: hsla(0,0%,80%,.5), match arrowpanel-dimmed-further */ } + + /* New Folder Button */ + #editBMPanel_newFolderButton { + appearance: none; + border: 0; + border-radius: 4px; + background-color: var(--button-bgcolor); + color: var(--button-color, inherit); + font-weight: 600; + min-width: 0; + padding: 8px 16px; + /* This button is deeper in the visual hierarchy than others (notably the + buttons at the bottom of the panel), so it should be slightly smaller. */ + font-size: 90%; + /* This button needs to align with the tree above it. */ + margin-inline-start: 4px; + } + #editBMPanel_newFolderButton:hover { + background-color: var(--button-hover-bgcolor); + } + #editBMPanel_newFolderButton:hover:active { + background-color: var(--button-active-bgcolor); + } } /*= Fully Dark Mode ==========================================================*/ @supports -moz-bool-pref("userChrome.theme.fully_dark") { @@ -2318,7 +2349,7 @@ border-radius: 4px !important; } } - /*= Cert Exeption Dialog =====================================================*/ + /*= Cert Exception Dialog ====================================================*/ @-moz-document url("chrome://pippki/content/exceptionDialog.xhtml") { #locationTextBox { @@ -2336,13 +2367,13 @@ border-color: transparent !important; outline: 2px solid var(--in-content-focus-outline-color) !important; outline-offset: -1px !important; - /* Prevents antialising around the corners */ + /* 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 antialising around the corners */ + /* Prevents antialiasing around the corners */ } #locationTextBox:disabled { opacity: 0.4 !important; @@ -3124,7 +3155,7 @@ from { margin-top: 0; } - /* Dont' use `to`: Depending on density */ + /* Don't use `to`: Depending on density */ } /*- Expand - Synced Tabs ---------------------------------------------------*/ @-moz-document url("chrome://browser/content/syncedtabs/sidebar.xhtml") @@ -3200,7 +3231,7 @@ } } @supports -moz-bool-pref("userChrome.rounding.square_tab") or -moz-bool-pref("userChrome.round.square_button") { - /* Fix Tab bar button radious */ + /* Fix Tab bar button radius */ #TabsToolbar .toolbarbutton-1:not(#tabs-newtab-button) > .toolbarbutton-icon, #TabsToolbar .toolbarbutton-1:not(#tabs-newtab-button) > .toolbarbutton-text, #TabsToolbar .toolbarbutton-1:not(#tabs-newtab-button) > .toolbarbutton-badge-stack, @@ -3442,7 +3473,7 @@ padding-inline: 1px !important; } } - .tabbrowser-tab:not([last-visible-tab]) { + #TabsToolbar:not([multibar]) .tabbrowser-tab:not([last-visible-tab]) { margin-inline-end: -1px !important; } } @@ -3567,21 +3598,45 @@ } } } + :root { + /* Works with TabMixPlus */ + --tab-min-height_mlt: calc( + 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) */ + } + @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 */ } - :root:not([uidensity="compact"]) #tabbrowser-arrowscrollbox, - #tabbrowser-arrowscrollbox[overflowing="true"] > .tabbrowser-tab[pinned="true"], - #tabbrowser-arrowscrollbox[overflowing="true"] > .tabbrowser-tab[pinned="true"] .tab-stack, - #tabbrowser-arrowscrollbox[overflowing="true"] > .tabbrowser-tab[pinned="true"] .tab-content { + :root:not([uidensity="compact"]) #TabsToolbar:not([multibar]) #tabbrowser-arrowscrollbox, + #TabsToolbar:not([multibar]) #tabbrowser-arrowscrollbox[overflowing="true"] > .tabbrowser-tab[pinned="true"], + #TabsToolbar:not([multibar]) + #tabbrowser-arrowscrollbox[overflowing="true"] + > .tabbrowser-tab[pinned="true"] + .tab-stack, + #TabsToolbar:not([multibar]) + #tabbrowser-arrowscrollbox[overflowing="true"] + > .tabbrowser-tab[pinned="true"] + .tab-content { max-height: var(--tab-min-height) !important; /* Force apply height */ } - :root[uidensity="compact"] #tabbrowser-arrowscrollbox { + :root[uidensity="compact"] #TabsToolbar:not([multibar]) #tabbrowser-arrowscrollbox { height: var(--tab-min-height) !important; } } @@ -4071,7 +4126,7 @@ } } } - /*= Tabbar - Hidden at singgle tab ===========================================*/ + /*= Tabbar - Hidden at single tab ===========================================*/ @supports -moz-bool-pref("userChrome.tabbar.on_bottom.hidden_single_tab") { #tabbrowser-tabs .tabbrowser-tab:only-of-type { display: none !important; @@ -4221,7 +4276,7 @@ } } } - /*= Tabbar - Hidden at singgle tab ===========================================*/ + /*= Tabbar - Hidden at single tab ===========================================*/ @supports -moz-bool-pref("userChrome.tabbar.on_bottom.hidden_single_tab") { #tabbrowser-tabs .tabbrowser-tab:only-of-type { display: none !important; @@ -6117,7 +6172,7 @@ } } } -/** Tab UI ****************************************************************/ +/** Tab UI ********************************************************************/ /*= Tab - Connect to window ==============================================*/ @supports -moz-bool-pref("userChrome.tab.connect_to_window") { .tab-background { @@ -6139,7 +6194,7 @@ z-index: 1 !important; } - #TabsToolbar { + #TabsToolbar:not([multibar]) { overflow: hidden; /* Prevent toolbar area over */ } @@ -6218,7 +6273,7 @@ .tabbrowser-tab[visuallyselected="true"]:not(:focus) > .tab-stack > .tab-background:-moz-lwtheme { - /* Origina: 0 0 1px var(--tab-line-color, rgba(128,128,142,0.9)) + /* Original: 0 0 1px var(--tab-line-color, rgba(128,128,142,0.9)) 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; } @@ -6330,7 +6385,7 @@ /* Fill color for GTK */ :root:not([customizing="true"]):not([lwtheme="true"]) tab[visuallyselected] > stack::before, :root:not([customizing="true"]):not([lwtheme="true"]) tab[visuallyselected] > stack::after { - /* As GTK Toolbar's background-color + backround-image + /* As GTK Toolbar's background-color + background-image * --toolbar-non-lwt-bgcolor: -moz-dialog; * --toolbar-non-lwt-bgimage: linear-gradient(rgba(255,255,255,.15), rgba(255,255,255,.15)); */ @@ -6406,7 +6461,7 @@ background-color: rgba(255, 255, 255, 0.2) !important; } - /* Prevent identitiy color flashing */ + /* Prevent identity color flashing */ .tabbrowser-tab[usercontextid] .tab-context-line { --identity-icon-color: none; } @@ -6456,7 +6511,7 @@ } /*= Unselected Tab - Divide line =============================================*/ /*= Unselected Tab - Dynamic Separator =======================================*/ -@supports -moz-bool-pref("userChrome.tab.dynamic_separtor") { +@supports -moz-bool-pref("userChrome.tab.dynamic_separator") or -moz-bool-pref("userChrome.tab.dynamic_separtor") { #tabbrowser-arrowscrollbox { --start-tab-separator-position-x: -1.5px; --end-tab-separator-position-x: 1.5px; @@ -6469,8 +6524,12 @@ --tab-separator-position-x: 2.5px; } + #tabbrowser-arrowscrollbox-periphery { + position: relative; + } + @supports -moz-bool-pref("userChrome.tab.newtab_button_like_tab") { - #tabbrowser-arrowscrollbox { + #TabsToolbar:not([multibar]) #tabbrowser-arrowscrollbox { position: absolute; } @@ -6690,13 +6749,13 @@ #tabs-newtab-button { /* Original: margin: 0 0 var(--tabs-navbar-shadow-size) !important - => Can't ovrride style. Therefore, we should approach it by bypass. + => Can't override style. Therefore, we should approach it by bypass. */ --tabs-navbar-shadow-size: -1px; /* Original: 1px */ --tabs-navbar-original-shadow-size: 1px; --tab-corner-rounding: 4px; - /* Hardcorded */ + /* Hardcoded */ /* Size */ -moz-box-align: stretch !important; padding-top: var(--tab-block-margin) !important; @@ -6725,27 +6784,27 @@ :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; - /* Hardcorded for compatibility */ + /* 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; - /* Hardcorded for compatibility */ + /* 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; - /* Hardcorded for compatibility */ + /* 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; - /* Hardcorded for compatibility */ + /* Hardcoded for compatibility */ } } } @@ -6763,8 +6822,9 @@ /*= New tab button - Smaller button ==========================================*/ @supports -moz-bool-pref("userChrome.tab.newtab_button_smaller") { #tabs-newtab-button > .toolbarbutton-icon { + --tab-border-radius: var(--toolbarbutton-border-radius); margin-left: 1px; - /* Origianl: calc((var(--tab-min-height) - 16px) / 2) = 10px */ + /* Original: calc((var(--tab-min-height) - 16px) / 2) = 10px */ --toolbarbutton-inner-padding: 6px; } @@ -7487,8 +7547,16 @@ 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, #sidebar { min-width: var(--uc-sidebar-activate-width) !important; max-width: var(--uc-sidebar-activate-width) !important; @@ -7499,7 +7567,7 @@ will-change: padding-inline; } #sidebar-box:not([hidden="true"]) { - padding-inline-start: var(--uc-sidebar-activate-width); + padding-inline-start: var(--uc-sidebar-activate-width) !important; } @media (prefers-reduced-motion: no-preference) { #sidebar-box { @@ -7525,7 +7593,7 @@ } @media (-moz-gtk-csd-available) { - /* Fix transparent backgorund */ + /* Fix transparent background */ :root[tabsintitlebar][sizemode="fullscreen"] #TabsToolbar:not(:-moz-lwtheme) { appearance: auto !important; } @@ -8192,12 +8260,14 @@ } @supports -moz-bool-pref("userChrome.sidebar.overlap") { + #sidebar-header, #sidebar { min-width: var(--uc-sidebar-width) !important; 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; @@ -8219,11 +8289,13 @@ } @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; } @@ -8447,2570 +8519,2634 @@ } } /** Icons *********************************************************************/ -/** Library - Icons Replace ***************************************************/ -@supports -moz-bool-pref("userChrome.icon.library") { - /*= Standard Folder - More Visible ===========================================*/ - /* on Toolbar and Menus */ - :-moz-any(#PlacesToolbar, #BMB_bookmarksPopup, #bookmarksMenu) - .bookmark-item[container="true"]:not([query="true"], [tagContainer], [dayContainer]), - :-moz-any(#bookmarks-view, #historyTree, #editBMPanel_folderTree, #placesList, #placeContent) - treechildren::-moz-tree-image(title, container), - #editBMPanel_folderMenuList:not([selectedGuid="toolbar_____"], [selectedGuid="menu________"]), - #editBMPanel_folderMenuList .folder-icon:not([id]), - .downloadIconShow > .button-box > .button-icon { - list-style-image: url("../icons/folder.svg") !important; - } +@supports not -moz-bool-pref("userChrome.icon.disabled") { + /** Library - Icons Replace ***************************************************/ + @supports -moz-bool-pref("userChrome.icon.library") { + /*= Standard Folder - More Visible ===========================================*/ + /* on Toolbar and Menus */ + :-moz-any(#PlacesToolbar, #BMB_bookmarksPopup, #bookmarksMenu) + .bookmark-item[container="true"]:not([query="true"], [tagContainer], [dayContainer]), + :-moz-any(#bookmarks-view, #historyTree, #editBMPanel_folderTree, #placesList, #placeContent) + treechildren::-moz-tree-image(title, container), + #editBMPanel_folderMenuList:not([selectedGuid="toolbar_____"], [selectedGuid="menu________"]), + #editBMPanel_folderMenuList .folder-icon:not([id]), + .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"], - :-moz-any(#bookmarks-view, #historyTree, #editBMPanel_folderTree, #placesList, #placeContent) - treechildren::-moz-tree-image(title, container, open) { - list-style-image: url("../icons/folder-open.svg") !important; - } + /* Standard Folder - Open */ + :-moz-any(#PlacesToolbar, #BMB_bookmarksPopup, #bookmarksMenu) + .bookmark-item[container="true"]:not([query="true"], [tagContainer], [dayContainer])[open="true"], + :-moz-any(#bookmarks-view, #historyTree, #editBMPanel_folderTree, #placesList, #placeContent) + treechildren::-moz-tree-image(title, container, open) { + list-style-image: url("../icons/folder-open.svg") !important; + } - /*= Other Folder - Inbox Icon ================================================*/ - /* on Menus */ - #PlacesToolbar #OtherBookmarks, - #BMB_bookmarksPopup #BMB_unsortedBookmarks, - #bookmarksMenuPopup #menu_unsortedBookmarks, - :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent) - treechildren::-moz-tree-image(container, OrganizerQuery_UnfiledBookmarks), - :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent) - treechildren::-moz-tree-image(container, queryFolder_unfiled_____), - #editBMPanel_unfiledRootItem, - #editBMPanel_folderMenuList[selectedGuid="unfiled_____"] { - list-style-image: url("../icons/mail-inbox-all.svg") !important; - } + /*= Other Folder - Inbox Icon ================================================*/ + /* on Menus */ + #PlacesToolbar #OtherBookmarks, + #BMB_bookmarksPopup #BMB_unsortedBookmarks, + #bookmarksMenuPopup #menu_unsortedBookmarks, + :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent) + treechildren::-moz-tree-image(container, OrganizerQuery_UnfiledBookmarks), + :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent) + treechildren::-moz-tree-image(container, queryFolder_unfiled_____), + #editBMPanel_unfiledRootItem, + #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"], - #bookmarksMenuPopup #menu_unsortedBookmarks[open="true"], - :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent) - treechildren::-moz-tree-image(container, open, OrganizerQuery_UnfiledBookmarks), - :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent) - treechildren::-moz-tree-image(container, open, queryFolder_unfiled_____) { - list-style-image: url("../icons/mail-inbox.svg") !important; - } + /* Other Folder - Open */ + #PlacesToolbar #OtherBookmarks[open="true"], + #BMB_bookmarksPopup #BMB_unsortedBookmarks[open="true"], + #bookmarksMenuPopup #menu_unsortedBookmarks[open="true"], + :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent) + treechildren::-moz-tree-image(container, open, OrganizerQuery_UnfiledBookmarks), + :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent) + 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; - } + /*= 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; - } + /* 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; - } + /* 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; - } + /* 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; + } - /* Boomark */ - :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, OrganizerQuery_allbms_____v) { - list-style-image: url("chrome://browser/skin/bookmark.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, - :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent) - treechildren::-moz-tree-image(container, queryFolder_toolbar_____) { - list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.svg") !important; - } + /* Bookmark Toolbar */ + #BMB_bookmarksPopup #BMB_bookmarksToolbar, + #bookmarksMenuPopup #bookmarksToolbarFolderMenu, + :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent) + 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; - } + /* 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) - .bookmark-item[container="true"][query="true"]:not([tagContainer])[open="true"] - > .menu-iconic-left - > .menu-iconic-icon { - transform: rotate(15deg) !important; - } + /*= Default Icon - Open ======================================================*/ + /* Query */ + :-moz-any(#PlacesToolbar, #BMB_bookmarksPopup, #bookmarksMenu) + .bookmark-item[container="true"][query="true"]:not([tagContainer])[open="true"] + > .menu-iconic-left + > .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; - } + /* 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"], - :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(title, query, open, tagContainer), - :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, open, OrganizerQuery_tags_______v) { - list-style-image: url("../icons/tag-open.svg") !important; - } + /* Tag */ + :-moz-any(#PlacesToolbar, #BMB_bookmarksPopup, #bookmarksMenu) + .bookmark-item[container="true"][tagContainer="true"][open="true"], + :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(title, query, open, tagContainer), + :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, open, OrganizerQuery_tags_______v) { + list-style-image: url("../icons/tag-open.svg") !important; + } - /* Boomark */ - :-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 */ + :-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"], - :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent) - treechildren::-moz-tree-image(container, open, queryFolder_toolbar_____) { - list-style-image: url("../icons/bookmarksToolbar-open.svg") !important; - } + /* Bookmark Toolbar */ + #BMB_bookmarksPopup #BMB_bookmarksToolbar[open="true"], + #bookmarksMenuPopup #bookmarksToolbarFolderMenu[open="true"], + :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent) + 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" */ - } + /* 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" */ + } - @-moz-document url("chrome://browser/content/places/places.xhtml") - { - @media (-moz-gtk-csd-available) { - /*= Menubar - Icons ==========================================================*/ - #organizeButton, - #viewMenu, - #maintenanceButton, - #back-button, - #forward-button, - #clearDownloadsButton { - fill: currentColor !important; - -moz-context-properties: fill !important; - } + @-moz-document url("chrome://browser/content/places/places.xhtml") + { + @media (-moz-gtk-csd-available) { + /*= Menubar - Icons ==========================================================*/ + #organizeButton, + #viewMenu, + #maintenanceButton, + #back-button, + #forward-button, + #clearDownloadsButton { + fill: currentColor !important; + -moz-context-properties: fill !important; + } - /* Add */ - #organizeButton { - list-style-image: url("chrome://global/skin/icons/settings.svg") !important; - } + /* Add */ + #organizeButton { + list-style-image: url("chrome://global/skin/icons/settings.svg") !important; + } - #viewMenu { - list-style-image: url("../icons/sort.svg") !important; - } + #viewMenu { + list-style-image: url("../icons/sort.svg") !important; + } - #maintenanceButton { - list-style-image: url("../icons/import-export.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 { + list-style-image: url("chrome://global/skin/icons/delete.svg") !important; + } - #clearDownloadsButton > .toolbarbutton-icon { - display: -moz-inline-box !important; - margin-top: 0; - margin-bottom: 0; - margin-inline-start: 0; - margin-inline-end: 2px; - } + #clearDownloadsButton > .toolbarbutton-icon { + display: -moz-inline-box !important; + margin-top: 0; + margin-bottom: 0; + margin-inline-start: 0; + margin-inline-end: 2px; + } - /* Replace */ - #back-button { - list-style-image: url("chrome://browser/skin/back.svg") !important; - } + /* 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; - } + #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; + #back-button:-moz-locale-dir(rtl) > .toolbarbutton-icon, + #forward-button:-moz-locale-dir(rtl) > .toolbarbutton-icon { + transform: scaleX(-1) !important; + } } } } -} -/** Panel - Icons *************************************************************/ -@supports -moz-bool-pref("userChrome.icon.panel") { - /*= Padding ==================================================================*/ - :root { - --arrowpanel-menuicon-padding: 8px; - --arrowpanel-menublank-padding: calc( - var(--arrowpanel-menuicon-padding) * 2 + var(var(--arrowpanel-menuitem-padding-inline)) - ) !important; - --arrowpanel-menuimageblank-padding: calc(var(--arrowpanel-menuitem-padding-inline) - 2px) !important; - --arrowpanel-menuimageblank-padding-block: calc(var(--arrowpanel-menuitem-padding-block) - 2px) !important; - } - - .subviewbutton > .toolbarbutton-icon { - width: 16px; - } - - @supports -moz-bool-pref("userChrome.icon.panel_photon") or -moz-bool-pref("userChrome.icon.panel_sparse") { + /** Panel - Icons *************************************************************/ + @supports -moz-bool-pref("userChrome.icon.panel") { + /*= Padding ==================================================================*/ :root { - /* Global */ - --arrowpanel-menuicon-paddingx2: calc(var(--arrowpanel-menuicon-padding) * 2); - /* General Panel */ - --arrowpanel-menublank-padding: calc(var(--arrowpanel-menuicon-paddingx2) + 8px) !important; + --arrowpanel-menuicon-padding: 8px; + --arrowpanel-menublank-padding: calc( + var(--arrowpanel-menuicon-padding) * 2 + var(var(--arrowpanel-menuitem-padding-inline)) + ) !important; --arrowpanel-menuimageblank-padding: calc(var(--arrowpanel-menuitem-padding-inline) - 2px) !important; - /* Blank Menu Left Padding */ - --arrowpanel-menuimageblank-padding-horizontal: calc( - var(--arrowpanel-menuicon-paddingx2) + var(--arrowpanel-menuitem-padding-inline) - ); - --arrowpanel-menuitemblank-padding: calc(var(--arrowpanel-menuitem-padding-block) + 1px); - } - } - #downloadsHistory .button-text, - .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 */ - } - - #appMenu-multiView .subviewbutton::before, - #appMenu-proton-update-banner::before { - display: -moz-inline-box; - margin-inline-end: var(--arrowpanel-menuicon-padding); - 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 { - align-items: center; - 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, - #downloadsHistory .button-icon, - .subviewbutton:not(#appMenu-proton-update-banner) > image { - fill: currentColor !important; - fill-opacity: var(--toolbarbutton-icon-fill-opacity) !important; - -moz-context-properties: fill !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") */ - content: ""; - border-radius: 50% !important; - 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"); - } - } - @supports -moz-bool-pref("userChrome.icon.panel_photon") { - #appMenu-save-file-button2, - #appMenu-find-button2, - #appMenu-more-button2 { - padding-top: var(--arrowpanel-menuitemblank-padding) !important; - padding-bottom: var(--arrowpanel-menuitemblank-padding) !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") { + :root { + /* Global */ + --arrowpanel-menuicon-paddingx2: calc(var(--arrowpanel-menuicon-padding) * 2); + /* General Panel */ + --arrowpanel-menublank-padding: calc(var(--arrowpanel-menuicon-paddingx2) + 8px) !important; + --arrowpanel-menuimageblank-padding: calc(var(--arrowpanel-menuitem-padding-inline) - 2px) !important; + /* Blank Menu Left Padding */ + --arrowpanel-menuimageblank-padding-horizontal: calc( + var(--arrowpanel-menuicon-paddingx2) + var(--arrowpanel-menuitem-padding-inline) + ); + --arrowpanel-menuitemblank-padding: calc(var(--arrowpanel-menuitem-padding-block) + 1px); + } + } + #downloadsHistory .button-text, + .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 */ + } + + #appMenu-multiView .subviewbutton::before, + #appMenu-proton-update-banner::before { + display: -moz-inline-box; + margin-inline-end: var(--arrowpanel-menuicon-padding); + 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 { - 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; - } - } - #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"); - } - } - #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"); - } - - #appMenu-find-button2 { - list-style-image: url("chrome://global/skin/icons/search-glass.svg"); + align-items: center; + padding-top: var(--arrowpanel-menuimageblank-padding-block) !important; + padding-bottom: var(--arrowpanel-menuimageblank-padding-block) !important; } #appMenu-zoom-controls2::before, #appMenu-zoom-controls::before { - content: url("../icons/screenshot.svg"); + margin-inline-end: 0 !important; } - } - #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"); + #appMenu-zoomReduce-button2, + #appMenu-zoomReset-button2, + #appMenu-zoomEnlarge-button2, + #appMenu-fullscreen-button2 { + --arrowpanel-menuitem-padding-block: 0px; } - } - @supports -moz-bool-pref("userChrome.icon.panel_full") or -moz-bool-pref("userChrome.icon.panel_photon") { - #appMenu-help-button2 { + + .subviewbutton[type="checkbox"]:not([checked="true"]) > .toolbarbutton-text { + margin-left: 16px !important; + } + + /* Icons Color */ + #appMenu-multiView .subviewbutton::before, + #appMenu-proton-update-banner::before, + #downloadsHistory .button-icon, + .subviewbutton:not(#appMenu-proton-update-banner) > image { + fill: currentColor !important; + fill-opacity: var(--toolbarbutton-icon-fill-opacity) !important; + -moz-context-properties: fill !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") */ + content: ""; + border-radius: 50% !important; + 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"); + } + } + @supports -moz-bool-pref("userChrome.icon.panel_photon") { + #appMenu-save-file-button2, + #appMenu-find-button2, + #appMenu-more-button2 { + 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; + } + } + #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"); + } + } + #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"); + } + + #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"); + } + } + #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"); + } + } + @supports -moz-bool-pref("userChrome.icon.panel_full") or -moz-bool-pref("userChrome.icon.panel_photon") { + #appMenu-help-button2 { + list-style-image: url("chrome://global/skin/icons/help.svg"); + } + + #appMenu-quit-button2 { + list-style-image: url("../icons/quit.svg"); + } + } + /*= Panel - Account ==========================================================*/ + #PanelUI-fxa-menu-connect-device-button .toolbarbutton-icon, + #PanelUI-fxa-menu-account-signout-button .toolbarbutton-icon { + width: 16px !important; + height: 16px !important; + } + + /* Default */ + #fxa-manage-account-button::before { + content: ""; + display: -moz-inline-box; + width: 32px !important; + height: 32px !important; + border-radius: 50%; + background-size: 32px; + background-image: var(--avatar-image-url); + margin-inline-end: var(--arrowpanel-menuicon-padding); + } + @supports -moz-bool-pref("userChrome.icon.account_image_to_right") { + #fxa-manage-account-button::before { + -moz-box-ordinal-group: 2 !important; + } + } + + @supports -moz-bool-pref("userChrome.icon.account_label_to_right") { + #fxa-menu-header-title, + #fxa-menu-header-description { + text-align: right; + } + } + .syncNowBtn { + visibility: visible !important; + -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: ""; + padding-inline-end: 16px; + padding-block: 1px; + margin-inline-end: var(--arrowpanel-menuicon-padding); + /* Color */ + fill: currentColor; + fill-opacity: var(--toolbarbutton-icon-fill-opacity); + -moz-context-properties: fill; + 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: ""; + display: -moz-box; + border-bottom: 1px solid var(--panel-separator-color); + 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-quit-button2 { - list-style-image: url("../icons/quit.svg"); + #appMenu_feedbackPage { + list-style-image: url("../icons/send.svg"); } - } - /*= Panel - Account ==========================================================*/ - #PanelUI-fxa-menu-connect-device-button .toolbarbutton-icon, - #PanelUI-fxa-menu-account-signout-button .toolbarbutton-icon { - width: 16px !important; - height: 16px !important; - } - /* Default */ - #fxa-manage-account-button::before { - content: ""; - display: -moz-inline-box; - width: 32px !important; - height: 32px !important; - border-radius: 50%; - background-size: 32px; - background-image: var(--avatar-image-url); - margin-inline-end: var(--arrowpanel-menuicon-padding); - } - @supports -moz-bool-pref("userChrome.icon.account_image_to_right") { - #fxa-manage-account-button::before { - -moz-box-ordinal-group: 2 !important; + #appMenu_helpSafeMode { + list-style-image: url("chrome://devtools/skin/images/debugging-workers.svg"); } - } - @supports -moz-bool-pref("userChrome.icon.account_label_to_right") { - #fxa-menu-header-title, - #fxa-menu-header-description { - text-align: right; + #appMenu_troubleShooting { + list-style-image: url("chrome://global/skin/icons/more.svg"); } - } - .syncNowBtn { - visibility: visible !important; - -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: ""; - padding-inline-end: 16px; - padding-block: 1px; - margin-inline-end: var(--arrowpanel-menuicon-padding); - /* Color */ - fill: currentColor; - fill-opacity: var(--toolbarbutton-icon-fill-opacity); - -moz-context-properties: fill; - 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: ""; - display: -moz-box; - border-bottom: 1px solid var(--panel-separator-color); - 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; - } - } - /* BMB_bookmarksToolbarPopup */ - #BMB_viewBookmarksToolbar[data-l10n-args='{"isVisible":true}'] { - --menuitem-image: url("../icons/eye-hide.svg"); - } - #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; - 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 */ - } - - #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"); - } -} -/** 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 */ - } - - /* Icon */ - #main-menubar > menu, - :not(menu, #ContentSelectDropdown) - > menupopup - > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), - :not(menu, #ContentSelectDropdown) > menupopup > menu:not(.menu-iconic, .in-menulist, [checked="true"]), - menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup) - menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), - menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup) - menu:not(.menu-iconic, .in-menulist, [checked="true"]), - menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) - > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), - menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu:not(.menu-iconic, .in-menulist, [checked="true"]), - menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup, #context-sendlinktodevice-popup) - > menuitem, - .openintabs-menuitem, - #blockedPopupDontShowMessage, - #BMB_viewBookmarksToolbar { - /* Color */ - -moz-context-properties: fill, fill-opacity !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) - > menupopup - > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), - :not(menu, #ContentSelectDropdown) > menupopup > menu:not(.menu-iconic, .in-menulist, [checked="true"]) { - list-style-image: var(--menuitem-image, url("../icons/blank.svg")) !important; - } - } - - /* Padding */ - :root { - --uc-menu-background-position: left; - --context-menu-background-padding-default: 5px; - --context-menu-background-padding: var(--context-menu-background-padding-default); - } - :root:-moz-locale-dir(rtl) { - --uc-menu-background-position: right; - } - - :not(menu, #ContentSelectDropdown, #context-navigation) > menupopup > menuitem:not(.menuitem-iconic), - :not(menu, #ContentSelectDropdown, #context-navigation) > menupopup > menu:not(.menu-iconic), - :not(menu, #ContentSelectDropdown, #context-navigation) - > menupopup - > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), - :not(menu, #ContentSelectDropdown, #context-navigation) - > menupopup - > menu:not(.menu-iconic, .in-menulist, [checked="true"]), - menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup) - menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), - menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup) - menu:not(.menu-iconic, .in-menulist, [checked="true"]), - menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) - > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), - menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu:not(.menu-iconic, .in-menulist, [checked="true"]), - menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup, #context-sendlinktodevice-popup) - > menuitem, - .openintabs-menuitem, - #blockedPopupDontShowMessage, - #BMB_viewBookmarksToolbar { - 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 { - background-position: var(--uc-menu-background-position) var(--context-menu-background-padding-default) center !important; - padding-inline-start: calc(16px + var(--context-menu-background-padding-default)) !important; - padding-inline-end: 3px; - } - #main-menubar > menu:first-child { - background-position: var(--uc-menu-background-position) calc(3px + var(--context-menu-background-padding-default)) - center !important; - padding-inline-start: calc(19px + var(--context-menu-background-padding-default)) !important; - } - #main-menubar > menu > menupopup { - --menuitem-image: none; - /* Prevent Image Inheritance */ - } - @supports not -moz-bool-pref("userChrome.padding.global_menubar") { - #main-menubar > menu { - padding-block: 2px !important; - } - } - } - /* Padding - Windows */ - @media (-moz-os-version: windows-win7), (-moz-platform: windows-win7) { - :root { - --context-menu-background-padding-default: 2px; - } - } - @media (-moz-os-version: windows-win8), (-moz-platform: windows-win8) { - :root { - --context-menu-background-padding-default: 3px; - } - } - @media (-moz-os-version: windows-win7), - (-moz-platform: windows-win7), - (-moz-os-version: windows-win8), - (-moz-platform: windows-win8) { - :not(menu, #ContentSelectDropdown, #context-navigation) - > menupopup - > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), - :not(menu, #ContentSelectDropdown, #context-navigation) - > menupopup - > menu:not(.menu-iconic, .in-menulist, [checked="true"]), - menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup) - menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), - menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup) - menu:not(.menu-iconic, .in-menulist, [checked="true"]), - menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) - > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), - menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu:not(.menu-iconic, .in-menulist, [checked="true"]), - menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup, #context-sendlinktodevice-popup) - > menuitem, - .openintabs-menuitem, - #blockedPopupDontShowMessage, - #BMB_viewBookmarksToolbar { - background-position: left var(--context-menu-background-padding) center !important; - padding-inline-start: 0 !important; - } - } - @media (-moz-os-version: windows-win10), (-moz-platform: windows-win10) { - :root { - --context-menu-background-padding: 1em; - --context-menu-text-padding: 24px; - /* 16px + 8px */ - --menu-background-padding-default: calc( - var(--context-menu-background-padding) + var(--context-menu-text-padding) - ); - } - - :not(menu, #ContentSelectDropdown, #context-navigation) - > menupopup - > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), - :not(menu, #ContentSelectDropdown, #context-navigation) - > menupopup - > menu:not(.menu-iconic, .in-menulist, [checked="true"]), - menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup) - menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), - menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup) - menu:not(.menu-iconic, .in-menulist, [checked="true"]), - menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) - > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), - menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu:not(.menu-iconic, .in-menulist, [checked="true"]), - menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup, #context-sendlinktodevice-popup) - > menuitem, - .openintabs-menuitem, - #blockedPopupDontShowMessage, - #BMB_viewBookmarksToolbar { - padding-inline-start: var(--menu-background-padding-default) !important; - margin-left: 0 !important; - } - } - /* Padding - Linux */ - @media (-moz-gtk-csd-available) { - :root { - --context-menu-background-padding-default: 6px; - } - - #main-menubar > menu > .menubar-text { - padding-inline-start: 3px; - } - } - /* Padding - Mac */ - @supports -moz-bool-pref("layout.css.osx-font-smoothing.enabled") { - :root { - --context-menu-background-padding-default: 10px; - --context-menu-mac-padding: 21px; - } - - /* context menu width */ - :not(menu, #ContentSelectDropdown, #context-navigation) - > menupopup - > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), - :not(menu, #ContentSelectDropdown, #context-navigation) - > menupopup - > menu:not(.menu-iconic, .in-menulist, [checked="true"]), - #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) { - 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) - menuitem:not(.menuitem-iconic, .bookmark-item), - menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup) - menu:not(.menu-iconic) { - list-style-image: var(--menuitem-image, url("../icons/blank.svg")) !important; - } - } - } - /*= Bookmark Menu - Layout ===================================================*/ - /* #goPopup(Legacy of historyMenuPoup), #historyMenuPopup, #bookmarksMenuPopup: looks like global menu - * #BMB_bookmarksPopup: looks like arrow panel - */ - /* Empty Menu */ - menupopup menupopup[emptyplacesresult] .menu-text, - #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), - (-moz-os-version: windows-win8), - (-moz-platform: windows-win8) { - /* Global Menu */ - menupopup:is(#goPopup, #historyMenuPopup, #bookmarksMenuPopup) .bookmark-item { - padding-inline-start: 0 !important; - } - - /* Bookmark Popup - None icon menu */ - #BMB_bookmarksPopup, - #PersonalToolbar { - --arrowpanel-menuicon-padding: 9px; - } - - menupopup:is(#BMB_bookmarksPopup) menuitem:not(.menuitem-iconic, [disabled="true"]), - menupopup:is(#BMB_bookmarksPopup) menu:not(.menu-iconic), - #PersonalToolbar menupopup[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]), - #PersonalToolbar menupopup[placespopup="true"] menu:not(.menu-iconic) { - margin-inline: var(--arrowpanel-menuitem-padding-inline) !important; - background-position: var(--uc-menu-background-position) calc(var(--arrowpanel-menuicon-padding)) center !important; - } - - menupopup:is(#BMB_bookmarksPopup) menuitem:not(.menuitem-iconic, [disabled="true"]), - menupopup:is(#BMB_bookmarksPopup) menu:not(.menu-iconic) { - padding-inline-start: calc( - var(--arrowpanel-menuicon-padding) + var(--context-menu-text-padding) + 2px - ) !important; - } - - #PersonalToolbar menupopup[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]), - #PersonalToolbar menupopup[placespopup="true"] menu:not(.menu-iconic) { - padding-inline-start: var(--arrowpanel-menuicon-padding) !important; - } - } - /* Windows */ - @media (-moz-os-version: windows-win10), (-moz-platform: windows-win10) { - /* Bookmark Popup - None icon menu */ - menupopup:is(#BMB_bookmarksPopup) menuitem:not(.menuitem-iconic, [disabled="true"]), - menupopup:is(#BMB_bookmarksPopup) menu:not(.menu-iconic), - #PersonalToolbar menupopup[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]), - #PersonalToolbar menupopup[placespopup="true"] menu:not(.menu-iconic) { - margin-inline: var(--arrowpanel-menuitem-padding-inline) !important; - padding-inline-start: calc(var(--arrowpanel-menuicon-padding) + var(--context-menu-text-padding)) !important; - background-position: var(--uc-menu-background-position) calc(var(--arrowpanel-menuicon-padding)) center !important; - } - } - /* Linux */ - @media (-moz-gtk-csd-available) { - /* Global Menu */ - 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), - #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; - } - } - @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; - } - - /* 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; - } - } - @supports -moz-bool-pref("userChrome.icon.context_menu") { - /** 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, - #treestyletab_piro_sakura_ne_jp-menuitem-_noContextTab\:context_reloadTab, - #treestyletab_piro_sakura_ne_jp-menuitem-_grouped\:reloadTree, - #tabcenter-reborn_ariasuni-menuitem-_contextMenuReloadTab, - #sidebartabs_asamuzak_jp-menuitem-_reloadTab, - #sidebartabs_asamuzak_jp-menuitem-_reloadAllTabs { - --menuitem-image: url("../icons/reload.svg"); - } - - #context_toggleMuteTab, - #context_toggleMuteSelectedTabs, - #treestyletab_piro_sakura_ne_jp-menuitem-_context_toggleMuteTab-mute, - #tabcenter-reborn_ariasuni-menuitem-_contextMenuMuteTab, - #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, - #tabcenter-reborn_ariasuni-menuitem-_contextMenuMuteTab[label="Unmute Tab"], - #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, - #tabcenter-reborn_ariasuni-menuitem-_contextMenuPinTab, - #sidebartabs_asamuzak_jp-menuitem-_pinTab { - --menuitem-image: url("../icons/pin-tab.svg"); - } - - #context_unpinTab, - #context_unpinSelectedTabs, - #treestyletab_piro_sakura_ne_jp-menuitem-_context_unpinTab, - #tabcenter-reborn_ariasuni-menuitem-_contextMenuPinTab[label="Unpin Tab"], - #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, - #tabcenter-reborn_ariasuni-menuitem-_contextMenuDuplicateTab, - #sidebartabs_asamuzak_jp-menuitem-_dupeTab { - --menuitem-image: url("../icons/notebook-subsection.svg"); - } - - #context_bookmarkTab, - #context_bookmarkSelectedTabs, - #treestyletab_piro_sakura_ne_jp-menuitem-_context_bookmarkTab, - #treestyletab_piro_sakura_ne_jp-menuitem-_noContextTab\:context_bookmarkSelected, - #treestyletab_piro_sakura_ne_jp-menuitem-_grouped\:bookmarkTree, - #sidebartabs_asamuzak_jp-menuitem-_bookmarkTab, - #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 { - --menuitem-image: url("../icons/share.svg"); - } - } - #context_reopenInContainer, - #treestyletab_piro_sakura_ne_jp-menuitem-_context_reopenInContainer, - #tabcenter-reborn_ariasuni-menuitem-_contextMenuOpenInContextualTab, - #sidebartabs_asamuzak_jp-menuitem-_openNewTabInContainer, - #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, - #tabcenter-reborn_ariasuni-menuitem-_contextMenuCloseTab, - #sidebartabs_asamuzak_jp-menuitem-_closeTab { - --menuitem-image: url("chrome://global/skin/icons/close.svg"); - } - - #context_undoCloseTab, - #treestyletab_piro_sakura_ne_jp-menuitem-_context_undoCloseTab, - #treestyletab_piro_sakura_ne_jp-menuitem-_noContextTab\:context_undoCloseTab, - #tabcenter-reborn_ariasuni-menuitem-_contextMenuUndoCloseTab, - #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"); + #appMenu_help_reportSiteIssue { + list-style-image: url("chrome://global/skin/icons/lightbulb.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"); + #appMenu_menu_HelpPopup_reportPhishingtoolmenu { + list-style-image: url("chrome://global/skin/icons/warning.svg"); } - /*= toolbar-context-menu =====================================================*/ - .customize-context-manageExtension { - --menuitem-image: url("chrome://global/skin/icons/settings.svg"); + #appMenu_aboutName { + list-style-image: url("chrome://global/skin/icons/info.svg"); } - .customize-context-removeExtension { - --menuitem-image: url("chrome://global/skin/icons/delete.svg"); + /*= Panel - Library ==========================================================*/ + #appMenu-library-bookmarks-button { + list-style-image: url("chrome://browser/skin/bookmark.svg"); } - .customize-context-reportExtension { - --menuitem-image: url("../icons/send.svg"); + #appMenu-library-history-button { + list-style-image: url("chrome://browser/skin/history.svg"); } - .customize-context-moveToPanel { - --menuitem-image: url("chrome://browser/skin/pin-12.svg"); + #appMenu-library-downloads-button { + list-style-image: url("chrome://browser/skin/downloads/downloads.svg"); } - #toolbar-context-autohide-downloads-button { - /* checkbox */ - --menuitem-image: url("../icons/eye-tracking-off.svg"); + /*= Panel - Downloads ========================================================*/ + #downloadsHistory { + list-style-image: url("chrome://browser/skin/downloads/downloads.svg"); } - .customize-context-removeFromToolbar { - --menuitem-image: url("chrome://global/skin/icons/delete.svg"); + #downloadsHistory .box-inherit.button-box { + display: -moz-inline-box !important; } - #toolbar-context-always-open-downloads-panel { - /* checkbox */ - --menuitem-image: url("../icons/drawer-arrow-download.svg"); + /*= Toolbar - Overflow Menu ==================================================*/ + #overflowMenu-customize-button { + list-style-image: url("chrome://browser/skin/customize.svg"); } - #toolbar-context-openANewTab { - --menuitem-image: url("chrome://browser/skin/new-tab.svg"); + /*= Tabbar - All Tab Menu ====================================================*/ + #allTabsMenu-undoCloseTab { + list-style-image: url("../icons/undo.svg"); } - #toolbar-context-reloadSelectedTab, - #toolbar-context-reloadSelectedTabs { - --menuitem-image: url("../icons/reload.svg"); + #allTabsMenu-searchTabs { + list-style-image: url("chrome://global/skin/icons/search-glass.svg"); } - #toolbar-context-bookmarkSelectedTab, - #toolbar-context-bookmarkSelectedTabs { - --menuitem-image: url("chrome://browser/skin/bookmark.svg"); + #allTabsMenu-containerTabsButton { + list-style-image: url("../icons/container-openin-16.svg"); } - #toolbar-context-selectAllTabs { - --menuitem-image: url("../icons/tab-multiple.svg"); + #allTabsMenu-hiddenTabsButton { + list-style-image: url("../icons/eye-hide.svg"); } - #toolbar-context-undoCloseTab { - --menuitem-image: url("../icons/undo.svg"); + #allTabsMenu-containerTabsView .subviewbutton:last-child { + list-style-image: url("chrome://global/skin/icons/settings.svg"); } - #toggle_toolbar-menubar { - /* checkbox */ - --menuitem-image: url("../icons/calendar-agenda.svg"); + /*= BMB_bookmarksPopup =======================================================*/ + #BMB_bookmarksShowAllTop, + #BMB_bookmarksShowAll { + --menuitem-image: url("chrome://browser/skin/bookmark-star-on-tray.svg"); } - #toggle_PersonalToolbar { - /* Also placeContext */ + #BMB_bookmarksToolbar { --menuitem-image: url("chrome://browser/skin/bookmarks-toolbar.svg"); } - menuitem.viewCustomizeToolbar { - --menuitem-image: url("chrome://browser/skin/customize.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; + } - .fullscreen-context-autohide { - /* checkbox */ - --menuitem-image: url("../icons/eye-tracking-off.svg"); + #BMB_bookmarksShowAllTop > .menu-iconic-left { + display: -moz-box !important; + } } - - #toolbar-context-menu > menuitem[data-l10n-id="full-screen-exit"] { - --menuitem-image: url("chrome://browser/skin/fullscreen-exit.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"); - } - - #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 { + /* BMB_bookmarksToolbarPopup */ + #BMB_viewBookmarksToolbar[data-l10n-args='{"isVisible":true}'] { --menuitem-image: url("../icons/eye-hide.svg"); } - - #context-media-showcontrols { + #BMB_viewBookmarksToolbar[data-l10n-args='{"isVisible":false}'] { --menuitem-image: url("../icons/eye-show.svg"); } - #context-viewvideo { - --menuitem-image: url("../icons/video.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; + fill: currentColor; + margin-inline-end: 1em; } - #context-video-pictureinpicture { - /* checkbox */ - --menuitem-image: url("chrome://global/skin/media/picture-in-picture-open.svg"); + #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"); } - #context-reloadimage { - --menuitem-image: url("../icons/image-arrow-counterclockwise.svg"); + #protections-popup-show-report-button > .protections-popup-show-report-icon { + /* chrome://browser/skin/controlcenter/dashboard.svg */ + list-style-image: url("../icons/dashboard.svg"); } - #context-viewimage { - --menuitem-image: url("../icons/image-add.svg"); + /*= identity-popup ===========================================================*/ + #identity-popup-clear-sitedata-button, + #identity-popup-more-info { + padding-inline: 5px !important; } - #context-saveimage { - --menuitem-image: url("../icons/image.svg"); + #identity-popup-securityView-body { + margin-inline-start: 32px !important; + /* Original: 10px */ } - #context-video-saveimage { - --menuitem-image: url("../icons/video-snapshot.svg"); + #identity-popup-clear-sitedata-button { + list-style-image: url("../icons/broom.svg"); } - #context-savevideo { - --menuitem-image: url("../icons/video.svg"); + /*= sidebarMenu-popup ========================================================*/ + #identity-popup-more-info { + list-style-image: url("chrome://global/skin/icons/info.svg"); } - #context-saveaudio { - --menuitem-image: url("chrome://global/skin/media/audio.svg"); + #sidebar-switcher-bookmarks { + list-style-image: url("chrome://browser/skin/bookmark.svg"); } - #context-copyimage-contents { - --menuitem-image: url("../icons/image-copy.svg"); + #sidebar-switcher-history { + list-style-image: url("chrome://browser/skin/history.svg"); } - #context-copyimage, - #context-copyvideourl, - #context-copyaudiourl { - --menuitem-image: url("../icons/link.svg"); + #sidebar-switcher-tabs { + list-style-image: url("chrome://browser/skin/tab.svg"); } - #context-sendimage, - #context-sendvideo, - #context-sendaudio { - --menuitem-image: url("chrome://browser/skin/mail.svg"); + #sidebar-reverse-position { + list-style-image: url("chrome://browser/skin/sidebars-right.svg"); } - #context-viewimageinfo { - --menuitem-image: url("chrome://global/skin/icons/info.svg"); + #sidebar-box[positionend="true"] #sidebar-reverse-position { + /* Can't apply this. shadow dom */ + list-style-image: url("chrome://browser/skin/sidebars.svg"); } - #context-viewimagedesc { - --menuitem-image: url("../icons/image-alt-text.svg"); + #sidebarMenu-popup > .subviewbutton[data-l10n-id="sidebar-menu-close"] { + list-style-image: url("chrome://global/skin/icons/close.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 */ } - #context-setDesktopBackground { - --menuitem-image: url("../icons/resize-image.svg"); + /* Icon */ + #main-menubar > menu, + :not(menu, #ContentSelectDropdown) + > menupopup + > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), + :not(menu, #ContentSelectDropdown) > menupopup > menu:not(.menu-iconic, .in-menulist, [checked="true"]), + menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup) + menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), + menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup) + menu:not(.menu-iconic, .in-menulist, [checked="true"]), + menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) + > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), + menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu:not(.menu-iconic, .in-menulist, [checked="true"]), + menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup, #context-sendlinktodevice-popup) + > menuitem, + .openintabs-menuitem, + #blockedPopupDontShowMessage, + #BMB_viewBookmarksToolbar { + /* Color */ + -moz-context-properties: fill, fill-opacity !important; + fill: currentColor !important; + /* Layout */ + background-size: 16px !important; + background-repeat: no-repeat !important; + background-image: var(--menuitem-image); } - #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"); - } - - #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 */ + #tabContextMenu > .tabmix-newtab-menu-icon { + -moz-context-properties: fill, fill-opacity !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") { - #context-back { - --menuitem-image: url("chrome://browser/skin/back.svg"); + :not(menu, #ContentSelectDropdown) + > menupopup + > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), + :not(menu, #ContentSelectDropdown) > menupopup > menu:not(.menu-iconic, .in-menulist, [checked="true"]) { + list-style-image: var(--menuitem-image, url("../icons/blank.svg")) !important; + } + } + + /* Padding */ + :root { + --uc-menu-background-position: left; + --context-menu-background-padding-default: 5px; + --context-menu-background-padding: var(--context-menu-background-padding-default); + } + :root:-moz-locale-dir(rtl) { + --uc-menu-background-position: right; + } + + :not(menu, #ContentSelectDropdown, #context-navigation) > menupopup > menuitem:not(.menuitem-iconic), + :not(menu, #ContentSelectDropdown, #context-navigation) > menupopup > menu:not(.menu-iconic), + :not(menu, #ContentSelectDropdown, #context-navigation) + > menupopup + > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), + :not(menu, #ContentSelectDropdown, #context-navigation) + > menupopup + > menu:not(.menu-iconic, .in-menulist, [checked="true"]), + menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup) + menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), + menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup) + menu:not(.menu-iconic, .in-menulist, [checked="true"]), + menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) + > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), + menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu:not(.menu-iconic, .in-menulist, [checked="true"]), + menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup, #context-sendlinktodevice-popup) + > menuitem, + .openintabs-menuitem, + #blockedPopupDontShowMessage, + #BMB_viewBookmarksToolbar { + 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 { + background-position: var(--uc-menu-background-position) var(--context-menu-background-padding-default) center !important; + padding-inline-start: calc(16px + var(--context-menu-background-padding-default)) !important; + padding-inline-end: 3px; + } + #main-menubar > menu:first-child { + background-position: var(--uc-menu-background-position) + calc(3px + var(--context-menu-background-padding-default)) center !important; + padding-inline-start: calc(19px + var(--context-menu-background-padding-default)) !important; + } + #main-menubar > menu > menupopup { + --menuitem-image: none; + /* Prevent Image Inheritance */ + } + @supports not -moz-bool-pref("userChrome.padding.global_menubar") { + #main-menubar > menu { + padding-block: 2px !important; + } + } + } + /* Padding - Windows */ + @media (-moz-os-version: windows-win7), (-moz-platform: windows-win7) { + :root { + --context-menu-background-padding-default: 2px; + } + } + @media (-moz-os-version: windows-win8), (-moz-platform: windows-win8) { + :root { + --context-menu-background-padding-default: 3px; + } + } + @media (-moz-os-version: windows-win7), + (-moz-platform: windows-win7), + (-moz-os-version: windows-win8), + (-moz-platform: windows-win8) { + :not(menu, #ContentSelectDropdown, #context-navigation) + > menupopup + > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), + :not(menu, #ContentSelectDropdown, #context-navigation) + > menupopup + > menu:not(.menu-iconic, .in-menulist, [checked="true"]), + menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup) + menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), + menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup) + menu:not(.menu-iconic, .in-menulist, [checked="true"]), + menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) + > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), + menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu:not(.menu-iconic, .in-menulist, [checked="true"]), + menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup, #context-sendlinktodevice-popup) + > menuitem, + .openintabs-menuitem, + #blockedPopupDontShowMessage, + #BMB_viewBookmarksToolbar { + background-position: left var(--context-menu-background-padding) center !important; + padding-inline-start: 0 !important; + } + } + @media (-moz-os-version: windows-win10), (-moz-platform: windows-win10) { + :root { + --context-menu-background-padding: 1em; + --context-menu-text-padding: 24px; + /* 16px + 8px */ + --menu-background-padding-default: calc( + var(--context-menu-background-padding) + var(--context-menu-text-padding) + ); } - #context-forward { - --menuitem-image: url("chrome://browser/skin/forward.svg"); + :not(menu, #ContentSelectDropdown, #context-navigation) + > menupopup + > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), + :not(menu, #ContentSelectDropdown, #context-navigation) + > menupopup + > menu:not(.menu-iconic, .in-menulist, [checked="true"]), + menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup) + menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), + menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup) + menu:not(.menu-iconic, .in-menulist, [checked="true"]), + menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) + > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), + menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu:not(.menu-iconic, .in-menulist, [checked="true"]), + menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup, #context-sendlinktodevice-popup) + > menuitem, + .openintabs-menuitem, + #blockedPopupDontShowMessage, + #BMB_viewBookmarksToolbar { + padding-inline-start: var(--menu-background-padding-default) !important; + margin-left: 0 !important; + } + } + /* Padding - Linux */ + @media (-moz-gtk-csd-available) { + :root { + --context-menu-background-padding-default: 6px; } - #context-reload { + #main-menubar > menu > .menubar-text { + padding-inline-start: 3px; + } + } + /* Padding - Mac */ + @supports -moz-bool-pref("layout.css.osx-font-smoothing.enabled") { + :root { + --context-menu-background-padding-default: 10px; + --context-menu-mac-padding: 21px; + } + + /* context menu width */ + :not(menu, #ContentSelectDropdown, #context-navigation) + > menupopup + > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), + :not(menu, #ContentSelectDropdown, #context-navigation) + > menupopup + > menu:not(.menu-iconic, .in-menulist, [checked="true"]), + #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) { + 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) + menuitem:not(.menuitem-iconic, .bookmark-item), + menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup) + menu:not(.menu-iconic) { + list-style-image: var(--menuitem-image, url("../icons/blank.svg")) !important; + } + } + } + /*= Bookmark Menu - Layout ===================================================*/ + /* #goPopup(Legacy of historyMenuPopup), #historyMenuPopup, #bookmarksMenuPopup: looks like global menu + * #BMB_bookmarksPopup: looks like arrow panel + */ + /* Empty Menu */ + menupopup menupopup[emptyplacesresult] .menu-text, + #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), + (-moz-os-version: windows-win8), + (-moz-platform: windows-win8) { + /* Global Menu */ + menupopup:is(#goPopup, #historyMenuPopup, #bookmarksMenuPopup) .bookmark-item { + padding-inline-start: 0 !important; + } + + /* Bookmark Popup - None icon menu */ + #BMB_bookmarksPopup, + #PersonalToolbar { + --arrowpanel-menuicon-padding: 9px; + } + + menupopup:is(#BMB_bookmarksPopup) menuitem:not(.menuitem-iconic, [disabled="true"]), + menupopup:is(#BMB_bookmarksPopup) menu:not(.menu-iconic), + #PersonalToolbar menupopup[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]), + #PersonalToolbar menupopup[placespopup="true"] menu:not(.menu-iconic) { + margin-inline: var(--arrowpanel-menuitem-padding-inline) !important; + background-position: var(--uc-menu-background-position) calc(var(--arrowpanel-menuicon-padding)) center !important; + } + + menupopup:is(#BMB_bookmarksPopup) menuitem:not(.menuitem-iconic, [disabled="true"]), + menupopup:is(#BMB_bookmarksPopup) menu:not(.menu-iconic) { + padding-inline-start: calc( + var(--arrowpanel-menuicon-padding) + var(--context-menu-text-padding) + 2px + ) !important; + } + + #PersonalToolbar menupopup[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]), + #PersonalToolbar menupopup[placespopup="true"] menu:not(.menu-iconic) { + padding-inline-start: var(--arrowpanel-menuicon-padding) !important; + } + } + /* Windows */ + @media (-moz-os-version: windows-win10), (-moz-platform: windows-win10) { + /* Bookmark Popup - None icon menu */ + menupopup:is(#BMB_bookmarksPopup) menuitem:not(.menuitem-iconic, [disabled="true"]), + menupopup:is(#BMB_bookmarksPopup) menu:not(.menu-iconic), + #PersonalToolbar menupopup[placespopup="true"] menuitem:not(.menuitem-iconic, [disabled="true"]), + #PersonalToolbar menupopup[placespopup="true"] menu:not(.menu-iconic) { + margin-inline: var(--arrowpanel-menuitem-padding-inline) !important; + padding-inline-start: calc(var(--arrowpanel-menuicon-padding) + var(--context-menu-text-padding)) !important; + background-position: var(--uc-menu-background-position) calc(var(--arrowpanel-menuicon-padding)) center !important; + } + } + /* Linux */ + @media (-moz-gtk-csd-available) { + /* Global Menu */ + 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), + #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; + } + } + @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; + } + + /* 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; + } + } + @supports -moz-bool-pref("userChrome.icon.context_menu") { + /** 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, + #treestyletab_piro_sakura_ne_jp-menuitem-_noContextTab\:context_reloadTab, + #treestyletab_piro_sakura_ne_jp-menuitem-_grouped\:reloadTree, + #tabcenter-reborn_ariasuni-menuitem-_contextMenuReloadTab, + #sidebartabs_asamuzak_jp-menuitem-_reloadTab, + #sidebartabs_asamuzak_jp-menuitem-_reloadAllTabs { --menuitem-image: url("../icons/reload.svg"); } - #context-stop { + #context_toggleMuteTab, + #context_toggleMuteSelectedTabs, + #treestyletab_piro_sakura_ne_jp-menuitem-_context_toggleMuteTab-mute, + #tabcenter-reborn_ariasuni-menuitem-_contextMenuMuteTab, + #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, + #tabcenter-reborn_ariasuni-menuitem-_contextMenuMuteTab[label="Unmute Tab"], + #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, + #tabcenter-reborn_ariasuni-menuitem-_contextMenuPinTab, + #sidebartabs_asamuzak_jp-menuitem-_pinTab { + --menuitem-image: url("../icons/pin-tab.svg"); + } + + #context_unpinTab, + #context_unpinSelectedTabs, + #treestyletab_piro_sakura_ne_jp-menuitem-_context_unpinTab, + #tabcenter-reborn_ariasuni-menuitem-_contextMenuPinTab[label="Unpin Tab"], + #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, + #tabcenter-reborn_ariasuni-menuitem-_contextMenuDuplicateTab, + #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, + #treestyletab_piro_sakura_ne_jp-menuitem-_noContextTab\:context_bookmarkSelected, + #treestyletab_piro_sakura_ne_jp-menuitem-_grouped\:bookmarkTree, + #sidebartabs_asamuzak_jp-menuitem-_bookmarkTab, + #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 { + --menuitem-image: url("../icons/share.svg"); + } + } + #context_reopenInContainer, + #treestyletab_piro_sakura_ne_jp-menuitem-_context_reopenInContainer, + #tabcenter-reborn_ariasuni-menuitem-_contextMenuOpenInContextualTab, + #sidebartabs_asamuzak_jp-menuitem-_openNewTabInContainer, + #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, + #tabcenter-reborn_ariasuni-menuitem-_contextMenuCloseTab, + #sidebartabs_asamuzak_jp-menuitem-_closeTab { --menuitem-image: url("chrome://global/skin/icons/close.svg"); } - #context-bookmarkpage { + @supports -moz-bool-pref("userChrome.icon.menu.full") { + #context_closeTabOptions, + #treestyletab_piro_sakura_ne_jp-menuitem-_context_closeMultipleTabs, + #tabcenter-reborn_ariasuni-menuitem-_contextMenuCloseTabs, + #sidebartabs_asamuzak_jp-menuitem-_closeMultipleTabs { + --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, + #tabcenter-reborn_ariasuni-menuitem-_contextMenuUndoCloseTab, + #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"); } - } - /*= 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"); - } - @supports -moz-bool-pref("userChrome.icon.library") { - .downloadShowMenuItem { - --menuitem-image: url("../icons/folder.svg"); + #toolbar-context-selectAllTabs { + --menuitem-image: url("../icons/tab-multiple.svg"); } - } - #downloadsContextMenu > menuitem.downloadOpenReferrerMenuItem, - #downloadsContextMenu > menuitem[command="downloadsCmd_openReferrer"] { - --menuitem-image: url("../icons/link-square.svg"); - } - #downloadsContextMenu > menuitem.downloadCopyLocationMenuItem, - #downloadsContextMenu > menuitem[command="downloadsCmd_copyLocation"] { - --menuitem-image: url("../icons/link.svg"); - } + #toolbar-context-undoCloseTab { + --menuitem-image: url("../icons/undo.svg"); + } - .downloadDeleteFileMenuItem { - --menuitem-image: url("chrome://global/skin/icons/delete.svg"); - } + #toggle_toolbar-menubar { + /* checkbox */ + --menuitem-image: url("../icons/calendar-agenda.svg"); + } - .downloadRemoveFromHistoryMenuItem { - --menuitem-image: url("../icons/eraser.svg"); - } + #toggle_PersonalToolbar { + /* Also placeContext */ + --menuitem-image: url("chrome://browser/skin/bookmarks-toolbar.svg"); + } - #downloadsContextMenu > menuitem[command="downloadsCmd_clearList"], - #downloadsContextMenu > menuitem[command="downloadsCmd_clearDownloads"] { - --menuitem-image: url("../icons/broom.svg"); - } + menuitem.viewCustomizeToolbar { + --menuitem-image: url("chrome://browser/skin/customize.svg"); + } - /*= placeContext =============================================================*/ - #placesContext_open { - --menuitem-image: url("../icons/link-square.svg"); - } + .fullscreen-context-autohide { + /* checkbox */ + --menuitem-image: url("../icons/eye-tracking-off.svg"); + } - #placesContext_openBookmarkContainer\:tabs, - #placesContext_openBookmarkLinks\:tabs { - --menuitem-image: url("../icons/movetowindow-16.svg"); - } + #toolbar-context-menu > menuitem[data-l10n-id="full-screen-exit"] { + --menuitem-image: url("chrome://browser/skin/fullscreen-exit.svg"); + } - #placesContext_open\:newtab, - #placesContext_openContainer\:tabs, - #placesContext_openLinks\:tabs { - --menuitem-image: url("chrome://browser/skin/new-tab.svg"); - } + /*= Tab Mix Plus =============================================================*/ + #context_openANewTab.tabmix-newtab-menu-icon { + list-style-image: var(--menuitem-image) !important; + } - #placesContext_open\:newcontainertab { - --menuitem-image: url("../icons/container-openin-16.svg"); - } + #tm-copyTabUrl { + --menuitem-image: url("../icons/link.svg"); + } - #placesContext_open\:newwindow { - --menuitem-image: url("chrome://browser/skin/window.svg"); - } + #context_reloadTabOptions { + --menuitem-image: url("../icons/reload.svg"); + } + @supports -moz-bool-pref("userChrome.icon.menu.full") { + #context_reloadTabOptions { + --menuitem-image: url("../icons/filter-reload.svg"); + } + } + @supports not -moz-bool-pref("userChrome.icon.menu.full") { + #context_reloadTabOptions + #context_reloadTab { + --menuitem-image: url("../icons/blank.svg"); + } + } - #placesContext_open\:newprivatewindow { - --menuitem-image: url("chrome://browser/skin/privateBrowsing.svg"); - } + #tm-protectTab { + --menuitem-image: url("../icons/shield-task.svg"); + } - #placesContext_show_bookmark\:info, - #placesContext_show\:info, - #placesContext_show_folder\:info { - --menuitem-image: url("chrome://global/skin/icons/edit.svg"); - } + @supports -moz-bool-pref("userChrome.icon.menu.full") { + #tm-lockTab { + --menuitem-image: url("../icons/lock-closed.svg"); + } + } - #placesContext_deleteBookmark, - #placesContext_deleteFolder, - #placesContext_delete, - #placesContext_delete_history { - --menuitem-image: url("chrome://global/skin/icons/delete.svg"); - } + @supports -moz-bool-pref("userChrome.icon.menu.full") { + #context_bookmarkAllTabs { + --menuitem-image: url("../icons/bookmark-multiple.svg"); + } + } - #placesContext_deleteHost { - --menuitem-image: url("../icons/eye-hide.svg"); - } + /*= contentAreaContextMenu ===================================================*/ + #context-viewsource-goToLine { + --menuitem-image: url("../icons/text-number-format.svg"); + } - #placesContext_sortBy\:name { - --menuitem-image: url("../icons/text-sort-ascending.svg"); - } + #context-viewsource-wrapLongLines { + /* checkbox */ + --menuitem-image: url("../icons/arrow-sort-down-lines.svg"); + } - #placesContext_cut { - --menuitem-image: url("chrome://browser/skin/edit-cut.svg"); - } + #context-viewsource-highlightSyntax { + /* checkbox */ + --menuitem-image: url("../icons/code.svg"); + } - #placesContext_copy { - --menuitem-image: url("../icons/edit-copy.svg"); - } + #spell-no-suggestions { + --menuitem-image: url("../icons/text-proofing-tools.svg"); + } - #placesContext_paste_group { - --menuitem-image: url("chrome://browser/skin/edit-paste.svg"); - } + #spell-add-to-dictionary { + --menuitem-image: url("../icons/book-add.svg"); + } - #placesContext_new\:bookmark { - --menuitem-image: url("chrome://browser/skin/bookmark.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"); + } + + #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"); + } + + #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") { + #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"); + } + + #tm-openAllLinks { + --menuitem-image: url("../icons/new-tab-multiple.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"); + } + @supports -moz-bool-pref("userChrome.icon.library") { + .downloadShowMenuItem { + --menuitem-image: url("../icons/folder.svg"); + } + } + + #downloadsContextMenu > menuitem.downloadOpenReferrerMenuItem, + #downloadsContextMenu > menuitem[command="downloadsCmd_openReferrer"] { + --menuitem-image: url("../icons/link-square.svg"); + } + #downloadsContextMenu > menuitem.downloadCopyLocationMenuItem, + #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"); - } - @supports -moz-bool-pref("userChrome.icon.library") { #placesContext_showInFolder, #placesContext_new\:folder { - --menuitem-image: url("../icons/folder.svg"); + --menuitem-image: url("chrome://global/skin/icons/folder.svg"); + } + @supports -moz-bool-pref("userChrome.icon.library") { + #placesContext_showInFolder, + #placesContext_new\:folder { + --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"); + } + + /*= 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"); + } + .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"); + } + .sync-menuitem.sendtab-target[clientType="tablet"] { + --menuitem-image: url("chrome://browser/skin/device-tablet.svg"); + } + .sync-menuitem.sendtab-target[clientType="desktop"] { + --menuitem-image: url("chrome://browser/skin/device-desktop.svg"); + } + .sync-menuitem.sendtab-target[clientType="tv"] { + --menuitem-image: url("chrome://browser/skin/device-tv.svg"); + } + .sync-menuitem.sendtab-target[clientType="vr"] { + --menuitem-image: url("chrome://browser/skin/device-vr.svg"); + } + .sync-menuitem.sendtab-target[clientType=""] { + --menuitem-image: url("../icons/send-to-device.svg"); + } + .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"); } } + @supports -moz-bool-pref("userChrome.icon.global_menubar") { + /*= main-menubar =============================================================*/ + #file-menu { + --menuitem-image: url("../icons/mail-inbox-all.svg"); + } - #placesContext_new\:separator { - --menuitem-image: url("../icons/vertical-line.svg"); - } + #edit-menu { + --menuitem-image: url("chrome://global/skin/icons/edit.svg"); + } - #placesContext_paste { - --menuitem-image: url("chrome://browser/skin/edit-paste.svg"); - } + #view-menu { + --menuitem-image: url("../icons/content-view.svg"); + } - #placesContext_createBookmark { - --menuitem-image: url("chrome://browser/skin/bookmark.svg"); - } + #history-menu { + --menuitem-image: url("chrome://browser/skin/history.svg"); + } - #show-other-bookmarks_PersonalToolbar { - /* checkbox */ - --menuitem-image: url("../icons/star-line-horizontal.svg"); - } + #bookmarksMenu { + --menuitem-image: url("chrome://browser/skin/bookmark.svg"); + } - #placesContext_showAllBookmarks { - --menuitem-image: url("chrome://browser/skin/bookmark-star-on-tray.svg"); - } + #tools-menu { + --menuitem-image: url("../icons/toolbox.svg"); + } - .openintabs-menuitem { - --menuitem-image: url("../icons/movetowindow-16.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"); - } - .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"); + #helpMenu { + --menuitem-image: url("chrome://global/skin/icons/help.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"); - } - - #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, Libray'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"); + @supports -moz-bool-pref("userChrome.icon.global_menu") { + /** Global Menu ***************************************************************/ + /*= menu_FilePopup ===========================================================*/ + #menu_newNavigatorTab { + --menuitem-image: url("chrome://browser/skin/new-tab.svg"); } - } - .textbox-contextmenu > menuitem[data-l10n-id="text-action-cut"] { - --menuitem-image: url("chrome://browser/skin/edit-cut.svg"); - } + #menu_newUserContext { + --menuitem-image: url("../icons/container-openin-16.svg"); + } - .textbox-contextmenu > menuitem[data-l10n-id="text-action-copy"] { - --menuitem-image: url("../icons/edit-copy.svg"); - } + #menu_newNavigator { + --menuitem-image: url("chrome://browser/skin/window.svg"); + } - .textbox-contextmenu > menuitem[data-l10n-id="text-action-paste"] { - --menuitem-image: url("chrome://browser/skin/edit-paste.svg"); - } + #menu_newPrivateWindow { + --menuitem-image: url("chrome://browser/skin/privateBrowsing.svg"); + } - .textbox-contextmenu > menuitem[data-l10n-id="text-action-delete"] { - --menuitem-image: url("chrome://global/skin/icons/delete.svg"); - } + #menu_openFile { + --menuitem-image: url("chrome://browser/skin/open.svg"); + } - .textbox-contextmenu > menuitem[data-l10n-id="text-action-select-all"] { - --menuitem-image: url("../icons/select-all-on.svg"); - } + #menu_savePage { + --menuitem-image: url("chrome://browser/skin/save.svg"); + } - /* Only searchbar */ - menuitem.searchbar-clear-history { - --menuitem-image: url("chrome://browser/skin/forget.svg"); - } + #menu_sendLink { + --menuitem-image: url("chrome://browser/skin/mail.svg"); + } - /*= context_sendTabToDevicePopupMenu =========================================*/ - .sync-menuitem.sendtab-target[clientType="phone"] { - --menuitem-image: url("chrome://browser/skin/device-phone.svg"); - } - .sync-menuitem.sendtab-target[clientType="tablet"] { - --menuitem-image: url("chrome://browser/skin/device-tablet.svg"); - } - .sync-menuitem.sendtab-target[clientType="desktop"] { - --menuitem-image: url("chrome://browser/skin/device-desktop.svg"); - } - .sync-menuitem.sendtab-target[clientType="tv"] { - --menuitem-image: url("chrome://browser/skin/device-tv.svg"); - } - .sync-menuitem.sendtab-target[clientType="vr"] { - --menuitem-image: url("chrome://browser/skin/device-vr.svg"); - } - .sync-menuitem.sendtab-target[clientType=""] { - --menuitem-image: url("../icons/send-to-device.svg"); - } - .sync-menuitem.sendtab-target:not([clientType]) { - --menuitem-image: url("chrome://global/skin/icons/settings.svg"); - } + menu.share-tab-url-item { + --menuitem-image: url("chrome://browser/skin/share.svg"); + } - #treestyletab_piro_sakura_ne_jp-menuitem-_context_sendTabsToDevice\:manage { - --menuitem-image: url("chrome://global/skin/icons/settings.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"); + } + #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"); + } } } - @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"); - } - } - @supports -moz-bool-pref("userChrome.icon.global_menu") { - /** Global Menu ***************************************************************/ - /*= menu_FilePopup ===========================================================*/ - #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"); - } - - #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"); + /** Library Menu **************************************************************/ + @supports -moz-bool-pref("userChrome.icon.library") { + @supports -moz-bool-pref("userChrome.icon.menu") { + /*= organizeButtonPopup ======================================================*/ + #newbookmark { + --menuitem-image: url("chrome://browser/skin/bookmark.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"); - } - - #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"); - } - #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"); - } - } -} -/** Libray Menu ***************************************************************/ -@supports -moz-bool-pref("userChrome.icon.library") { - @supports -moz-bool-pref("userChrome.icon.menu") { - /*= organizeButtonPopup ======================================================*/ - #newbookmark { - --menuitem-image: url("chrome://browser/skin/bookmark.svg"); - } - - #newfolder { - --menuitem-image: url("chrome://global/skin/icons/folder.svg"); - } - @supports -moz-bool-pref("userChrome.icon.library") { #newfolder { - --menuitem-image: url("../icons/folder.svg"); + --menuitem-image: url("chrome://global/skin/icons/folder.svg"); + } + @supports -moz-bool-pref("userChrome.icon.library") { + #newfolder { + --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"); + } + + #fileExport { + --menuitem-image: url("chrome://browser/skin/open.svg"); + } + + #browserImport { + --menuitem-image: url("chrome://browser/skin/import.svg"); } } - - #newseparator { - --menuitem-image: url("../icons/vertical-line.svg"); + } + /** Waterfox ******************************************************************/ + @supports -moz-bool-pref("userChrome.icon.panel") { + #appMenu-restart-button { + list-style-image: url("../icons/refresh-cw.svg") !important; + } + } + @supports -moz-bool-pref("userChrome.icon.menu") { + #menu_FileRestartItem { + --menuitem-image: url("../icons/refresh-cw.svg"); } - #orgUndo { - --menuitem-image: url("../icons/undo.svg"); + menuitem.privatetab-icon { + --menuitem-image: url("../icons/private-favicon.svg"); + } + } + /** Tor Browser ***************************************************************/ + @supports -moz-bool-pref("userChrome.icon.panel") { + #appMenuNewIdentity { + list-style-image: url("chrome://browser/skin/new_identity.svg"); } - #orgCut { - --menuitem-image: url("chrome://browser/skin/edit-cut.svg"); + #appMenuNewCircuit { + list-style-image: url("chrome://browser/skin/new_circuit.svg"); } - #orgCopy { - --menuitem-image: url("../icons/edit-copy.svg"); + #appMenu_torBrowserUserManual { + list-style-image: url("chrome://browser/skin/onion.svg"); + } + } + @supports -moz-bool-pref("userChrome.icon.menu") { + #menu_newIdentity { + --menuitem-image: url("chrome://browser/skin/new_identity.svg"); } - #orgPaste { - --menuitem-image: url("chrome://browser/skin/edit-paste.svg"); + #menu_newCircuit { + --menuitem-image: url("chrome://browser/skin/new_circuit.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"); - } - - #fileExport { - --menuitem-image: url("chrome://browser/skin/open.svg"); - } - - #browserImport { - --menuitem-image: url("chrome://browser/skin/import.svg"); + #torBrowserUserManual { + --menuitem-image: url("chrome://browser/skin/onion.svg"); } } } -/** Waterfox ******************************************************************/ -@supports -moz-bool-pref("userChrome.icon.panel") { - #appMenu-restart-button { - list-style-image: url("../icons/refresh-cw.svg") !important; - } -} -@supports -moz-bool-pref("userChrome.icon.menu") { - #menu_FileRestartItem { - --menuitem-image: url("../icons/refresh-cw.svg"); - } - - menuitem.privatetab-icon { - --menuitem-image: url("../icons/private-favicon.svg"); - } -} -@supports -moz-bool-pref("userChrome.theme.fully_color") { - /* New Folder Button */ - #editBMPanel_newFolderButton { - appearance: none; - border: 0; - border-radius: 4px; - background-color: var(--button-bgcolor); - color: var(--button-color, inherit); - font-weight: 600; - min-width: 0; - padding: 8px 16px; - /* This button is deeper in the visual hierarchy than others (notably the - buttons at the bottom of the panel), so it should be slightly smaller. */ - font-size: 90%; - /* This button needs to align with the tree above it. */ - margin-inline-start: 4px; - } - #editBMPanel_newFolderButton:hover { - background-color: var(--button-hover-bgcolor); - } - #editBMPanel_newFolderButton:hover:active { - background-color: var(--button-active-bgcolor); - } -} -/** Tor Browser ***************************************************************/ -@supports -moz-bool-pref("userChrome.icon.panel") { - #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"); - } -} -@supports -moz-bool-pref("userChrome.icon.menu") { - #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/css/leptonContent.css b/css/leptonContent.css index 0e0d42c..d42e866 100644 --- a/css/leptonContent.css +++ b/css/leptonContent.css @@ -650,7 +650,7 @@ --in-content-link-color-hover: var(--blue-70); --in-content-link-color-active: var(--blue-80); --in-content-link-color-visited: var(--blue-60); - /* button background states are also used for checkboxes and radiobuttons */ + /* button background states are also used for checkboxes and radio buttons */ --in-content-button-text-color: var(--in-content-text-color); --in-content-button-text-color-hover: var(--in-content-text-color); --in-content-button-background: rgba(207, 207, 216, 0.33); @@ -1160,7 +1160,7 @@ /* .developer-hub */ /* Background */ /* Border */ - /* Othres */ + /* Others */ } body:is(.developer-hub, .statistics) #main-wrapper, body:is(.developer-hub, .statistics) .menu-nav > ul > li > ul::after, @@ -2014,7 +2014,7 @@ border-color: transparent !important; outline: 2px solid var(--in-content-focus-outline-color) !important; outline-offset: -1px !important; - /* Prevents antialising around the corners */ + /* Prevents antialiasing around the corners */ } input:is([type="email"], [type="tel"], [type="text"], [type="password"], [type="url"], [type="number"]):-moz-ui-invalid, @@ -2022,7 +2022,7 @@ border-color: transparent !important; outline: 2px solid var(--in-content-border-invalid) !important; outline-offset: -1px !important; - /* Prevents antialising around the corners */ + /* Prevents antialiasing around the corners */ } input:is([type="email"], [type="tel"], [type="text"], [type="password"], [type="url"], [type="number"]):disabled, @@ -2282,7 +2282,7 @@ list-style-image: url("chrome://browser/skin/places/tag.svg") !important; } - /* Boomark */ + /* Bookmark */ :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, OrganizerQuery_allbms_____v) { list-style-image: url("chrome://browser/skin/bookmark.svg") !important; } @@ -2326,7 +2326,7 @@ list-style-image: url("../icons/tag-open.svg") !important; } - /* Boomark */ + /* 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; } @@ -2770,7 +2770,7 @@ color: var(--organizer-selected-color) !important; } - /*- Radio Button ---------------------------------------------------------*/ + /*- Radio Button -------------------------------------------------------------*/ menuitem[type="radio"] { /* margin-inline-start: 0 !important; */ appearance: none !important; @@ -2828,7 +2828,7 @@ opacity: 0.5 !important; } - /*- Check Box ------------------------------------------------------------*/ + /*- Check Box ----------------------------------------------------------------*/ /* From checkbox.css */ menuitem[type="checkbox"] { appearance: none !important; @@ -2985,7 +2985,7 @@ opacity: 0.4 !important; } - /*- Menu Separtor --------------------------------------------------------*/ + /*- Menu Separator -----------------------------------------------------------*/ menuseparator { appearance: none !important; min-width: 2px; @@ -3011,96 +3011,14 @@ } } /** Menu - Icons Layout *******************************************************/ -@supports -moz-bool-pref("userChrome.icon.menu") { - @-moz-document url("chrome://browser/content/places/places.xhtml"), +@supports not -moz-bool-pref("userChrome.icon.disabled") { + @supports -moz-bool-pref("userChrome.icon.menu") { + @-moz-document url("chrome://browser/content/places/places.xhtml"), 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 */ - } - - menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu) - menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), - menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu) - menu:not(.menu-iconic, .in-menulist, [checked="true"]), - menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) - > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), - menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu:not(.menu-iconic, .in-menulist, [checked="true"]) { - /* Color */ - -moz-context-properties: fill, fill-opacity !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) - > menupopup - > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), - :not(menu, #ContentSelectDropdown) > menupopup > menu:not(.menu-iconic, .in-menulist, [checked="true"]) { - list-style-image: var(--menuitem-image, url("../icons/blank.svg")) !important; - } - } - - /* Padding */ - :root { - --uc-menu-background-position: left; - --context-menu-background-padding-default: 5px; - --context-menu-background-padding: var(--context-menu-background-padding-default); - } - :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) - menu:not(.menu-iconic, .in-menulist, [checked="true"]), - menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) - > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), - menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu:not(.menu-iconic, .in-menulist, [checked="true"]) { - background-position: 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 { - --context-menu-background-padding-default: 2px; - } - } - @media (-moz-os-version: windows-win8), (-moz-platform: windows-win8) { - :root { - --context-menu-background-padding-default: 3px; - } - } - @media (-moz-os-version: windows-win7), - (-moz-platform: windows-win7), - (-moz-os-version: windows-win8), - (-moz-platform: windows-win8) { - menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu) - menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), - menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu) - menu:not(.menu-iconic, .in-menulist, [checked="true"]), - menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) - > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), - menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu:not(.menu-iconic, .in-menulist, [checked="true"]) { - background-position: left var(--context-menu-background-padding) center !important; - padding-inline-start: 0 !important; - } - } - @media (-moz-os-version: windows-win10), (-moz-platform: windows-win10) { - :root { - --context-menu-background-padding: 1em; - --context-menu-text-padding: 24px; - /* 16px + 8px */ - --menu-background-padding-default: calc( - var(--context-menu-background-padding) + var(--context-menu-text-padding) - ); + menupopup menuitem:not([type="checkbox"][checked="true"], [type="radio"]), + menupopup menu:not([type="checkbox"][checked="true"], [type="radio"]) { + -moz-appearance: none !important; + /* Linux: menulist */ } menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu) @@ -3110,297 +3028,383 @@ menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu:not(.menu-iconic, .in-menulist, [checked="true"]) { - padding-inline-start: var(--menu-background-padding-default) !important; - margin-left: 0 !important; - } - } - /* Padding - Linux */ - @media (-moz-gtk-csd-available) { - :root { - --context-menu-background-padding-default: 6px; + /* Color */ + -moz-context-properties: fill, fill-opacity !important; + fill: currentColor !important; + /* Layout */ + background-size: 16px !important; + background-repeat: no-repeat !important; + background-image: var(--menuitem-image); } - /* Contextmenu Checkbox Unset */ - menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu) menuitem[type="checkbox"] { - margin-inline: 0 !important; - } - menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu) - menuitem[type="checkbox"] - > .menu-iconic-left - > .menu-iconic-icon { - margin-inline-end: 0 !important; - } - menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu) - menuitem[type="checkbox"]:not([checked="true"]) - > .menu-iconic-left - > .menu-iconic-icon { - border: none !important; - background-color: unset !important; - } - } - /* Padding - Mac */ - @supports -moz-bool-pref("layout.css.osx-font-smoothing.enabled") { - :root { - --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"]), - menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu) - menu:not(.menu-iconic, .in-menulist, [checked="true"]) { - padding-inline-end: var(--context-menu-background-padding) !important; - } - menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu) - menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]) - > .menu-text, - menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu) - menu:not(.menu-iconic, .in-menulist, [checked="true"]) - > .menu-text { - /* 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) { - padding-inline-start: calc(var(--context-menu-background-padding) + var(--context-menu-mac-padding)) !important; - } - } - /*= Context Menu ===========================================================*/ - @supports -moz-bool-pref("userChrome.icon.context_menu") { - /* Icon lists */ - /*= 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"); - } - @supports -moz-bool-pref("userChrome.icon.library") { - .downloadShowMenuItem { - --menuitem-image: url("../icons/folder.svg"); + /* For native context menus */ + @supports -moz-bool-pref("widget.macos.native-context-menus") or -moz-bool-pref("widget.gtk.native-context-menus") { + :not(menu, #ContentSelectDropdown) + > menupopup + > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), + :not(menu, #ContentSelectDropdown) > menupopup > menu:not(.menu-iconic, .in-menulist, [checked="true"]) { + list-style-image: var(--menuitem-image, url("../icons/blank.svg")) !important; } } - #downloadsContextMenu > menuitem.downloadOpenReferrerMenuItem, - #downloadsContextMenu > menuitem[command="downloadsCmd_openReferrer"] { - --menuitem-image: url("../icons/link-square.svg"); + /* Padding */ + :root { + --uc-menu-background-position: left; + --context-menu-background-padding-default: 5px; + --context-menu-background-padding: var(--context-menu-background-padding-default); } - #downloadsContextMenu > menuitem.downloadCopyLocationMenuItem, - #downloadsContextMenu > menuitem[command="downloadsCmd_copyLocation"] { - --menuitem-image: url("../icons/link.svg"); + :root:-moz-locale-dir(rtl) { + --uc-menu-background-position: right; } - .downloadDeleteFileMenuItem { - --menuitem-image: url("chrome://global/skin/icons/delete.svg"); + menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu) + menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), + menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu) + menu:not(.menu-iconic, .in-menulist, [checked="true"]), + menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) + > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), + menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu:not(.menu-iconic, .in-menulist, [checked="true"]) { + background-position: var(--uc-menu-background-position) var(--context-menu-background-padding) center !important; + padding-inline-start: var(--context-menu-background-padding) !important; } - .downloadRemoveFromHistoryMenuItem { - --menuitem-image: url("../icons/eraser.svg"); + /* Padding - Windows */ + @media (-moz-os-version: windows-win7), (-moz-platform: windows-win7) { + :root { + --context-menu-background-padding-default: 2px; + } } + @media (-moz-os-version: windows-win8), (-moz-platform: windows-win8) { + :root { + --context-menu-background-padding-default: 3px; + } + } + @media (-moz-os-version: windows-win7), + (-moz-platform: windows-win7), + (-moz-os-version: windows-win8), + (-moz-platform: windows-win8) { + menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu) + menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), + menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu) + menu:not(.menu-iconic, .in-menulist, [checked="true"]), + menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) + > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), + menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu:not(.menu-iconic, .in-menulist, [checked="true"]) { + background-position: left var(--context-menu-background-padding) center !important; + padding-inline-start: 0 !important; + } + } + @media (-moz-os-version: windows-win10), (-moz-platform: windows-win10) { + :root { + --context-menu-background-padding: 1em; + --context-menu-text-padding: 24px; + /* 16px + 8px */ + --menu-background-padding-default: calc( + var(--context-menu-background-padding) + var(--context-menu-text-padding) + ); + } - #downloadsContextMenu > menuitem[command="downloadsCmd_clearList"], - #downloadsContextMenu > menuitem[command="downloadsCmd_clearDownloads"] { - --menuitem-image: url("../icons/broom.svg"); + menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu) + menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), + menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu) + menu:not(.menu-iconic, .in-menulist, [checked="true"]), + menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) + > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), + menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu:not(.menu-iconic, .in-menulist, [checked="true"]) { + padding-inline-start: var(--menu-background-padding-default) !important; + margin-left: 0 !important; + } } + /* Padding - Linux */ + @media (-moz-gtk-csd-available) { + :root { + --context-menu-background-padding-default: 6px; + } - /*= placeContext =============================================================*/ - #placesContext_open { - --menuitem-image: url("../icons/link-square.svg"); + /* Contextmenu Checkbox Unset */ + menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu) menuitem[type="checkbox"] { + margin-inline: 0 !important; + } + menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu) + menuitem[type="checkbox"] + > .menu-iconic-left + > .menu-iconic-icon { + margin-inline-end: 0 !important; + } + menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu) + menuitem[type="checkbox"]:not([checked="true"]) + > .menu-iconic-left + > .menu-iconic-icon { + border: none !important; + background-color: unset !important; + } } + /* Padding - Mac */ + @supports -moz-bool-pref("layout.css.osx-font-smoothing.enabled") { + :root { + --context-menu-background-padding-default: 10px; + --context-menu-mac-padding: 21px; + } - #placesContext_openBookmarkContainer\:tabs, - #placesContext_openBookmarkLinks\:tabs { - --menuitem-image: url("../icons/movetowindow-16.svg"); - } + /* context menu width */ + menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu) + menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]), + menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu) + menu:not(.menu-iconic, .in-menulist, [checked="true"]) { + padding-inline-end: var(--context-menu-background-padding) !important; + } + menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu) + menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]) + > .menu-text, + menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu) + menu:not(.menu-iconic, .in-menulist, [checked="true"]) + > .menu-text { + /* text position */ + padding-inline-start: var(--context-menu-mac-padding) !important; + } - #placesContext_open\:newtab, - #placesContext_openContainer\:tabs, - #placesContext_openLinks\:tabs { - --menuitem-image: url("chrome://browser/skin/new-tab.svg"); + /* Checkbox menuitem, None iconic menu */ + menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu) menuitem[checked="true"], + menupopup:is(#placesContext, #placesColumnsContext, #downloadsContextMenu) menu:not(.menu-iconic) { + padding-inline-start: calc( + var(--context-menu-background-padding) + var(--context-menu-mac-padding) + ) !important; + } } + /*= Context Menu ===========================================================*/ + @supports -moz-bool-pref("userChrome.icon.context_menu") { + /* Icon lists */ + /*= downloadsContextMenu =====================================================*/ + .downloadPauseMenuItem { + --menuitem-image: url("chrome://global/skin/media/pause-fill.svg"); + } - #placesContext_open\:newcontainertab { - --menuitem-image: url("../icons/container-openin-16.svg"); - } + .downloadResumeMenuItem { + --menuitem-image: url("chrome://global/skin/media/play-fill.svg"); + } - #placesContext_open\:newwindow { - --menuitem-image: url("chrome://browser/skin/window.svg"); - } + .downloadUnblockMenuItem { + --menuitem-image: url("../icons/checkmark-circle.svg"); + } - #placesContext_open\:newprivatewindow { - --menuitem-image: url("chrome://browser/skin/privateBrowsing.svg"); - } + .downloadUseSystemDefaultMenuItem { + --menuitem-image: url("chrome://browser/skin/open.svg"); + } - #placesContext_show_bookmark\:info, - #placesContext_show\:info, - #placesContext_show_folder\:info { - --menuitem-image: url("chrome://global/skin/icons/edit.svg"); - } + .downloadAlwaysUseSystemDefaultMenuItem { + /* checkbox */ + --menuitem-image: url("../icons/folder-globe.svg"); + } - #placesContext_deleteBookmark, - #placesContext_deleteFolder, - #placesContext_delete, - #placesContext_delete_history { - --menuitem-image: url("chrome://global/skin/icons/delete.svg"); - } + .downloadAlwaysOpenSimilarFilesMenuItem { + /* checkbox */ + --menuitem-image: url("../icons/fluid.svg"); + } - #placesContext_deleteHost { - --menuitem-image: url("../icons/eye-hide.svg"); - } + .downloadShowMenuItem { + --menuitem-image: url("chrome://global/skin/icons/folder.svg"); + } + @supports -moz-bool-pref("userChrome.icon.library") { + .downloadShowMenuItem { + --menuitem-image: url("../icons/folder.svg"); + } + } - #placesContext_sortBy\:name { - --menuitem-image: url("../icons/text-sort-ascending.svg"); - } + #downloadsContextMenu > menuitem.downloadOpenReferrerMenuItem, + #downloadsContextMenu > menuitem[command="downloadsCmd_openReferrer"] { + --menuitem-image: url("../icons/link-square.svg"); + } + #downloadsContextMenu > menuitem.downloadCopyLocationMenuItem, + #downloadsContextMenu > menuitem[command="downloadsCmd_copyLocation"] { + --menuitem-image: url("../icons/link.svg"); + } - #placesContext_cut { - --menuitem-image: url("chrome://browser/skin/edit-cut.svg"); - } + .downloadDeleteFileMenuItem { + --menuitem-image: url("chrome://global/skin/icons/delete.svg"); + } - #placesContext_copy { - --menuitem-image: url("../icons/edit-copy.svg"); - } + .downloadRemoveFromHistoryMenuItem { + --menuitem-image: url("../icons/eraser.svg"); + } - #placesContext_paste_group { - --menuitem-image: url("chrome://browser/skin/edit-paste.svg"); - } + #downloadsContextMenu > menuitem[command="downloadsCmd_clearList"], + #downloadsContextMenu > menuitem[command="downloadsCmd_clearDownloads"] { + --menuitem-image: url("../icons/broom.svg"); + } - #placesContext_new\:bookmark { - --menuitem-image: url("chrome://browser/skin/bookmark.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"); - } - @supports -moz-bool-pref("userChrome.icon.library") { #placesContext_showInFolder, #placesContext_new\:folder { - --menuitem-image: url("../icons/folder.svg"); + --menuitem-image: url("chrome://global/skin/icons/folder.svg"); + } + @supports -moz-bool-pref("userChrome.icon.library") { + #placesContext_showInFolder, + #placesContext_new\:folder { + --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"); } } + @supports -moz-bool-pref("userChrome.icon.global_menu") { + /*= organizeButtonPopup ======================================================*/ + #newbookmark { + --menuitem-image: url("chrome://browser/skin/bookmark.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"); - } - } - @supports -moz-bool-pref("userChrome.icon.global_menu") { - /*= organizeButtonPopup ======================================================*/ - #newbookmark { - --menuitem-image: url("chrome://browser/skin/bookmark.svg"); - } - - #newfolder { - --menuitem-image: url("chrome://global/skin/icons/folder.svg"); - } - @supports -moz-bool-pref("userChrome.icon.library") { #newfolder { - --menuitem-image: url("../icons/folder.svg"); + --menuitem-image: url("chrome://global/skin/icons/folder.svg"); + } + @supports -moz-bool-pref("userChrome.icon.library") { + #newfolder { + --menuitem-image: url("../icons/folder.svg"); + } } - } - #newseparator { - --menuitem-image: url("../icons/vertical-line.svg"); - } + #newseparator { + --menuitem-image: url("../icons/vertical-line.svg"); + } - #orgUndo { - --menuitem-image: url("../icons/undo.svg"); - } + #orgUndo { + --menuitem-image: url("../icons/undo.svg"); + } - #orgCut { - --menuitem-image: url("chrome://browser/skin/edit-cut.svg"); - } + #orgCut { + --menuitem-image: url("chrome://browser/skin/edit-cut.svg"); + } - #orgCopy { - --menuitem-image: url("../icons/edit-copy.svg"); - } + #orgCopy { + --menuitem-image: url("../icons/edit-copy.svg"); + } - #orgPaste { - --menuitem-image: url("chrome://browser/skin/edit-paste.svg"); - } + #orgPaste { + --menuitem-image: url("chrome://browser/skin/edit-paste.svg"); + } - #orgDelete { - --menuitem-image: url("chrome://global/skin/icons/delete.svg"); - } + #orgDelete { + --menuitem-image: url("chrome://global/skin/icons/delete.svg"); + } - #orgSelectAll { - --menuitem-image: url("../icons/select-all-on.svg"); - } + #orgSelectAll { + --menuitem-image: url("../icons/select-all-on.svg"); + } - #orgClose { - --menuitem-image: url("chrome://global/skin/icons/close.svg"); - } + #orgClose { + --menuitem-image: url("chrome://global/skin/icons/close.svg"); + } - /*= viewMenuPopup ============================================================*/ - #viewColumns { - --menuitem-image: url("chrome://global/skin/icons/columnpicker.svg"); - } + /*= viewMenuPopup ============================================================*/ + #viewColumns { + --menuitem-image: url("chrome://global/skin/icons/columnpicker.svg"); + } - #viewSort { - --menuitem-image: url("../icons/text-sort-ascending.svg"); - } + #viewSort { + --menuitem-image: url("../icons/text-sort-ascending.svg"); + } - /*= maintenanceButtonPopup ===================================================*/ - #backupBookmarks { - --menuitem-image: url("chrome://devtools/skin/images/datastore.svg"); - } + /*= maintenanceButtonPopup ===================================================*/ + #backupBookmarks { + --menuitem-image: url("chrome://devtools/skin/images/datastore.svg"); + } - #fileImport { - --menuitem-image: url("chrome://browser/skin/save.svg"); - } + #fileImport { + --menuitem-image: url("chrome://browser/skin/save.svg"); + } - #fileExport { - --menuitem-image: url("chrome://browser/skin/open.svg"); - } + #fileExport { + --menuitem-image: url("chrome://browser/skin/open.svg"); + } - #browserImport { - --menuitem-image: url("chrome://browser/skin/import.svg"); + #browserImport { + --menuitem-image: url("chrome://browser/skin/import.svg"); + } } } } diff --git a/docs/Omni_ja.md b/docs/Omni_ja.md index e71753e..ea0249e 100644 --- a/docs/Omni_ja.md +++ b/docs/Omni_ja.md @@ -15,7 +15,7 @@ - [UDN: omni.ja (formerly omni.jar)](https://udn.realityripple.com/docs/Mozilla/About_omni.ja_(formerly_omni.jar)) - [Firefox 4: jar jar jar](https://web.archive.org/web/20161003115800/https://blog.mozilla.org/tglek/2010/09/14/firefox-4-jar-jar-jar/) - [Firefox's Optimized Zip Format: Reading Zip Files Really Quickly](https://taras.glek.net/post/optimized-zip-format/) -- [How to Optimize or Deoptimize Firefox OMNI.JA File](https://www.raymond.cc/blog/edit-files-inside-firefox-4-omni-jar-to-auto-save-password/) +- [How to Optimize or De-optimize Firefox OMNI.JA File](https://www.raymond.cc/blog/edit-files-inside-firefox-4-omni-jar-to-auto-save-password/) **Explanation** diff --git a/docs/Preference.md b/docs/Preference.md index acb6351..547bd7c 100644 --- a/docs/Preference.md +++ b/docs/Preference.md @@ -73,7 +73,7 @@ See [EBNF(Extended Backus-Naur form)](https://en.wikipedia.org/wiki/Extended_Bac ## Default Config - [`modules/libpref/init/all.js`](https://github.com/mozilla/gecko-dev/blob/master/modules/libpref/init/all.js): all products -- [`browser/app/profile/firefox.js`](https://github.com/mozilla/gecko-dev/blob/master/browser/app/profile/firefox.js): only firefox deskstop +- [`browser/app/profile/firefox.js`](https://github.com/mozilla/gecko-dev/blob/master/browser/app/profile/firefox.js): only firefox desktop In release builds these are all put into [`omni.ja`](./Omni_ja.md). diff --git a/docs/Project_Structure.md b/docs/Project_Structure.md index 0be4940..257d12c 100644 --- a/docs/Project_Structure.md +++ b/docs/Project_Structure.md @@ -27,7 +27,7 @@ root |- .github: Issue/PR Template, Github Actions |- .prettierignore: Exclude coding style |- .prettierrc.json: Coding style -|- install.ps1: Install script write in powersehll +|- install.ps1: Install script write in powershell |- install.sh: Install script write in bash |- package.json: Build setup, package dependency |- LEPTON: Meta infos (branch, version) @@ -47,7 +47,7 @@ Icons are mainly [FirefoxUX/photon-icons](https://github.com/FirefoxUX/photon-ic or [microsoft/fluentui-system-icons](https://github.com/microsoft/fluentui-system-icons). Although not yet used, [tabler/tabler-icons](https://github.com/tabler/tabler-icons) and [feathericons/feather](https://github.com/feathericons/feather) can also be referred to. -You can see more in the issue, [Unify icon design langauge #213](https://github.com/black7375/Firefox-UI-Fix/issues/213). +You can see more in the issue, [Unify icon design language #213](https://github.com/black7375/Firefox-UI-Fix/issues/213). ## Install Scripts ### Meta Info files diff --git a/docs/README.md b/docs/README.md index 3b335b2..d1378c4 100644 --- a/docs/README.md +++ b/docs/README.md @@ -1,4 +1,4 @@ -# Develper Documents for Firefox Custom +# Developer Documents for Firefox Custom **Table of Contents** @@ -62,7 +62,7 @@ yarn build You can check test and css validate: ```shell ## test - When you make mixin or function -# __tests__ direcory, You can also find out how to use internal utils. +# __tests__ directory, You can also find out how to use internal utils. yarn test ## validate - Will be failed, this project uses non-standard features. @@ -93,7 +93,7 @@ This is a rough guideline. (Not forced) ### Basics `userChrome.css` file is for browser UI, `userContent.css` file is for web contents. -Unlike [User config](./Preference.md#user-config), they are located in `/chrome/`. +Unlike [User config](./Preference.md#user-config), they are located in `/chrome/`. Start Guide: - [What is userChrome.css? What can it do?](https://www.userchrome.org/what-is-userchrome-css.html) diff --git a/docs/Restrictions.md b/docs/Restrictions.md index 0194345..c3142a3 100644 --- a/docs/Restrictions.md +++ b/docs/Restrictions.md @@ -100,7 +100,7 @@ Many implementations using `::before`, `::after`. - [Dynamic Tab Separator](https://github.com/black7375/Firefox-UI-Fix/blob/36e9c94844fee2417662251cbd50c2b874d5b576/userChrome.css#L3394-L3457) - [Static Tab Separator](https://github.com/black7375/Firefox-UI-Fix/blob/0f78a73b856e1335954ecded93d377b85134bd61/userChrome.css#L3387-L3428) - [Picture In Picture Indicator](https://github.com/black7375/Firefox-UI-Fix/blob/36e9c94844fee2417662251cbd50c2b874d5b576/userChrome.css#L3716-L3753) -- [Contaner Indicator](https://github.com/black7375/Firefox-UI-Fix/blob/36e9c94844fee2417662251cbd50c2b874d5b576/userChrome.css#L3754-L3852) +- [Container Indicator](https://github.com/black7375/Firefox-UI-Fix/blob/36e9c94844fee2417662251cbd50c2b874d5b576/userChrome.css#L3754-L3852) For icons, [`list-style-image`](https://developer.mozilla.org/en-US/docs/Web/CSS/list-style-image) and [`background-image`](https://developer.mozilla.org/en-US/docs/Web/CSS/background-image) are available. @@ -127,7 +127,7 @@ Firefox actively uses [shadow dom](https://developer.mozilla.org/en-US/docs/Web/ To modify, it is often a roundabout approach or impossible to inherit. -Onething bypass method is to declare [`var()`](https://developer.mozilla.org/en-US/docs/Web/CSS/var) to shadow root. +One bypass method is to declare [`var()`](https://developer.mozilla.org/en-US/docs/Web/CSS/var) to shadow root. - [Scrollbutton Padding](https://github.com/black7375/Firefox-UI-Fix/blob/36e9c94844fee2417662251cbd50c2b874d5b576/userChrome.css#L2906-L2924) - [Audio, Video Player UI](https://github.com/black7375/Firefox-UI-Fix/blob/36e9c94844fee2417662251cbd50c2b874d5b576/userContent.css#L5-L47) - [Video Player Twoline UI](https://github.com/black7375/Firefox-UI-Fix/blob/cbf14cd55a9edada7ab2f5f1b626608fb9fe38a2/src/contents/_video_player.scss#L68-L171): It is pretty difficult when the condition becomes complicated. @@ -139,7 +139,7 @@ Another limitation of shadow dom in user style is that you cannot use shadow dom - [Bug 1575507 - Shadow parts should work in user-origin stylesheets.](https://bugzilla.mozilla.org/show_bug.cgi?id=1575507) ### XUL -Sometimes firefox can use [XUL](https://en.wikipedia.org/wiki/XUL) that have been written and binded with C++ for performance like a treeview of bookmarks. +Sometimes firefox can use [XUL](https://en.wikipedia.org/wiki/XUL) that have been written and bound with C++ for performance like a treeview of bookmarks. XUL's [box model](https://udn.realityripple.com/docs/Archive/Mozilla/XUL/Tutorial/The_Box_Model) and [DOM](https://udn.realityripple.com/docs/Archive/Mozilla/XUL/Tutorial/Document_Object_Model) are different from HTML. There ar few appropriate documents, so we have to read the source code and work. (Ex. [1](https://github.com/mozilla/gecko-dev/blob/master/layout/style/nsCSSAnonBoxList.h), [2](https://github.com/mozilla/gecko-dev/blob/master/layout/xul/tree/nsITreeView.idl)) @@ -151,7 +151,7 @@ Example of legacy documents that will help. - [UDN: ::-moz-tree-cell-text](https://udn.realityripple.com/docs/Mozilla/Gecko/Chrome/CSS/::-moz-tree-cell-text) Another case. -Like [``](https://udn.realityripple.com/docs/Archive/Mozilla/XUL/Attribute/align), [`attributes`](https://udn.realityripple.com/docs/Archive/Mozilla/XUL/Attribute) is set and CSS of same property may not be appplied. (Ex. [`box-align: start`](https://udn.realityripple.com/docs/Web/CSS/box-align)) +Like [``](https://udn.realityripple.com/docs/Archive/Mozilla/XUL/Attribute/align), [`attributes`](https://udn.realityripple.com/docs/Archive/Mozilla/XUL/Attribute) is set and CSS of same property may not be applied. (Ex. [`box-align: start`](https://udn.realityripple.com/docs/Web/CSS/box-align)) ### Supports [`@supports`](https://developer.mozilla.org/en-US/docs/Web/CSS/@supports) change in CSS is not detected in real time. (Caching after checking only once) diff --git a/docs/Rules.md b/docs/Rules.md index a1cc771..dbb4ce8 100644 --- a/docs/Rules.md +++ b/docs/Rules.md @@ -46,7 +46,7 @@ It comes from [#109](https://github.com/black7375/Firefox-UI-Fix/issues/109#issu Stable: Only bugfix, Documentation. - `master`: Common bugfix, documentation. - `photon-style`: Bugfix, documentation specified in `photon-style`. -- `proton-sryle`: Bugfix, documentation specified in `proton-style`. +- `proton-style`: Bugfix, documentation specified in `proton-style`. Development: New Features. - `dev`: Common new features. diff --git a/icons/bookmark-multiple.svg b/icons/bookmark-multiple.svg new file mode 100644 index 0000000..14dcee9 --- /dev/null +++ b/icons/bookmark-multiple.svg @@ -0,0 +1,3 @@ + + + diff --git a/icons/edit-paste-go.svg b/icons/edit-paste-go.svg new file mode 100644 index 0000000..f7abda4 --- /dev/null +++ b/icons/edit-paste-go.svg @@ -0,0 +1,4 @@ + + + + diff --git a/icons/edit-paste-search.svg b/icons/edit-paste-search.svg new file mode 100644 index 0000000..c2ab698 --- /dev/null +++ b/icons/edit-paste-search.svg @@ -0,0 +1,4 @@ + + + + diff --git a/icons/filter-dismiss.svg b/icons/filter-dismiss.svg new file mode 100644 index 0000000..bb9ce9b --- /dev/null +++ b/icons/filter-dismiss.svg @@ -0,0 +1,3 @@ + + + diff --git a/icons/filter-reload.svg b/icons/filter-reload.svg new file mode 100644 index 0000000..71b4c68 --- /dev/null +++ b/icons/filter-reload.svg @@ -0,0 +1,3 @@ + + + diff --git a/icons/lock-closed.svg b/icons/lock-closed.svg new file mode 100644 index 0000000..528e69f --- /dev/null +++ b/icons/lock-closed.svg @@ -0,0 +1,3 @@ + + + diff --git a/icons/new-tab-multiple.svg b/icons/new-tab-multiple.svg new file mode 100644 index 0000000..9007367 --- /dev/null +++ b/icons/new-tab-multiple.svg @@ -0,0 +1,4 @@ + + + + diff --git a/icons/notebook-subsection.svg b/icons/notebook-subsection.svg deleted file mode 100644 index d85c15a..0000000 --- a/icons/notebook-subsection.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/icons/reload-auto.svg b/icons/reload-auto.svg new file mode 100644 index 0000000..c55fc24 --- /dev/null +++ b/icons/reload-auto.svg @@ -0,0 +1,4 @@ + + + + diff --git a/icons/shield-task.svg b/icons/shield-task.svg new file mode 100644 index 0000000..662087e --- /dev/null +++ b/icons/shield-task.svg @@ -0,0 +1,3 @@ + + + diff --git a/icons/tab-copy.svg b/icons/tab-copy.svg new file mode 100644 index 0000000..3d3bad5 --- /dev/null +++ b/icons/tab-copy.svg @@ -0,0 +1,4 @@ + + + + diff --git a/icons/tab-unload.svg b/icons/tab-unload.svg new file mode 100644 index 0000000..8907267 --- /dev/null +++ b/icons/tab-unload.svg @@ -0,0 +1,4 @@ + + + + diff --git a/install.ps1 b/install.ps1 index af21842..eb5ef71 100644 --- a/install.ps1 +++ b/install.ps1 @@ -31,7 +31,7 @@ Shows this help message .PARAMETER WhatIf Runs the installer without actioning any file copies/moves -Equivelant to a dry-run +Equivalent to a dry-run .EXAMPLE PS> .\Install.ps1 -u -f C:\Users\someone\ff-profiles diff --git a/install.sh b/install.sh index 61b8b4e..185af73 100755 --- a/install.sh +++ b/install.sh @@ -185,8 +185,8 @@ write_file() { get_ini_section() { local filePath="$1" - local ouput=$(grep -E "^\[" "${filePath}" |sed -e "s/^\[//g" -e "s/\]$//g") - echo "${ouput}" + local output=$(grep -E "^\[" "${filePath}" |sed -e "s/^\[//g" -e "s/\]$//g") + echo "${output}" } get_ini_value() { local filePath="$1" diff --git a/src/autohide/_infobar.scss b/src/autohide/_infobar.scss index 65d350a..1d08f61 100644 --- a/src/autohide/_infobar.scss +++ b/src/autohide/_infobar.scss @@ -1,6 +1,6 @@ #tab-notification-deck:not([customizing]) > .notificationbox-stack { $infobarFixedHeight: 13px + ((1px + 5px) * 2); // button height + (button border + [button.small-button padding]) * 2 - // fiexedHeight + (button margin * 2) + messagebar margin + // fixedHeight + (button margin * 2) + messagebar margin --infobar-height: calc(#{ $infobarFixedHeight } + (var(--infobar-button-vertical-margin, 4px) * 2) + var(--infobar-message-vertical-margin, 8px)); } #tab-notification-deck:not([customizing]) > .notificationbox-stack[slot="selected"] > notification-message { diff --git a/src/autohide/sidebar/_overlap.scss b/src/autohide/sidebar/_overlap.scss index 40b720b..4a20e52 100644 --- a/src/autohide/sidebar/_overlap.scss +++ b/src/autohide/sidebar/_overlap.scss @@ -1,3 +1,4 @@ +#sidebar-header, #sidebar { min-width: var(--uc-sidebar-width) !important; max-width: var(--uc-sidebar-width) !important; @@ -5,9 +6,12 @@ will-change: min-width, max-width; } -#sidebar-box:is(:hover, :focus-within) > #sidebar { - min-width: var(--uc-sidebar-activate-width) !important; - max-width: var(--uc-sidebar-activate-width) !important; +#sidebar-box:is(:hover, :focus-within) > { + #sidebar-header, + #sidebar { + min-width: var(--uc-sidebar-activate-width) !important; + max-width: var(--uc-sidebar-activate-width) !important; + } } :root[inFullscreen="true"] #sidebar-box { @@ -29,12 +33,16 @@ } @include Animate { + #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 { - transition-delay: 0ms !important; + #sidebar-box:is(:hover, :focus-within) > { + #sidebar-header, + #sidebar { + transition-delay: 0ms !important; + } } :root[inFullscreen="true"] #sidebar-box { diff --git a/src/compatibility/_os.scss b/src/compatibility/_os.scss index c3a3ebf..30072d8 100644 --- a/src/compatibility/_os.scss +++ b/src/compatibility/_os.scss @@ -191,12 +191,18 @@ $_os_linuxDefaultShadow: 0 0 4px rgba(128, 128, 142, 0.5); /* -moz-default-appearance: -moz-window-titlebar */ appearance: none !important; } + @include OS($win7, $win8) { + &[sizemode="maximized"] #titlebar { + // Only win7, win8 #480 + padding-top: 8px; // Don't use margin-top for reserved fullscreen animation + } + } } @include Option("userChrome.compatibility.os.windows_maximized") { &[sizemode="maximized"] #titlebar { appearance: none !important; - // Prevent sideeffect #370 + // Prevent side effect #370 padding-top: 8px; // Don't use margin-top for reserved fullscreen animation } } diff --git a/src/compatibility/_theme.scss b/src/compatibility/_theme.scss index ff7e352..219edf0 100644 --- a/src/compatibility/_theme.scss +++ b/src/compatibility/_theme.scss @@ -48,7 +48,7 @@ menu { /*= Remove Tab Border ========================================================*/ @mixin _theme_removeTabBorder($options...) { %noneBorder { - /* Nigtly 96: 1px solid var(--tab-line-color, rgba(128,128,142,0.9)); */ + /* Nightly 96: 1px solid var(--tab-line-color, rgba(128,128,142,0.9)); */ border: unset !important; } @each $prefix, $postfix in $options { diff --git a/src/contents/dark_mode/_addons_org.scss b/src/contents/dark_mode/_addons_org.scss index 39e8ec5..d5de91c 100644 --- a/src/contents/dark_mode/_addons_org.scss +++ b/src/contents/dark_mode/_addons_org.scss @@ -486,7 +486,7 @@ background: var(--in-content-border-color) !important; } - /* Othres */ + /* Others */ #promos .view-button a, #upload-file-finish.button, #upload-file-widget .button.prominent, diff --git a/src/contents/proton_contents/_proton_commons.scss b/src/contents/proton_contents/_proton_commons.scss index 6ce5de0..757bc58 100644 --- a/src/contents/proton_contents/_proton_commons.scss +++ b/src/contents/proton_contents/_proton_commons.scss @@ -191,13 +191,13 @@ richlistbox:focus-visible { border-color: transparent !important; outline: 2px solid var(--in-content-focus-outline-color) !important; - outline-offset: -1px !important; /* Prevents antialising 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 antialising 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, diff --git a/src/decoration/_animate.scss b/src/decoration/_animate.scss index 6b969fe..6f79503 100644 --- a/src/decoration/_animate.scss +++ b/src/decoration/_animate.scss @@ -144,7 +144,7 @@ xul|search-textbox.tabsFilter, from { margin-top: 0; } - /* Dont' use `to`: Depending on density */ + /* Don't use `to`: Depending on density */ } /*- Expand - Synced Tabs ---------------------------------------------------*/ diff --git a/src/fullscreen/_overlap.scss b/src/fullscreen/_overlap.scss index 387c057..686466f 100644 --- a/src/fullscreen/_overlap.scss +++ b/src/fullscreen/_overlap.scss @@ -8,7 +8,7 @@ } @include OS($linux) { - /* Fix transparent backgorund */ + /* Fix transparent background */ :root[tabsintitlebar][sizemode="fullscreen"] #TabsToolbar:not(:-moz-lwtheme) { appearance: auto !important; } diff --git a/src/icons/_global_menu.scss b/src/icons/_global_menu.scss index be303a1..fc6d034 100644 --- a/src/icons/_global_menu.scss +++ b/src/icons/_global_menu.scss @@ -230,6 +230,9 @@ menu.share-tab-url-item { #sync-reauthitem { } +#menu_openFirefoxView { + --menuitem-image: url("chrome://branding/content/icon32.png"); +} #webDeveloperMenu, /* Legacy */ #browserToolsMenu { --menuitem-image: url("../icons/developer.svg"); diff --git a/src/icons/_index.scss b/src/icons/_index.scss index 90c2e29..06fe4fe 100644 --- a/src/icons/_index.scss +++ b/src/icons/_index.scss @@ -25,9 +25,15 @@ } } -/** Libray Menu ***************************************************************/ +/** Library Menu **************************************************************/ @include Option("userChrome.icon.library") { @include Option("userChrome.icon.menu") { @import "library"; } } + +/** Waterfox ******************************************************************/ +@import "waterfox"; + +/** Tor Browser ***************************************************************/ +@import "tor_browser"; diff --git a/src/icons/_panel.scss b/src/icons/_panel.scss index 134724b..cad45e4 100644 --- a/src/icons/_panel.scss +++ b/src/icons/_panel.scss @@ -42,14 +42,14 @@ } } @include Option("userChrome.icon.panel_sparse") { - #appMenu-new-tab-button2, /* Seperate */ - #appMenu-passwords-button, /* Seperate */ + #appMenu-new-tab-button2, /* Separate */ + #appMenu-passwords-button, /* Separate */ #appMenu-extensions-themes-button, - #appMenu-save-file-button2, /* Seperate */ + #appMenu-save-file-button2, /* Separate */ #appMenu-find-button2, - #appMenu-more-button2, /* Seperate */ + #appMenu-more-button2, /* Separate */ #appMenu-help-button2, - #appMenu-quit-button2 /* Seperate */ { + #appMenu-quit-button2 /* Separate */ { padding-top: var(--arrowpanel-menuitemblank-padding-block) !important; padding-bottom: var(--arrowpanel-menuitemblank-padding-block) !important; } diff --git a/src/icons/context_menu/_content_area.scss b/src/icons/context_menu/_content_area.scss index 416a09e..c74e829 100644 --- a/src/icons/context_menu/_content_area.scss +++ b/src/icons/context_menu/_content_area.scss @@ -261,3 +261,43 @@ --menuitem-image: url("chrome://browser/skin/bookmark.svg"); } } + +/*= Tab Mix Plus =============================================================*/ +#tm-autoreload_menu { + --menuitem-image: url("../icons/reload-auto.svg"); +} + +#tm-linkWithhistory { +} +#tm-openAllLinks { + --menuitem-image: url("../icons/new-tab-multiple.svg"); +} +#tm-openinverselink { +} +#context-openlinkinusercontext-menu { +} + +#tm-content-closetab { +} +#tm-duplicateTabContext { +} +#tm-duplicateinWinContext { +} +#tm-detachTabContext { +} +#tm-mergeWindows { +} +#tm-content-freezeTab { +} +#tm-content-protectTab { +} +#tm-content-lockTab { +} +#tm-tabsList { +} + +#tm-content-undoCloseTab { + --menuitem-image: url("../icons/undo.svg"); +} +#tm-content-undoCloseList { +} diff --git a/src/icons/context_menu/_others.scss b/src/icons/context_menu/_others.scss index 453f405..25f28d8 100644 --- a/src/icons/context_menu/_others.scss +++ b/src/icons/context_menu/_others.scss @@ -138,6 +138,9 @@ --menuitem-image: url("chrome://browser/skin/edit-paste.svg"); } #paste-and-go { + @include Option("userChrome.icon.menu.full") { + --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"); @@ -147,7 +150,7 @@ } /*= textbox-contextmenu ======================================================*/ -/* Browser's Searchbar, Libray's Searchbar, Page Info */ +/* Browser's Searchbar, Library's Searchbar, Page Info */ .textbox-contextmenu > menuitem[data-l10n-id="text-action-undo"] { --menuitem-image: url("../icons/undo.svg"); } @@ -175,6 +178,9 @@ /* Only searchbar */ menuitem.searchbar-paste-and-search { + @include Option("userChrome.icon.menu.full") { + --menuitem-image: url("../icons/edit-paste-search.svg"); + } } menuitem.searchbar-clear-history { --menuitem-image: url("chrome://browser/skin/forget.svg"); diff --git a/src/icons/context_menu/_tab_toolbar.scss b/src/icons/context_menu/_tab_toolbar.scss index 2a38cb3..d0b20be 100644 --- a/src/icons/context_menu/_tab_toolbar.scss +++ b/src/icons/context_menu/_tab_toolbar.scss @@ -55,9 +55,10 @@ #treestyletab_piro_sakura_ne_jp-menuitem-_context_duplicateTab, #tabcenter-reborn_ariasuni-menuitem-_contextMenuDuplicateTab, #sidebartabs_asamuzak_jp-menuitem-_dupeTab { - --menuitem-image: url("../icons/notebook-subsection.svg"); + --menuitem-image: url("../icons/tab-copy.svg"); } #tabcenter-reborn_ariasuni-menuitem-_contextMenuUnloadTab { + --menuitem-image: url("../icons/tab-unload.svg"); } #context_bookmarkTab, @@ -119,10 +120,13 @@ #sidebartabs_asamuzak_jp-menuitem-_closeTab { --menuitem-image: url("chrome://global/skin/icons/close.svg"); } +#context_closeTabOptions, +#treestyletab_piro_sakura_ne_jp-menuitem-_context_closeMultipleTabs, #tabcenter-reborn_ariasuni-menuitem-_contextMenuCloseTabs, #sidebartabs_asamuzak_jp-menuitem-_closeMultipleTabs { -} -#context_closeTabOptions { + @include Option("userChrome.icon.menu.full") { + --menuitem-image: url("../icons/filter-dismiss.svg"); + } } #context_undoCloseTab, #treestyletab_piro_sakura_ne_jp-menuitem-_context_undoCloseTab, @@ -215,3 +219,53 @@ menuitem.viewCustomizeToolbar { #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; +} +#tm-duplicateinWin { +} +#tm-mergeWindowsTab { +} +#tm-renameTab { +} +#tm-copyTabUrl { + --menuitem-image: url("../icons/link.svg"); +} + +#tm-autoreloadTab_menu { +} +#context_reloadTabOptions { + --menuitem-image: url("../icons/reload.svg"); + @include Option("userChrome.icon.menu.full") { + --menuitem-image: url("../icons/filter-reload.svg"); + } + + #context_reloadTab { + @include NotOption("userChrome.icon.menu.full") { + --menuitem-image: url("../icons/blank.svg"); + } + } +} + +#tm-undoCloseList { +} + +#tm-docShell { +} +#tm-freezeTab { +} +#tm-protectTab { + --menuitem-image: url("../icons/shield-task.svg"); +} +#tm-lockTab { + @include Option("userChrome.icon.menu.full") { + --menuitem-image: url("../icons/lock-closed.svg"); + } +} + +#context_bookmarkAllTabs { + @include Option("userChrome.icon.menu.full") { + --menuitem-image: url("../icons/bookmark-multiple.svg"); + } +} diff --git a/src/icons/layout/_bookmark_menu.scss b/src/icons/layout/_bookmark_menu.scss index 98beb65..ea3f2ad 100644 --- a/src/icons/layout/_bookmark_menu.scss +++ b/src/icons/layout/_bookmark_menu.scss @@ -1,5 +1,5 @@ /*= Bookmark Menu - Layout ===================================================*/ -/* #goPopup(Legacy of historyMenuPoup), #historyMenuPopup, #bookmarksMenuPopup: looks like global menu +/* #goPopup(Legacy of historyMenuPopup), #historyMenuPopup, #bookmarksMenuPopup: looks like global menu * #BMB_bookmarksPopup: looks like arrow panel */ diff --git a/src/icons/layout/_menu.scss b/src/icons/layout/_menu.scss index 074bb4a..c4d959f 100644 --- a/src/icons/layout/_menu.scss +++ b/src/icons/layout/_menu.scss @@ -41,6 +41,10 @@ $_layoutCommonMenus: ( @include _layoutInitIconMenus { @include _layout_icon_menus; } +#tabContextMenu > .tabmix-newtab-menu-icon { + -moz-context-properties: fill, fill-opacity !important; + fill: currentColor !important; +} /* For native context menus */ #{$_nestedPopupIconMenus} { diff --git a/src/icons/layout/_menu_common.scss b/src/icons/layout/_menu_common.scss index b7bb0f5..bfe3cc5 100644 --- a/src/icons/layout/_menu_common.scss +++ b/src/icons/layout/_menu_common.scss @@ -1,6 +1,6 @@ //-- Variables ----------------------------------------------------------------- // Items -// .menu-iconic, .menuitem-iconic: Alreay exist, not target. +// .menu-iconic, .menuitem-iconic: Already exist, not target. // .in-menulist: Not a range because it is a select menu of web content. // [checked="true"]: There should be a check mark instead of an icon. $_iconNoneCommon: ".in-menulist, [checked=\"true\"]"; diff --git a/src/leptonChrome.scss b/src/leptonChrome.scss index dc06906..339835a 100644 --- a/src/leptonChrome.scss +++ b/src/leptonChrome.scss @@ -13,7 +13,7 @@ @namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"; @namespace html "http://www.w3.org/1999/xhtml"; -/** Default Thme - Contrast ***************************************************/ +/** Default Theme - Contrast **************************************************/ @include Option("userChrome.theme.built_in_contrast") { @import "theme/built_in"; } @@ -36,7 +36,7 @@ /** Tab Bar UI ****************************************************************/ @import "tabbar/index"; -/** Tab UI ****************************************************************/ +/** Tab UI ********************************************************************/ @import "tab/index"; /** Url View UI ***************************************************************/ @@ -61,13 +61,6 @@ @import "hidden/index"; /** Icons *********************************************************************/ -@import "icons/index"; - -/** Waterfox ******************************************************************/ -@import "icons/waterfox"; -@include Option("userChrome.theme.fully_color") { - @import "theme/waterfox"; +@include NotOption("userChrome.icon.disabled") { + @import "icons/index"; } - -/** Tor Browser ***************************************************************/ -@import "icons/tor_browser"; diff --git a/src/leptonContent.scss b/src/leptonContent.scss index 01e47c2..50af254 100644 --- a/src/leptonContent.scss +++ b/src/leptonContent.scss @@ -40,8 +40,10 @@ } /** Menu - Icons Layout *******************************************************/ -@include Option("userChrome.icon.menu") { - @import "contents/context_menu"; +@include NotOption("userChrome.icon.disabled") { + @include Option("userChrome.icon.menu") { + @import "contents/context_menu"; + } } /** Download Panel ************************************************************/ diff --git a/src/library/_folder_icons.scss b/src/library/_folder_icons.scss index 9b33496..931b7e8 100644 --- a/src/library/_folder_icons.scss +++ b/src/library/_folder_icons.scss @@ -3,7 +3,7 @@ :-moz-any(#PlacesToolbar, #BMB_bookmarksPopup, #bookmarksMenu) .bookmark-item[container="true"]:not([query="true"], [tagContainer], [dayContainer]), /* in Sidebar, Library, Add/Edit Bookmark dialog */ /* https://github.com/rillian/firefox/blob/1f88437d263f56bdede4f20f69ba9c7b62f57001/layout/style/nsCSSAnonBoxList.h#L85-L98 */ -/* Need to overide!!, can not use :not() */ +/* Need to override!!, can not use :not() */ :-moz-any(#bookmarks-view, #historyTree, #editBMPanel_folderTree, #placesList, #placeContent) treechildren::-moz-tree-image(title, container), #editBMPanel_folderMenuList:not([selectedGuid="toolbar_____"], [selectedGuid="menu________"]), #editBMPanel_folderMenuList .folder-icon:not([id]), @@ -69,7 +69,7 @@ list-style-image: url("chrome://browser/skin/places/tag.svg") !important; } -/* Boomark */ +/* Bookmark */ :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, OrganizerQuery_allbms_____v) { list-style-image: url("chrome://browser/skin/bookmark.svg") !important; } @@ -111,7 +111,7 @@ list-style-image: url("../icons/tag-open.svg") !important; } -/* Boomark */ +/* 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; } diff --git a/src/library/_proton_contents.scss b/src/library/_proton_contents.scss index 9753ce8..f50b6de 100644 --- a/src/library/_proton_contents.scss +++ b/src/library/_proton_contents.scss @@ -1,7 +1,7 @@ $iconSelector: "> .menu-iconic-left > .menu-iconic-icon"; $checkedIconSelector: "> .menu-iconic-left[checked=\"true\"] > .menu-iconic-icon"; -/*- Radio Button ---------------------------------------------------------*/ +/*- Radio Button -------------------------------------------------------------*/ menuitem[type="radio"] { @include Proton.RadioGlobal; @@ -41,7 +41,7 @@ menuitem[type="checkbox"][disabled="true"] { @include Proton.DisabledMenuItem; } -/*- Check Box ------------------------------------------------------------*/ +/*- Check Box ----------------------------------------------------------------*/ /* From checkbox.css */ menuitem[type="checkbox"] { @include Proton.CheckboxGlobal(true); @@ -99,7 +99,7 @@ menuitem[type="checkbox"] { } } -/*- Menu Separtor --------------------------------------------------------*/ +/*- Menu Separator -----------------------------------------------------------*/ menuseparator { appearance: none !important; min-width: 2px; diff --git a/src/padding/_tabbar_height.scss b/src/padding/_tabbar_height.scss index 02456f7..c899b04 100644 --- a/src/padding/_tabbar_height.scss +++ b/src/padding/_tabbar_height.scss @@ -43,18 +43,31 @@ } } } + +:root { + /* Works with TabMixPlus */ + --tab-min-height_mlt: calc(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) */ +} + @include Option("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 */ } - :root:not([uidensity="compact"]) #tabbrowser-arrowscrollbox, - #tabbrowser-arrowscrollbox[overflowing="true"] > .tabbrowser-tab[pinned="true"], - #tabbrowser-arrowscrollbox[overflowing="true"] > .tabbrowser-tab[pinned="true"] .tab-stack, - #tabbrowser-arrowscrollbox[overflowing="true"] > .tabbrowser-tab[pinned="true"] .tab-content { + :root:not([uidensity="compact"]) #TabsToolbar:not([multibar]) #tabbrowser-arrowscrollbox, + #TabsToolbar:not([multibar]) #tabbrowser-arrowscrollbox[overflowing="true"] > .tabbrowser-tab[pinned="true"], + #TabsToolbar:not([multibar]) #tabbrowser-arrowscrollbox[overflowing="true"] > .tabbrowser-tab[pinned="true"] .tab-stack, + #TabsToolbar:not([multibar]) #tabbrowser-arrowscrollbox[overflowing="true"] > .tabbrowser-tab[pinned="true"] .tab-content { max-height: var(--tab-min-height) !important; /* Force apply height */ } - :root[uidensity="compact"] #tabbrowser-arrowscrollbox { + :root[uidensity="compact"] #TabsToolbar:not([multibar]) #tabbrowser-arrowscrollbox { height: var(--tab-min-height) !important; } } diff --git a/src/padding/_tabbar_width.scss b/src/padding/_tabbar_width.scss index 6797e88..222303c 100644 --- a/src/padding/_tabbar_width.scss +++ b/src/padding/_tabbar_width.scss @@ -95,7 +95,7 @@ padding-inline: 1px !important; } } - .tabbrowser-tab:not([last-visible-tab]) { + #TabsToolbar:not([multibar]) .tabbrowser-tab:not([last-visible-tab]) { margin-inline-end: -1px !important; } } diff --git a/src/rounding/_square.scss b/src/rounding/_square.scss index 10d9ab7..139f7bb 100644 --- a/src/rounding/_square.scss +++ b/src/rounding/_square.scss @@ -12,7 +12,7 @@ } } @include Option("userChrome.rounding.square_tab", "userChrome.round.square_button") { - /* Fix Tab bar button radious */ + /* Fix Tab bar button radius */ #TabsToolbar .toolbarbutton-1:not(#tabs-newtab-button) > .toolbarbutton-icon, #TabsToolbar .toolbarbutton-1:not(#tabs-newtab-button) > .toolbarbutton-text, #TabsToolbar .toolbarbutton-1:not(#tabs-newtab-button) > .toolbarbutton-badge-stack, diff --git a/src/sidebar/_overlap.scss b/src/sidebar/_overlap.scss index 75a4465..953cb48 100644 --- a/src/sidebar/_overlap.scss +++ b/src/sidebar/_overlap.scss @@ -46,8 +46,17 @@ overflow: hidden; } + #sidebar-header { + font-size: unset !important; + + > #sidebar-switcher-target { + font-size: 1.333em; + } + } + @include NotOption("userChrome.autohide.sidebar") { #sidebar-box, + #sidebar-header, #sidebar { min-width: var(--uc-sidebar-activate-width) !important; max-width: var(--uc-sidebar-activate-width) !important; @@ -58,7 +67,7 @@ will-change: padding-inline; &:not([hidden="true"]) { - padding-inline-start: var(--uc-sidebar-activate-width); + padding-inline-start: var(--uc-sidebar-activate-width) !important; } @include Animate { diff --git a/src/tab/_connect_to_window.scss b/src/tab/_connect_to_window.scss index e163495..cd05b30 100644 --- a/src/tab/_connect_to_window.scss +++ b/src/tab/_connect_to_window.scss @@ -16,7 +16,7 @@ #tabbrowser-tabs { z-index: 1 !important; } -#TabsToolbar { +#TabsToolbar:not([multibar]) { overflow: hidden; /* Prevent toolbar area over */ } diff --git a/src/tab/_unselected_tab.scss b/src/tab/_unselected_tab.scss index df326bb..ba0a587 100644 --- a/src/tab/_unselected_tab.scss +++ b/src/tab/_unselected_tab.scss @@ -1,5 +1,8 @@ /*= Unselected Tab - Dynamic Separator =======================================*/ -@include Option("userChrome.tab.dynamic_separtor") { +@include Option( + "userChrome.tab.dynamic_separator", + "userChrome.tab.dynamic_separtor" +) { @import "unselected_tab/dynamic_separator"; } diff --git a/src/tab/newtab_button/_looks_like_tab.scss b/src/tab/newtab_button/_looks_like_tab.scss index bdda2a6..a989aae 100644 --- a/src/tab/newtab_button/_looks_like_tab.scss +++ b/src/tab/newtab_button/_looks_like_tab.scss @@ -1,11 +1,11 @@ #tabs-newtab-button { /* Original: margin: 0 0 var(--tabs-navbar-shadow-size) !important - => Can't ovrride style. Therefore, we should approach it by bypass. + => Can't override style. Therefore, we should approach it by bypass. */ --tabs-navbar-shadow-size: -1px; /* Original: 1px */ --tabs-navbar-original-shadow-size: 1px; - --tab-corner-rounding: 4px; /* Hardcorded */ + --tab-corner-rounding: 4px; /* Hardcoded */ /* Size */ -moz-box-align: stretch !important; @@ -39,7 +39,7 @@ in srgb, $accentTextColor 10%, transparent - ) !important; /* Hardcorded for compatibility */ + ) !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 { @@ -47,7 +47,7 @@ in srgb, $accentTextColor 15%, transparent - ) !important; /* Hardcorded for compatibility */ + ) !important; /* Hardcoded for compatibility */ } } } diff --git a/src/tab/newtab_button/_smaller_button.scss b/src/tab/newtab_button/_smaller_button.scss index e992373..2d82a83 100644 --- a/src/tab/newtab_button/_smaller_button.scss +++ b/src/tab/newtab_button/_smaller_button.scss @@ -1,7 +1,9 @@ #tabs-newtab-button > .toolbarbutton-icon { + // Not like tab, as button + --tab-border-radius: var(--toolbarbutton-border-radius); margin-left: 1px; - /* Origianl: calc((var(--tab-min-height) - 16px) / 2) = 10px */ + /* Original: calc((var(--tab-min-height) - 16px) / 2) = 10px */ --toolbarbutton-inner-padding: 6px; } :root[uidensity="compact"] #tabs-newtab-button > .toolbarbutton-icon { diff --git a/src/tab/selected_tab/_bottom_rounded_corner.scss b/src/tab/selected_tab/_bottom_rounded_corner.scss index ff0bec3..4fc717a 100644 --- a/src/tab/selected_tab/_bottom_rounded_corner.scss +++ b/src/tab/selected_tab/_bottom_rounded_corner.scss @@ -58,7 +58,7 @@ tab[visuallyselected] > stack::after { /* Fill color for GTK */ :root:not([customizing="true"]):not([lwtheme="true"]) tab[visuallyselected] > stack::before, :root:not([customizing="true"]):not([lwtheme="true"]) tab[visuallyselected] > stack::after { - /* As GTK Toolbar's background-color + backround-image + /* As GTK Toolbar's background-color + background-image * --toolbar-non-lwt-bgcolor: -moz-dialog; * --toolbar-non-lwt-bgimage: linear-gradient(rgba(255,255,255,.15), rgba(255,255,255,.15)); */ diff --git a/src/tab/selected_tab/_box_shadow.scss b/src/tab/selected_tab/_box_shadow.scss index 00d28d2..1c29fc7 100644 --- a/src/tab/selected_tab/_box_shadow.scss +++ b/src/tab/selected_tab/_box_shadow.scss @@ -3,7 +3,7 @@ .tabbrowser-tab[visuallyselected="true"]:not(:focus) > .tab-stack > .tab-background:-moz-lwtheme { - /* Origina: 0 0 1px var(--tab-line-color, rgba(128,128,142,0.9)) + /* Original: 0 0 1px var(--tab-line-color, rgba(128,128,142,0.9)) 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; } diff --git a/src/tab/selected_tab/_photon_like_contextline.scss b/src/tab/selected_tab/_photon_like_contextline.scss index 6863996..fd1d26b 100644 --- a/src/tab/selected_tab/_photon_like_contextline.scss +++ b/src/tab/selected_tab/_photon_like_contextline.scss @@ -37,7 +37,7 @@ background-color: rgba(255, 255, 255, 0.2) !important; } -/* Prevent identitiy color flashing */ +/* Prevent identity color flashing */ .tabbrowser-tab[usercontextid] .tab-context-line { --identity-icon-color: none; } diff --git a/src/tab/unselected_tab/_dynamic_separator.scss b/src/tab/unselected_tab/_dynamic_separator.scss index f1a8ed7..c0a1a3a 100644 --- a/src/tab/unselected_tab/_dynamic_separator.scss +++ b/src/tab/unselected_tab/_dynamic_separator.scss @@ -35,8 +35,12 @@ } } +#tabbrowser-arrowscrollbox-periphery { + position: relative; +} + @include Option("userChrome.tab.newtab_button_like_tab") { - #tabbrowser-arrowscrollbox { + #TabsToolbar:not([multibar]) #tabbrowser-arrowscrollbox { position: absolute; } diff --git a/src/tabbar/_on_bottom.scss b/src/tabbar/_on_bottom.scss index 6011748..0bcf567 100644 --- a/src/tabbar/_on_bottom.scss +++ b/src/tabbar/_on_bottom.scss @@ -36,7 +36,7 @@ See the above repository for updates as well as full license text. */ } } -/*= Tabbar - Hidden at singgle tab ===========================================*/ +/*= Tabbar - Hidden at single tab ===========================================*/ @include Option("userChrome.tabbar.on_bottom.hidden_single_tab") { #tabbrowser-tabs .tabbrowser-tab:only-of-type { display: none !important; diff --git a/src/theme/_index.scss b/src/theme/_index.scss index 36f344e..f9542fa 100644 --- a/src/theme/_index.scss +++ b/src/theme/_index.scss @@ -17,6 +17,7 @@ } @include Option("userChrome.theme.fully_color") { @import "fully_color"; + @import "waterfox"; } /*= Fully Dark Mode ==========================================================*/ diff --git a/src/theme/_proton_color.scss b/src/theme/_proton_color.scss index cc44b85..27f547a 100644 --- a/src/theme/_proton_color.scss +++ b/src/theme/_proton_color.scss @@ -25,7 +25,7 @@ --in-content-link-color-hover: var(--blue-70); --in-content-link-color-active: var(--blue-80); --in-content-link-color-visited: var(--blue-60); - /* button background states are also used for checkboxes and radiobuttons */ + /* button background states are also used for checkboxes and radio buttons */ --in-content-button-text-color: var(--in-content-text-color); --in-content-button-text-color-hover: var(--in-content-text-color); --in-content-button-background: rgba(207, 207, 216, 0.33); diff --git a/src/theme/proton_chrome/_cert.scss b/src/theme/proton_chrome/_cert.scss index 152e45f..6e10d2a 100644 --- a/src/theme/proton_chrome/_cert.scss +++ b/src/theme/proton_chrome/_cert.scss @@ -7,7 +7,7 @@ } } -/*= Cert Exeption Dialog =====================================================*/ +/*= Cert Exception Dialog ====================================================*/ @-moz-document url("chrome://pippki/content/exceptionDialog.xhtml") { #locationTextBox { @@ -25,12 +25,12 @@ &:focus { border-color: transparent !important; outline: 2px solid var(--in-content-focus-outline-color) !important; - outline-offset: -1px !important; /* Prevents antialising around the corners */ + outline-offset: -1px !important; /* Prevents antialiasing around the corners */ } &:-moz-ui-invalid { border-color: transparent !important; outline: 2px solid var(--in-content-border-invalid) !important; - outline-offset: -1px !important; /* Prevents antialising around the corners */ + outline-offset: -1px !important; /* Prevents antialiasing around the corners */ } &:disabled { opacity: 0.4 !important; @@ -44,7 +44,7 @@ background-image: url("chrome://global/skin/icons/warning.svg") !important; background-size: 48px !important; background-repeat: no-repeat !important; - + -moz-context-properties: fill !important; fill: currentColor !important; } diff --git a/src/theme/system_default_theme/_mac.scss b/src/theme/system_default_theme/_mac.scss index a63537a..b3a2900 100644 --- a/src/theme/system_default_theme/_mac.scss +++ b/src/theme/system_default_theme/_mac.scss @@ -59,12 +59,12 @@ --toolbar-bgcolor: var(--mac-selected-bgcolor) !important; --toolbar-non-lwt-bgcolor: var(--mac-selected-bgcolor) !important; - /* Field Backround Color */ + /* Field Background Color */ --input-bgcolor: var(--mac-field-bgcolor) !important; --toolbar-field-background-color: var(--mac-field-bgcolor) !important; --tab-icon-overlay-stroke: var(--mac-field-bgcolor) !important; - /* Panel Backround Color */ + /* Panel Background Color */ --arrowpanel-background: var(--mac-panel-bgcolor) !important; /* Hover Background Color */ @@ -108,7 +108,7 @@ --autocomplete-popup-separator-color: var(--mac-bgcolor) !important; */ - /* Accent Color Forground */ + /* Accent Color Foreground */ --button-primary-color: var(--mac-primary-button-color) !important; --checkbox-checked-color: var(--mac-primary-button-color) !important; diff --git a/src/theme/system_default_theme/_win10.scss b/src/theme/system_default_theme/_win10.scss index 0024cc7..1bd608e 100644 --- a/src/theme/system_default_theme/_win10.scss +++ b/src/theme/system_default_theme/_win10.scss @@ -12,17 +12,17 @@ --win-field-bgcolor: #ffffff; --win-component-bgcolor: #f2f2f2; --win-border-color: #8a8a8a; - --win-tab-seperator-color: #a3a3a3; + --win-tab-separator-color: #a3a3a3; --win-sidebar-bgcolor: #e6e6e6; --win-sidebar-hover-bgcolor: #cfcfcf; --win-sidebar-button-hover-bgcolor: #b8b8b8; --win-sidebar-button-hover-active-bgcolor: #a3a3a3; --win-button-border: #747474; - --win-shorcut-text-color: #757575; + --win-shortcut-text-color: #757575; --win-error-color: #b31616; --win-red-border-color: #ff4343; @include AccentColor { - --win-accent-forground-color: #{$accentTextColor}; + --win-accent-foreground-color: #{$accentTextColor}; --win-accent-color: color-mix(in srgb, rgba(0, 0, 0, 0.8) 10%, #{$accentColor}); --win-accent-content-color: color-mix(in srgb, rgba(255, 255, 255, 0.8) 15%, #{$accentColor}); --win-accent-hover-color: color-mix(in srgb, rgba(255, 255, 255, 0.8) 27%, #{$accentColor}); @@ -42,13 +42,13 @@ --win-field-bgcolor: #373737; --win-component-bgcolor: #171717; --win-border-color: #5b5b5b; - --win-tab-seperator-color: #555555; + --win-tab-separator-color: #555555; --win-sidebar-bgcolor: #1f1f1f; --win-sidebar-hover-bgcolor: #353535; --win-sidebar-button-hover-bgcolor: #353535; --win-sidebar-button-hover-active-bgcolor: #4c4c4c; --win-button-border: #8f8f8f; - --win-shorcut-text-color: #adadad; + --win-shortcut-text-color: #adadad; --win-error-color: #ffb900; --win-red-border-color: #ff4343; @include AccentColor { @@ -85,8 +85,8 @@ --download-progress-paused-color: var(--win-disabled-color) !important; /* Text Shortcut Color */ - --panel-shortcut-color: var(--win-shorcut-text-color) !important; - --panel-description-color: var(--win-shorcut-text-color) !important; + --panel-shortcut-color: var(--win-shortcut-text-color) !important; + --panel-description-color: var(--win-shortcut-text-color) !important; /* Title Background */ --lwt-accent-color: var(--win-bgcolor) !important; @@ -103,10 +103,10 @@ /* Border Color */ // --menu-border-color: var(--win-border-color) !important; - /* Seperator */ - --toolbarseparator-color: var(--win-tab-seperator-color) !important; + /* Separator */ + --toolbarseparator-color: var(--win-tab-separator-color) !important; - /* Field Backround Color */ + /* Field Background Color */ --input-bgcolor: var(--win-field-bgcolor) !important; --toolbar-field-background-color: var(--win-field-bgcolor) !important; --toolbar-field-focus-background-color: var(--win-field-bgcolor) !important; @@ -145,9 +145,9 @@ --input-border-color: var(--win-button-border) !important; --autocomplete-popup-separator-color: var(--win-button-border) !important; - /* Accent Forground Color */ - --button-primary-color: var(--win-accent-forground-color) !important; - --checkbox-checked-color: var(--win-accent-forground-color) !important; + /* Accent Foreground Color */ + --button-primary-color: var(--win-accent-foreground-color) !important; + --checkbox-checked-color: var(--win-accent-foreground-color) !important; /* Accent Color */ --button-primary-bgcolor: var(--win-accent-color) !important; diff --git a/src/utils/_each.scss b/src/utils/_each.scss index 06d7b44..c2c5691 100644 --- a/src/utils/_each.scss +++ b/src/utils/_each.scss @@ -3,13 +3,13 @@ @use "list" as list-utils; $_defaultOption: ( - "seperator": ", ", + "separator": ", ", "quoted": false ); @mixin AtEach($name, $list, $prefix: null, $option: $_defaultOption) { $option: map.merge($_defaultOption, $option); - $seperator: map.get($option, "seperator"); + $separator: map.get($option, "separator"); $quoted: map.get($option, "quoted"); $quoted: if($quoted, "\"", null); @@ -21,7 +21,7 @@ $_defaultOption: ( @if $listL > 1 { @for $i from 2 through ($listL) { $nextBlock: list.nth($list, $i); - $nextBlock: "#{$seperator}#{$prefix}(#{$quoted}#{$nextBlock}#{$quoted})"; + $nextBlock: "#{$separator}#{$prefix}(#{$quoted}#{$nextBlock}#{$quoted})"; $blocks: "#{$blocks}#{$nextBlock}"; } } diff --git a/src/utils/_option.scss b/src/utils/_option.scss index 3311464..b23fac6 100644 --- a/src/utils/_option.scss +++ b/src/utils/_option.scss @@ -1,13 +1,13 @@ @use "each"; @mixin Option($optionNames...) { - @include each.AtEach("supports", $optionNames, "-moz-bool-pref", ("seperator": " or ", "quoted": true)) { + @include each.AtEach("supports", $optionNames, "-moz-bool-pref", ("separator": " or ", "quoted": true)) { @content; } } @mixin NotOption($optionNames...) { - @include each.AtEach("supports", $optionNames, "not -moz-bool-pref", ("seperator": " or ", "quoted": true)) { + @include each.AtEach("supports", $optionNames, "not -moz-bool-pref", ("separator": " or ", "quoted": true)) { @content; } } diff --git a/user.js b/user.js index 4d50428..06e92bd 100644 --- a/user.js +++ b/user.js @@ -39,7 +39,7 @@ user_pref("userChrome.tab.color_like_toolbar", true); // Original, Photo user_pref("userChrome.tab.lepton_like_padding", false); // Original user_pref("userChrome.tab.photon_like_padding", true); // Photon -user_pref("userChrome.tab.dynamic_separtor", false); // Original, Proton +user_pref("userChrome.tab.dynamic_separator", false); // Original, Proton user_pref("userChrome.tab.static_separator", true); // Photon user_pref("userChrome.tab.static_separator.selected_accent", false); // Just option @@ -64,7 +64,7 @@ user_pref("userChrome.rounding.square_tab", true); // user_pref("userChrome.compatibility.covered_header_image", true); // user_pref("userChrome.compatibility.panel_cutoff", true); // user_pref("userChrome.compatibility.navbar_top_border", true); -// user_pref("userChrome.compatibility.dynamic_separator", true); // Need dynamic_seperator +// user_pref("userChrome.compatibility.dynamic_separator", true); // Need dynamic_separator // user_pref("userChrome.compatibility.os.linux_non_native_titlebar_button", true); // user_pref("userChrome.compatibility.os.windows_maximized", true); @@ -153,6 +153,7 @@ user_pref("userChrome.rounding.square_tab", true); // user_pref("userChrome.sidebar.overlap", true); +// user_pref("userChrome.icon.disabled", true); // user_pref("userChrome.icon.account_image_to_right", true); // user_pref("userChrome.icon.account_label_to_right", true); // user_pref("userChrome.icon.menu.full", true); @@ -255,7 +256,7 @@ user_pref("general.smoothScroll.currentVelocityWeighting", "0.15"); // "0.25" user_pref("general.smoothScroll.stopDecelerationWeighting", "0.6"); // "0.4" */ -// == Smooth Scroling ========================================================== +// == Smooth Scrolling ========================================================== // ** Scrolling Options ******************************************************** // based on natural smooth scrolling v2 by aveyo // this preset will reset couple extra variables for consistency