diff --git a/css/leptonChrome.css b/css/leptonChrome.css index 768ace0a..42fc5d4d 100644 --- a/css/leptonChrome.css +++ b/css/leptonChrome.css @@ -161,6 +161,10 @@ #main-menubar { --panel-border-radius: var(--arrowpanel-border-radius); } + /*= Infobar Align #858 =======================================================*/ + .container.infobar { + align-items: center !important; + } } /*= OS - Compatibility =======================================================*/ @supports -moz-bool-pref("userChrome.compatibility.os") { @@ -759,11 +763,6 @@ --urlbar-popup-url-color: -moz-accent-color; } } - /* Nightly Compatibility */ - :root:not(:-moz-lwtheme) #urlbar { - --toolbar-field-focus-color: var(--toolbar-field-color); /* Nightly: rgba(0, 0, 0, 1) */ - --toolbar-field-focus-background-color: var(--toolbar-field-background-color); /* Nightly: white */ - } } /*= Mac - Default like color =================================================*/ @supports -moz-bool-pref("layout.css.osx-font-smoothing.enabled") { @@ -776,7 +775,7 @@ --mac-selected-bgcolor: color-mix(in srgb, rgb(255, 255, 255) 15%, -moz-dialog); --mac-field-bgcolor: Window; --mac-panel-bgcolor: Menu; - --mac-sidebar-bgcolor: -moz-mac-source-list; + --mac-sidebar-bgcolor: Window; --mac-sidebar-hover-bgcolor: color-mix(in srgb, ButtonFace 60%, var(--mac-sidebar-bgcolor)); --mac-hover-bgcolor: Window; --mac-disabled-bgcolor: transparent; @@ -7219,6 +7218,12 @@ height: 2px !important; border-radius: var(--tab-border-radius, 4px) var(--tab-border-radius, 4px) 0 0 !important; } + :root[lwtheme-mozlightdark]:not([lwthemetextcolor="bright"]), + :root[style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"] .tab-context-line, + :root[lwtheme-mozlightdark][lwthemetextcolor="bright"], + :root[style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"] .tab-context-line { + --tab-line-color: rgb(10, 132, 255); + } .tabbrowser-tab:is([selected], [multiselected]) .tab-context-line { /* Photon like color Default: var(--tab-line-color, rgb(10, 132, 255)) @@ -10940,7 +10945,7 @@ list-style-image: url("chrome://global/skin/icons/search-glass.svg"); } #appMenu-translate-button { - list-style-image: url(chrome://browser/skin/translations.svg); + list-style-image: url("../icons/translations.svg"); } #appMenu-zoom-controls2::before, #appMenu-zoom-controls::before { @@ -11166,7 +11171,7 @@ /* 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"); + list-style-image: url("../icons/command-console.svg"); } /* Responsive Design Mode */ #appmenu-developer-tools-view .subviewbutton:nth-last-child(4), @@ -11176,7 +11181,7 @@ /* 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"); + list-style-image: url("../icons/command-eyedropper.svg"); } /* Page Source - Edge file-search.svg */ #appmenu-developer-tools-view .subviewbutton:nth-last-child(2), @@ -11186,7 +11191,7 @@ /* 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"); + list-style-image: url("chrome://mozapps/skin/extensions/extension.svg"); } #appmenu-developer-tools-view .subviewbutton:last-child { margin-bottom: 6px !important; @@ -11417,9 +11422,10 @@ #context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup, #context-sendlinktodevice-popup, - #frame > menupopup + #frame > menupopup, + #spell-dictionaries-menu ) - > menuitem, + > menuitem:not([type="checkbox"][checked="true"], [type="radio"]), .openintabs-menuitem, #blockedPopupDontShowMessage, #BMB_viewBookmarksToolbar, @@ -11501,9 +11507,10 @@ #context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup, #context-sendlinktodevice-popup, - #frame > menupopup + #frame > menupopup, + #spell-dictionaries-menu ) - > menuitem, + > menuitem:not([type="checkbox"][checked="true"], [type="radio"]), .openintabs-menuitem, #blockedPopupDontShowMessage, #BMB_viewBookmarksToolbar, @@ -11594,9 +11601,10 @@ #context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup, #context-sendlinktodevice-popup, - #frame > menupopup + #frame > menupopup, + #spell-dictionaries-menu ) - > menuitem, + > menuitem:not([type="checkbox"][checked="true"], [type="radio"]), .openintabs-menuitem, #blockedPopupDontShowMessage, #BMB_viewBookmarksToolbar, @@ -11662,9 +11670,10 @@ #context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup, #context-sendlinktodevice-popup, - #frame > menupopup + #frame > menupopup, + #spell-dictionaries-menu ) - > menuitem, + > menuitem:not([type="checkbox"][checked="true"], [type="radio"]), .openintabs-menuitem, #blockedPopupDontShowMessage, #BMB_viewBookmarksToolbar, @@ -11758,6 +11767,32 @@ list-style-image: var(--menuitem-image, url("../icons/blank.svg")) !important; } } + /* Exeptions */ + #unified-extensions-context-menu > menuitem::before { + padding-inline: 0 !important; + } + :not(menu, #ContentSelectDropdown, #context-navigation) + > menupopup:not(.in-menulist) + > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]) { + padding-inline-start: 0 !important; + } + :not(menu, #ContentSelectDropdown, #context-navigation) + > menupopup:not(.in-menulist) + > menuitem:not(.menuitem-iconic):has(.menu-iconic-left)[checked] { + padding-left: 4px !important; + background-image: none !important; + } + :not(menu, #ContentSelectDropdown, #context-navigation) + > menupopup:not(.in-menulist) + > menuitem:not(.menuitem-iconic):has(.menu-iconic-left)[checked="true"] { + padding-left: calc(var(--context-menu-mac-padding) - 8px) !important; + } + :not(menu, #ContentSelectDropdown, #context-navigation) + > menupopup:not(.in-menulist) + > menuitem:not(.menuitem-iconic):has(.menu-iconic-left)[checked="true"] + .menu-iconic-text { + padding-left: 8px !important; + } } /*= Bookmark Menu - Layout ===================================================*/ /* #goPopup(Legacy of historyMenuPopup), #historyMenuPopup, #bookmarksMenuPopup: looks like global menu @@ -12111,7 +12146,8 @@ #spell-no-suggestions { --menuitem-image: url("../icons/text-proofing-tools.svg"); } - #spell-add-to-dictionary { + #spell-add-to-dictionary, + #spell-add-dictionaries { --menuitem-image: url("../icons/book-add.svg"); } #spell-undo-add-to-dictionary { @@ -13024,7 +13060,7 @@ --menuitem-image: url("../icons/command-frames.svg"); } #menu_browserConsole { - --menuitem-image: url("chrome://devtools/skin/images/command-console.svg"); + --menuitem-image: url("../icons/command-console.svg"); } #menu_responsiveUI { /* checkbox */ @@ -13032,13 +13068,13 @@ } #menu_eyedropper { /* checkbox */ - --menuitem-image: url("chrome://devtools/skin/images/command-eyedropper.svg"); + --menuitem-image: url("../icons/command-eyedropper.svg"); } #menu_pageSource { --menuitem-image: url("../icons/document-search.svg"); } #extensionsForDevelopers { - --menuitem-image: url("chrome://devtools/skin/images/debugging-addons.svg"); + --menuitem-image: url("chrome://mozapps/skin/extensions/extension.svg"); } /*= windowPopup ==============================================================*/ #windowPopup > menuitem[command="minimizeWindow"] { @@ -13143,6 +13179,18 @@ } } } + /** Icons - 1.25px Stroke Width ***********************************************/ + @supports -moz-bool-pref("userChrome.icon.1-25px_stroke") { + #firefox-view-button { + list-style-image: url("../icons/firefox-view.svg") !important; + } + #reset-pbm-toolbar-button { + list-style-image: url("../icons/flame.svg") !important; + } + #translations-button-icon { + list-style-image: url("../icons/translations.svg") !important; + } + } /** Icons for fork browsers ***************************************************/ /*= Waterfox =================================================================*/ @supports -moz-bool-pref("userChrome.icon.panel") { @@ -13340,6 +13388,7 @@ /*= Drop Indicator Color #473 ================================================*/ /*= Firefox View Border #498 =================================================*/ /*= Menubar rounding #814 ====================================================*/ + /*= Infobar Align #858 =======================================================*/ } @media (-moz-bool-pref: "userChrome.compatibility.theme") and (-moz-bool-pref: "userChrome.tab.connect_to_window") { /* TARGET: original, photon */ @@ -13444,6 +13493,11 @@ --panel-border-radius: var(--arrowpanel-border-radius); } } +@media (-moz-bool-pref: "userChrome.compatibility.theme") { + .container.infobar { + align-items: center !important; + } +} /*= OS - Compatibility =======================================================*/ @media (-moz-bool-pref: "userChrome.compatibility.os") { /*= Windows 10 - Top border of accent color at ESR #358 ======================*/ @@ -14026,19 +14080,12 @@ :root:not(:-moz-lwtheme) .urlbarView-url { --urlbar-popup-url-color: AccentColor; } - /* Nightly Compatibility */ } @media (-moz-bool-pref: "userChrome.theme.system_default") and (-moz-gtk-csd-available) and (-moz-bool-pref: "userChrome.compatibility.accent_color") { :root:not(:-moz-lwtheme) .urlbarView-url { --urlbar-popup-url-color: -moz-accent-color; } } -@media (-moz-bool-pref: "userChrome.theme.system_default") and (-moz-gtk-csd-available) { - :root:not(:-moz-lwtheme) #urlbar { - --toolbar-field-focus-color: var(--toolbar-field-color); /* Nightly: rgba(0, 0, 0, 1) */ - --toolbar-field-focus-background-color: var(--toolbar-field-background-color); /* Nightly: white */ - } -} @media (-moz-bool-pref: "userChrome.theme.system_default") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") { :root:not(:-moz-lwtheme), :root[lwt-default-theme-in-dark-mode] { @@ -14049,7 +14096,7 @@ --mac-selected-bgcolor: color-mix(in srgb, rgb(255, 255, 255) 15%, -moz-dialog); --mac-field-bgcolor: Window; --mac-panel-bgcolor: Menu; - --mac-sidebar-bgcolor: -moz-mac-source-list; + --mac-sidebar-bgcolor: Window; --mac-sidebar-hover-bgcolor: color-mix(in srgb, ButtonFace 60%, var(--mac-sidebar-bgcolor)); --mac-hover-bgcolor: Window; --mac-disabled-bgcolor: transparent; @@ -21190,6 +21237,12 @@ height: 2px !important; border-radius: var(--tab-border-radius, 4px) var(--tab-border-radius, 4px) 0 0 !important; } + :root[lwtheme-mozlightdark]:not([lwthemetextcolor="bright"]), + :root[style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"] .tab-context-line, + :root[lwtheme-mozlightdark][lwthemetextcolor="bright"], + :root[style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"] .tab-context-line { + --tab-line-color: rgb(10, 132, 255); + } .tabbrowser-tab:is([selected], [multiselected]) .tab-context-line { /* Photon like color Default: var(--tab-line-color, rgb(10, 132, 255)) @@ -24855,6 +24908,7 @@ /** Library - Icons Replace ***************************************************/ /** Panel - Icons *************************************************************/ /** Menu - Icons Layout *******************************************************/ + /** Icons - 1.25px Stroke Width ***********************************************/ /** Icons for fork browsers ***************************************************/ /*= Waterfox =================================================================*/ /*= Tor Browser ==============================================================*/ @@ -25345,7 +25399,7 @@ list-style-image: url("chrome://global/skin/icons/search-glass.svg"); } #appMenu-translate-button { - list-style-image: url(chrome://browser/skin/translations.svg); + list-style-image: url("../icons/translations.svg"); } #appMenu-zoom-controls2::before, #appMenu-zoom-controls::before { @@ -25653,7 +25707,7 @@ @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") { #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"); + list-style-image: url("../icons/command-console.svg"); } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") { @@ -25665,7 +25719,7 @@ @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") { #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"); + list-style-image: url("../icons/command-eyedropper.svg"); } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") { @@ -25677,7 +25731,7 @@ @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") { #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"); + list-style-image: url("chrome://mozapps/skin/extensions/extension.svg"); } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") { @@ -25974,9 +26028,10 @@ #context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup, #context-sendlinktodevice-popup, - #frame > menupopup + #frame > menupopup, + #spell-dictionaries-menu ) - > menuitem, + > menuitem:not([type="checkbox"][checked="true"], [type="radio"]), .openintabs-menuitem, #blockedPopupDontShowMessage, #BMB_viewBookmarksToolbar, @@ -26077,9 +26132,10 @@ #context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup, #context-sendlinktodevice-popup, - #frame > menupopup + #frame > menupopup, + #spell-dictionaries-menu ) - > menuitem, + > menuitem:not([type="checkbox"][checked="true"], [type="radio"]), .openintabs-menuitem, #blockedPopupDontShowMessage, #BMB_viewBookmarksToolbar, @@ -26169,9 +26225,10 @@ #context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup, #context-sendlinktodevice-popup, - #frame > menupopup + #frame > menupopup, + #spell-dictionaries-menu ) - > menuitem, + > menuitem:not([type="checkbox"][checked="true"], [type="radio"]), .openintabs-menuitem, #blockedPopupDontShowMessage, #BMB_viewBookmarksToolbar, @@ -26232,9 +26289,10 @@ #context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup, #context-sendlinktodevice-popup, - #frame > menupopup + #frame > menupopup, + #spell-dictionaries-menu ) - > menuitem, + > menuitem:not([type="checkbox"][checked="true"], [type="radio"]), .openintabs-menuitem, #blockedPopupDontShowMessage, #BMB_viewBookmarksToolbar, @@ -26291,6 +26349,7 @@ padding-inline-start: calc(var(--context-menu-background-padding) + var(--context-menu-mac-padding)) !important; } /* Global Menu */ + /* Exeptions */ } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") and (-moz-bool-pref: "userChrome.icon.global_menu.mac") { menupopup:is( @@ -26322,6 +26381,35 @@ list-style-image: var(--menuitem-image, url("../icons/blank.svg")) !important; } } +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") { + #unified-extensions-context-menu > menuitem::before { + padding-inline: 0 !important; + } +} +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") { + :not(menu, #ContentSelectDropdown, #context-navigation) + > menupopup:not(.in-menulist) + > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]) { + padding-inline-start: 0 !important; + } + :not(menu, #ContentSelectDropdown, #context-navigation) + > menupopup:not(.in-menulist) + > menuitem:not(.menuitem-iconic):has(.menu-iconic-left)[checked] { + padding-left: 4px !important; + background-image: none !important; + } + :not(menu, #ContentSelectDropdown, #context-navigation) + > menupopup:not(.in-menulist) + > menuitem:not(.menuitem-iconic):has(.menu-iconic-left)[checked="true"] { + padding-left: calc(var(--context-menu-mac-padding) - 8px) !important; + } + :not(menu, #ContentSelectDropdown, #context-navigation) + > menupopup:not(.in-menulist) + > menuitem:not(.menuitem-iconic):has(.menu-iconic-left)[checked="true"] + .menu-iconic-text { + padding-left: 8px !important; + } +} @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") { menupopup menupopup[emptyplacesresult] .menu-text, #PersonalToolbar menupopup[emptyplacesresult] .menu-text { @@ -26757,7 +26845,8 @@ } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") { - #spell-add-to-dictionary { + #spell-add-to-dictionary, + #spell-add-dictionaries { --menuitem-image: url("../icons/book-add.svg"); } } @@ -28108,7 +28197,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_browserConsole { - --menuitem-image: url("chrome://devtools/skin/images/command-console.svg"); + --menuitem-image: url("../icons/command-console.svg"); } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") { @@ -28120,7 +28209,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_eyedropper { /* checkbox */ - --menuitem-image: url("chrome://devtools/skin/images/command-eyedropper.svg"); + --menuitem-image: url("../icons/command-eyedropper.svg"); } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") { @@ -28130,7 +28219,7 @@ } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") { #extensionsForDevelopers { - --menuitem-image: url("chrome://devtools/skin/images/debugging-addons.svg"); + --menuitem-image: url("chrome://mozapps/skin/extensions/extension.svg"); } } @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") { @@ -28278,6 +28367,17 @@ --menuitem-image: url("chrome://browser/skin/import.svg"); } } +@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.1-25px_stroke") { + #firefox-view-button { + list-style-image: url("../icons/firefox-view.svg") !important; + } + #reset-pbm-toolbar-button { + list-style-image: url("../icons/flame.svg") !important; + } + #translations-button-icon { + list-style-image: url("../icons/translations.svg") !important; + } +} @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") { #appMenu-restart-button { list-style-image: url("../icons/refresh-cw.svg") !important; diff --git a/css/leptonChromeESR.css b/css/leptonChromeESR.css index 01d509da..edee2db6 100644 --- a/css/leptonChromeESR.css +++ b/css/leptonChromeESR.css @@ -161,6 +161,10 @@ #main-menubar { --panel-border-radius: var(--arrowpanel-border-radius); } + /*= Infobar Align #858 =======================================================*/ + .container.infobar { + align-items: center !important; + } } /*= OS - Compatibility =======================================================*/ @supports -moz-bool-pref("userChrome.compatibility.os") { @@ -978,11 +982,6 @@ --urlbar-popup-url-color: -moz-accent-color; } } - /* Nightly Compatibility */ - :root:not(:-moz-lwtheme) #urlbar { - --toolbar-field-focus-color: var(--toolbar-field-color); /* Nightly: rgba(0, 0, 0, 1) */ - --toolbar-field-focus-background-color: var(--toolbar-field-background-color); /* Nightly: white */ - } } /*= Mac - Default like color =================================================*/ @supports -moz-bool-pref("layout.css.osx-font-smoothing.enabled") { @@ -7628,6 +7627,12 @@ height: 2px !important; border-radius: var(--tab-border-radius, 4px) var(--tab-border-radius, 4px) 0 0 !important; } + :root[lwtheme-mozlightdark]:not([lwthemetextcolor="bright"]), + :root[style*="--lwt-accent-color: rgb(240, 240, 244); --lwt-text-color: rgba(21, 20, 26);"] .tab-context-line, + :root[lwtheme-mozlightdark][lwthemetextcolor="bright"], + :root[style*="--lwt-accent-color: rgb(28, 27, 34); --lwt-text-color: rgba(251, 251, 254);"] .tab-context-line { + --tab-line-color: rgb(10, 132, 255); + } .tabbrowser-tab:is([selected], [multiselected]) .tab-context-line { /* Photon like color Default: var(--tab-line-color, rgb(10, 132, 255)) @@ -11357,7 +11362,7 @@ list-style-image: url("chrome://global/skin/icons/search-glass.svg"); } #appMenu-translate-button { - list-style-image: url(chrome://browser/skin/translations.svg); + list-style-image: url("../icons/translations.svg"); } #appMenu-zoom-controls2::before, #appMenu-zoom-controls::before { @@ -11583,7 +11588,7 @@ /* 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"); + list-style-image: url("../icons/command-console.svg"); } /* Responsive Design Mode */ #appmenu-developer-tools-view .subviewbutton:nth-last-child(4), @@ -11593,7 +11598,7 @@ /* 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"); + list-style-image: url("../icons/command-eyedropper.svg"); } /* Page Source - Edge file-search.svg */ #appmenu-developer-tools-view .subviewbutton:nth-last-child(2), @@ -11603,7 +11608,7 @@ /* 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"); + list-style-image: url("chrome://mozapps/skin/extensions/extension.svg"); } #appmenu-developer-tools-view .subviewbutton:last-child { margin-bottom: 6px !important; @@ -11834,9 +11839,10 @@ #context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup, #context-sendlinktodevice-popup, - #frame > menupopup + #frame > menupopup, + #spell-dictionaries-menu ) - > menuitem, + > menuitem:not([type="checkbox"][checked="true"], [type="radio"]), .openintabs-menuitem, #blockedPopupDontShowMessage, #BMB_viewBookmarksToolbar, @@ -11918,9 +11924,10 @@ #context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup, #context-sendlinktodevice-popup, - #frame > menupopup + #frame > menupopup, + #spell-dictionaries-menu ) - > menuitem, + > menuitem:not([type="checkbox"][checked="true"], [type="radio"]), .openintabs-menuitem, #blockedPopupDontShowMessage, #BMB_viewBookmarksToolbar, @@ -12014,9 +12021,10 @@ #context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup, #context-sendlinktodevice-popup, - #frame > menupopup + #frame > menupopup, + #spell-dictionaries-menu ) - > menuitem, + > menuitem:not([type="checkbox"][checked="true"], [type="radio"]), .openintabs-menuitem, #blockedPopupDontShowMessage, #BMB_viewBookmarksToolbar, @@ -12089,9 +12097,10 @@ #context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup, #context-sendlinktodevice-popup, - #frame > menupopup + #frame > menupopup, + #spell-dictionaries-menu ) - > menuitem, + > menuitem:not([type="checkbox"][checked="true"], [type="radio"]), .openintabs-menuitem, #blockedPopupDontShowMessage, #BMB_viewBookmarksToolbar, @@ -12272,9 +12281,10 @@ #context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup, #context-sendlinktodevice-popup, - #frame > menupopup + #frame > menupopup, + #spell-dictionaries-menu ) - > menuitem, + > menuitem:not([type="checkbox"][checked="true"], [type="radio"]), .openintabs-menuitem, #blockedPopupDontShowMessage, #BMB_viewBookmarksToolbar, @@ -12352,6 +12362,32 @@ list-style-image: var(--menuitem-image, url("../icons/blank.svg")) !important; } } + /* Exeptions */ + #unified-extensions-context-menu > menuitem::before { + padding-inline: 0 !important; + } + :not(menu, #ContentSelectDropdown, #context-navigation) + > menupopup:not(.in-menulist) + > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]) { + padding-inline-start: 0 !important; + } + :not(menu, #ContentSelectDropdown, #context-navigation) + > menupopup:not(.in-menulist) + > menuitem:not(.menuitem-iconic):has(.menu-iconic-left)[checked] { + padding-left: 4px !important; + background-image: none !important; + } + :not(menu, #ContentSelectDropdown, #context-navigation) + > menupopup:not(.in-menulist) + > menuitem:not(.menuitem-iconic):has(.menu-iconic-left)[checked="true"] { + padding-left: calc(var(--context-menu-mac-padding) - 8px) !important; + } + :not(menu, #ContentSelectDropdown, #context-navigation) + > menupopup:not(.in-menulist) + > menuitem:not(.menuitem-iconic):has(.menu-iconic-left)[checked="true"] + .menu-iconic-text { + padding-left: 8px !important; + } } /*= Bookmark Menu - Layout ===================================================*/ /* #goPopup(Legacy of historyMenuPopup), #historyMenuPopup, #bookmarksMenuPopup: looks like global menu @@ -12720,7 +12756,8 @@ #spell-no-suggestions { --menuitem-image: url("../icons/text-proofing-tools.svg"); } - #spell-add-to-dictionary { + #spell-add-to-dictionary, + #spell-add-dictionaries { --menuitem-image: url("../icons/book-add.svg"); } #spell-undo-add-to-dictionary { @@ -13633,7 +13670,7 @@ --menuitem-image: url("../icons/command-frames.svg"); } #menu_browserConsole { - --menuitem-image: url("chrome://devtools/skin/images/command-console.svg"); + --menuitem-image: url("../icons/command-console.svg"); } #menu_responsiveUI { /* checkbox */ @@ -13641,13 +13678,13 @@ } #menu_eyedropper { /* checkbox */ - --menuitem-image: url("chrome://devtools/skin/images/command-eyedropper.svg"); + --menuitem-image: url("../icons/command-eyedropper.svg"); } #menu_pageSource { --menuitem-image: url("../icons/document-search.svg"); } #extensionsForDevelopers { - --menuitem-image: url("chrome://devtools/skin/images/debugging-addons.svg"); + --menuitem-image: url("chrome://mozapps/skin/extensions/extension.svg"); } /*= windowPopup ==============================================================*/ #windowPopup > menuitem[command="minimizeWindow"] { @@ -13752,6 +13789,18 @@ } } } + /** Icons - 1.25px Stroke Width ***********************************************/ + @supports -moz-bool-pref("userChrome.icon.1-25px_stroke") { + #firefox-view-button { + list-style-image: url("../icons/firefox-view.svg") !important; + } + #reset-pbm-toolbar-button { + list-style-image: url("../icons/flame.svg") !important; + } + #translations-button-icon { + list-style-image: url("../icons/translations.svg") !important; + } + } /** Icons for fork browsers ***************************************************/ /*= Waterfox =================================================================*/ @supports -moz-bool-pref("userChrome.icon.panel") { diff --git a/icons/command-console.svg b/icons/command-console.svg new file mode 100644 index 00000000..6e8a445f --- /dev/null +++ b/icons/command-console.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/command-eyedropper.svg b/icons/command-eyedropper.svg new file mode 100644 index 00000000..708e127e --- /dev/null +++ b/icons/command-eyedropper.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/firefox-view.svg b/icons/firefox-view.svg new file mode 100644 index 00000000..a3da0d09 --- /dev/null +++ b/icons/firefox-view.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/flame.svg b/icons/flame.svg new file mode 100644 index 00000000..dd1062cf --- /dev/null +++ b/icons/flame.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/icons/tab-photon.svg b/icons/tab-photon.svg index 2b0c392d..c9199598 100644 --- a/icons/tab-photon.svg +++ b/icons/tab-photon.svg @@ -1,3 +1 @@ - - - \ No newline at end of file + \ No newline at end of file diff --git a/icons/translations.svg b/icons/translations.svg new file mode 100644 index 00000000..155c55fe --- /dev/null +++ b/icons/translations.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/compatibility/_theme.scss b/src/compatibility/_theme.scss index 041ac7ed..3911d6e1 100644 --- a/src/compatibility/_theme.scss +++ b/src/compatibility/_theme.scss @@ -160,3 +160,8 @@ vbox[part="drop-indicator-bar"] > image[part="drop-indicator"] { #main-menubar { --panel-border-radius: var(--arrowpanel-border-radius); } + +/*= Infobar Align #858 =======================================================*/ +.container.infobar { + align-items: center !important; +} diff --git a/src/icons/_1.25px_stroke.scss b/src/icons/_1.25px_stroke.scss new file mode 100644 index 00000000..0e0a03ce --- /dev/null +++ b/src/icons/_1.25px_stroke.scss @@ -0,0 +1,9 @@ +#firefox-view-button { + list-style-image: url("../icons/firefox-view.svg") !important; +} +#reset-pbm-toolbar-button { + 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 diff --git a/src/icons/_global_menu.scss b/src/icons/_global_menu.scss index 0c93d6f4..bb64697b 100644 --- a/src/icons/_global_menu.scss +++ b/src/icons/_global_menu.scss @@ -282,7 +282,7 @@ menu.share-tab-url-item { --menuitem-image: url("../icons/command-frames.svg"); } #menu_browserConsole { - --menuitem-image: url("chrome://devtools/skin/images/command-console.svg"); + --menuitem-image: url("../icons/command-console.svg"); } #menu_responsiveUI { /* checkbox */ @@ -290,13 +290,13 @@ menu.share-tab-url-item { } #menu_eyedropper { /* checkbox */ - --menuitem-image: url("chrome://devtools/skin/images/command-eyedropper.svg"); + --menuitem-image: url("../icons/command-eyedropper.svg"); } #menu_pageSource { --menuitem-image: url("../icons/document-search.svg"); } #extensionsForDevelopers { - --menuitem-image: url("chrome://devtools/skin/images/debugging-addons.svg"); + --menuitem-image: url("chrome://mozapps/skin/extensions/extension.svg"); } /*= windowPopup ==============================================================*/ diff --git a/src/icons/_index.scss b/src/icons/_index.scss index cdbf0237..60dce9ed 100644 --- a/src/icons/_index.scss +++ b/src/icons/_index.scss @@ -70,5 +70,10 @@ } } +/** Icons - 1.25px Stroke Width ***********************************************/ +@include Option("userChrome.icon.1-25px_stroke") { + @import "1.25px_stroke"; +} + /** Icons for fork browsers ***************************************************/ @import "fork_browsers/index"; diff --git a/src/icons/_panel.scss b/src/icons/_panel.scss index 2b0a8594..c334e99e 100644 --- a/src/icons/_panel.scss +++ b/src/icons/_panel.scss @@ -99,7 +99,7 @@ list-style-image: url("chrome://global/skin/icons/search-glass.svg"); } #appMenu-translate-button { - list-style-image: url(chrome://browser/skin/translations.svg); + list-style-image: url("../icons/translations.svg"); } #appMenu-zoom-controls2::before, /* Legacy v104 */ #appMenu-zoom-controls::before { @@ -340,7 +340,7 @@ panelMenuBookmarkThisPage[starred] { /* 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"); + list-style-image: url("../icons/command-console.svg"); } /* Responsive Design Mode */ #appmenu-developer-tools-view .subviewbutton:nth-last-child(4), @@ -350,7 +350,7 @@ panelMenuBookmarkThisPage[starred] { /* 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"); + list-style-image: url("../icons/command-eyedropper.svg"); } /* Page Source - Edge file-search.svg */ #appmenu-developer-tools-view .subviewbutton:nth-last-child(2), @@ -360,7 +360,7 @@ panelMenuBookmarkThisPage[starred] { /* 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"); + list-style-image: url("chrome://mozapps/skin/extensions/extension.svg"); } #appmenu-developer-tools-view .subviewbutton:last-child { margin-bottom: 6px !important; diff --git a/src/icons/context_menu/_content_area.scss b/src/icons/context_menu/_content_area.scss index e10c0a62..165e4375 100644 --- a/src/icons/context_menu/_content_area.scss +++ b/src/icons/context_menu/_content_area.scss @@ -15,7 +15,8 @@ #spell-no-suggestions { --menuitem-image: url("../icons/text-proofing-tools.svg"); } -#spell-add-to-dictionary { +#spell-add-to-dictionary, +#spell-add-dictionaries { --menuitem-image: url("../icons/book-add.svg"); } #spell-undo-add-to-dictionary { diff --git a/src/icons/layout/_menu.scss b/src/icons/layout/_menu.scss index b94e82f5..6b2411fe 100644 --- a/src/icons/layout/_menu.scss +++ b/src/icons/layout/_menu.scss @@ -146,4 +146,29 @@ $_layoutCommonMenus: ( list-style-image: var(--menuitem-image, url("../icons/blank.svg")) !important; } } + + /* Exeptions */ + // Mac unified extenstions #847 + #unified-extensions-context-menu > menuitem::before { + padding-inline: 0 !important; + } + + :not(menu, #ContentSelectDropdown, #context-navigation) > menupopup:not(.in-menulist) > menuitem { + &:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]) { + padding-inline-start: 0 !important; + } + + &:not(.menuitem-iconic):has(.menu-iconic-left) { + &[checked] { + padding-left: 4px !important; + background-image: none !important; + } + &[checked="true"] { + padding-left: calc(var(--context-menu-mac-padding) - 8px) !important; + .menu-iconic-text { + padding-left: 8px !important; + } + } + } + } } diff --git a/src/icons/layout/_menu_common.scss b/src/icons/layout/_menu_common.scss index d4306094..3885026f 100644 --- a/src/icons/layout/_menu_common.scss +++ b/src/icons/layout/_menu_common.scss @@ -6,6 +6,7 @@ $_iconNoneCommon: ".in-menulist, [checked=\"true\"]"; $_iconMenuitem: "menuitem:not(.menuitem-iconic, .bookmark-item, #{$_iconNoneCommon})"; $_iconMenu: "menu:not(.menu-iconic, #{$_iconNoneCommon})"; +$_checkMenu: ":not([type=\"checkbox\"][checked=\"true\"], [type=\"radio\"])"; // Components $_nestedPopup: "> menupopup:not(.in-menulist) >"; @@ -30,14 +31,14 @@ $_globalMenus: "#main-menubar > menu"; $_libraryMenuitem: "menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) > #{$_iconMenuitem}"; $_libraryMenu: "menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > #{$_iconMenu}"; $_sendTabMenuPopup: "#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup, #context-sendlinktodevice-popup"; -$_otherPopupMenuitem: "menupopup:is(#{$_sendTabMenuPopup}, #frame > menupopup) > menuitem"; +$_otherPopupMenuitem: "menupopup:is(#{$_sendTabMenuPopup}, #frame > menupopup, #spell-dictionaries-menu) > menuitem#{$_checkMenu}"; $_otherIconMenu: ".openintabs-menuitem, #blockedPopupDontShowMessage, #BMB_viewBookmarksToolbar, #sidebarMenu-popup:is(menupopup)"; //-- Mixin --------------------------------------------------------------------- // Init Menu $_initialMenus: selector.append( "menupopup menuitem, menupopup menu", - ":not([type=\"checkbox\"][checked=\"true\"], [type=\"radio\"])" + $_checkMenu ); $_initialMenus: $_initialMenus + "," + selector.nest($_initialMenus, "> .menu-iconic-left > .menu-iconic-icon"); diff --git a/src/tab/selected_tab/_photon_like_contextline.scss b/src/tab/selected_tab/_photon_like_contextline.scss index 0b5d4531..9cab5317 100644 --- a/src/tab/selected_tab/_photon_like_contextline.scss +++ b/src/tab/selected_tab/_photon_like_contextline.scss @@ -4,6 +4,10 @@ border-radius: var(--tab-border-radius, 4px) var(--tab-border-radius, 4px) 0 0 !important; } +#{built-in-light-theme()} .tab-context-line, +#{built-in-dark-theme()} .tab-context-line { + --tab-line-color: rgb(10, 132, 255); +} .tabbrowser-tab:is([selected], [multiselected]) .tab-context-line { /* Photon like color Default: var(--tab-line-color, rgb(10, 132, 255)) diff --git a/src/theme/system_default_theme/_gtk.scss b/src/theme/system_default_theme/_gtk.scss index 4a2e4547..fb4ec0f3 100644 --- a/src/theme/system_default_theme/_gtk.scss +++ b/src/theme/system_default_theme/_gtk.scss @@ -5,10 +5,4 @@ --urlbar-popup-url-color: #{$accentColor}; } } - - /* Nightly Compatibility */ - :root:not(:-moz-lwtheme) #urlbar { - --toolbar-field-focus-color: var(--toolbar-field-color); /* Nightly: rgba(0, 0, 0, 1) */ - --toolbar-field-focus-background-color: var(--toolbar-field-background-color); /* Nightly: white */ - } } diff --git a/src/theme/system_default_theme/_mac.scss b/src/theme/system_default_theme/_mac.scss index c94e52c2..b9121930 100644 --- a/src/theme/system_default_theme/_mac.scss +++ b/src/theme/system_default_theme/_mac.scss @@ -8,7 +8,12 @@ --mac-selected-bgcolor: color-mix(in srgb, rgb(255, 255, 255) 15%, -moz-dialog); --mac-field-bgcolor: Window; --mac-panel-bgcolor: Menu; - --mac-sidebar-bgcolor: -moz-mac-source-list; + @if mode.isSTANDARD() { + --mac-sidebar-bgcolor: Window; // TODO: -moz-sidebar; + } + @if mode.isESR() { + --mac-sidebar-bgcolor: -moz-mac-source-list; + } --mac-sidebar-hover-bgcolor: color-mix(in srgb, ButtonFace 60%, var(--mac-sidebar-bgcolor)); --mac-hover-bgcolor: Window; --mac-disabled-bgcolor: transparent; diff --git a/user.js b/user.js index 1f673b4f..da69e3b6 100644 --- a/user.js +++ b/user.js @@ -258,6 +258,7 @@ user_pref("userChrome.icon.menu", true); user_pref("userChrome.icon.context_menu", true); user_pref("userChrome.icon.global_menu", true); user_pref("userChrome.icon.global_menubar", true); +user_pref("userChrome.icon.1-25px_stroke", true); // -- User Content ------------------------------------------------------------- user_pref("userContent.player.ui", true);