diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 3bbad13..541c511 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -15,3 +15,4 @@ # custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2'] github: [black7375] +ko_fi: [black7375] diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9faa3c5..bc619ec 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -64,8 +64,10 @@ jobs: # or TAGVER=$(git describe --tags --abbrev=0) BRANCH=${{ matrix.branch }} TAGVER=${GITHUB_REF#refs/*/} + NAME=${{ matrix.name }} echo -e "[Info]\nVer=${TAGVER}\nBranch=${BRANCH}" > LEPTON + sed -i "1i// ${TAGVER} ${NAME}" user.js - name: Processing for STANDARD if: matrix.mode == 'STANDARD' diff --git a/CREDITS b/CREDITS index 6cae6eb..24c1a9c 100644 --- a/CREDITS +++ b/CREDITS @@ -40,6 +40,9 @@ W: https://github.com/Cyberax N: AuRiMaS666 W: https://github.com/AuRiMaS666 +N: Duncanyoyo1 +W: https://ko-fi.com/duncanyoyo1 + N: firefox9067 E: firefox@snowdot.kr W: https://github.com/firefox9067 @@ -52,6 +55,9 @@ N: Jiho Lee E: optional.int@kakao.com W: https://github.com/DPS0340 +N: Julie Engel +W: https://github.com/engelju + N: kanlukasz W: https://github.com/kanlukasz diff --git a/README.org b/README.org index f6e8408..a762b22 100644 --- a/README.org +++ b/README.org @@ -212,8 +212,11 @@ Thanks to all sponsors & contributors to this project for providing help and dev [[https://github.com/AuRiMaS666][@@html:@@]] [[https://github.com/firefox9067][@@html:@@]] [[https://github.com/Ygg01][@@html:@@]] +[[https://github.com/engelju][@@html:@@]] -- A donation was received from Safira on [[https://ko-fi.com/home/coffeeshop?txid=97e5fa0d-c73e-4308-a2fd-6b44b08cd828][Ko-Fi]] +- A donation was received on [[https://ko-fi.com/black7375][Ko-Fi]] + - [[https://ko-fi.com/home/coffeeshop?txid=97e5fa0d-c73e-4308-a2fd-6b44b08cd828][Safira]] + - [[https://ko-fi.com/duncanyoyo1][https://ko-fi.com/duncanyoyo1]] - Private sponsors: 4 *Contributors* diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 90e935b..dac3290 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -184,6 +184,15 @@ :root[tabsintitlebar] #titlebar:-moz-window-inactive .toolbarbutton-icon { fill-opacity: var(--inactive-toolbarbutton-icon-fill-opacity, 1); } + /*= Tabpreviw transparent #890 ===============================================*/ + #tab-preview-panel { + --panel-background: var( + --arrowpanel-background + ) !important; /* Original: var(--tab-selected-bgcolor, var(--toolbar-bgcolor)) */ + --panel-color: var( + --arrowpanel-color + ) !important; /* Original: var(--tab-selected-textcolor, var(--toolbar-color)) */ + } } /*= OS - Compatibility =======================================================*/ @supports -moz-bool-pref("userChrome.compatibility.os") { @@ -813,7 +822,7 @@ --mac-text-color: -moz-dialogtext; --mac-disabled-color: GrayText; --mac-bgcolor: Window; - --mac-selected-bgcolor: color-mix(in srgb, rgb(255, 255, 255) 15%, -moz-dialog); + --mac-selected-bgcolor: color-mix(in srgb, rgb(255, 255, 255) 15%, Field); --mac-field-bgcolor: Window; --mac-panel-bgcolor: Menu; --mac-sidebar-bgcolor: Window; @@ -4152,6 +4161,7 @@ max-width: var(--tab-max-width) !important; /* Original: 225px */ } /* neighbouring tabs should "pinch" together */ + :root[customizing="true"] #tabbrowser-arrowscrollbox-periphery, #tabbrowser-tabs:not([hasadjacentnewtabbutton]):not([overflow="true"]) > #tabbrowser-arrowscrollbox > #tabbrowser-arrowscrollbox-periphery { @@ -6787,7 +6797,7 @@ margin-bottom: 0px !important; } .tab-content { - margin-top: var(--tab-block-margin); + margin-top: 0px; } .tab-stack { margin-top: 0px !important; @@ -6810,6 +6820,16 @@ /* Temporary solution for compatibility #513 */ overflow-y: clip; } + /* Border top #889 */ + #nav-bar { + border-top: none !important; + box-shadow: 0 -0.01px 0 ThreeDShadow; + } + @media (-moz-gtk-csd-available) { + :root:is(:not([lwtheme]), :not(:-moz-lwtheme)) #nav-bar { + box-shadow: 0 -0.01px 0 ThreeDShadow; + } + } } /*= Selected Tab =============================================================*/ /*= Selected Tab - Bold ======================================================*/ @@ -8428,15 +8448,22 @@ transform: translate(var(--uc-container-position-x), var(--uc-container-position-y)); /* Shape */ border-bottom: 2px solid var(--identity-icon-color); - width: 25%; + width: calc(100% - 30px); opacity: 0.75; } - .tabbrowser-tab[visuallyselected]:not([pinned]) .tab-content::before { - width: calc(100% - 30px); + .tabbrowser-tab[visuallyselected] .tab-content::before { opacity: 1; } - #tabbrowser-tabs[closebuttons="activetab"] .tabbrowser-tab[visuallyselected]:not([pinned]) .tab-content::before { - width: calc(100% - 33px); + @supports not -moz-bool-pref("userChrome.tab.container.always_long") { + .tab-content::before { + width: 25%; + } + .tabbrowser-tab[visuallyselected]:not([pinned]) .tab-content::before { + width: calc(100% - 30px); + } + #tabbrowser-tabs[closebuttons="activetab"] .tabbrowser-tab[visuallyselected]:not([pinned]) .tab-content::before { + width: calc(100% - 33px); + } } /* Animate */ @media (prefers-reduced-motion: no-preference) { @@ -8456,7 +8483,10 @@ } } @supports not -moz-bool-pref("userChrome.tab.container.on_top") { - .tab-content[titlechanged]::before { + .tabbrowser-tab:is([image], [pinned])[usercontextid] + > .tab-stack + > .tab-content[attention]:not([selected])::before, + .tabbrowser-tab[usercontextid] > .tab-stack > .tab-content[pinned][titlechanged]:not([selected])::before { opacity: 0; } /* Pinned Tab - Titlechanged Indicator override */ @@ -10718,6 +10748,8 @@ --uc-tab-copy-icon: url("../icons/tab-copy.svg"); --uc-tab-unload-icon: url("../icons/tab-unload.svg"); --uc-tab-multiple-icon: url("../icons/tab-desktop-multiple.svg"); + --uc-tab-close-icon: url("../icons/close-tab.svg"); + --uc-tab-close-duplicate-icon: url("../icons/close-duplicate-tabs.svg"); --uc-new-tab-icon: url("../icons/new-tab.svg"); --uc-new-tab-forward-icon: url("../icons/new-tab-forward.svg"); --uc-new-tab-skip-forward-icon: url("../icons/new-tab-skip-forward.svg"); @@ -10736,6 +10768,8 @@ --uc-tab-copy-icon: url("../icons/tab-copy-photon.svg"); --uc-tab-unload-icon: url("../icons/tab-unload-photon.svg"); --uc-tab-multiple-icon: url("../icons/tab-multiple.svg"); + --uc-tab-close-icon: url("../icons/close-tab-photon.svg"); + --uc-tab-close-duplicate-icon: url("../icons/close-duplicate-tabs-photon.svg"); --uc-new-tab-icon: url("../icons/new-tab-photon.svg"); --uc-new-tab-forward-icon: url("../icons/new-tab-forward-photon.svg"); --uc-new-tab-skip-forward-icon: url("../icons/new-tab-skip-forward-photon.svg"); @@ -10964,6 +10998,11 @@ > .toolbarbutton-text { padding-inline-start: 0 !important; } + #panelMenu_bookmarksMenu .subviewbutton[disabled="true"], + #appMenu_historyMenu .subviewbutton[disabled="true"] { + margin-inline-start: 0 !important; + 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; @@ -11033,8 +11072,13 @@ order: -1 !important; -moz-box-ordinal-group: 0 !important; } + #appMenu-addon-banners > .addon-banner-item > .toolbarbutton-icon { + display: inline-flex !important; + } + #appMenu-update-banner::before, #appMenu-proton-update-banner::before { content: url("../icons/whatsnew.svg"); + margin-inline-end: 0px !important; } #appMenu-fxa-status2::before { /* Don't exist img tag */ @@ -11219,6 +11263,13 @@ #PanelUI-fxa-menu-setup-sync-button { list-style-image: url("chrome://browser/skin/sync.svg"); } + @media (prefers-reduced-motion: reduce) { + #PanelUI-fxa-menu-syncnow-button[syncstatus="active"] > .toolbarbutton-icon, + #PanelUI-remotetabs-syncnow[syncstatus="active"] > .toolbarbutton-icon, + .syncNowBtn[syncstatus="active"] { + list-style-image: url("chrome://browser/skin/tabbrowser/hourglass.svg") !important; + } + } #PanelUI-fxa-menu-connect-device-button { list-style-image: url("../icons/add-device.svg"); } @@ -11261,6 +11312,9 @@ margin: var(--panel-separator-margin); padding: 0; } + #PanelUI-signedin-panel[hidden="true"] + #PanelUI-fxa-cta-menu #PanelUI-products-separator { + display: none; + } #PanelUI-fxa-menu > :first-child { order: -1; -moz-box-ordinal-group: 0; @@ -11430,6 +11484,9 @@ #allTabsMenu-searchTabs { list-style-image: url("chrome://global/skin/icons/search-glass.svg"); } + #allTabsMenu-closeDuplicateTabs { + list-style-image: var(--uc-tab-close-duplicate-icon); + } #allTabsMenu-containerTabsButton { list-style-image: url("../icons/container-openin-16.svg"); } @@ -12172,6 +12229,11 @@ #sidebartabs_asamuzak_jp-menuitem-_closeTab { --menuitem-image: url("chrome://global/skin/icons/close.svg"); } + @supports -moz-bool-pref("userChrome.icon.menu.full") { + #context_closeDuplicateTabs { + --menuitem-image: var(--uc-tab-close-duplicate-icon); + } + } @supports -moz-bool-pref("userChrome.icon.menu.full") { #context_closeTabOptions, #treestyletab_piro_sakura_ne_jp-menuitem-_context_closeMultipleTabs, @@ -12507,6 +12569,9 @@ #context-pdfjs-selectall { --menuitem-image: url("../icons/select-all-on.svg"); } + #context-pdfjs-highlight-selection { + --menuitem-image: url("../icons/toolbarButton-editorHighlight.svg"); + } #context-reveal-password { --menuitem-image: url("../icons/eye-show.svg"); } @@ -12523,6 +12588,9 @@ #context-searchselect-private { --menuitem-image: url("chrome://global/skin/icons/search-glass.svg"); } + #context-translate-selection { + --menuitem-image: url("../icons/translations.svg"); + } #frame { --menuitem-image: url("../icons/command-frames.svg"); } @@ -12973,6 +13041,12 @@ .unified-extensions-context-menu-pin-to-toolbar { --menuitem-image: url("../icons/pin-tab.svg"); } + .unified-extensions-context-menu-move-widget-up { + --menuitem-image: url("chrome://global/skin/icons/arrow-up.svg"); + } + .unified-extensions-context-menu-move-widget-down { + --menuitem-image: url("chrome://global/skin/icons/arrow-down.svg"); + } .unified-extensions-context-menu-manage-extension { --menuitem-image: url("chrome://global/skin/icons/settings.svg"); } @@ -12989,6 +13063,20 @@ .urlbarView-result-menuitem[data-command="help"] { --menuitem-image: url("chrome://global/skin/icons/info.svg"); } + /*= full-page-translations-panel-settings-menupopup ==========================*/ + .manage-languages-menuitem { + --menuitem-image: url("chrome://global/skin/icons/settings.svg"); + } + #full-page-translations-panel-settings-menupopup > menuitem[data-l10n-id="translations-panel-settings-about2"] { + --menuitem-image: url("chrome://global/skin/icons/info.svg"); + } + /*= select-translations-panel-settings-menupopup =============================*/ + #select-translations-panel-open-settings-page-menuitem { + --menuitem-image: url("chrome://global/skin/icons/settings.svg"); + } + #select-translations-panel-about-translations-menuitem { + --menuitem-image: url("chrome://global/skin/icons/info.svg"); + } } @supports -moz-bool-pref("userChrome.icon.global_menubar") { /*= main-menubar =============================================================*/ @@ -13035,6 +13123,14 @@ #menu_openFile { --menuitem-image: url("../icons/toolbarButton-upload.svg"); } + #menu_close { + --menuitem-image: var(--uc-tab-close-icon); + } + @supports -moz-bool-pref("userChrome.icon.menu.full") { + #menu_closeWindow { + --menuitem-image: url("../icons/close-window.svg"); + } + } #menu_savePage { --menuitem-image: url("../icons/toolbarButton-download.svg"); } @@ -13088,6 +13184,11 @@ #menu_find { --menuitem-image: url("chrome://global/skin/icons/search-glass.svg"); } + @supports -moz-bool-pref("userChrome.icon.menu.full") { + #menu_findAgain { + --menuitem-image: url("../icons/find-again.svg"); + } + } #menu_preferences { --menuitem-image: url("chrome://global/skin/icons/settings.svg"); } @@ -13215,7 +13316,7 @@ --menuitem-image: url("chrome://browser/skin/sync.svg"); } #menu_openFirefoxView { - --menuitem-image: url("chrome://branding/content/icon32.png"); + --menuitem-image: url("../icons/firefox-view.svg"); } #webDeveloperMenu, #browserToolsMenu { @@ -13372,6 +13473,15 @@ #translations-button-icon { list-style-image: url("../icons/translations.svg") !important; } + .tabbrowser-tab:is([image="chrome://global/skin/icons/performance.svg"], + [image="chrome://devtools/skin/images/tool-profiler.svg"]) .tab-icon-image + { + content: url("../icons/performance.svg") !important; + } + .tabbrowser-tab:is([image="chrome://global/skin/icons/developer.svg"]) .tab-icon-image + { + content: url("../icons/developer.svg") !important; + } } /** Icons for fork browsers ***************************************************/ /*= Waterfox =================================================================*/ @@ -13572,6 +13682,7 @@ /*= Menubar rounding #814 ====================================================*/ /*= Infobar Align #858 =======================================================*/ /*= Inactive transparent #882 ================================================*/ + /*= Tabpreviw transparent #890 ===============================================*/ } @media (-moz-bool-pref: "userChrome.compatibility.theme") and (-moz-bool-pref: "userChrome.tab.connect_to_window") { /* TARGET: original, photon */ @@ -13703,6 +13814,16 @@ fill-opacity: var(--inactive-toolbarbutton-icon-fill-opacity, 1); } } +@media (-moz-bool-pref: "userChrome.compatibility.theme") { + #tab-preview-panel { + --panel-background: var( + --arrowpanel-background + ) !important; /* Original: var(--tab-selected-bgcolor, var(--toolbar-bgcolor)) */ + --panel-color: var( + --arrowpanel-color + ) !important; /* Original: var(--tab-selected-textcolor, var(--toolbar-color)) */ + } +} /*= OS - Compatibility =======================================================*/ @media (-moz-bool-pref: "userChrome.compatibility.os") { /*= Windows 10 - Top border of accent color at ESR #358 ======================*/ @@ -14322,7 +14443,7 @@ --mac-text-color: -moz-dialogtext; --mac-disabled-color: GrayText; --mac-bgcolor: Window; - --mac-selected-bgcolor: color-mix(in srgb, rgb(255, 255, 255) 15%, -moz-dialog); + --mac-selected-bgcolor: color-mix(in srgb, rgb(255, 255, 255) 15%, Field); --mac-field-bgcolor: Window; --mac-panel-bgcolor: Menu; --mac-sidebar-bgcolor: Window; @@ -17817,6 +17938,7 @@ } } @media (-moz-bool-pref: "userChrome.padding.tabbar_width") { + :root[customizing="true"] #tabbrowser-arrowscrollbox-periphery, #tabbrowser-tabs:not([hasadjacentnewtabbutton]):not([overflow="true"]) > #tabbrowser-arrowscrollbox > #tabbrowser-arrowscrollbox-periphery { @@ -20875,7 +20997,7 @@ margin-bottom: 0px !important; } .tab-content { - margin-top: var(--tab-block-margin); + margin-top: 0px; } .tab-stack { margin-top: 0px !important; @@ -20886,6 +21008,7 @@ z-index: 1 !important; } /* Pinned Tab - tabbrowser-arrowscrollbox overflowing */ + /* Border top #889 */ } @media (-moz-bool-pref: "userChrome.tab.connect_to_window") and (not (-moz-bool-pref: "userChrome.tabbar.multi_row")) { #TabsToolbar:not([multibar]) { @@ -20901,6 +21024,17 @@ overflow-y: clip; } } +@media (-moz-bool-pref: "userChrome.tab.connect_to_window") { + #nav-bar { + border-top: none !important; + box-shadow: 0 -0.01px 0 ThreeDShadow; + } +} +@media (-moz-bool-pref: "userChrome.tab.connect_to_window") and (-moz-gtk-csd-available) { + :root:is(:not([lwtheme]), :not(:-moz-lwtheme)) #nav-bar { + box-shadow: 0 -0.01px 0 ThreeDShadow; + } +} /*= Selected Tab =============================================================*/ /*= Selected Tab - Bold ======================================================*/ @media not (-moz-bool-pref: "userChrome.tab.selected_bold") { @@ -22685,17 +22819,22 @@ transform: translate(var(--uc-container-position-x), var(--uc-container-position-y)); /* Shape */ border-bottom: 2px solid var(--identity-icon-color); - width: 25%; + width: calc(100% - 30px); opacity: 0.75; } } @media (-moz-bool-pref: "userChrome.tab.container") and (not (-moz-bool-pref: "userChrome.tabbar.as_titlebar")) { - .tabbrowser-tab[visuallyselected]:not([pinned]) .tab-content::before { - width: calc(100% - 30px); + .tabbrowser-tab[visuallyselected] .tab-content::before { opacity: 1; } } -@media (-moz-bool-pref: "userChrome.tab.container") and (not (-moz-bool-pref: "userChrome.tabbar.as_titlebar")) { +@media (-moz-bool-pref: "userChrome.tab.container") and (not (-moz-bool-pref: "userChrome.tabbar.as_titlebar")) and (not (-moz-bool-pref: "userChrome.tab.container.always_long")) { + .tab-content::before { + width: 25%; + } + .tabbrowser-tab[visuallyselected]:not([pinned]) .tab-content::before { + width: calc(100% - 30px); + } #tabbrowser-tabs[closebuttons="activetab"] .tabbrowser-tab[visuallyselected]:not([pinned]) .tab-content::before { width: calc(100% - 33px); } @@ -22718,7 +22857,8 @@ } } @media (-moz-bool-pref: "userChrome.tab.container") and (not (-moz-bool-pref: "userChrome.tabbar.as_titlebar")) and (not (-moz-bool-pref: "userChrome.tab.container.on_top")) { - .tab-content[titlechanged]::before { + .tabbrowser-tab:is([image], [pinned])[usercontextid] > .tab-stack > .tab-content[attention]:not([selected])::before, + .tabbrowser-tab[usercontextid] > .tab-stack > .tab-content[pinned][titlechanged]:not([selected])::before { opacity: 0; } /* Pinned Tab - Titlechanged Indicator override */ @@ -25256,6 +25396,8 @@ --uc-tab-copy-icon: url("../icons/tab-copy.svg"); --uc-tab-unload-icon: url("../icons/tab-unload.svg"); --uc-tab-multiple-icon: url("../icons/tab-desktop-multiple.svg"); + --uc-tab-close-icon: url("../icons/close-tab.svg"); + --uc-tab-close-duplicate-icon: url("../icons/close-duplicate-tabs.svg"); --uc-new-tab-icon: url("../icons/new-tab.svg"); --uc-new-tab-forward-icon: url("../icons/new-tab-forward.svg"); --uc-new-tab-skip-forward-icon: url("../icons/new-tab-skip-forward.svg"); @@ -25283,6 +25425,8 @@ --uc-tab-copy-icon: url("../icons/tab-copy-photon.svg"); --uc-tab-unload-icon: url("../icons/tab-unload-photon.svg"); --uc-tab-multiple-icon: url("../icons/tab-multiple.svg"); + --uc-tab-close-icon: url("../icons/close-tab-photon.svg"); + --uc-tab-close-duplicate-icon: url("../icons/close-duplicate-tabs-photon.svg"); --uc-new-tab-icon: url("../icons/new-tab-photon.svg"); --uc-new-tab-forward-icon: url("../icons/new-tab-forward-photon.svg"); --uc-new-tab-skip-forward-icon: url("../icons/new-tab-skip-forward-photon.svg"); @@ -25551,6 +25695,13 @@ padding-inline-start: 0 !important; } } +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") { + #panelMenu_bookmarksMenu .subviewbutton[disabled="true"], + #appMenu_historyMenu .subviewbutton[disabled="true"] { + margin-inline-start: 0 !important; + padding-inline-start: 0 !important; + } +} @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") { #panelMenu_bookmarksMenu .subviewbutton[disabled="true"] .toolbarbutton-text, #appMenu_historyMenu .subviewbutton[disabled="true"] .toolbarbutton-text { @@ -25645,8 +25796,15 @@ } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") { + #appMenu-addon-banners > .addon-banner-item > .toolbarbutton-icon { + display: inline-flex !important; + } +} +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") { + #appMenu-update-banner::before, #appMenu-proton-update-banner::before { content: url("../icons/whatsnew.svg"); + margin-inline-end: 0px !important; } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") { @@ -25883,6 +26041,13 @@ list-style-image: url("chrome://browser/skin/sync.svg"); } } +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") and (prefers-reduced-motion: reduce) { + #PanelUI-fxa-menu-syncnow-button[syncstatus="active"] > .toolbarbutton-icon, + #PanelUI-remotetabs-syncnow[syncstatus="active"] > .toolbarbutton-icon, + .syncNowBtn[syncstatus="active"] { + list-style-image: url("chrome://browser/skin/tabbrowser/hourglass.svg") !important; + } +} @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") { #PanelUI-fxa-menu-connect-device-button { list-style-image: url("../icons/add-device.svg"); @@ -25938,6 +26103,11 @@ padding: 0; } } +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") { + #PanelUI-signedin-panel[hidden="true"] + #PanelUI-fxa-cta-menu #PanelUI-products-separator { + display: none; + } +} @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") { #PanelUI-fxa-menu > :first-child { order: -1; @@ -26179,6 +26349,11 @@ list-style-image: url("chrome://global/skin/icons/search-glass.svg"); } } +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") { + #allTabsMenu-closeDuplicateTabs { + list-style-image: var(--uc-tab-close-duplicate-icon); + } +} @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") { #allTabsMenu-containerTabsButton { list-style-image: url("../icons/container-openin-16.svg"); @@ -26958,6 +27133,8 @@ /*= context_sendTabToDevicePopupMenu =========================================*/ /*= unified-extensions-context-menu ==========================================*/ /*= urlbarView-result-menu ===================================================*/ + /*= full-page-translations-panel-settings-menupopup ==========================*/ + /*= select-translations-panel-settings-menupopup =============================*/ } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") and (-moz-bool-pref: "userChrome.icon.menu.full") { #context_shareTabURL, @@ -26991,6 +27168,11 @@ --menuitem-image: url("chrome://global/skin/icons/close.svg"); } } +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") and (-moz-bool-pref: "userChrome.icon.menu.full") { + #context_closeDuplicateTabs { + --menuitem-image: var(--uc-tab-close-duplicate-icon); + } +} @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") and (-moz-bool-pref: "userChrome.icon.menu.full") { #context_closeTabOptions, #treestyletab_piro_sakura_ne_jp-menuitem-_context_closeMultipleTabs, @@ -27492,6 +27674,11 @@ --menuitem-image: url("../icons/select-all-on.svg"); } } +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { + #context-pdfjs-highlight-selection { + --menuitem-image: url("../icons/toolbarButton-editorHighlight.svg"); + } +} @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { #context-reveal-password { --menuitem-image: url("../icons/eye-show.svg"); @@ -27518,6 +27705,11 @@ --menuitem-image: url("chrome://global/skin/icons/search-glass.svg"); } } +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { + #context-translate-selection { + --menuitem-image: url("../icons/translations.svg"); + } +} @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { #frame { --menuitem-image: url("../icons/command-frames.svg"); @@ -28175,6 +28367,16 @@ --menuitem-image: url("../icons/pin-tab.svg"); } } +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { + .unified-extensions-context-menu-move-widget-up { + --menuitem-image: url("chrome://global/skin/icons/arrow-up.svg"); + } +} +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { + .unified-extensions-context-menu-move-widget-down { + --menuitem-image: url("chrome://global/skin/icons/arrow-down.svg"); + } +} @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { .unified-extensions-context-menu-manage-extension { --menuitem-image: url("chrome://global/skin/icons/settings.svg"); @@ -28198,6 +28400,26 @@ --menuitem-image: url("chrome://global/skin/icons/info.svg"); } } +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { + .manage-languages-menuitem { + --menuitem-image: url("chrome://global/skin/icons/settings.svg"); + } +} +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { + #full-page-translations-panel-settings-menupopup > menuitem[data-l10n-id="translations-panel-settings-about2"] { + --menuitem-image: url("chrome://global/skin/icons/info.svg"); + } +} +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { + #select-translations-panel-open-settings-page-menuitem { + --menuitem-image: url("chrome://global/skin/icons/settings.svg"); + } +} +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { + #select-translations-panel-about-translations-menuitem { + --menuitem-image: url("chrome://global/skin/icons/info.svg"); + } +} @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menubar") { /*= main-menubar =============================================================*/ #file-menu { @@ -28243,36 +28465,11 @@ #menu_openFile { --menuitem-image: url("../icons/toolbarButton-upload.svg"); } - #menu_savePage { - --menuitem-image: url("../icons/toolbarButton-download.svg"); - } - #menu_sendLink { - --menuitem-image: url("../icons/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"); + #menu_close { + --menuitem-image: var(--uc-tab-close-icon); } /* 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"); - } /*= menu_viewPopup ===========================================================*/ /* view-menu-popup sub menu */ /* viewSidebarMenu sub menu */ @@ -28285,6 +28482,57 @@ /*= windowPopup ==============================================================*/ /*= menu_HelpPopup ===========================================================*/ } +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") and (-moz-bool-pref: "userChrome.icon.menu.full") { + #menu_closeWindow { + --menuitem-image: url("../icons/close-window.svg"); + } +} +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") { + #menu_savePage { + --menuitem-image: url("../icons/toolbarButton-download.svg"); + } +} +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") { + #menu_sendLink { + --menuitem-image: url("../icons/mail.svg"); + } +} +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") { + menu.share-tab-url-item { + --menuitem-image: url("chrome://browser/skin/share.svg"); + } +} +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") { + #menu_print { + --menuitem-image: url("chrome://global/skin/icons/print.svg"); + } +} +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") { + #menu_importFromAnotherBrowser { + --menuitem-image: url("chrome://browser/skin/import.svg"); + } +} +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") { + #goOfflineMenuitem { + /* checkbox */ + --menuitem-image: url("../icons/plug-disconnected.svg"); + } +} +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") { + #menu_FileQuitItem { + --menuitem-image: url("../icons/quit.svg"); + } +} +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") { + #menu_newUserContext menupopup menuitem:last-child { + --menuitem-image: url("chrome://global/skin/icons/settings.svg"); + } +} +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") { + #menu_undo { + --menuitem-image: url("../icons/undo.svg"); + } +} @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") and (-moz-bool-pref: "userChrome.icon.menu.full") { #menu_redo { --menuitem-image: url("../icons/redo.svg"); @@ -28320,6 +28568,11 @@ --menuitem-image: url("chrome://global/skin/icons/search-glass.svg"); } } +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") and (-moz-bool-pref: "userChrome.icon.menu.full") { + #menu_findAgain { + --menuitem-image: url("../icons/find-again.svg"); + } +} @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") { #menu_preferences { --menuitem-image: url("chrome://global/skin/icons/settings.svg"); @@ -28516,7 +28769,7 @@ } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") { #menu_openFirefoxView { - --menuitem-image: url("chrome://branding/content/icon32.png"); + --menuitem-image: url("../icons/firefox-view.svg"); } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") { @@ -28738,6 +28991,15 @@ #translations-button-icon { list-style-image: url("../icons/translations.svg") !important; } + .tabbrowser-tab:is([image="chrome://global/skin/icons/performance.svg"], + [image="chrome://devtools/skin/images/tool-profiler.svg"]) .tab-icon-image + { + content: url("../icons/performance.svg") !important; + } + .tabbrowser-tab:is([image="chrome://global/skin/icons/developer.svg"]) .tab-icon-image + { + content: url("../icons/developer.svg") !important; + } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") { #appMenu-restart-button { diff --git a/css/leptonChromeESR.css b/css/leptonChromeESR.css index f2fe381..699c3e0 100644 --- a/css/leptonChromeESR.css +++ b/css/leptonChromeESR.css @@ -184,6 +184,15 @@ :root[tabsintitlebar] #titlebar:-moz-window-inactive .toolbarbutton-icon { fill-opacity: var(--inactive-toolbarbutton-icon-fill-opacity, 1); } + /*= Tabpreviw transparent #890 ===============================================*/ + #tab-preview-panel { + --panel-background: var( + --arrowpanel-background + ) !important; /* Original: var(--tab-selected-bgcolor, var(--toolbar-bgcolor)) */ + --panel-color: var( + --arrowpanel-color + ) !important; /* Original: var(--tab-selected-textcolor, var(--toolbar-color)) */ + } } /*= OS - Compatibility =======================================================*/ @supports -moz-bool-pref("userChrome.compatibility.os") { @@ -1035,7 +1044,7 @@ --mac-text-color: -moz-dialogtext; --mac-disabled-color: GrayText; --mac-bgcolor: Window; - --mac-selected-bgcolor: color-mix(in srgb, rgb(255, 255, 255) 15%, -moz-dialog); + --mac-selected-bgcolor: color-mix(in srgb, rgb(255, 255, 255) 15%, Field); --mac-field-bgcolor: Window; --mac-panel-bgcolor: Menu; --mac-sidebar-bgcolor: -moz-mac-source-list; @@ -4475,6 +4484,7 @@ max-width: var(--tab-max-width) !important; /* Original: 225px */ } /* neighbouring tabs should "pinch" together */ + :root[customizing="true"] #tabbrowser-arrowscrollbox-periphery, #tabbrowser-tabs:not([hasadjacentnewtabbutton]):not([overflow="true"]) > #tabbrowser-arrowscrollbox > #tabbrowser-arrowscrollbox-periphery { @@ -7217,7 +7227,7 @@ margin-bottom: 0px !important; } .tab-content { - margin-top: var(--tab-block-margin); + margin-top: 0px; } .tab-stack { margin-top: 0px !important; @@ -7240,6 +7250,16 @@ /* Temporary solution for compatibility #513 */ overflow-y: clip; } + /* Border top #889 */ + #nav-bar { + border-top: none !important; + box-shadow: 0 -0.01px 0 ThreeDShadow; + } + @media (-moz-gtk-csd-available) { + :root:is(:not([lwtheme]), :not(:-moz-lwtheme)) #nav-bar { + box-shadow: 0 -0.01px 0 ThreeDShadow; + } + } } /*= Selected Tab =============================================================*/ /*= Selected Tab - Bold ======================================================*/ @@ -8858,15 +8878,22 @@ transform: translate(var(--uc-container-position-x), var(--uc-container-position-y)); /* Shape */ border-bottom: 2px solid var(--identity-icon-color); - width: 25%; + width: calc(100% - 30px); opacity: 0.75; } - .tabbrowser-tab[visuallyselected]:not([pinned]) .tab-content::before { - width: calc(100% - 30px); + .tabbrowser-tab[visuallyselected] .tab-content::before { opacity: 1; } - #tabbrowser-tabs[closebuttons="activetab"] .tabbrowser-tab[visuallyselected]:not([pinned]) .tab-content::before { - width: calc(100% - 33px); + @supports not -moz-bool-pref("userChrome.tab.container.always_long") { + .tab-content::before { + width: 25%; + } + .tabbrowser-tab[visuallyselected]:not([pinned]) .tab-content::before { + width: calc(100% - 30px); + } + #tabbrowser-tabs[closebuttons="activetab"] .tabbrowser-tab[visuallyselected]:not([pinned]) .tab-content::before { + width: calc(100% - 33px); + } } /* Animate */ @media (prefers-reduced-motion: no-preference) { @@ -8886,7 +8913,10 @@ } } @supports not -moz-bool-pref("userChrome.tab.container.on_top") { - .tab-content[titlechanged]::before { + .tabbrowser-tab:is([image], [pinned])[usercontextid] + > .tab-stack + > .tab-content[attention]:not([selected])::before, + .tabbrowser-tab[usercontextid] > .tab-stack > .tab-content[pinned][titlechanged]:not([selected])::before { opacity: 0; } /* Pinned Tab - Titlechanged Indicator override */ @@ -11156,6 +11186,8 @@ --uc-tab-copy-icon: url("../icons/tab-copy.svg"); --uc-tab-unload-icon: url("../icons/tab-unload.svg"); --uc-tab-multiple-icon: url("../icons/tab-desktop-multiple.svg"); + --uc-tab-close-icon: url("../icons/close-tab.svg"); + --uc-tab-close-duplicate-icon: url("../icons/close-duplicate-tabs.svg"); --uc-new-tab-icon: url("../icons/new-tab.svg"); --uc-new-tab-forward-icon: url("../icons/new-tab-forward.svg"); --uc-new-tab-skip-forward-icon: url("../icons/new-tab-skip-forward.svg"); @@ -11174,6 +11206,8 @@ --uc-tab-copy-icon: url("../icons/tab-copy-photon.svg"); --uc-tab-unload-icon: url("../icons/tab-unload-photon.svg"); --uc-tab-multiple-icon: url("../icons/tab-multiple.svg"); + --uc-tab-close-icon: url("../icons/close-tab-photon.svg"); + --uc-tab-close-duplicate-icon: url("../icons/close-duplicate-tabs-photon.svg"); --uc-new-tab-icon: url("../icons/new-tab-photon.svg"); --uc-new-tab-forward-icon: url("../icons/new-tab-forward-photon.svg"); --uc-new-tab-skip-forward-icon: url("../icons/new-tab-skip-forward-photon.svg"); @@ -11402,6 +11436,11 @@ > .toolbarbutton-text { padding-inline-start: 0 !important; } + #panelMenu_bookmarksMenu .subviewbutton[disabled="true"], + #appMenu_historyMenu .subviewbutton[disabled="true"] { + margin-inline-start: 0 !important; + 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; @@ -11471,8 +11510,13 @@ order: -1 !important; -moz-box-ordinal-group: 0 !important; } + #appMenu-addon-banners > .addon-banner-item > .toolbarbutton-icon { + display: inline-flex !important; + } + #appMenu-update-banner::before, #appMenu-proton-update-banner::before { content: url("../icons/whatsnew.svg"); + margin-inline-end: 0px !important; } #appMenu-fxa-status2::before { /* Don't exist img tag */ @@ -11657,6 +11701,13 @@ #PanelUI-fxa-menu-setup-sync-button { list-style-image: url("chrome://browser/skin/sync.svg"); } + @media (prefers-reduced-motion: reduce) { + #PanelUI-fxa-menu-syncnow-button[syncstatus="active"] > .toolbarbutton-icon, + #PanelUI-remotetabs-syncnow[syncstatus="active"] > .toolbarbutton-icon, + .syncNowBtn[syncstatus="active"] { + list-style-image: url("chrome://browser/skin/tabbrowser/hourglass.svg") !important; + } + } #PanelUI-fxa-menu-connect-device-button { list-style-image: url("../icons/add-device.svg"); } @@ -11699,6 +11750,9 @@ margin: var(--panel-separator-margin); padding: 0; } + #PanelUI-signedin-panel[hidden="true"] + #PanelUI-fxa-cta-menu #PanelUI-products-separator { + display: none; + } #PanelUI-fxa-menu > :first-child { order: -1; -moz-box-ordinal-group: 0; @@ -11868,6 +11922,9 @@ #allTabsMenu-searchTabs { list-style-image: url("chrome://global/skin/icons/search-glass.svg"); } + #allTabsMenu-closeDuplicateTabs { + list-style-image: var(--uc-tab-close-duplicate-icon); + } #allTabsMenu-containerTabsButton { list-style-image: url("../icons/container-openin-16.svg"); } @@ -12800,6 +12857,11 @@ #sidebartabs_asamuzak_jp-menuitem-_closeTab { --menuitem-image: url("chrome://global/skin/icons/close.svg"); } + @supports -moz-bool-pref("userChrome.icon.menu.full") { + #context_closeDuplicateTabs { + --menuitem-image: var(--uc-tab-close-duplicate-icon); + } + } @supports -moz-bool-pref("userChrome.icon.menu.full") { #context_closeTabOptions, #treestyletab_piro_sakura_ne_jp-menuitem-_context_closeMultipleTabs, @@ -13138,6 +13200,9 @@ #context-pdfjs-selectall { --menuitem-image: url("../icons/select-all-on.svg"); } + #context-pdfjs-highlight-selection { + --menuitem-image: url("../icons/toolbarButton-editorHighlight.svg"); + } #context-reveal-password { --menuitem-image: url("../icons/eye-show.svg"); } @@ -13154,6 +13219,9 @@ #context-searchselect-private { --menuitem-image: url("chrome://global/skin/icons/search-glass.svg"); } + #context-translate-selection { + --menuitem-image: url("../icons/translations.svg"); + } #frame { --menuitem-image: url("../icons/command-frames.svg"); } @@ -13604,6 +13672,12 @@ .unified-extensions-context-menu-pin-to-toolbar { --menuitem-image: url("../icons/pin-tab.svg"); } + .unified-extensions-context-menu-move-widget-up { + --menuitem-image: url("chrome://global/skin/icons/arrow-up.svg"); + } + .unified-extensions-context-menu-move-widget-down { + --menuitem-image: url("chrome://global/skin/icons/arrow-down.svg"); + } .unified-extensions-context-menu-manage-extension { --menuitem-image: url("chrome://global/skin/icons/settings.svg"); } @@ -13620,6 +13694,20 @@ .urlbarView-result-menuitem[data-command="help"] { --menuitem-image: url("chrome://global/skin/icons/info.svg"); } + /*= full-page-translations-panel-settings-menupopup ==========================*/ + .manage-languages-menuitem { + --menuitem-image: url("chrome://global/skin/icons/settings.svg"); + } + #full-page-translations-panel-settings-menupopup > menuitem[data-l10n-id="translations-panel-settings-about2"] { + --menuitem-image: url("chrome://global/skin/icons/info.svg"); + } + /*= select-translations-panel-settings-menupopup =============================*/ + #select-translations-panel-open-settings-page-menuitem { + --menuitem-image: url("chrome://global/skin/icons/settings.svg"); + } + #select-translations-panel-about-translations-menuitem { + --menuitem-image: url("chrome://global/skin/icons/info.svg"); + } } @supports -moz-bool-pref("userChrome.icon.global_menubar") { /*= main-menubar =============================================================*/ @@ -13666,6 +13754,14 @@ #menu_openFile { --menuitem-image: url("../icons/toolbarButton-upload.svg"); } + #menu_close { + --menuitem-image: var(--uc-tab-close-icon); + } + @supports -moz-bool-pref("userChrome.icon.menu.full") { + #menu_closeWindow { + --menuitem-image: url("../icons/close-window.svg"); + } + } #menu_savePage { --menuitem-image: url("../icons/toolbarButton-download.svg"); } @@ -13719,6 +13815,11 @@ #menu_find { --menuitem-image: url("chrome://global/skin/icons/search-glass.svg"); } + @supports -moz-bool-pref("userChrome.icon.menu.full") { + #menu_findAgain { + --menuitem-image: url("../icons/find-again.svg"); + } + } #menu_preferences { --menuitem-image: url("chrome://global/skin/icons/settings.svg"); } @@ -13846,7 +13947,7 @@ --menuitem-image: url("chrome://browser/skin/sync.svg"); } #menu_openFirefoxView { - --menuitem-image: url("chrome://branding/content/icon32.png"); + --menuitem-image: url("../icons/firefox-view.svg"); } #webDeveloperMenu, #browserToolsMenu { @@ -14003,6 +14104,15 @@ #translations-button-icon { list-style-image: url("../icons/translations.svg") !important; } + .tabbrowser-tab:is([image="chrome://global/skin/icons/performance.svg"], + [image="chrome://devtools/skin/images/tool-profiler.svg"]) .tab-icon-image + { + content: url("../icons/performance.svg") !important; + } + .tabbrowser-tab:is([image="chrome://global/skin/icons/developer.svg"]) .tab-icon-image + { + content: url("../icons/developer.svg") !important; + } } /** Icons for fork browsers ***************************************************/ /*= Waterfox =================================================================*/ diff --git a/css/leptonContent.css b/css/leptonContent.css index 37a2458..7e5a57a 100644 --- a/css/leptonContent.css +++ b/css/leptonContent.css @@ -12,6 +12,14 @@ min-height: 27px !important; padding-inline-start: 35px !important; } + .translations-manage-language:first-child { + padding-block: 4px !important; + margin-bottom: 4px !important; + } + .translations-manage-language button { + min-height: var(--size-item-medium, 28px) !important; + max-height: var(--size-item-medium, 28px) !important; + } #firefoxExperimentalCategory:not([hidden="true"]) { display: inline-block; } @@ -21,6 +29,9 @@ #firefoxExperimentalCategory > hbox { transform: translateY(5px); } + #firefoxExperimentalCategory .description-deemphasized { + display: none; + } #pane-experimental-featureGates > html|p[data-l10n-id="pane-experimental-description2"] { border-bottom: 1px solid var(--in-content-border-color); padding-bottom: 1.5em; @@ -31,6 +42,14 @@ box-sizing: content-box; padding: 0 !important; } + #categories { + padding-inline-end: 1px !important; /* Original: 4px */ + } +} +@-moz-document url-prefix("about:policies") { + #categories > .category { + box-sizing: border-box; + } } /** Video player **************************************************************/ /* Control Bar Size */ @@ -1007,6 +1026,7 @@ .MetadataCard-content a, .CollectionSort-label, .SearchResult-summary, + .SearchResult-note, .AddonMeta .MetadataCard-content a.AddonMeta-reviews-content-link, .AddonMeta .MetadataCard-title a.AddonMeta-reviews-content-link, .PermissionsCard-subhead--optional, @@ -1498,6 +1518,7 @@ --color-moz-inverse-bg: var(red) !important; --focus-shadow: 0 0 0 4px color-mix(in srgb, var(--in-content-primary-button-background) 30%, transparent), 0 0 0 2px var(--in-content-primary-button-background-active); + --color-dark-gray-10: var(--in-content-deemphasized-text) !important; } .warning { --color-link: rgb(55, 255, 255) !important; @@ -1606,7 +1627,9 @@ details .is-summary button::before, summary::before, .icon-button > button, - .search-button { + .search-button, + img:is(.pencil, .thumbsup, .syncing.icon), + #step-indicator li:not([status="done"])::before { filter: invert(95%) !important; } button.markup-toolbar-button { @@ -1671,6 +1694,7 @@ color: var(--in-content-page-color) !important; } #main-content.panel a, + .nav-active, .links a, .link-blue, .text-blue-500 { @@ -1715,6 +1739,7 @@ .input-text, header, .card, + .card-base, .bg-white:not(nav) { background: var(--in-content-box-background) !important; } @@ -1727,6 +1752,7 @@ .hover\:bg-grey-100:hover { background: var(--in-content-button-background-hover) !important; } + .nav-active, .text-blue-500 .cta-neutral, .text-blue-500 .bg-grey-50, .text-blue-500 .hover\:bg-grey-100 { @@ -1754,6 +1780,14 @@ footer a[data-testid="link-mozilla"] { filter: invert(95%) !important; } + div[data-testid="settings-connected-service"] + svg:is( + [data-testid="mobile-icon"], + [data-testid="desktop-icon"], + [data-testid="tablet-icon"], + [data-testid="vr-icon"], + [data-testid="addon-icon"] + ), header button svg, header .rounded svg, #service svg { @@ -1764,6 +1798,7 @@ filter: brightness(2) !important; } /* Others */ + .border-grey-100, .input-row input[type="email"], .input-row input[type="number"], .input-row input[type="password"], @@ -1772,6 +1807,7 @@ .unit-row-hr .border-grey-100 { border-color: var(--in-content-border-color) !important; } + .border-grey-100:hover, .input-row input[type="email"]:hover, .input-row input[type="number"]:hover, .input-row input[type="password"]:hover, @@ -2215,6 +2251,21 @@ background-color: var(--in-content-box-background-odd); } } + /*= about:processes ==========================================================*/ + @-moz-document url-prefix("about:processes") { + td.type.favicon[style*='background-image: url("chrome://global/skin/icons/link.svg");'] + { + background-image: url("../icons/link.svg") !important; + } + .profiler-icon { + background: url("../icons/performance.svg") no-repeat center !important; + } + } + @-moz-document url-prefix("about:profiling") { + .perf-intro-icon { + background-image: url("../icons/performance.svg") !important; + } + } /*= chrome://browser/content/places/places.xhtml =============================*/ @-moz-document url("chrome://browser/content/places/places.xhtml") { @@ -3633,6 +3684,14 @@ min-height: 27px !important; padding-inline-start: 35px !important; } + .translations-manage-language:first-child { + padding-block: 4px !important; + margin-bottom: 4px !important; + } + .translations-manage-language button { + min-height: var(--size-item-medium, 28px) !important; + max-height: var(--size-item-medium, 28px) !important; + } #firefoxExperimentalCategory:not([hidden="true"]) { display: inline-block; } @@ -3642,6 +3701,9 @@ #firefoxExperimentalCategory > hbox { transform: translateY(5px); } + #firefoxExperimentalCategory .description-deemphasized { + display: none; + } #pane-experimental-featureGates > html|p[data-l10n-id="pane-experimental-description2"] { border-bottom: 1px solid var(--in-content-border-color); padding-bottom: 1.5em; @@ -3652,6 +3714,14 @@ box-sizing: content-box; padding: 0 !important; } + #categories { + padding-inline-end: 1px !important; /* Original: 4px */ + } +} +@-moz-document url-prefix("about:policies") { + #categories > .category { + box-sizing: border-box; + } } /** Video player **************************************************************/ /* Control Bar Size */ @@ -4643,6 +4713,7 @@ .MetadataCard-content a, .CollectionSort-label, .SearchResult-summary, + .SearchResult-note, .AddonMeta .MetadataCard-content a.AddonMeta-reviews-content-link, .AddonMeta .MetadataCard-title a.AddonMeta-reviews-content-link, .PermissionsCard-subhead--optional, @@ -5134,6 +5205,7 @@ --color-moz-inverse-bg: var(red) !important; --focus-shadow: 0 0 0 4px color-mix(in srgb, var(--in-content-primary-button-background) 30%, transparent), 0 0 0 2px var(--in-content-primary-button-background-active); + --color-dark-gray-10: var(--in-content-deemphasized-text) !important; } .warning { --color-link: rgb(55, 255, 255) !important; @@ -5242,7 +5314,9 @@ details .is-summary button::before, summary::before, .icon-button > button, - .search-button { + .search-button, + img:is(.pencil, .thumbsup, .syncing.icon), + #step-indicator li:not([status="done"])::before { filter: invert(95%) !important; } button.markup-toolbar-button { @@ -5307,6 +5381,7 @@ color: var(--in-content-page-color) !important; } #main-content.panel a, + .nav-active, .links a, .link-blue, .text-blue-500 { @@ -5351,6 +5426,7 @@ .input-text, header, .card, + .card-base, .bg-white:not(nav) { background: var(--in-content-box-background) !important; } @@ -5363,6 +5439,7 @@ .hover\:bg-grey-100:hover { background: var(--in-content-button-background-hover) !important; } + .nav-active, .text-blue-500 .cta-neutral, .text-blue-500 .bg-grey-50, .text-blue-500 .hover\:bg-grey-100 { @@ -5390,6 +5467,14 @@ footer a[data-testid="link-mozilla"] { filter: invert(95%) !important; } + div[data-testid="settings-connected-service"] + svg:is( + [data-testid="mobile-icon"], + [data-testid="desktop-icon"], + [data-testid="tablet-icon"], + [data-testid="vr-icon"], + [data-testid="addon-icon"] + ), header button svg, header .rounded svg, #service svg { @@ -5400,6 +5485,7 @@ filter: brightness(2) !important; } /* Others */ + .border-grey-100, .input-row input[type="email"], .input-row input[type="number"], .input-row input[type="password"], @@ -5408,6 +5494,7 @@ .unit-row-hr .border-grey-100 { border-color: var(--in-content-border-color) !important; } + .border-grey-100:hover, .input-row input[type="email"]:hover, .input-row input[type="number"]:hover, .input-row input[type="password"]:hover, @@ -5698,6 +5785,7 @@ /*= about:checkerboard =======================================================*/ /*= about:memory =============================================================*/ /*= about:preferences ========================================================*/ + /*= about:processes ==========================================================*/ /*= chrome://browser/content/places/places.xhtml =============================*/ } @media (-moz-bool-pref: "userContent.page.proton") and (-moz-bool-pref: "userContent.page.field_border") and (prefers-reduced-motion: no-preference) { @@ -5861,6 +5949,24 @@ } } } +@media (-moz-bool-pref: "userContent.page.proton") { + @-moz-document url-prefix("about:processes") { + td.type.favicon[style*='background-image: url("chrome://global/skin/icons/link.svg");'] + { + background-image: url("../icons/link.svg") !important; + } + .profiler-icon { + background: url("../icons/performance.svg") no-repeat center !important; + } + } +} +@media (-moz-bool-pref: "userContent.page.proton") { + @-moz-document url-prefix("about:profiling") { + .perf-intro-icon { + background-image: url("../icons/performance.svg") !important; + } + } +} @media (-moz-bool-pref: "userContent.page.proton") { @-moz-document url("chrome://browser/content/places/places.xhtml") { diff --git a/css/leptonContentESR.css b/css/leptonContentESR.css index 1a6cebc..40ab7f0 100644 --- a/css/leptonContentESR.css +++ b/css/leptonContentESR.css @@ -12,6 +12,14 @@ min-height: 27px !important; padding-inline-start: 35px !important; } + .translations-manage-language:first-child { + padding-block: 4px !important; + margin-bottom: 4px !important; + } + .translations-manage-language button { + min-height: var(--size-item-medium, 28px) !important; + max-height: var(--size-item-medium, 28px) !important; + } #firefoxExperimentalCategory:not([hidden="true"]) { display: inline-block; } @@ -21,6 +29,9 @@ #firefoxExperimentalCategory > hbox { transform: translateY(5px); } + #firefoxExperimentalCategory .description-deemphasized { + display: none; + } #pane-experimental-featureGates > html|p[data-l10n-id="pane-experimental-description2"] { border-bottom: 1px solid var(--in-content-border-color); padding-bottom: 1.5em; @@ -31,6 +42,14 @@ box-sizing: content-box; padding: 0 !important; } + #categories { + padding-inline-end: 1px !important; /* Original: 4px */ + } +} +@-moz-document url-prefix("about:policies") { + #categories > .category { + box-sizing: border-box; + } } /** Video player **************************************************************/ /* Control Bar Size */ @@ -1009,6 +1028,7 @@ .MetadataCard-content a, .CollectionSort-label, .SearchResult-summary, + .SearchResult-note, .AddonMeta .MetadataCard-content a.AddonMeta-reviews-content-link, .AddonMeta .MetadataCard-title a.AddonMeta-reviews-content-link, .PermissionsCard-subhead--optional, @@ -1500,6 +1520,7 @@ --color-moz-inverse-bg: var(red) !important; --focus-shadow: 0 0 0 4px color-mix(in srgb, var(--in-content-primary-button-background) 30%, transparent), 0 0 0 2px var(--in-content-primary-button-background-active); + --color-dark-gray-10: var(--in-content-deemphasized-text) !important; } .warning { --color-link: rgb(55, 255, 255) !important; @@ -1608,7 +1629,9 @@ details .is-summary button::before, summary::before, .icon-button > button, - .search-button { + .search-button, + img:is(.pencil, .thumbsup, .syncing.icon), + #step-indicator li:not([status="done"])::before { filter: invert(95%) !important; } button.markup-toolbar-button { @@ -1674,6 +1697,7 @@ color: var(--in-content-page-color) !important; } #main-content.panel a, + .nav-active, .links a, .link-blue, .text-blue-500 { @@ -1718,6 +1742,7 @@ .input-text, header, .card, + .card-base, .bg-white:not(nav) { background: var(--in-content-box-background) !important; } @@ -1730,6 +1755,7 @@ .hover\:bg-grey-100:hover { background: var(--in-content-button-background-hover) !important; } + .nav-active, .text-blue-500 .cta-neutral, .text-blue-500 .bg-grey-50, .text-blue-500 .hover\:bg-grey-100 { @@ -1757,6 +1783,14 @@ footer a[data-testid="link-mozilla"] { filter: invert(95%) !important; } + div[data-testid="settings-connected-service"] + svg:is( + [data-testid="mobile-icon"], + [data-testid="desktop-icon"], + [data-testid="tablet-icon"], + [data-testid="vr-icon"], + [data-testid="addon-icon"] + ), header button svg, header .rounded svg, #service svg { @@ -1767,6 +1801,7 @@ filter: brightness(2) !important; } /* Others */ + .border-grey-100, .input-row input[type="email"], .input-row input[type="number"], .input-row input[type="password"], @@ -1775,6 +1810,7 @@ .unit-row-hr .border-grey-100 { border-color: var(--in-content-border-color) !important; } + .border-grey-100:hover, .input-row input[type="email"]:hover, .input-row input[type="number"]:hover, .input-row input[type="password"]:hover, @@ -2218,6 +2254,21 @@ background-color: var(--in-content-box-background-odd); } } + /*= about:processes ==========================================================*/ + @-moz-document url-prefix("about:processes") { + td.type.favicon[style*='background-image: url("chrome://global/skin/icons/link.svg");'] + { + background-image: url("../icons/link.svg") !important; + } + .profiler-icon { + background: url("../icons/performance.svg") no-repeat center !important; + } + } + @-moz-document url-prefix("about:profiling") { + .perf-intro-icon { + background-image: url("../icons/performance.svg") !important; + } + } /*= chrome://browser/content/places/places.xhtml =============================*/ @-moz-document url("chrome://browser/content/places/places.xhtml") { diff --git a/icons/close-duplicate-tabs-photon.svg b/icons/close-duplicate-tabs-photon.svg new file mode 100644 index 0000000..f77036b --- /dev/null +++ b/icons/close-duplicate-tabs-photon.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/close-duplicate-tabs.svg b/icons/close-duplicate-tabs.svg new file mode 100644 index 0000000..a24c971 --- /dev/null +++ b/icons/close-duplicate-tabs.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/close-tab-photon.svg b/icons/close-tab-photon.svg new file mode 100644 index 0000000..31b724b --- /dev/null +++ b/icons/close-tab-photon.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/close-tab.svg b/icons/close-tab.svg new file mode 100644 index 0000000..20ce397 --- /dev/null +++ b/icons/close-tab.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/close-window.svg b/icons/close-window.svg new file mode 100644 index 0000000..3c92d8c --- /dev/null +++ b/icons/close-window.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/find-again.svg b/icons/find-again.svg new file mode 100644 index 0000000..8f1b2b7 --- /dev/null +++ b/icons/find-again.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/toolbarButton-editorHighlight.svg b/icons/toolbarButton-editorHighlight.svg new file mode 100644 index 0000000..0e46ba0 --- /dev/null +++ b/icons/toolbarButton-editorHighlight.svg @@ -0,0 +1,4 @@ + + + + diff --git a/install.sh b/install.sh index ab6c377..5ba9579 100755 --- a/install.sh +++ b/install.sh @@ -341,6 +341,7 @@ firefoxProfileDirPaths=( "${HOME}/.ghostery browser" "${HOME}/.pulse-browser" "${HOME}/.firedragon" + "${HOME}/.cachy" "${HOME}/.local/opt/tor-browser/app/Browser/TorBrowser/Data/Browser" "${HOME}/.var/app/org.mozilla.firefox/.mozilla/firefox" "${HOME}/snap/firefox/common/.mozilla/firefox" diff --git a/src/compatibility/_theme.scss b/src/compatibility/_theme.scss index bd0d991..2cb8861 100644 --- a/src/compatibility/_theme.scss +++ b/src/compatibility/_theme.scss @@ -193,3 +193,9 @@ vbox[part="drop-indicator-bar"] > image[part="drop-indicator"] { fill-opacity: var(--inactive-toolbarbutton-icon-fill-opacity, 1); } } + +/*= Tabpreviw transparent #890 ===============================================*/ +#tab-preview-panel { + --panel-background: var(--arrowpanel-background) !important; /* Original: var(--tab-selected-bgcolor, var(--toolbar-bgcolor)) */ + --panel-color: var(--arrowpanel-color) !important; /* Original: var(--tab-selected-textcolor, var(--toolbar-color)) */ +} diff --git a/src/contents/_compatibility.scss b/src/contents/_compatibility.scss index d9863f1..3a205d2 100644 --- a/src/contents/_compatibility.scss +++ b/src/contents/_compatibility.scss @@ -11,6 +11,16 @@ padding-inline-start: 35px !important; } + // #910 + .translations-manage-language:first-child { + padding-block: 4px !important; + margin-bottom: 4px !important; + } + .translations-manage-language button { + min-height: var(--size-item-medium, 28px) !important; + max-height: var(--size-item-medium, 28px) !important; + } + // Align & Separator #722 #firefoxExperimentalCategory { &:not([hidden="true"]) { @@ -23,6 +33,10 @@ > hbox { transform: translateY(5px); } + + .description-deemphasized { + display: none; // #912 + } } #pane-experimental-featureGates > html|p[data-l10n-id="pane-experimental-description2"] { border-bottom: 1px solid var(--in-content-border-color); @@ -30,10 +44,22 @@ } } -// #695 @include moz-document(url-prefix "about:addons") { + // #695 #updates-message + .page-options-menu > .more-options-button { box-sizing: content-box; padding: 0 !important; } + + // #911 + #categories { + padding-inline-end: 1px !important; /* Original: 4px */ + } +} + +@include moz-document(url-prefix "about:policies") { + // #923 + #categories > .category { + box-sizing: border-box; + } } diff --git a/src/contents/_proton_contents.scss b/src/contents/_proton_contents.scss index cefc4d6..2a06c7a 100644 --- a/src/contents/_proton_contents.scss +++ b/src/contents/_proton_contents.scss @@ -29,5 +29,8 @@ /*= about:preferences ========================================================*/ @import "proton_contents/about_preferences"; +/*= about:processes ==========================================================*/ +@import "proton_contents/about_processes"; + /*= chrome://browser/content/places/places.xhtml =============================*/ @import "../library/contents"; diff --git a/src/contents/dark_mode/_accounts_com.scss b/src/contents/dark_mode/_accounts_com.scss index 9ae0afc..654ffb3 100644 --- a/src/contents/dark_mode/_accounts_com.scss +++ b/src/contents/dark_mode/_accounts_com.scss @@ -25,6 +25,7 @@ color: var(--in-content-page-color) !important; } #main-content.panel a, + .nav-active, .links a, .link-blue, .text-blue-500 { @@ -71,6 +72,7 @@ .input-text, header, .card, + .card-base, .bg-white:not(nav) { background: var(--in-content-box-background) !important; } @@ -83,6 +85,7 @@ .hover\:bg-grey-100:hover { background: var(--in-content-button-background-hover) !important; } + .nav-active, .text-blue-500 .cta-neutral, .text-blue-500 .bg-grey-50, .text-blue-500 .hover\:bg-grey-100 { @@ -111,6 +114,13 @@ footer a[data-testid="link-mozilla"] { filter: invert(95%) !important; } + div[data-testid="settings-connected-service"] svg:is( + [data-testid="mobile-icon"], + [data-testid="desktop-icon"], + [data-testid="tablet-icon"], + [data-testid="vr-icon"], + [data-testid="addon-icon"] + ), header button svg, header .rounded svg, #service svg { @@ -122,6 +132,7 @@ } /* Others */ + .border-grey-100, .input-row input[type="email"], .input-row input[type="number"], .input-row input[type="password"], @@ -130,6 +141,7 @@ .unit-row-hr .border-grey-100 { border-color: var(--in-content-border-color) !important; } + .border-grey-100:hover, .input-row input[type="email"]:hover, .input-row input[type="number"]:hover, .input-row input[type="password"]:hover, diff --git a/src/contents/dark_mode/_addons_org.scss b/src/contents/dark_mode/_addons_org.scss index 01ff0c9..71239a2 100644 --- a/src/contents/dark_mode/_addons_org.scss +++ b/src/contents/dark_mode/_addons_org.scss @@ -77,6 +77,7 @@ .MetadataCard-content a, .CollectionSort-label, .SearchResult-summary, + .SearchResult-note, .AddonMeta .MetadataCard-content a.AddonMeta-reviews-content-link, .AddonMeta .MetadataCard-title a.AddonMeta-reviews-content-link, .PermissionsCard-subhead--optional, diff --git a/src/contents/dark_mode/_support_org.scss b/src/contents/dark_mode/_support_org.scss index b0deeaa..f4fcb4b 100644 --- a/src/contents/dark_mode/_support_org.scss +++ b/src/contents/dark_mode/_support_org.scss @@ -25,6 +25,8 @@ --color-moz-inverse-bg: var(red) !important; --focus-shadow: 0 0 0 4px color-mix(in srgb, var(--in-content-primary-button-background) 30%, transparent), 0 0 0 2px var(--in-content-primary-button-background-active); + + --color-dark-gray-10: var(--in-content-deemphasized-text) !important; } .warning { --color-link: rgb(55, 255, 255) !important; @@ -141,7 +143,9 @@ details .is-summary button::before, summary::before, .icon-button > button, - .search-button { + .search-button, + img:is(.pencil, .thumbsup, .syncing.icon), + #step-indicator li:not([status="done"])::before, { filter: invert(95%) !important; } button.markup-toolbar-button { diff --git a/src/contents/proton_contents/_about_processes.scss b/src/contents/proton_contents/_about_processes.scss new file mode 100644 index 0000000..7d52b32 --- /dev/null +++ b/src/contents/proton_contents/_about_processes.scss @@ -0,0 +1,16 @@ +@include moz-document(url-prefix "about:processes") { + td.type.favicon[style*='background-image: url("chrome://global/skin/icons/link.svg");'] { + background-image: url("../icons/link.svg") !important; + } + + .profiler-icon { + background: url("../icons/performance.svg") no-repeat center !important; + } +} + +@include moz-document(url-prefix "about:profiling") { + .perf-intro-icon { + background-image: url("../icons/performance.svg") !important; + } +} + diff --git a/src/icons/_1.25px_stroke.scss b/src/icons/_1.25px_stroke.scss index 0e0a03c..ac47244 100644 --- a/src/icons/_1.25px_stroke.scss +++ b/src/icons/_1.25px_stroke.scss @@ -1,9 +1,22 @@ #firefox-view-button { - list-style-image: url("../icons/firefox-view.svg") !important; + list-style-image: url("../icons/firefox-view.svg") !important; } #reset-pbm-toolbar-button { - list-style-image: url("../icons/flame.svg") !important; + list-style-image: url("../icons/flame.svg") !important; } #translations-button-icon { - list-style-image: url("../icons/translations.svg") !important; -} \ No newline at end of file + list-style-image: url("../icons/translations.svg") !important; +} + +.tabbrowser-tab:is( + [image="chrome://global/skin/icons/performance.svg"], + [image="chrome://devtools/skin/images/tool-profiler.svg"] +) .tab-icon-image { + content: url("../icons/performance.svg") !important; +} + +.tabbrowser-tab:is( + [image="chrome://global/skin/icons/developer.svg"] +) .tab-icon-image { + content: url("../icons/developer.svg") !important; +} diff --git a/src/icons/_global_menu.scss b/src/icons/_global_menu.scss index bb64697..fa0de58 100644 --- a/src/icons/_global_menu.scss +++ b/src/icons/_global_menu.scss @@ -22,8 +22,12 @@ --menuitem-image: url("../icons/toolbarButton-upload.svg"); } #menu_close { + --menuitem-image: var(--uc-tab-close-icon); } #menu_closeWindow { + @include Option("userChrome.icon.menu.full") { + --menuitem-image: url("../icons/close-window.svg"); + } } #menu_savePage { @@ -90,6 +94,9 @@ menu.share-tab-url-item { --menuitem-image: url("chrome://global/skin/icons/search-glass.svg"); } #menu_findAgain { + @include Option("userChrome.icon.menu.full") { + --menuitem-image: url("../icons/find-again.svg"); + } } #textfieldDirection-swap { @@ -252,7 +259,7 @@ menu.share-tab-url-item { } #menu_openFirefoxView { - --menuitem-image: url("chrome://branding/content/icon32.png"); + --menuitem-image: url("../icons/firefox-view.svg"); } #webDeveloperMenu, /* Legacy */ #browserToolsMenu { diff --git a/src/icons/_index.scss b/src/icons/_index.scss index 60dce9e..c9fe7f8 100644 --- a/src/icons/_index.scss +++ b/src/icons/_index.scss @@ -7,6 +7,8 @@ --uc-tab-copy-icon: url("../icons/tab-copy.svg"); --uc-tab-unload-icon: url("../icons/tab-unload.svg"); --uc-tab-multiple-icon: url("../icons/tab-desktop-multiple.svg"); + --uc-tab-close-icon: url("../icons/close-tab.svg"); + --uc-tab-close-duplicate-icon: url("../icons/close-duplicate-tabs.svg"); --uc-new-tab-icon: url("../icons/new-tab.svg"); --uc-new-tab-forward-icon: url("../icons/new-tab-forward.svg"); --uc-new-tab-skip-forward-icon: url("../icons/new-tab-skip-forward.svg"); @@ -16,6 +18,8 @@ --uc-tab-copy-icon: url("../icons/tab-copy-photon.svg"); --uc-tab-unload-icon: url("../icons/tab-unload-photon.svg"); --uc-tab-multiple-icon: url("../icons/tab-multiple.svg"); + --uc-tab-close-icon: url("../icons/close-tab-photon.svg"); + --uc-tab-close-duplicate-icon: url("../icons/close-duplicate-tabs-photon.svg"); --uc-new-tab-icon: url("../icons/new-tab-photon.svg"); --uc-new-tab-forward-icon: url("../icons/new-tab-forward-photon.svg"); --uc-new-tab-skip-forward-icon: url("../icons/new-tab-skip-forward-photon.svg"); diff --git a/src/icons/_panel.scss b/src/icons/_panel.scss index c334e99..e276e4b 100644 --- a/src/icons/_panel.scss +++ b/src/icons/_panel.scss @@ -4,9 +4,14 @@ margin-inline-start: var(--arrowpanel-menuicon-padding); @include BoxOrder(0, true); } +#appMenu-addon-banners > .addon-banner-item > .toolbarbutton-icon { + display: inline-flex !important; +} +#appMenu-update-banner::before, #appMenu-proton-update-banner::before { content: url("../icons/whatsnew.svg"); + margin-inline-end: 0px !important; } #appMenu-fxa-status2::before { /* Don't exist img tag */ @@ -200,6 +205,13 @@ #PanelUI-fxa-menu-setup-sync-button { list-style-image: url("chrome://browser/skin/sync.svg"); } +@media (prefers-reduced-motion: reduce) { + #PanelUI-fxa-menu-syncnow-button[syncstatus="active"] > .toolbarbutton-icon, + #PanelUI-remotetabs-syncnow[syncstatus="active"] > .toolbarbutton-icon, + .syncNowBtn[syncstatus="active"] { + list-style-image: url("chrome://browser/skin/tabbrowser/hourglass.svg") !important; + } +} #PanelUI-fxa-menu-connect-device-button { list-style-image: url("../icons/add-device.svg"); @@ -244,6 +256,9 @@ margin: var(--panel-separator-margin); padding: 0; } +#PanelUI-signedin-panel[hidden="true"] + #PanelUI-fxa-cta-menu #PanelUI-products-separator { + display: none; // #916 +} #PanelUI-fxa-menu > :first-child { @include BoxOrder(0); } @@ -424,6 +439,9 @@ panelMenuBookmarkThisPage[starred] { #allTabsMenu-searchTabs { list-style-image: url("chrome://global/skin/icons/search-glass.svg"); } +#allTabsMenu-closeDuplicateTabs { + list-style-image: var(--uc-tab-close-duplicate-icon); +} #allTabsMenu-containerTabsButton { list-style-image: url("../icons/container-openin-16.svg"); } diff --git a/src/icons/context_menu/_content_area.scss b/src/icons/context_menu/_content_area.scss index 165e437..7cad874 100644 --- a/src/icons/context_menu/_content_area.scss +++ b/src/icons/context_menu/_content_area.scss @@ -207,6 +207,9 @@ #context-pdfjs-selectall { --menuitem-image: url("../icons/select-all-on.svg"); } +#context-pdfjs-highlight-selection { + --menuitem-image: url("../icons/toolbarButton-editorHighlight.svg"); +} #context-reveal-password { --menuitem-image: url("../icons/eye-show.svg"); } @@ -226,6 +229,10 @@ --menuitem-image: url("chrome://global/skin/icons/search-glass.svg"); } +#context-translate-selection { + --menuitem-image: url("../icons/translations.svg"); +} + #frame { --menuitem-image: url("../icons/command-frames.svg"); } diff --git a/src/icons/context_menu/_others.scss b/src/icons/context_menu/_others.scss index 8fe0d53..98f40ae 100644 --- a/src/icons/context_menu/_others.scss +++ b/src/icons/context_menu/_others.scss @@ -241,6 +241,13 @@ menuitem.searchbar-clear-history { --menuitem-image: url("../icons/pin-tab.svg"); } +.unified-extensions-context-menu-move-widget-up { + --menuitem-image: url("chrome://global/skin/icons/arrow-up.svg"); +} +.unified-extensions-context-menu-move-widget-down { + --menuitem-image: url("chrome://global/skin/icons/arrow-down.svg"); +} + .unified-extensions-context-menu-manage-extension { --menuitem-image: url("chrome://global/skin/icons/settings.svg"); } @@ -260,3 +267,20 @@ menuitem.searchbar-clear-history { --menuitem-image: url("chrome://global/skin/icons/info.svg"); } } + +/*= full-page-translations-panel-settings-menupopup ==========================*/ +.manage-languages-menuitem { + --menuitem-image: url("chrome://global/skin/icons/settings.svg"); +} +#full-page-translations-panel-settings-menupopup > + menuitem[data-l10n-id="translations-panel-settings-about2"] { + --menuitem-image: url("chrome://global/skin/icons/info.svg"); +} + +/*= select-translations-panel-settings-menupopup =============================*/ +#select-translations-panel-open-settings-page-menuitem { + --menuitem-image: url("chrome://global/skin/icons/settings.svg"); +} +#select-translations-panel-about-translations-menuitem { + --menuitem-image: url("chrome://global/skin/icons/info.svg"); +} diff --git a/src/icons/context_menu/_tab_toolbar.scss b/src/icons/context_menu/_tab_toolbar.scss index a5ce5e3..2488d3b 100644 --- a/src/icons/context_menu/_tab_toolbar.scss +++ b/src/icons/context_menu/_tab_toolbar.scss @@ -121,6 +121,11 @@ #sidebartabs_asamuzak_jp-menuitem-_closeTab { --menuitem-image: url("chrome://global/skin/icons/close.svg"); } +#context_closeDuplicateTabs { + @include Option("userChrome.icon.menu.full") { + --menuitem-image: var(--uc-tab-close-duplicate-icon); + } +} #context_closeTabOptions, #treestyletab_piro_sakura_ne_jp-menuitem-_context_closeMultipleTabs, #tabcenter-reborn_ariasuni-menuitem-_contextMenuCloseTabs, diff --git a/src/icons/layout/_panel.scss b/src/icons/layout/_panel.scss index a117e10..ec95758 100644 --- a/src/icons/layout/_panel.scss +++ b/src/icons/layout/_panel.scss @@ -33,6 +33,11 @@ .toolbaritem-combined-buttons:not(.unified-extensions-item) > .subviewbutton:not(.subviewbutton-iconic) > .toolbarbutton-text { padding-inline-start: 0 !important; } +#panelMenu_bookmarksMenu .subviewbutton[disabled="true"], +#appMenu_historyMenu .subviewbutton[disabled="true"] { + margin-inline-start: 0 !important; + 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; diff --git a/src/padding/_tabbar_width.scss b/src/padding/_tabbar_width.scss index 5573f2c..fdc5ee1 100644 --- a/src/padding/_tabbar_width.scss +++ b/src/padding/_tabbar_width.scss @@ -95,9 +95,10 @@ } /* neighbouring tabs should "pinch" together */ +:root[customizing="true"] #tabbrowser-arrowscrollbox-periphery, #tabbrowser-tabs:not([hasadjacentnewtabbutton]):not([overflow="true"]) > #tabbrowser-arrowscrollbox > #tabbrowser-arrowscrollbox-periphery { - min-width: 3px; // With Panorama Tab Groups #643 + min-width: 3px; // With Panorama Tab Groups #643 #846 } @include NotOption("userChrome.tab.photon_like_padding") { @include Option("userChrome.tab.lepton_like_padding") { diff --git a/src/tab/_connect_to_window.scss b/src/tab/_connect_to_window.scss index 641130a..89ba62b 100644 --- a/src/tab/_connect_to_window.scss +++ b/src/tab/_connect_to_window.scss @@ -7,7 +7,7 @@ } .tab-content { - margin-top: var(--tab-block-margin); + margin-top: 0px; // #892 Consider var(--tab-block-margin) } .tab-stack { @@ -34,3 +34,14 @@ overflow-y: clip; } } + +/* Border top #889 */ +#nav-bar { + border-top: none !important; + box-shadow: 0 -0.01px 0 ThreeDShadow; + @include OS($linux) { + @include not_lwtheme(false) { + box-shadow: 0 -0.01px 0 ThreeDShadow; + } + } +} diff --git a/src/tab/_container_tab.scss b/src/tab/_container_tab.scss index 5a2fa7c..311680b 100644 --- a/src/tab/_container_tab.scss +++ b/src/tab/_container_tab.scss @@ -39,15 +39,23 @@ /* Shape */ border-bottom: 2px solid var(--identity-icon-color); - width: 25%; + width: calc(100% - 30px); opacity: 0.75; } -.tabbrowser-tab[visuallyselected]:not([pinned]) .tab-content::before { - width: calc(100% - 30px); +.tabbrowser-tab[visuallyselected] .tab-content::before { opacity: 1; } -#tabbrowser-tabs[closebuttons="activetab"] .tabbrowser-tab[visuallyselected]:not([pinned]) .tab-content::before { - width: calc(100% - 33px); + +@include NotOption("userChrome.tab.container.always_long") { + .tab-content::before { + width: 25%; + } + .tabbrowser-tab[visuallyselected]:not([pinned]) .tab-content::before { + width: calc(100% - 30px); + } + #tabbrowser-tabs[closebuttons="activetab"] .tabbrowser-tab[visuallyselected]:not([pinned]) .tab-content::before { + width: calc(100% - 33px); + } } /* Animate */ @@ -71,7 +79,8 @@ } @include NotOption("userChrome.tab.container.on_top") { - .tab-content[titlechanged]::before { + .tabbrowser-tab:is([image], [pinned])[usercontextid] > .tab-stack > .tab-content[attention]:not([selected])::before, + .tabbrowser-tab[usercontextid] > .tab-stack > .tab-content[pinned][titlechanged]:not([selected])::before { opacity: 0; } diff --git a/src/theme/system_default_theme/_mac.scss b/src/theme/system_default_theme/_mac.scss index 5ea7ef4..f48da86 100644 --- a/src/theme/system_default_theme/_mac.scss +++ b/src/theme/system_default_theme/_mac.scss @@ -5,7 +5,7 @@ --mac-text-color: -moz-dialogtext; --mac-disabled-color: GrayText; --mac-bgcolor: Window; - --mac-selected-bgcolor: color-mix(in srgb, rgb(255, 255, 255) 15%, -moz-dialog); + --mac-selected-bgcolor: color-mix(in srgb, rgb(255, 255, 255) 15%, Field); --mac-field-bgcolor: Window; --mac-panel-bgcolor: Menu; @if mode.isSTANDARD() { diff --git a/user.js b/user.js index 71f23ca..3d11c57 100644 --- a/user.js +++ b/user.js @@ -177,6 +177,7 @@ user_pref("userChrome.rounding.square_tab", true); // user_pref("userChrome.tab.close_button_at_hover.with_selected", true); // Need close_button_at_hover // user_pref("userChrome.tab.sound_show_label", true); // Need remove sound_hide_label // user_pref("userChrome.tab.container.on_top", true); +// user_pref("userChrome.tab.container.always_long", true); // user_pref("userChrome.tab.sound_with_favicons.on_center", true); // user_pref("userChrome.tab.selected_bold", true); diff --git a/yarn.lock b/yarn.lock index da567ca..b4142e8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -902,11 +902,11 @@ brace-expansion@^1.1.7: concat-map "0.0.1" braces@^3.0.2, braces@~3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" - integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== + version "3.0.3" + resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789" + integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA== dependencies: - fill-range "^7.0.1" + fill-range "^7.1.1" browserslist@^4.21.3: version "4.21.4" @@ -1232,10 +1232,10 @@ fb-watchman@^2.0.0: dependencies: bser "2.1.1" -fill-range@^7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" - integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ== +fill-range@^7.1.1: + version "7.1.1" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292" + integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg== dependencies: to-regex-range "^5.0.1"