diff --git a/browser/branding/aurora/content/identity-icons-brand.svg b/browser/branding/aurora/content/identity-icons-brand.svg deleted file mode 100644 index fc8b1a356768..000000000000 --- a/browser/branding/aurora/content/identity-icons-brand.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/browser/branding/aurora/content/jar.mn b/browser/branding/aurora/content/jar.mn index 989efd11bb96..6280b5488255 100644 --- a/browser/branding/aurora/content/jar.mn +++ b/browser/branding/aurora/content/jar.mn @@ -16,5 +16,4 @@ browser.jar: content/branding/icon48.png (../default48.png) content/branding/icon64.png (../default64.png) content/branding/icon128.png (../default128.png) - content/branding/identity-icons-brand.svg content/branding/aboutDialog.css diff --git a/browser/branding/nightly/content/identity-icons-brand.svg b/browser/branding/nightly/content/identity-icons-brand.svg deleted file mode 100644 index fc8b1a356768..000000000000 --- a/browser/branding/nightly/content/identity-icons-brand.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/browser/branding/nightly/content/jar.mn b/browser/branding/nightly/content/jar.mn index 989efd11bb96..6280b5488255 100644 --- a/browser/branding/nightly/content/jar.mn +++ b/browser/branding/nightly/content/jar.mn @@ -16,5 +16,4 @@ browser.jar: content/branding/icon48.png (../default48.png) content/branding/icon64.png (../default64.png) content/branding/icon128.png (../default128.png) - content/branding/identity-icons-brand.svg content/branding/aboutDialog.css diff --git a/browser/branding/official/content/identity-icons-brand.svg b/browser/branding/official/content/identity-icons-brand.svg deleted file mode 100644 index fc8b1a356768..000000000000 --- a/browser/branding/official/content/identity-icons-brand.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/browser/branding/official/content/jar.mn b/browser/branding/official/content/jar.mn index 989efd11bb96..6280b5488255 100644 --- a/browser/branding/official/content/jar.mn +++ b/browser/branding/official/content/jar.mn @@ -16,5 +16,4 @@ browser.jar: content/branding/icon48.png (../default48.png) content/branding/icon64.png (../default64.png) content/branding/icon128.png (../default128.png) - content/branding/identity-icons-brand.svg content/branding/aboutDialog.css diff --git a/browser/branding/unofficial/content/identity-icons-brand.svg b/browser/branding/unofficial/content/identity-icons-brand.svg deleted file mode 100644 index 9beb35fa2d0b..000000000000 --- a/browser/branding/unofficial/content/identity-icons-brand.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/browser/branding/unofficial/content/jar.mn b/browser/branding/unofficial/content/jar.mn index 989efd11bb96..6280b5488255 100644 --- a/browser/branding/unofficial/content/jar.mn +++ b/browser/branding/unofficial/content/jar.mn @@ -16,5 +16,4 @@ browser.jar: content/branding/icon48.png (../default48.png) content/branding/icon64.png (../default64.png) content/branding/icon128.png (../default128.png) - content/branding/identity-icons-brand.svg content/branding/aboutDialog.css diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css index d43ef52c1176..329f29d8819a 100644 --- a/browser/themes/linux/browser.css +++ b/browser/themes/linux/browser.css @@ -30,7 +30,6 @@ --chrome-content-separator-color: ThreeDShadow; } -@media (-moz-proton) { :root:not(:-moz-lwtheme) { --focus-outline-color: -moz-accent-color; } @@ -40,18 +39,6 @@ --attention-icon-color: -moz-accent-color; } -} /*** END proton ***/ - -@media not (-moz-proton) { -:root { - --toolbarbutton-icon-fill-opacity: .85; -} - -#tabbrowser-tabs { - --tab-line-color: -moz-accent-color; -} -} /*** end !proton ***/ - :root:-moz-lwtheme { --chrome-content-separator-color: rgba(0,0,0,.3); @@ -217,12 +204,6 @@ menuitem.bookmark-item { --autocomplete-popup-highlight-color: HighlightText; } -@media not (-moz-proton) { -:root:not(:-moz-lwtheme) { - --urlbar-popup-url-color: -moz-nativehyperlinktext; -} -} /*** END !proton ***/ - /* Translation infobar */ %include ../shared/translation/infobar.inc.css @@ -284,14 +265,6 @@ menuitem.bookmark-item { } } -@media not (-moz-proton) { -.keyboard-focused-tab > .tab-stack > .tab-content, -.tabbrowser-tab:focus:not([aria-activedescendant]) > .tab-stack > .tab-content { - outline: 1px dotted; - outline-offset: -6px; -} -} /*** END !proton ***/ - #context_reloadTab { list-style-image: url("moz-icon://stock/gtk-refresh?size=menu"); } diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css index a0813d579796..af4a7c498003 100644 --- a/browser/themes/osx/browser.css +++ b/browser/themes/osx/browser.css @@ -32,32 +32,9 @@ --arrowpanel-field-background: rgba(12,12,13,.3); } -@media not (-moz-proton) { -:root { - --toolbarbutton-icon-fill-opacity: .7; -} - -#navigator-toolbox { - appearance: none; - --tabs-border-color: rgba(0,0,0,.2); -} -} /*** end !proton ***/ - -@media (-moz-proton) { #navigator-toolbox { appearance: none; } -} /*** END proton ***/ - -@media not (-moz-proton) { -#navigator-toolbox:not(:-moz-lwtheme):-moz-window-inactive { - --tabs-border-color: rgba(0,0,0,.05); -} - -#navigator-toolbox:-moz-lwtheme { - --tabs-border-color: rgba(0,0,0,.3); -} -} /*** end !proton ***/ /* This is a workaround for Bug 1482157 @@ -76,26 +53,6 @@ opacity: 0.001; } -@media not (-moz-proton) { -#tabbrowser-tabs { - --tab-line-color: -moz-accent-color; -} - -#navigator-toolbox toolbarbutton:-moz-lwtheme { - color: inherit; - text-shadow: inherit; -} -} /* END !proton */ - -@media not (-moz-proton) { -:root[macOSNativeFullscreen]:not(:-moz-lwtheme) :is(#navigator-toolbox, #sidebar-box) { - /* Make the toolbar opaque using this color that simulates the - -moz-mac-vibrant-toolbar-dark effect. This hides vibrancy, but it also - ensures that we can't see #browser through the transparent toolbar. */ - background-color: #232323; -} -} /*** END !proton ***/ - /** Begin titlebar **/ #titlebar { @@ -141,12 +98,6 @@ color: var(--toolbar-color); } -@media not (-moz-proton) { -.browser-toolbar.titlebar-color:not(:-moz-lwtheme) { - appearance: auto; -} -} /* END !proton */ - /* Draw the bottom border of the tabs toolbar when titlebar isn't using vibrancy */ :root:not([inFullscreen], [tabsintitlebar]) #nav-bar:not([tabs-hidden="true"]), #nav-bar:not([tabs-hidden="true"]):-moz-lwtheme { @@ -159,13 +110,6 @@ position: relative; } -@media not (-moz-proton) { -#PersonalToolbar:not(:-moz-lwtheme):-moz-window-inactive, -#nav-bar:not(:-moz-lwtheme):-moz-window-inactive { - background-color: -moz-mac-chrome-inactive; -} -} /* END !proton */ - /* ----- BOOKMARK TOOLBAR ----- */ #nav-bar-customization-target > #wrapper-personal-bookmarks > #personal-bookmarks { @@ -205,19 +149,6 @@ %include ../shared/toolbarbutton-icons.inc.css %include ../shared/menupanel.inc.css -@media not (-moz-proton) { -/* On Mac, native buttons keep their full opacity when they become disabled - * and only the glyph or text on top of them becomes less opaque. */ -:root:not([customizing]) #back-button[disabled="true"] { - opacity: 1 !important; - /* Disabled toolbar buttons get an opacity of 0.4 which multiplies - * their fill-opacity of 0.7. calc() doesn't work here - we'd need - * to multiply two unitless numbers and that's invalid in CSS, so - * we need to hard code the value for now. */ - fill-opacity: 0.28; -} -} /* END !proton */ - /* Inactive elements are faded out on OSX */ .toolbarbutton-1:not(:hover):-moz-window-inactive, .bookmark-item:not(:hover):-moz-window-inactive, @@ -238,14 +169,12 @@ %include ../shared/urlbar-searchbar.inc.css @media not (prefers-contrast) { - @media (-moz-proton) { :root:not(:-moz-lwtheme) #urlbar:not([focused="true"]) { --urlbar-box-bgcolor: white; } :root[lwt-default-theme-in-dark-mode] #urlbar:not([focused="true"]) { --urlbar-box-bgcolor: var(--lwt-toolbar-field-focus); } - } /*** END proton ***/ } #urlbar, @@ -299,18 +228,6 @@ moz-input-box > menupopup .context-menu-add-engine > .menu-iconic-left { margin-block: -17px; } -@media not (-moz-proton) { -#BMB_bookmarksPopup[side="top"], -#BMB_bookmarksPopup[side="bottom"] { - margin-inline: -26px; -} - -#BMB_bookmarksPopup[side="left"], -#BMB_bookmarksPopup[side="right"] { - margin-block: -26px; -} -} /** END not Proton **/ - /* Bookmarking panel */ %include ../shared/places/editBookmarkPanel.inc.css @@ -476,34 +393,6 @@ moz-input-box > menupopup .context-menu-add-engine > .menu-iconic-left { text-shadow: inherit; } -@media not (-moz-proton) { -:is(.keyboard-focused-tab, .tabbrowser-tab:focus:not([aria-activedescendant])) > .tab-stack > .tab-content > .tab-label-container:not([pinned]), -:is(.keyboard-focused-tab, .tabbrowser-tab:focus:not([aria-activedescendant])) > .tab-stack > .tab-content > .tab-icon-image[pinned], -:is(.keyboard-focused-tab, .tabbrowser-tab:focus:not([aria-activedescendant])) > .tab-stack > .tab-content > .tab-throbber[pinned] { - box-shadow: var(--focus-ring-box-shadow); -} -} /*** END !proton ***/ - -@media not (-moz-proton) { -#TabsToolbar:not(:-moz-lwtheme) { - color: #333; -} - -:root:is([inFullscreen], [tabsintitlebar]) #TabsToolbar:not(:-moz-lwtheme) { - appearance: auto; - -moz-default-appearance: -moz-mac-vibrant-titlebar-dark; - -moz-font-smoothing-background-color: -moz-mac-vibrant-titlebar-dark; - background-color: #232323; - color: hsl(240, 9%, 98%); - text-shadow: none; -} - -.tabbrowser-tab[multiselected]:not(:-moz-lwtheme), -.tabbrowser-tab[visuallyselected=true]:not(:-moz-lwtheme) { - -moz-font-smoothing-background-color: var(--toolbar-bgcolor); -} -} /* END !proton */ - #tabbrowser-tabs { -moz-box-align: stretch; padding-inline: 0; diff --git a/browser/themes/osx/compacttheme.css b/browser/themes/osx/compacttheme.css index 094440f2b60c..fe83efc4e224 100644 --- a/browser/themes/osx/compacttheme.css +++ b/browser/themes/osx/compacttheme.css @@ -3,25 +3,3 @@ % file, You can obtain one at http://mozilla.org/MPL/2.0/. %include ../shared/compacttheme.inc.css - -@media not (-moz-proton) { -/** - * macOS vibrancy effects only work when there is no background colour behind - * the effect. We disable transparency in fullscreen so #browser can't be seen - * through the toolbar if the latter shifts over the former. - */ -:root:not([macOSNativeFullscreen]) #navigator-toolbox:-moz-lwtheme-darktext { - background-color: transparent; -} - -#TabsToolbar:-moz-lwtheme-darktext { - appearance: auto; - -moz-default-appearance: -moz-mac-vibrant-titlebar-light; - -moz-font-smoothing-background-color: -moz-mac-vibrant-titlebar-light; -} - -.tabbrowser-tab[multiselected]:-moz-lwtheme-darktext, -.tabbrowser-tab[visuallyselected=true]:-moz-lwtheme-darktext { - -moz-font-smoothing-background-color: var(--toolbar-bgcolor); -} -} /* END !proton */ diff --git a/browser/themes/osx/customizableui/panelUI.css b/browser/themes/osx/customizableui/panelUI.css index c3eed7787f95..372d6a9a7419 100644 --- a/browser/themes/osx/customizableui/panelUI.css +++ b/browser/themes/osx/customizableui/panelUI.css @@ -4,7 +4,6 @@ %include ../../shared/customizableui/panelUI.inc.css -@media (-moz-proton) { panel[type="arrow"][side="top"], panel[type="arrow"][side="bottom"] { margin-inline: -16px; @@ -24,23 +23,7 @@ panel[type="arrow"][side="right"] { #customizationui-widget-panel[viewId="PanelUI-profiler"][type="arrow"][side="right"] { margin-block: -8px; } -} /** END Proton **/ -@media not (-moz-proton) { -.subviewbutton { - padding-inline-start: 18px; -} - -.subviewbutton.download { - padding-inline-start: 14px; -} - -.PanelUI-subView menuseparator { - padding: 0 !important; -} -} /** END not Proton **/ - -@media (-moz-proton) { #downloadsPanel, #widget-overflow, #appMenu-popup, @@ -54,9 +37,8 @@ panel[type="arrow"][side="right"] { #BMB_bookmarksPopup { margin-top: -4px; /* Overrides value from panelUI.inc.css */ } -} /** END Proton **/ -panelmultiview .toolbaritem-combined-buttons > spacer.before-label { +#panelmultiview .toolbaritem-combined-buttons > spacer.before-label { width: 42px; /* 18px toolbarbutton padding + 16px icon + 8px label padding start */ } diff --git a/browser/themes/osx/searchbar.css b/browser/themes/osx/searchbar.css index ab34a015ca8d..b9fb5fd24771 100644 --- a/browser/themes/osx/searchbar.css +++ b/browser/themes/osx/searchbar.css @@ -7,9 +7,3 @@ #PopupSearchAutoComplete { border-radius: 4px; } - -@media not (-moz-proton) { -.search-panel-current-engine { - border-radius: 4px 4px 0 0; -} -} /*** END !proton ***/ diff --git a/browser/themes/shared/aboutNetError.css b/browser/themes/shared/aboutNetError.css index bcbb8fcd101d..6213d42c72c7 100644 --- a/browser/themes/shared/aboutNetError.css +++ b/browser/themes/shared/aboutNetError.css @@ -193,29 +193,6 @@ body:not(.neterror) #advancedButton { display: none; } -@media not (-moz-proton) { -.connectionFailure #errorPageContainer, -.netInterrupt #errorPageContainer, -.netTimeout #errorPageContainer, -.netReset #errorPageContainer, -.netOffline #errorPageContainer { - background-image: url("chrome://browser/skin/illustrations/error-connection-failure.svg"); -} - -.dnsNotFound #errorPageContainer { - background-image: url("chrome://browser/skin/illustrations/error-server-not-found.svg"); -} - -.malformedURI #errorPageContainer { - background-image: url("chrome://browser/skin/illustrations/error-malformed-url.svg"); -} - -.clockSkewError #errorPageContainer { - background-image: url("chrome://browser/skin/illustrations/blue-berror.svg"); - background-size: 18.5em; -} -} /* END !proton */ - .clockSkewError #returnButton { display: none; } diff --git a/browser/themes/shared/aboutRestartRequired.css b/browser/themes/shared/aboutRestartRequired.css index b6c25b2a7aa0..7ec80e87269c 100644 --- a/browser/themes/shared/aboutRestartRequired.css +++ b/browser/themes/shared/aboutRestartRequired.css @@ -14,26 +14,6 @@ margin: auto; } -@media not (-moz-proton) { -#errorPageContainer:dir(rtl) { - background-position-x: right; -} - -#text-container { - padding-inline-start: 38%; -} - -#errorPageContainer { - min-height: 350px; - display: flex; - flex-direction: column; - background-position: left center; - background-repeat: no-repeat; - background-size: 38%; - background-image: url("chrome://browser/skin/illustrations/error-connection-failure.svg"); -} -} /*** END !proton ***/ - #restart { margin-top: 1.2em; } diff --git a/browser/themes/shared/aboutSessionRestore.css b/browser/themes/shared/aboutSessionRestore.css index 69b6f03382ae..ff8586dd4cee 100644 --- a/browser/themes/shared/aboutSessionRestore.css +++ b/browser/themes/shared/aboutSessionRestore.css @@ -2,21 +2,6 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -@media not (-moz-proton) { -.description-wrapper { - background-image: url("chrome://browser/skin/illustrations/error-session-restore.svg"); - background-repeat: no-repeat; - background-size: 38%; - padding-inline-start: 38%; - background-position: left center; - min-height: 300px; -} -} /*** END !proton ***/ - -.description-wrapper:dir(rtl) { - background-position-x: right; -} - .title { background-image: none; } diff --git a/browser/themes/shared/aboutTabCrashed.css b/browser/themes/shared/aboutTabCrashed.css index dc4a4beaeb55..1ebc7e52c7a5 100644 --- a/browser/themes/shared/aboutTabCrashed.css +++ b/browser/themes/shared/aboutTabCrashed.css @@ -6,12 +6,6 @@ body { font-size: 1.25rem; } -@media not (-moz-proton) { -.title { - background-image: url("chrome://browser/skin/tab-crashed.svg"); -} -} /*** END !proton ***/ - #reportSent { font-weight: bold; } diff --git a/browser/themes/shared/aboutWelcomeBack.css b/browser/themes/shared/aboutWelcomeBack.css index 621f4abbc7de..e8fa5dd1a802 100644 --- a/browser/themes/shared/aboutWelcomeBack.css +++ b/browser/themes/shared/aboutWelcomeBack.css @@ -2,12 +2,6 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -@media not (-moz-proton) { -.title { - background-image: url("chrome://browser/skin/welcome-back.svg"); -} -} /*** END !proton ***/ - .radioRestoreContainer:not(:last-child) { margin-bottom: 0.3em; } diff --git a/browser/themes/shared/browser.inc.css b/browser/themes/shared/browser.inc.css index f3d4ffde6bbd..fbbfa44c11c9 100644 --- a/browser/themes/shared/browser.inc.css +++ b/browser/themes/shared/browser.inc.css @@ -76,16 +76,6 @@ } } -@media not (-moz-proton) { - :root { - --focus-outline-width: 0; - --identity-box-margin-inline: 3px; - --identity-box-label-opacity: .6; - --urlbar-icon-fill-opacity: .6; - --urlbar-icon-border-radius: 0; - } -} /*** END !proton ***/ - :root[uidensity=compact] { --urlbar-min-height: 26px; --urlbar-icon-padding: 3px; /* (26px - 2px border - 2px padding - 16px icon) / 2 */ @@ -96,21 +86,6 @@ --urlbar-icon-padding: 7px; /* (34px - 2px border - 2px padding - 16px icon) / 2 */ } -@media not (-moz-proton) { -:root { - --urlbar-min-height: 30px; - --urlbar-icon-padding: 6px; /* (30px - 2px border - 16px icon) / 2 */ -} -:root[uidensity=compact] { - --urlbar-min-height: 26px; - --urlbar-icon-padding: 4px; /* (26px - 2px border - 16px icon) / 2 */ -} -:root[uidensity=touch] { - --urlbar-min-height: 32px; - --urlbar-icon-padding: 7px; /* (32px - 2px border - 16px icon) / 2 */ -} -} /*** END !proton ***/ - :root:-moz-lwtheme { --toolbar-bgcolor: rgba(255,255,255,.4); --toolbar-bgimage: none; @@ -119,7 +94,6 @@ color: var(--lwt-text-color); } -@media (-moz-proton) { :root { --focus-outline-width: 2px; --focus-outline-color: currentColor; @@ -153,7 +127,6 @@ --urlbar-box-hover-bgcolor: color-mix(in srgb, currentColor 22%, transparent); } } -} /*** END proton ***/ @media (min-resolution: 1.5dppx) { :root { @@ -193,13 +166,11 @@ border-bottom-style: none; } -@media (-moz-proton) { /* Add space to beginning of toolbar and make that space click the first */ #nav-bar-customization-target > :is(toolbarbutton, toolbaritem):first-child, #nav-bar-customization-target > toolbarpaletteitem:first-child > :is(toolbarbutton, toolbaritem) { padding-inline-start: var(--toolbar-start-end-padding); } -} /*** END proton ***/ :root[sessionrestored] #nav-bar:-moz-lwtheme { transition: @themeTransition@; @@ -214,19 +185,8 @@ #PersonalToolbar { overflow: clip; max-height: 4em; -} - -@media not (-moz-proton) { -#PersonalToolbar { - padding: 2px 6px; -} -} /*** END !proton ***/ - -@media (-moz-proton) { -#PersonalToolbar { padding-inline: 6px; } -} /*** END proton ***/ :root[uidensity=compact] #PersonalToolbar { padding-inline: 2px; diff --git a/browser/themes/shared/customizableui/customizeMode.inc.css b/browser/themes/shared/customizableui/customizeMode.inc.css index e907f68d8f01..dbe5e615a065 100644 --- a/browser/themes/shared/customizableui/customizeMode.inc.css +++ b/browser/themes/shared/customizableui/customizeMode.inc.css @@ -143,34 +143,6 @@ } %endif /* defined(XP_MACOSX) || defined(XP_WIN) */ -@media not (-moz-proton) { -.customizationmode-button > .box-inherit > .box-inherit > .button-icon, -.customizationmode-button > .button-box > .button-icon { - height: 16px; -} - -#customization-uidensity-button > .box-inherit > .box-inherit > .button-text, -#customization-lwtheme-button > .box-inherit > .box-inherit > .button-text { - margin-inline-start: 6px; -} - -#customization-uidensity-button > .box-inherit > .box-inherit > .button-icon, -#customization-lwtheme-button > .box-inherit > .box-inherit > .button-icon { - width: 16px; - height: 16px; - border-radius: 2px; - background-size: contain; -} - -#customization-lwtheme-button > .box-inherit > .box-inherit > .button-icon { - background-image: url("chrome://mozapps/content/extensions/default-theme/icon.svg"); -} - -#customization-uidensity-button > .box-inherit > .box-inherit > .button-icon { - background-image: url("chrome://browser/skin/customizableui/density-normal.svg"); -} -} /*** END !proton ***/ - #widget-overflow-fixed-list > toolbarpaletteitem:not([notransition])[place="menu-panel"], toolbarpaletteitem:not([notransition])[place="toolbar"] { transition: border-width var(--drag-drop-transition-duration) ease-in-out; @@ -320,6 +292,7 @@ toolbarpaletteitem > #search-container > #searchbar > .searchbar-textbox { #customization-uidensity-menu, #customization-lwtheme-menu { font: menu; + margin-inline: 0; /* Make the panel padding uniform across all platforms due to the styling of the section headers and footer. */ @@ -366,24 +339,6 @@ toolbarpaletteitem > #search-container > #searchbar > .searchbar-textbox { background-color: var(--button-active-bgcolor); } -@media not (-moz-proton) { -.customization-uidensity-menuitem, -.customization-lwtheme-menu-theme { - margin: 0 0 5px; - border-radius: 0; -} -.customization-uidensity-menuitem:last-child { - margin-bottom: 0; -} -.customization-uidensity-menuitem:is(:hover, [active="true"]), -.customization-lwtheme-menu-theme:is(:hover, [active="true"]) { - border-color: var(--panel-separator-color); -} -#customization-lwtheme-menu-footer { - margin-inline: calc(-1 * var(--arrowpanel-padding)); -} -} /*** END !proton ***/ - .customization-uidensity-menuitem > .menu-iconic-text, .customization-lwtheme-menu-theme > .toolbarbutton-text { text-align: start; @@ -405,22 +360,6 @@ toolbarpaletteitem > #search-container > #searchbar > .searchbar-textbox { color: inherit; border-style: none; padding: 8px 16px; -} - -@media (-moz-proton) { -#customization-lwtheme-menu, -#customization-uidensity-menu { - margin-inline: 0; -} - -/* Builtin themes use a round gradient image that look better with a border. */ -.customization-lwtheme-menu-theme[image^="resource:"] > .toolbarbutton-icon { - border-radius: 100%; - outline: 1px solid var(--checkbox-border-color); - outline-offset: -0.5px; -} - -.customization-lwtheme-menu-footeritem { font-weight: 600; border-radius: 4px; margin: 0; @@ -428,10 +367,6 @@ toolbarpaletteitem > #search-container > #searchbar > .searchbar-textbox { background-color: var(--button-bgcolor); } -.customization-lwtheme-menu-footeritem:first-child { - margin-inline-end: 8px; -} - .customization-lwtheme-menu-footeritem:hover { background-color: var(--button-hover-bgcolor); } @@ -439,28 +374,17 @@ toolbarpaletteitem > #search-container > #searchbar > .searchbar-textbox { .customization-lwtheme-menu-footeritem:hover:active { background-color: var(--button-active-bgcolor); } -} /*** END proton ***/ -@media not (-moz-proton) { -#customization-lwtheme-menu-footer { - background: linear-gradient(var(--arrowpanel-dimmed) 60%, transparent) border-box; - border-top: 1px solid var(--arrowpanel-dimmed); - margin-bottom: calc(-1 * var(--arrowpanel-padding)); -} - -.customization-lwtheme-menu-footeritem { - padding: 10px; - margin-inline: 0; -} - -.customization-lwtheme-menu-footeritem:hover { - background: linear-gradient(var(--arrowpanel-dimmed) 40%, transparent) padding-box; +/* Builtin themes use a round gradient image that look better with a border. */ +.customization-lwtheme-menu-theme[image^="resource:"] > .toolbarbutton-icon { + border-radius: 100%; + outline: 1px solid var(--checkbox-border-color); + outline-offset: -0.5px; } .customization-lwtheme-menu-footeritem:first-child { - border-inline-end: 1px solid var(--panel-separator-color); + margin-inline-end: 8px; } -} /*** END !proton ***/ .customization-uidensity-menuitem > .menu-iconic-left > .menu-iconic-icon:-moz-locale-dir(rtl), .customization-lwtheme-menu-theme > .toolbarbutton-icon:-moz-locale-dir(rtl) { diff --git a/browser/themes/shared/customizableui/menu-arrow.svg b/browser/themes/shared/customizableui/menu-arrow.svg deleted file mode 100644 index 88b8db7e7885..000000000000 --- a/browser/themes/shared/customizableui/menu-arrow.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - diff --git a/browser/themes/shared/customizableui/panelUI.inc.css b/browser/themes/shared/customizableui/panelUI.inc.css index 769522f6e446..82155f62d48a 100644 --- a/browser/themes/shared/customizableui/panelUI.inc.css +++ b/browser/themes/shared/customizableui/panelUI.inc.css @@ -23,10 +23,6 @@ %define appmenuWarningColor black %define appmenuWarningBorderColor hsl(45,100%,77%) -%define appmenuWarningBackgroundColorBrightText hsla(55,100%,50%,.1) -%define appmenuWarningBackgroundColorHoverBrightText hsla(55,100%,50%,.15) -%define appmenuWarningBackgroundColorActiveBrightText hsla(55,100%,50%,.2) -%define appmenuWarningColorBrightText #F9F9FA :root { --arrowpanel-menuitem-margin: 0; @@ -38,28 +34,7 @@ --panel-separator-zap-gradient: linear-gradient(90deg, #9059FF 0%, #FF4AA2 52.08%, #FFBD4F 100%); --panelview-toolbarbutton-focus-box-shadow: inset 0 0 0 2px var(--focus-outline-color); -} -@media not (-moz-proton) { -:root { - --panel-banner-item-color: black; - --panel-banner-item-background-color: hsla(96,65%,75%,.5); - --panel-banner-item-hover-bgcolor: hsla(96,65%,75%,.8); - --panel-banner-item-active-bgcolor: hsl(96,65%,75%); - --panel-banner-item-update-supported-bgcolor: #74BF43; - --panel-banner-item-warning-icon-bgcolor: #FFBF00; -} - -:root[lwt-popup-brighttext] { - --panel-banner-item-color: @appmenuWarningColorBrightText@; - --panel-banner-item-background-color: rgba(48,230,11,.1); - --panel-banner-item-hover-bgcolor: rgba(48,230,11,.15); - --panel-banner-item-active-bgcolor: rgba(48,230,11,.2); -} -} - -@media (-moz-proton) { -:root { --panel-banner-item-color: var(--button-color); --panel-banner-item-background-color: var(--button-bgcolor); --panel-banner-item-hover-bgcolor: var(--button-hover-bgcolor); @@ -76,22 +51,6 @@ --panel-subview-body-padding: 8px 0; } -} /*** END proton ***/ - -@media not (-moz-proton) { -:root:not([uidensity=compact], [chromehidden~="toolbar"]) #PanelUI-button { - margin-inline-start: 3px; - border-inline-start: 1px solid; - border-image: linear-gradient( - transparent 4px, - var(--toolbarseparator-color) 4px, - var(--toolbarseparator-color) calc(100% - 4px), - transparent calc(100% - 4px) - ); - border-image-slice: 1; -} -} /*** END !proton ***/ - #PanelUI-menu-button[badge-status] > .toolbarbutton-badge-stack > .toolbarbutton-badge { display: -moz-box; height: 10px; @@ -135,7 +94,6 @@ fill: var(--panel-banner-item-warning-icon-bgcolor); } -@media (-moz-proton) { .panel-banner-item[notificationid="update-available"] > .toolbarbutton-icon, .panel-banner-item[notificationid="update-downloading"] > .toolbarbutton-icon, .panel-banner-item[notificationid="update-manual"] > .toolbarbutton-icon, @@ -154,32 +112,6 @@ stroke: var(--arrowpanel-background); fill: var(--panel-banner-item-warning-icon-bgcolor); } -} - -@media not (-moz-proton) { -#PanelUI-menu-button[badge-status="update-unsupported"] > .toolbarbutton-badge-stack > .toolbarbutton-badge { - background-image: url(chrome://browser/skin/update-circle-fill-12.svg); -} - -.panel-banner-item[notificationid="update-available"]::after, -.panel-banner-item[notificationid="update-downloading"]::after, -.panel-banner-item[notificationid="update-manual"]::after, -.panel-banner-item[notificationid="update-other-instance"]::after, -.panel-banner-item[notificationid="update-restart"]::after, -.panel-banner-item[notificationid="update-unsupported"]::after { - background-image: url(chrome://browser/skin/update-badge.svg); - background-repeat: no-repeat; - background-position: center; - -moz-context-properties: fill; - fill: var(--panel-banner-item-update-supported-bgcolor); -} -.panel-banner-item[notificationid="update-unsupported"]::after { - fill: var(--panel-banner-item-warning-icon-bgcolor); -} -.panel-banner-item[notificationid^=update] { - list-style-image: url(chrome://branding/content/icon16.png); -} -} /** END not Proton **/ #PanelUI-menu-button[badge-status="addon-alert"] > .toolbarbutton-badge-stack > .toolbarbutton-badge, #PanelUI-menu-button[badge-status="fxa-needs-authentication"] > .toolbarbutton-badge-stack > .toolbarbutton-badge, @@ -189,33 +121,17 @@ box-shadow: none; border-radius: 0; -moz-context-properties: fill; + fill: var(--panel-banner-item-warning-icon-bgcolor); } #fxa-toolbar-menu-button[badge-status="login_failed"] > .toolbarbutton-badge-stack > .toolbarbutton-badge { display: flex; } -@media (-moz-proton) { -#PanelUI-menu-button[badge-status="addon-alert"] > .toolbarbutton-badge-stack > .toolbarbutton-badge, -#PanelUI-menu-button[badge-status="fxa-needs-authentication"] > .toolbarbutton-badge-stack > .toolbarbutton-badge, -#fxa-toolbar-menu-button[badge-status="login_failed"] > .toolbarbutton-badge-stack > .toolbarbutton-badge { - fill: var(--panel-banner-item-warning-icon-bgcolor); -} -} - #PanelUI-menu-button[badge-status] > .toolbarbutton-badge-stack > .toolbarbutton-badge:-moz-window-inactive { filter: grayscale(100%); } -@media not (-moz-proton) { -#nav-bar[brighttext] #PanelUI-menu-button[badge-status="addon-alert"] > .toolbarbutton-badge-stack > .toolbarbutton-badge, -#nav-bar[brighttext] #PanelUI-menu-button[badge-status="fxa-needs-authentication"] > .toolbarbutton-badge-stack > .toolbarbutton-badge { - -moz-context-properties: fill, stroke; - fill: #FFE900; - stroke: transparent; -} -} /* End NOT Proton */ - .cui-widget-panel, #widget-overflow { font: menu; @@ -250,59 +166,6 @@ panelmultiview[transitioning] > .panel-viewcontainer > .panel-viewstack > panelv margin-top: -8px; } -@media not (-moz-proton) { -/* This section is to anchor all the drop down panels at the same height, shift the - panel`s top margin according to its positioning and the uidensity of the window. */ -#downloadsPanel, -#widget-overflow, -#appMenu-popup, -#customizationui-widget-panel, -#identity-popup, -#permission-popup, -#protections-popup { - margin-top: -6px; -} - -/* The difference between the toolbar buttons` padding and the urlbar-icons` padding, - then subtract 6px. */ -#pageActionActivatedActionPanel, -#pageActionPanel, -#editBookmarkPanel, -.browser-extension-panel { - margin-top: calc(var(--toolbarbutton-inner-padding) - var(--urlbar-icon-padding) - 6px) -} - -/* The bookmarks toolbar is too thin to have the panels overlap 6px. */ -#downloadsPanel.bookmarks-toolbar, -#widget-overflow.bookmarks-toolbar, -#appMenu-popup.bookmarks-toolbar, -#customizationui-widget-panel.bookmarks-toolbar { - margin-top: -1px; -} - -:root:not([uidensity]) #nav-bar #BMB_bookmarksPopup { - margin-top: -11px; -} - -:root[uidensity=touch] #nav-bar #BMB_bookmarksPopup, -:root[uidensity=touch] #TabsToolbar #BMB_bookmarksPopup, -:root[uidensity=compact] #BMB_bookmarksPopup { - margin-top: -9px; -} - -:root[uidensity=compact] #TabsToolbar #BMB_bookmarksPopup { - margin-top: -7px; -} - -#PersonalToolbar #BMB_bookmarksPopup { - margin-top: -2px -} - -:root[uidensity=touch] #PersonalToolbar #BMB_bookmarksPopup { - margin-top: -5px; -} -} /** END not Proton **/ - .panel-subview-body { overflow-y: auto; overflow-x: hidden; @@ -310,18 +173,16 @@ panelmultiview[transitioning] > .panel-viewcontainer > .panel-viewstack > panelv padding: var(--panel-subview-body-padding); } -@media (-moz-proton) { - toolbarseparator + .panel-subview-body, - .subview-subheader + .panel-subview-body { - padding: 0; - } +toolbarseparator + .panel-subview-body, +.subview-subheader + .panel-subview-body { + padding: 0; +} - #appmenu-developer-tools-view.panel-subview-body { - display: flex; - flex-direction: column; - min-height: 0; - } -} /** END Proton **/ +#appmenu-developer-tools-view.panel-subview-body { + display: flex; + flex-direction: column; + min-height: 0; +} .panel-view-body-unscrollable { overflow: hidden; @@ -599,18 +460,6 @@ toolbarbutton[constrain-size="true"][cui-areatype="menu-panel"] > .toolbarbutton display: none; } -/* When we want to display the application's icon in the notification, add a - content element to put it in, since the regular icon element is used for the - notification type icon. */ -@media not (-moz-proton) { -.panel-banner-item::after { - content: ""; - width: 16px; - height: 16px; - margin-inline: 10px 12px; - display: -moz-box; -} -} /* Addon banners use that one for the addon's icon and need a content element added to put their generic notification in. */ @@ -633,26 +482,6 @@ toolbarbutton[constrain-size="true"][cui-areatype="menu-panel"] > .toolbarbutton -moz-image-region: rect(0, 16px, 16px, 0); } -@media not (-moz-proton) { -.addon-banner-item { - /* Force border to override `.addon-banner-item` selector below */ - border-top: 1px solid @appmenuWarningBorderColor@ !important; -} - -.addon-banner-item:last-child { - border-bottom: 1px solid @appmenuWarningBorderColor@; -} - -.addon-banner-item:focus, -.addon-banner-item:hover { - background-color: @appmenuWarningBackgroundColorHover@; -} - -.addon-banner-item:hover:active { - background-color: @appmenuWarningBackgroundColorActive@; -} -} - .panel-banner-item > .toolbarbutton-icon, .addon-banner-item > .toolbarbutton-icon { width: 16px; @@ -661,81 +490,27 @@ toolbarbutton[constrain-size="true"][cui-areatype="menu-panel"] > .toolbarbutton .addon-banner-item::after { background: url(chrome://global/skin/icons/warning.svg) no-repeat center; -} - -@media not (-moz-proton) { -:root[lwt-popup-brighttext] .addon-banner-item::after { - -moz-context-properties: fill; - fill: #FFE900; -} -} - -@media (-moz-proton) { -.addon-banner-item::after { margin-inline-end: 8px; -moz-context-properties: fill; fill: var(--panel-banner-item-warning-icon-bgcolor); } -} -.addon-banner-item, -.panel-banner-item { - margin: 0; - padding: 11px 0; - box-sizing: border-box; - min-height: 40px; - appearance: none; - box-shadow: none; - border: none; - border-radius: 0; - transition: background-color; - -moz-box-orient: horizontal; -} - -@media (-moz-proton) { .addon-banner-item, .panel-banner-item { margin: 0 8px 4px; padding: 8px; padding-inline-start: 0; - min-height: unset; - border-radius: 4px; -moz-box-align: start; + box-sizing: border-box; + appearance: none; + box-shadow: none; + border: none; + border-radius: 4px; + transition: background-color; + -moz-box-orient: horizontal; font-weight: 600; } -} /** END Proton **/ - -@media not (-moz-proton) { -.panel-banner-item { - border-block: 1px solid var(--panel-separator-color); - padding-inline-start: 12px; -} - -#appMenu-addon-banners:not(:empty) + .panel-banner-item { - /* Overlap the .addon-banner-item border so there's one border. */ - margin-top: -1px; -} - -#appMenu-addon-banners > .addon-banner-item { - padding-inline-start: 12px; -} - -.panel-banner-item > .toolbarbutton-text { - width: 0; /* Fancy cropping solution for flexbox. */ -} - -#appMenu-addon-banners:not(:empty) ~ #appMenu-fxa-status, -.panel-banner-item:not([hidden]) + #appMenu-fxa-status { - margin-top: 6px; -} - -#appMenu-popup panelview { - min-width: @menuPanelWidth@; - max-width: 35em; -} -} /** END not Proton **/ - /* FxAccount indicator bits. */ #appMenu-fxa-label { @@ -835,83 +610,81 @@ toolbarbutton[constrain-size="true"][cui-areatype="menu-panel"] > .toolbarbutton background-color: @appmenuWarningBackgroundColorActive@; } -@media (-moz-proton) { - #appMenu-fxa-status2 { - display: flex; - } +#appMenu-fxa-status2 { + display: flex; +} - #appMenu-fxa-text, - #appMenu-fxa-status2[fxastatus] > #appMenu-fxa-label2 { - flex: 1; - align-self: center; - } +#appMenu-fxa-text, +#appMenu-fxa-status2[fxastatus] > #appMenu-fxa-label2 { + flex: 1; + align-self: center; +} - #appMenu-fxa-status2[fxastatus] { - margin: 0; - padding: 0; - } +#appMenu-fxa-status2[fxastatus] { + margin: 0; + padding: 0; +} - #appMenu-fxa-status2:not([fxastatus]) { - padding-block: 0 2px; - } +#appMenu-fxa-status2:not([fxastatus]) { + padding-block: 0 2px; +} - #appMenu-fxa-status2[fxastatus] > #appMenu-fxa-label2 > vbox > #appMenu-header-description, - #appMenu-fxa-text { - font-weight: 600; - } +#appMenu-fxa-status2[fxastatus] > #appMenu-fxa-label2 > vbox > #appMenu-header-description, +#appMenu-fxa-text { + font-weight: 600; +} - #appMenu-fxa-status2:not([fxastatus]) > #appMenu-fxa-label2 { - padding: 6px 12px; - background-color: var(--button-bgcolor); - font-size: 0.8em; - font-weight: 600; - } +#appMenu-fxa-status2:not([fxastatus]) > #appMenu-fxa-label2 { + padding: 6px 12px; + background-color: var(--button-bgcolor); + font-size: 0.8em; + font-weight: 600; +} - #appMenu-fxa-status2:not([fxastatus]) > #appMenu-fxa-label2:hover { - background-color: var(--button-hover-bgcolor); - } +#appMenu-fxa-status2:not([fxastatus]) > #appMenu-fxa-label2:hover { + background-color: var(--button-hover-bgcolor); +} - #appMenu-fxa-status2:not([fxastatus]) > #appMenu-fxa-label2:active { - background-color: var(--button-active-bgcolor); - } +#appMenu-fxa-status2:not([fxastatus]) > #appMenu-fxa-label2:active { + background-color: var(--button-active-bgcolor); +} - :root[fxadisabled=true] #appMenu-fxa-status2, - :root[fxadisabled=true] #appMenu-fxa-separator { - display: none; - } +:root[fxadisabled=true] #appMenu-fxa-status2, +:root[fxadisabled=true] #appMenu-fxa-separator { + display: none; +} - #fxa-manage-account-button > vbox > label, - #PanelUI-fxa-menu-syncnow-button > hbox > label, - #PanelUI-remotetabs-syncnow > hbox > label { - margin-inline-start: 0; - } +#fxa-manage-account-button > vbox > label, +#PanelUI-fxa-menu-syncnow-button > hbox > label, +#PanelUI-remotetabs-syncnow > hbox > label { + margin-inline-start: 0; +} - #appMenu-fxa-label2 > vbox > label { - margin-inline: 0; - } +#appMenu-fxa-label2 > vbox > label { + margin-inline: 0; +} - .syncNowBtn { - visibility: collapse; - -moz-box-ordinal-group: 2; - } +.syncNowBtn { + visibility: collapse; + -moz-box-ordinal-group: 2; +} - .PanelUI-remotetabs-clientcontainer > label[itemtype="client"] { - font-size: 11px; - } +.PanelUI-remotetabs-clientcontainer > label[itemtype="client"] { + font-size: 11px; +} - #appMenu-fxa-status2[fxastatus="login-failed"] #appMenu-fxa-label2::after { - content: url("chrome://global/skin/icons/warning.svg"); - -moz-context-properties: fill; - fill: var(--panel-banner-item-warning-icon-bgcolor); - } +#appMenu-fxa-status2[fxastatus="login-failed"] #appMenu-fxa-label2::after { + content: url("chrome://global/skin/icons/warning.svg"); + -moz-context-properties: fill; + fill: var(--panel-banner-item-warning-icon-bgcolor); +} - #appMenu-fxa-status2[fxastatus="unverified"] #appMenu-fxa-label2::after { - content: url("chrome://global/skin/icons/info-filled.svg"); - -moz-context-properties: fill; - fill: var(--panel-banner-item-info-icon-bgcolor); - } +#appMenu-fxa-status2[fxastatus="unverified"] #appMenu-fxa-label2::after { + content: url("chrome://global/skin/icons/info-filled.svg"); + -moz-context-properties: fill; + fill: var(--panel-banner-item-info-icon-bgcolor); +} -} /** END Proton **/ /* Tracking Protection Button & Toggle */ @@ -935,45 +708,21 @@ toolbarbutton[constrain-size="true"][cui-areatype="menu-panel"] > .toolbarbutton .addon-banner-item > .toolbarbutton-text, .panel-banner-item > .toolbarbutton-text { text-align: start; -} - -@media not (-moz-proton) { -.addon-banner-item > .toolbarbutton-text, -.panel-banner-item > .toolbarbutton-text { - margin: 0; - padding: 0 6px; -} -} /** END not Proton **/ - -@media (-moz-proton) { -.addon-banner-item > .toolbarbutton-text, -.panel-banner-item > .toolbarbutton-text { margin-inline: 8px; padding: 0; } -} /** END Proton **/ .addon-banner-item > .toolbarbutton-icon, .panel-banner-item > .toolbarbutton-icon { margin-inline-end: 0; -} - -@media (-moz-proton) { -.addon-banner-item > .toolbarbutton-icon, -.panel-banner-item > .toolbarbutton-icon { /* Move the icon to appear after the text label. */ -moz-box-ordinal-group: 2; } -} .addon-banner-item { flex: 1; padding-inline-start: 15px; border-inline-start-style: none; -} - -@media (-moz-proton) { -.addon-banner-item { padding-inline: 0; width: auto; } @@ -981,48 +730,6 @@ toolbarbutton[constrain-size="true"][cui-areatype="menu-panel"] > .toolbarbutton .addon-banner-item > .toolbarbutton-icon { display: none; } -} - -@media not (-moz-proton) { -:root[lwt-popup-brighttext] .addon-banner-item { - color: @appmenuWarningColorBrightText@; - background: @appmenuWarningBackgroundColorBrightText@; - /* override `.addon-banner-item` border-top !important defined above */ - border: 0 !important; -} - -:root[lwt-popup-brighttext] .addon-banner-item:hover, -:root[lwt-popup-brighttext] .addon-banner-item:focus { - background: @appmenuWarningBackgroundColorHoverBrightText@; -} - -:root[lwt-popup-brighttext] .addon-banner-item:hover:active, -:root[lwt-popup-brighttext] .addon-banner-item:focus:active { - background: @appmenuWarningBackgroundColorActiveBrightText@; -} - -:root[lwt-popup-brighttext] #appMenu-fxa-status[fxastatus="login-failed"], -:root[lwt-popup-brighttext] #appMenu-fxa-status[fxastatus="unverified"], -:root[lwt-popup-brighttext][fxastatus="login-failed"] .fxa-menu-header, -:root[lwt-popup-brighttext][fxastatus="unverified"] .fxa-menu-header { - background-color: @appmenuWarningBackgroundColorBrightText@; - color: @appmenuWarningColorBrightText@; -} - -:root[lwt-popup-brighttext] #appMenu-fxa-status[fxastatus="login-failed"]:hover, -:root[lwt-popup-brighttext] #appMenu-fxa-status[fxastatus="unverified"]:hover, -:root[lwt-popup-brighttext][fxastatus="login-failed"] .fxa-menu-header:hover, -:root[lwt-popup-brighttext][fxastatus="unverified"] .fxa-menu-header:hover { - background-color: @appmenuWarningBackgroundColorHoverBrightText@; -} - -:root[lwt-popup-brighttext] #appMenu-fxa-status[fxastatus="login-failed"]:hover:active, -:root[lwt-popup-brighttext] #appMenu-fxa-status[fxastatus="unverified"]:hover:active, -:root[lwt-popup-brighttext][fxastatus="login-failed"] .fxa-menu-header:hover:active, -:root[lwt-popup-brighttext][fxastatus="unverified"] .fxa-menu-header:hover:active { - background-color: @appmenuWarningBackgroundColorActiveBrightText@; -} -} /* END NOT Proton */ /* Firefox Account Toolbar Panel */ @@ -1044,11 +751,9 @@ toolbarbutton[constrain-size="true"][cui-areatype="menu-panel"] > .toolbarbutton } /* Hide the FxA toolbar button when its in the nav-bar, until in use */ -@media (-moz-proton) { - :root[fxastatus="not_configured"] #widget-overflow-list > #fxa-toolbar-menu-button, - :root[fxastatus="not_configured"] #nav-bar-customization-target > #fxa-toolbar-menu-button { - display: none; - } +:root[fxastatus="not_configured"] #widget-overflow-list > #fxa-toolbar-menu-button, +:root[fxastatus="not_configured"] #nav-bar-customization-target > #fxa-toolbar-menu-button { + display: none; } #fxa-menu-avatar, @@ -1127,16 +832,6 @@ panelmultiview[mainViewId="PanelUI-fxa"] #PanelUI-remotetabs-syncnow { display: none; } -@media not (-moz-proton) { - #PanelUI-fxa-menu-account-signout-button { - list-style-image: url(chrome://browser/skin/sign-out.svg); - } - - #PanelUI-fxa-menu-sendtab-button { - list-style-image: url("chrome://browser/skin/send-to-device.svg"); - } -} /** END not Proton **/ - #PanelUI-fxa-menu-sendtab-button:-moz-locale-dir(rtl) > .toolbarbutton-icon { transform: scaleX(-1); } @@ -1337,34 +1032,6 @@ panelmultiview[mainViewId="PanelUI-fxa"] #PanelUI-remotetabs-syncnow { background-color: var(--panel-banner-item-active-bgcolor); } -@media not (-moz-proton) { -.panel-banner-item[notificationid="update-unsupported"] { - background-color: @appmenuWarningBackgroundColor@; -} - -.panel-banner-item[notificationid="update-unsupported"]:not([disabled]):focus, -.panel-banner-item[notificationid="update-unsupported"]:not([disabled]):hover { - background-color: @appmenuWarningBackgroundColorHover@; -} - -.panel-banner-item[notificationid="update-unsupported"]:not([disabled]):hover:active { - background-color: @appmenuWarningBackgroundColorActive@; -} - -:root[lwt-popup-brighttext] .panel-banner-item[notificationid="update-unsupported"]:not([disabled]) { - background-color: @appmenuWarningBackgroundColorBrightText@; -} - -:root[lwt-popup-brighttext] .panel-banner-item[notificationid="update-unsupported"]:not([disabled]):focus, -:root[lwt-popup-brighttext] .panel-banner-item[notificationid="update-unsupported"]:not([disabled]):hover { - background-color: @appmenuWarningBackgroundColorHoverBrightText@; -} - -:root[lwt-popup-brighttext] .panel-banner-item[notificationid="update-unsupported"]:not([disabled]):active { - background-color: @appmenuWarningBackgroundColorActiveBrightText@; -} -} /* END NOT Proton */ - #customization-palette .toolbarbutton-text { display: none; } @@ -1409,17 +1076,6 @@ panelview .toolbarbutton-1, list-style-image: url(chrome://global/skin/icons/arrow-left.svg); } -@media not (-moz-proton) { -.subviewbutton > .toolbarbutton-text { - padding: 0; - padding-inline-start: 24px; /* This is 16px for the icon + 8px for the padding as defined below. */ -} - -.subviewbutton > .menu-right { - list-style-image: url(chrome://browser/skin/customizableui/menu-arrow.svg); -} -} /** END not Proton **/ - .subviewbutton > .menu-right, .subviewbutton > .menu-accel-container > .menu-iconic-accel, .subviewbutton > .menu-iconic-left, @@ -1436,11 +1092,9 @@ panelview .toolbarbutton-1, padding-inline-start: 8px; /* See '.subviewbutton-iconic > .toolbarbutton-text' rule above. */ } -@media (-moz-proton) { .addon-banner-item > .toolbarbutton-text { padding-inline-start: 0; } -} .subviewbutton-iconic > .toolbarbutton-icon { width: 16px; @@ -1449,7 +1103,6 @@ panelview .toolbarbutton-1, fill: currentColor; } -@media (-moz-proton) { #appMenu-zoomReduce-button2@buttonStateHoverOrFocus@, #appMenu-zoomReduce-button2@buttonStateActive@, #appMenu-zoomReset-button2@buttonStateHoverOrFocus@, @@ -1514,7 +1167,6 @@ panelview .toolbarbutton-1, margin-inline-start: 2px; padding: 4px 4px; } -} /*** END proton ***/ /* We don't always display: none this item, and if it has forced width (like above) * or margin, that impacts the position of the label. Fix: @@ -1581,14 +1233,6 @@ panelview .toolbarbutton-1, text-shadow: none; } -@media not (-moz-proton) { -.widget-overflow-list .subviewbutton-nav::after, -.PanelUI-subView .subviewbutton-nav::after { - content: url(chrome://browser/skin/customizableui/menu-arrow.svg); - translate: 0 1px; -} -} /* END not Proton */ - .PanelUI-subView .subviewbutton-nav-down::after { content: url(chrome://global/skin/icons/arrow-down.svg); } @@ -1722,47 +1366,33 @@ panelview .toolbarbutton-1 { margin-top: 6px; } -@media not (-moz-proton) { - panelview .toolbarbutton-1@buttonStateHoverOrFocus@, - toolbarbutton.subviewbutton@buttonStateHoverOrFocus@, - .navigable.subviewbutton@buttonStateHoverOrFocus@, - menu.subviewbutton@menuStateHover@, - menuitem.subviewbutton@menuStateHover@, - .widget-overflow-list .toolbarbutton-1@buttonStateHoverOrFocus@, - .toolbaritem-combined-buttons@inAnyPanel@ > toolbarbutton@buttonStateHoverOrFocus@ { - background-color: var(--button-hover-bgcolor); - } -} /** END not Proton **/ +/** + * Focus uses a box-shadow because we want the stroke to be + * internal to the rect without affecting the surrounding layout. This + * seemed to be the simplest way to do that. + */ +panelview .toolbarbutton-1@buttonStateFocus@, +toolbarbutton.subviewbutton@buttonStateFocus@, +.navigable.subviewbutton@buttonStateFocus@, +.widget-overflow-list .toolbarbutton-1@buttonStateFocus@, +.toolbaritem-combined-buttons@inAnyPanel@ > toolbarbutton@buttonStateFocus@ { + box-shadow: var(--panelview-toolbarbutton-focus-box-shadow); +} -@media (-moz-proton) { - /** - * Focus in Proton uses a box-shadow because we want the stroke to be - * internal to the rect without affecting the surrounding layout. This - * seemed to be the simplest way to do that. - */ - panelview .toolbarbutton-1@buttonStateFocus@, - toolbarbutton.subviewbutton@buttonStateFocus@, - .navigable.subviewbutton@buttonStateFocus@, - .widget-overflow-list .toolbarbutton-1@buttonStateFocus@, - .toolbaritem-combined-buttons@inAnyPanel@ > toolbarbutton@buttonStateFocus@ { - box-shadow: var(--panelview-toolbarbutton-focus-box-shadow); - } +panelview .toolbarbutton-1@buttonStateHover@, +toolbarbutton.subviewbutton@buttonStateHover@, +.navigable.subviewbutton@buttonStateHover@, +menu.subviewbutton@menuStateHover@, +menuitem.subviewbutton@menuStateHover@, +.widget-overflow-list .toolbarbutton-1@buttonStateHover@, +.toolbaritem-combined-buttons@inAnyPanel@ > toolbarbutton@buttonStateHover@ { + background-color: var(--button-hover-bgcolor); +} - panelview .toolbarbutton-1@buttonStateHover@, - toolbarbutton.subviewbutton@buttonStateHover@, - .navigable.subviewbutton@buttonStateHover@, - menu.subviewbutton@menuStateHover@, - menuitem.subviewbutton@menuStateHover@, - .widget-overflow-list .toolbarbutton-1@buttonStateHover@, - .toolbaritem-combined-buttons@inAnyPanel@ > toolbarbutton@buttonStateHover@ { - background-color: var(--button-hover-bgcolor); - } - - .subview-subheader { - font-size: 11px; - padding-block: 4px; - } -} /** END Proton **/ +.subview-subheader { + font-size: 11px; + padding-block: 4px; +} panelview .toolbarbutton-1@buttonStateActive@, toolbarbutton.subviewbutton@buttonStateActive@, @@ -1825,7 +1455,6 @@ menuitem.panel-subview-footer@menuStateActive@, padding: 0; } -@media (-moz-proton) { .PanelUI-subView menuseparator { appearance: none; min-height: 0; @@ -1838,7 +1467,6 @@ menuitem.panel-subview-footer@menuStateActive@, .PanelUI-subView toolbarseparator.proton-zap { border-image: var(--panel-separator-zap-gradient) 1; } -} /** END Proton **/ .PanelUI-subView toolbarseparator.small-separator { margin-inline: 5px; @@ -2040,26 +1668,6 @@ toolbarpaletteitem[place="menu-panel"] > .subviewbutton-nav::after { background-color: var(--button-active-bgcolor); } -@media not (-moz-proton) { -.subviewradio { - padding: 1px; - border-radius: 2px; -} - -.subviewradio@buttonStateHoverOrFocus@, -.subviewradio[selected], -.subviewradio[selected]:hover, -.subviewradio@buttonStateActive@ { - border-color: var(--panel-separator-color); -} - -.subviewradio[selected], -.subviewradio[selected]:hover, -.subviewradio@buttonStateActive@ { - box-shadow: 0 1px 0 hsla(210,4%,10%,.03) inset; -} -} /*** END !proton ***/ - .subviewradio > .radio-check { appearance: none; width: 16px; @@ -2168,20 +1776,7 @@ toolbarpaletteitem[place="menu-panel"] > .subviewbutton-nav::after { background-color: var(--button-active-bgcolor); } -@media not (-moz-proton) { -#panic-button-success-closebutton, -#PanelUI-panic-view-button { - font-weight: normal; -} -} /*** END !proton ***/ - @media (min-resolution: 1.1dppx) { - @media not (-moz-proton) { - .panel-banner-item[notificationid^=update] { - list-style-image: url(chrome://branding/content/icon32.png); - } - } /** END not Proton **/ - #panic-button-success-icon, #PanelUI-panic-timeframe-icon { list-style-image: url(chrome://browser/skin/panic-panel/header@2x.png); @@ -2209,20 +1804,9 @@ toolbarpaletteitem[place="menu-panel"] > .subviewbutton-nav::after { display: flex; flex: 1 auto; padding: 4px; + padding-top: 8px; } -@media (-moz-proton) { - .panel-header { - padding-top: 8px; - } -} /** END Proton **/ - -@media not (-moz-proton) { - .panel-header { - border-bottom: 1px solid var(--panel-separator-color); - } -} /** END not Proton **/ - .panel-header > h1 { display: inline; flex: auto; @@ -2249,11 +1833,9 @@ toolbarpaletteitem[place="menu-panel"] > .subviewbutton-nav::after { padding: 8px; } -@media (-moz-proton) { .subviewbutton-back { margin: 0 4px; } -} /** End Proton **/ .panel-header > .subviewbutton-back:-moz-locale-dir(rtl) { list-style-image: url(chrome://global/skin/icons/arrow-right.svg); @@ -2339,60 +1921,6 @@ panelview:not([mainview]) #PanelUI-whatsNew-title { min-height: 41px; } -@media not (-moz-proton) { -#PanelUI-whatsNew .panelMenu-toggleWhatsNew-checkbox { - background-color: var(--arrowpanel-dimmed); - padding-inline-start: 18px; -} - -#PanelUI-whatsNew .panelMenu-toggleWhatsNew-checkbox:hover { - background-color: var(--arrowpanel-dimmed-further); -} - -#PanelUI-whatsNew .panelMenu-toggleWhatsNew-checkbox:focus { - background-color: var(--arrowpanel-dimmed-further); - outline: 2px solid rgba(0, 96, 223, 0.5); - outline-offset: -2px; -} - -#PanelUI-whatsNew .panelMenu-toggleWhatsNew-checkbox:active { - background-color: var(--arrowpanel-dimmed-even-further); -} - -/* These checkbox styles have been pulled from `common.inc.css` and - duplicated here to ensure they apply correctly. See - https://searchfox.org/mozilla-central/rev/7908ce29657cfd623993046bd8e38664e1c0b28e/toolkit/themes/shared/in-content/common.inc.css#559 */ -#PanelUI-whatsNew checkbox { - appearance: none; - height: 30px; - margin: 0; -} - -#PanelUI-whatsNew checkbox[checked] { - list-style-image: url("chrome://global/skin/icons/check.svg"); - -moz-context-properties: fill; - fill: #2292d0; -} - -#PanelUI-whatsNew .checkbox-check { - appearance: none; - width: 20px; - height: 20px; - padding: 1px; - border: 1px solid #A9A9A9; - border-radius: 2px; - margin: 0; - margin-inline-end: 6px; - background-color: #FFF; - background-position: center; - background-repeat: no-repeat; -} - -#PanelUI-whatsNew checkbox:hover .checkbox-check { - border-color: #0a84ff; -} -} /*** END !proton ***/ - #PanelUI-whatsNew .whatsNew-message { cursor: pointer; margin: 0; @@ -2659,77 +2187,6 @@ panelview:not([mainview]) #PanelUI-whatsNew-title { #PanelUI-profiler-presets { margin: 8px 15px; } -@media not (-moz-proton) { -#PanelUI-profiler-presets { - appearance: none; - position: relative; /* Ensure there is a stacking context for the dropdown arrow. */ - width: 100%; - min-height: 24px; - background-color: #ededf0; - color: #0c0c0d; - border: 1px solid transparent; - border-radius: 2px; - font-weight: 400; - padding-inline: 4px; - text-decoration: none; - font-size: 12px; -} - -/* This is dark-mode specific styling. */ -:root[lwt-popup-brighttext] #PanelUI-profiler-presets { - background-color: rgb(47, 47, 51); - color: #fff; - border: 1px solid #666168; -} - -#PanelUI-profiler-presets:hover:not([disabled="true"]) { - border-color: #DDDDE0; -} - -#PanelUI-profiler-presets:focus { - box-shadow: 0 0 0 1px #0a84ff, 0 0 0 4px rgba(10, 132, 255, 0.3); -} - -#PanelUI-profiler-presets menupopup { - appearance: none; - border: 1px solid #B7B7B7; - border-radius: 2px; - background-color: #FFF; - padding-block: 4px; -} - -#PanelUI-profiler-presets menuitem { - appearance: none; - font-size: 1em; - color: #000; - padding-block: 0.2em; -} - -#PanelUI-profiler-presets menuitem[_moz-menuactive] { - color: #fff; - background-color: #0060DF; -} - -#PanelUI-profiler-presets::after { - width: 12px; - height: 12px; - position: absolute; - display: block; - content: ""; - margin-block-start: 5px; - -moz-context-properties: fill; - fill: currentColor; - background: url("chrome://global/skin/icons/arrow-down-12.svg") center center no-repeat; -} - -#PanelUI-profiler-presets:-moz-locale-dir(ltr)::after { - right: 22px; -} - -#PanelUI-profiler-presets:-moz-locale-dir(rtl)::after { - left: 22px; -} -} /*** END !Proton ***/ #PanelUI-profiler-content-custom-button { appearance: none; diff --git a/browser/themes/shared/error-pages.css b/browser/themes/shared/error-pages.css index 22fe49f16700..49c2ac7c29dd 100644 --- a/browser/themes/shared/error-pages.css +++ b/browser/themes/shared/error-pages.css @@ -25,32 +25,6 @@ body { flex: 1; } -@media not (-moz-proton) { -.illustrated #errorPageContainer { - min-height: 300px; - display: flex; - flex-direction: column; - background-position: left center; - background-repeat: no-repeat; - background-size: 38%; -} - -.illustrated #errorPageContainer:dir(rtl) { - background-position-x: right; -} - -.illustrated .title { - background: none; - padding-inline-start: 0; - margin-inline-start: 0; -} - -.illustrated #text-container { - margin: auto; - padding-inline-start: 38%; -} -} /*** END !proton ***/ - @media only screen and (max-width: 959px) { body { padding: 0 75px; diff --git a/browser/themes/shared/icons/quit.svg b/browser/themes/shared/icons/quit.svg deleted file mode 100644 index 6478b62ed1f5..000000000000 --- a/browser/themes/shared/icons/quit.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - diff --git a/browser/themes/shared/icons/restore-session.svg b/browser/themes/shared/icons/restore-session.svg deleted file mode 100644 index 3852101fcbbe..000000000000 --- a/browser/themes/shared/icons/restore-session.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - diff --git a/browser/themes/shared/icons/send-to-device.svg b/browser/themes/shared/icons/send-to-device.svg deleted file mode 100644 index cef1604e5de2..000000000000 --- a/browser/themes/shared/icons/send-to-device.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/browser/themes/shared/icons/sign-out.svg b/browser/themes/shared/icons/sign-out.svg deleted file mode 100644 index 2e1bcab4e769..000000000000 --- a/browser/themes/shared/icons/sign-out.svg +++ /dev/null @@ -1,4 +0,0 @@ - - \ No newline at end of file diff --git a/browser/themes/shared/icons/tab-12.svg b/browser/themes/shared/icons/tab-12.svg deleted file mode 100644 index 08093dde84e2..000000000000 --- a/browser/themes/shared/icons/tab-12.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/browser/themes/shared/identity-block/identity-block.inc.css b/browser/themes/shared/identity-block/identity-block.inc.css index 5fa3ecaabdc2..ee60b2ff5f31 100644 --- a/browser/themes/shared/identity-block/identity-block.inc.css +++ b/browser/themes/shared/identity-block/identity-block.inc.css @@ -10,19 +10,6 @@ margin-inline-end: var(--identity-box-margin-inline); } -@media not (-moz-proton) { -#identity-box { - margin-inline-start: var(--identity-box-margin-inline); -} - -/* The tracking protection icon will be hidden if it is a chrome page. There - will be only the brand icon in the url bar. We need to change the margin - in order for the identity box to cover the whole urlbar start section. */ -#identity-box[pageproxystate="valid"].chromeUI { - margin-inline-start: 0; -} -} /*** END !proton ***/ - #identity-box, #tracking-protection-icon-container { /* Set default fill for icons in the identity block. @@ -31,12 +18,6 @@ fill-opacity: var(--urlbar-icon-fill-opacity); } -@media not (-moz-proton) { -#identity-box[pageproxystate="invalid"] { - margin-inline-end: calc(var(--identity-box-margin-inline) + 2px); -} -} /*** END !proton ***/ - #urlbar.searchButton > #urlbar-input-container > #identity-box[pageproxystate="invalid"], #identity-box[pageproxystate="invalid"] > #identity-permission-box, #identity-box[pageproxystate="invalid"] > #notification-popup-box, @@ -61,17 +42,6 @@ background-color: hsla(0,0%,70%,.3); } -@media not (-moz-proton) { -.identity-box-button:hover:not([open=true]), -.identity-box-button:hover:active, -.identity-box-button[open=true], -#tracking-protection-icon-container:hover:not([open=true]), -#tracking-protection-icon-container:hover:active, -#tracking-protection-icon-container[open=true] { - fill-opacity: .8; -} -} /*** END !proton ***/ - .identity-box-button:not(:active):-moz-focusring, #tracking-protection-icon-container:not(:active):-moz-focusring { outline: var(--toolbarbutton-focus-outline); @@ -83,16 +53,6 @@ border-radius: var(--urlbar-icon-border-radius); } -@media not (-moz-proton) { -.identity-box-button { - padding-inline: calc(var(--urlbar-icon-padding) / 2); -} - -#identity-box:not(.chromeUI, .extensionPage, .notSecureText) { - --autocomplete-popup-separator-color: transparent; -} -} /*** END !proton ***/ - #identity-box[pageproxystate="valid"].notSecureText #identity-icon-label, #identity-box[pageproxystate="valid"].chromeUI #identity-icon-label, #identity-box[pageproxystate="valid"].extensionPage #identity-icon-label, @@ -119,7 +79,6 @@ border-radius: var(--urlbar-icon-border-radius); } -@media (-moz-proton) { #identity-box[pageproxystate="valid"].notSecureText > .identity-box-button, #identity-box[pageproxystate="valid"].chromeUI > .identity-box-button, #identity-box[pageproxystate="valid"].extensionPage > .identity-box-button, @@ -141,7 +100,6 @@ #identity-box[pageproxystate="valid"].extensionPage > .identity-box-button[open=true] { background-color: var(--urlbar-box-active-bgcolor); } -} /*** END proton ***/ #urlbar[searchmode]:not([focused="true"]) > #urlbar-input-container > #urlbar-search-mode-indicator, #urlbar[searchmode]:not([focused="true"]) > #urlbar-input-container > #urlbar-label-box { @@ -152,37 +110,6 @@ pointer-events: initial; } -@media not (-moz-proton) { -#identity-box[pageproxystate="valid"].notSecureText, -#identity-box[pageproxystate="valid"].chromeUI, -#identity-box[pageproxystate="valid"].extensionPage, -#urlbar-label-box { - border-inline-end: 1px solid var(--autocomplete-popup-separator-color); - border-image: linear-gradient(transparent 15%, var(--autocomplete-popup-separator-color) 15%, var(--autocomplete-popup-separator-color) 85%, transparent 85%); - border-image-slice: 1; -} - -#identity-box[pageproxystate="valid"].notSecureText > #identity-icon-box, -#identity-box[pageproxystate="valid"].chromeUI > #identity-icon-box, -#identity-box[pageproxystate="valid"].extensionPage > #identity-icon-box { - padding-inline: 8px; -} - -#urlbar-label-box { - padding-inline: 4px; - border-inline-start: 1px solid var(--autocomplete-popup-separator-color); -} - -#urlbar[searchmode]:not([breakout-extend]) > #urlbar-input-container > #urlbar-label-box { - border-inline-start-color: transparent; - border-image-width: 0 1px 0 0; -} - -#urlbar[searchmode]:not([breakout-extend]) > #urlbar-input-container > #urlbar-label-box:-moz-locale-dir(rtl) { - border-image-width: 0 0 0 1px; -} -}/*** END !proton ***/ - .urlbar-label { margin: 0; } @@ -231,12 +158,6 @@ } } -@media not (-moz-proton) { -#identity-box[pageproxystate="valid"].chromeUI #identity-icon { - list-style-image: url(chrome://branding/content/identity-icons-brand.svg); -} -} /*** END !proton ***/ - #identity-box[pageproxystate="valid"].localResource #identity-icon { list-style-image: url(chrome://global/skin/icons/page-portrait.svg); } @@ -245,12 +166,6 @@ list-style-image: url(chrome://global/skin/icons/search-glass.svg); } -@media not (-moz-proton) { -#urlbar:not(.searchButton) > #urlbar-input-container > #identity-box[pageproxystate="invalid"] #identity-icon { - fill-opacity: .4; -} -} - #urlbar[actiontype="extension"] > #urlbar-input-container > #identity-box #identity-icon { list-style-image: url(chrome://mozapps/skin/extensions/extension.svg); } @@ -336,15 +251,6 @@ position: relative; } -@media not (-moz-proton) { -#tracking-protection-icon-container { - /* Separator */ - border-inline-end: 1px solid var(--autocomplete-popup-separator-color); - border-image: linear-gradient(transparent 15%, var(--autocomplete-popup-separator-color) 15%, var(--autocomplete-popup-separator-color) 85%, transparent 85%); - border-image-slice: 1; -} -} /*** END !proton ***/ - #urlbar-input-container[pageproxystate="valid"] > #tracking-protection-icon-container.chromeUI { display: none; } diff --git a/browser/themes/shared/illustrations/blue-berror.svg b/browser/themes/shared/illustrations/blue-berror.svg deleted file mode 100644 index 8c3c8b4c56c9..000000000000 --- a/browser/themes/shared/illustrations/blue-berror.svg +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/browser/themes/shared/illustrations/error-connection-failure.svg b/browser/themes/shared/illustrations/error-connection-failure.svg deleted file mode 100644 index f4725c67f847..000000000000 --- a/browser/themes/shared/illustrations/error-connection-failure.svg +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/browser/themes/shared/illustrations/error-server-not-found.svg b/browser/themes/shared/illustrations/error-server-not-found.svg deleted file mode 100644 index 0f13286dd245..000000000000 --- a/browser/themes/shared/illustrations/error-server-not-found.svg +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/browser/themes/shared/illustrations/error-session-restore.svg b/browser/themes/shared/illustrations/error-session-restore.svg deleted file mode 100644 index 2cbe12f471c8..000000000000 --- a/browser/themes/shared/illustrations/error-session-restore.svg +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/browser/themes/shared/incontent-icons/welcome-back.svg b/browser/themes/shared/incontent-icons/welcome-back.svg deleted file mode 100644 index 2fbea04b4e0b..000000000000 --- a/browser/themes/shared/incontent-icons/welcome-back.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - diff --git a/browser/themes/shared/jar.inc.mn b/browser/themes/shared/jar.inc.mn index c9472dd640b3..5913cb084133 100644 --- a/browser/themes/shared/jar.inc.mn +++ b/browser/themes/shared/jar.inc.mn @@ -40,7 +40,6 @@ skin/classic/browser/customizableui/density-compact.svg (../shared/customizableui/density-compact.svg) skin/classic/browser/customizableui/density-normal.svg (../shared/customizableui/density-normal.svg) skin/classic/browser/customizableui/density-touch.svg (../shared/customizableui/density-touch.svg) - skin/classic/browser/customizableui/menu-arrow.svg (../shared/customizableui/menu-arrow.svg) skin/classic/browser/customizableui/whimsy.png (../shared/customizableui/whimsy.png) skin/classic/browser/downloads/contentAreaDownloadsView.css (../shared/downloads/contentAreaDownloadsView.css) skin/classic/browser/downloads/download-blocked.svg (../shared/downloads/download-blocked.svg) @@ -50,11 +49,7 @@ skin/classic/browser/downloads/notification-start-animation.svg (../shared/downloads/notification-start-animation.svg) skin/classic/browser/drm-icon.svg (../shared/drm-icon.svg) skin/classic/browser/permissions.svg (../shared/identity-block/permissions.svg) - skin/classic/browser/illustrations/blue-berror.svg (../shared/illustrations/blue-berror.svg) - skin/classic/browser/illustrations/error-connection-failure.svg (../shared/illustrations/error-connection-failure.svg) skin/classic/browser/illustrations/error-malformed-url.svg (../shared/illustrations/error-malformed-url.svg) - skin/classic/browser/illustrations/error-server-not-found.svg (../shared/illustrations/error-server-not-found.svg) - skin/classic/browser/illustrations/error-session-restore.svg (../shared/illustrations/error-session-restore.svg) skin/classic/browser/notification-icons/autoplay-media.svg (../shared/notification-icons/autoplay-media.svg) skin/classic/browser/notification-icons/autoplay-media-blocked.svg (../shared/notification-icons/autoplay-media-blocked.svg) skin/classic/browser/notification-icons/camera-blocked.svg (../shared/notification-icons/camera-blocked.svg) @@ -174,16 +169,12 @@ skin/classic/browser/pocket-outline.svg (../shared/icons/pocket-outline.svg) skin/classic/browser/privateBrowsing.svg (../shared/icons/privateBrowsing.svg) skin/classic/browser/reader-mode.svg (../shared/icons/reader-mode.svg) - skin/classic/browser/restore-session.svg (../shared/icons/restore-session.svg) - skin/classic/browser/quit.svg (../shared/icons/quit.svg) skin/classic/browser/reload.svg (../shared/icons/reload.svg) skin/classic/browser/reload-to-stop.svg (../shared/icons/reload-to-stop.svg) skin/classic/browser/save.svg (../shared/icons/save.svg) skin/classic/browser/screenshot.svg (../shared/icons/screenshot.svg) - skin/classic/browser/send-to-device.svg (../shared/icons/send-to-device.svg) skin/classic/browser/sidebars.svg (../shared/icons/sidebars.svg) skin/classic/browser/sidebars-right.svg (../shared/icons/sidebars-right.svg) - skin/classic/browser/sign-out.svg (../shared/icons/sign-out.svg) #ifndef MOZ_WIDGET_GTK skin/classic/browser/sort.svg (../shared/icons/sort.svg) #endif @@ -192,7 +183,6 @@ skin/classic/browser/success-animation.svg (../shared/icons/success-animation.svg) skin/classic/browser/sync.svg (../shared/icons/sync.svg) skin/classic/browser/tab.svg (../shared/icons/tab.svg) - skin/classic/browser/tab-12.svg (../shared/icons/tab-12.svg) skin/classic/browser/whatsnew.svg (../shared/icons/whatsnew.svg) skin/classic/browser/window.svg (../shared/icons/window.svg) skin/classic/browser/zoom-in.svg (../shared/icons/zoom-in.svg) @@ -225,14 +215,12 @@ skin/classic/browser/translation-16.png (../shared/translation/translation-16.png) skin/classic/browser/translation-16@2x.png (../shared/translation/translation-16@2x.png) skin/classic/browser/update-badge.svg (../shared/update-badge.svg) - skin/classic/browser/update-circle-fill-12.svg (../shared/update-circle-fill-12.svg) skin/classic/browser/badge-blue.svg (../shared/badge-blue.svg) skin/classic/browser/warning.svg (../shared/warning.svg) skin/classic/browser/profiler-popup-backdrop.png (../shared/profiler-popup-backdrop.png) skin/classic/browser/cert-error.svg (../shared/incontent-icons/cert-error.svg) skin/classic/browser/wifi.svg (../shared/incontent-icons/wifi.svg) skin/classic/browser/tab-crashed.svg (../shared/incontent-icons/tab-crashed.svg) - skin/classic/browser/welcome-back.svg (../shared/incontent-icons/welcome-back.svg) skin/classic/browser/panic-panel/header.png (../shared/panic-panel/header.png) skin/classic/browser/panic-panel/header@2x.png (../shared/panic-panel/header@2x.png) skin/classic/browser/panic-panel/icons.png (../shared/panic-panel/icons.png) diff --git a/browser/themes/shared/menupanel.inc.css b/browser/themes/shared/menupanel.inc.css index 26c0a1a0a068..4629e5e86891 100644 --- a/browser/themes/shared/menupanel.inc.css +++ b/browser/themes/shared/menupanel.inc.css @@ -4,174 +4,6 @@ /* Menu panel and palette styles */ -@media not (-moz-proton) { -#appMenu-new-window-button { - list-style-image: url(chrome://browser/skin/window.svg); -} - -#appMenu-private-window-button { - list-style-image: url(chrome://browser/skin/privateBrowsing.svg); -} - -#appMenu-print-button { - list-style-image: url(chrome://global/skin/icons/print.svg); -} - -#appMenu-library-button { - list-style-image: url(chrome://browser/skin/library.svg); -} - -#appMenu-logins-button, -#PanelUI-fxa-menu-logins-button { - list-style-image: url(chrome://browser/skin/login.svg); -} - -#appMenu-addons-button { - list-style-image: url(chrome://mozapps/skin/extensions/extension.svg); -} - -#PanelUI-fxa-menu-sync-prefs-button, -#PanelUI-fxa-menu-account-devices-button, -#appMenu-preferences-button { - list-style-image: url(chrome://global/skin/icons/settings.svg); -} - -#appMenu-customize-button { - list-style-image: url(chrome://browser/skin/customize.svg); -} - -#appMenu-find-button, -#panelMenu_searchBookmarks { - list-style-image: url(chrome://global/skin/icons/search-glass.svg); -} - -#appMenu_help_importFromAnotherBrowser { - list-style-image: url(chrome://browser/skin/import.svg); -} - -#appMenu-taskmanager-button { - list-style-image: url(chrome://global/skin/icons/performance.svg); -} - -#appMenu-whatsnew-button { - list-style-image: url(chrome://browser/skin/whatsnew.svg); -} - -#appMenu-help-button { - list-style-image: url(chrome://global/skin/icons/help.svg); -} - -#appMenu-cut-button { - list-style-image: url(chrome://browser/skin/edit-cut.svg); -} - -#appMenu-copy-button { - list-style-image: url(chrome://browser/skin/edit-copy.svg); -} - -#appMenu-paste-button { - list-style-image: url(chrome://browser/skin/edit-paste.svg); -} - -#appMenu-quit-button { - list-style-image: url(chrome://browser/skin/quit.svg); -} - -#appMenu-zoomEnlarge-button, -#appMenu-zoomEnlarge-button2 { - list-style-image: url(chrome://browser/skin/zoom-in.svg); -} - -#appMenu-zoomReduce-button, -#appMenu-zoomReduce-button2 { - list-style-image: url(chrome://browser/skin/zoom-out.svg); -} - -#appMenu-fullscreen-button, -#appMenu-fullscreen-button2 { - list-style-image: url(chrome://browser/skin/fullscreen.svg); -} - -#appMenu-fullscreen-button[checked], -#appMenu-fullscreen-button2[checked] { - list-style-image: url(chrome://browser/skin/fullscreen-exit.svg); -} - -#appMenu-library-pocket-button { - list-style-image: url("chrome://global/skin/icons/pocket.svg"); -} - -#appMenu-library-history-button { - list-style-image: url(chrome://browser/skin/history.svg); -} - -#PanelUI-fxa-menu-remotetabs-button, -#appMenuRecentlyClosedTabs { - list-style-image: url("chrome://browser/skin/tab.svg"); -} - -#PanelUI-fxa-menu-setup-sync-button { - list-style-image: url("chrome://browser/skin/sync.svg"); -} - -#PanelUI-fxa-menu-view-managedevices -#PanelUI-remotetabs-view-managedevices { - list-style-image: url("chrome://browser/skin/device-phone.svg"); -} - -#PanelUI-fxa-menu-view-sidebar, -#panelMenu_viewBookmarksSidebar { - list-style-image: url("chrome://browser/skin/sidebars-right.svg"); -} - -#PanelUI-fxa-menu-view-sidebar:-moz-locale-dir(ltr):not([positionend]), -#PanelUI-fxa-menu-view-sidebar:-moz-locale-dir(rtl)[positionend], -#panelMenu_viewBookmarksSidebar:-moz-locale-dir(ltr):not([positionend]), -#panelMenu_viewBookmarksSidebar:-moz-locale-dir(rtl)[positionend] { - list-style-image: url("chrome://browser/skin/sidebars.svg"); -} - -#panelMenu_bookmarkingTools { - list-style-image: url("chrome://browser/skin/developer.svg"); -} - -#panelMenu_viewBookmarksToolbar { - list-style-image: url("chrome://browser/skin/bookmarks-toolbar.svg"); -} - -#panelMenuBookmarkThisPage { - list-style-image: url("chrome://browser/skin/bookmark-hollow.svg"); -} - -#appMenu-library-bookmarks-button, -#panelMenuBookmarkThisPage[starred] { - list-style-image: url("chrome://browser/skin/bookmark.svg"); -} - -#bookmarks-menu-button[cui-areatype="menu-panel"], -toolbarpaletteitem[place="palette"] > #bookmarks-menu-button, -#panelMenu_toggleBookmarksMenu { - list-style-image: url("chrome://browser/skin/bookmark-star-on-tray.svg"); -} - -#appMenuClearRecentHistory { - list-style-image: url("chrome://browser/skin/forget.svg"); -} - -#appMenuRestoreLastSession { - list-style-image: url("chrome://browser/skin/restore-session.svg"); -} - -#appMenuRecentlyClosedWindows { - list-style-image: url(chrome://browser/skin/window.svg); -} - -#appMenu-library-downloads-button { - list-style-image: url("chrome://browser/skin/downloads/downloads.svg"); -} -} /** END not Proton **/ - -@media (-moz-proton) { /** * These are placeholder icons until we get the proper Proton * assets for zoom/fullscreen/sync. @@ -191,4 +23,3 @@ toolbarpaletteitem[place="palette"] > #bookmarks-menu-button, #appMenu-fullscreen-button2[checked] { list-style-image: url(chrome://browser/skin/fullscreen-exit.svg); } -} /** END Proton **/ diff --git a/browser/themes/shared/notification-icons.inc.css b/browser/themes/shared/notification-icons.inc.css index 354b908e657b..658fa7f7430a 100644 --- a/browser/themes/shared/notification-icons.inc.css +++ b/browser/themes/shared/notification-icons.inc.css @@ -4,7 +4,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ %endif -@media (-moz-proton) { #notification-popup-box { height: calc(var(--urlbar-min-height) - 2px /* border */ - 2 * var(--urlbar-container-padding)); -moz-context-properties: fill, fill-opacity; @@ -20,7 +19,6 @@ #notification-popup-box[open] { background-color: hsla(0,0%,70%,.3); } -} /*** END proton ***/ .popup-notification-icon, .permission-popup-permission-icon { @@ -35,13 +33,6 @@ outline-offset: calc(var(--urlbar-icon-padding) - 2px); } -@media not (-moz-proton) { -.blocked-permission-icon:-moz-focusring, -.notification-anchor-icon:-moz-focusring { - outline-offset: 4px; -} -} /*** END !proton ***/ - /* This class can be used alone or in combination with the class defining the type of icon displayed. This rule must be defined before the others in order for its list-style-image to be overridden. */ @@ -264,14 +255,6 @@ font-size: 0.75em; } -@media not (-moz-proton) { -#notification-popup-box { - padding: 5px 0; - margin: -5px 0; - padding-inline-end: 5px; -} -} /** END not Proton **/ - #webRTC-previewWarningBox:-moz-locale-dir(rtl) { background-position: calc(100% - .75em) .75em; } diff --git a/browser/themes/shared/preferences/preferences.inc.css b/browser/themes/shared/preferences/preferences.inc.css index 55fa1a476525..8d929c5ccb78 100644 --- a/browser/themes/shared/preferences/preferences.inc.css +++ b/browser/themes/shared/preferences/preferences.inc.css @@ -596,7 +596,6 @@ richlistitem[selected] .actionsMenu:focus-visible { } } - .dialogBox[resizable="true"] { resize: both; overflow: hidden; @@ -610,16 +609,6 @@ richlistitem[selected] .actionsMenu:focus-visible { border-bottom: 1px solid var(--in-content-border-color); } -@media not (-moz-proton) { -.dialogBox { - border-radius: 3.5px; -} -.dialogTitleBar { - padding: 3.5px 0; - background-color: var(--in-content-dialog-header-background); -} -} /*** END !proton ***/ - .dialogTitle { font-size: .9em; font-weight: 600; diff --git a/browser/themes/shared/searchbar.inc.css b/browser/themes/shared/searchbar.inc.css index 9051b745d396..651b74c9e4f3 100644 --- a/browser/themes/shared/searchbar.inc.css +++ b/browser/themes/shared/searchbar.inc.css @@ -27,11 +27,9 @@ } /* Make the contrast stronger in dark mode */ -@media (-moz-proton) { :root[lwt-toolbar-field-focus-brighttext] .search-panel-header > label { opacity: 1; } -} /** * The borders of the various elements are specified as follows. @@ -52,20 +50,6 @@ padding-inline: 8px; } -@media not (-moz-proton) { -.search-panel-header { - padding-block: 3px; -} - -.search-panel-current-engine { - border-bottom: 1px solid var(--panel-separator-color); -} - -.search-panel-tree:not([collapsed=true]) ~ .search-one-offs { - border-top: 1px solid var(--panel-separator-color); -} -} /*** END !proton ***/ - .search-panel-one-offs:not([hidden]), .search-panel-one-offs-container { display: flex; @@ -92,13 +76,6 @@ border-radius: var(--toolbarbutton-border-radius); } -@media not (-moz-proton) { -.searchbar-engine-one-off-item { - border-radius: 0; - min-width: 48px; -} -} /*** END !proton ***/ - /* We don't handle `:active` because it doesn't work on the search or settings buttons due to event.preventDefault() in SearchOneOffs._on_mousedown(). */ .searchbar-engine-one-off-item:not([selected]):hover { @@ -130,11 +107,9 @@ padding: 1px 3px; } -@media (-moz-proton) { .search-panel-tree > .autocomplete-richlistitem:hover { background-color: var(--autocomplete-popup-hover-background); } -} /*** END proton ***/ .search-panel-tree > .autocomplete-richlistitem > .ac-type-icon { display: -moz-box; @@ -167,12 +142,6 @@ display: none; } -@media not (-moz-proton) { -.searchbar-separator { - display: none; -} -} /*** END !proton ***/ - .search-setting-button { max-height: 32px; align-self: end; diff --git a/browser/themes/shared/toolbarbutton-icons.inc.css b/browser/themes/shared/toolbarbutton-icons.inc.css index c92f73539b5c..9b52e7058b84 100644 --- a/browser/themes/shared/toolbarbutton-icons.inc.css +++ b/browser/themes/shared/toolbarbutton-icons.inc.css @@ -16,17 +16,6 @@ toolbar[brighttext]:-moz-lwtheme { --toolbarbutton-icon-fill-attention: var(--lwt-toolbarbutton-icon-fill-attention, rgb(0,221,255)); } -@media not (-moz-proton) { -:root:-moz-lwtheme { - --toolbarbutton-icon-fill-attention: var(--lwt-toolbarbutton-icon-fill-attention, #0a84ff); -} - -:root[lwt-popup-brighttext] panel, -toolbar[brighttext] { - --toolbarbutton-icon-fill-attention: var(--lwt-toolbarbutton-icon-fill-attention, #45a1ff); -} -} /** END !proton **/ - .toolbarbutton-animatable-box, .toolbarbutton-1 { color: inherit !important; diff --git a/browser/themes/shared/toolbarbuttons.inc.css b/browser/themes/shared/toolbarbuttons.inc.css index f50029010753..a5f6bcb98365 100644 --- a/browser/themes/shared/toolbarbuttons.inc.css +++ b/browser/themes/shared/toolbarbuttons.inc.css @@ -3,8 +3,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ :root { - --toolbarbutton-hover-transition-duration: 150ms; - --toolbar-start-end-padding: 8px; --toolbarbutton-outer-padding: 2px; --toolbarbutton-inner-padding: 8px; @@ -22,64 +20,26 @@ --toolbarbutton-height: 0; } -@media not (-moz-proton) { -:root { - --toolbarbutton-focus-outline: 2px solid currentColor; - - --toolbarbutton-hover-background: color-mix(in srgb, currentColor 10%, transparent); - --toolbarbutton-active-background: color-mix(in srgb, currentColor 15%, transparent); - - --backbutton-background: hsla(0,100%,100%,.5); - --backbutton-hover-background: var(--backbutton-background); - --backbutton-active-background: var(--toolbarbutton-active-background); - --backbutton-border-color: hsla(240,5%,5%,.3); -} - -:root:-moz-lwtheme { - --toolbarbutton-hover-background: color-mix(in srgb, currentColor 15%, transparent); - --toolbarbutton-active-background: color-mix(in srgb, currentColor 30%, transparent); -} - -:root:-moz-lwtheme-brighttext { - --backbutton-background: var(--toolbarbutton-hover-background); - --backbutton-hover-background: var(--toolbarbutton-active-background); - --backbutton-active-background: color-mix(in srgb, currentColor 20%, transparent); -} -} /*** END !proton ***/ - -@media (-moz-proton) { :root { --toolbarbutton-focus-outline: var(--focus-outline); } -} /*** END proton ***/ + :root[uidensity=compact] { --toolbarbutton-outer-padding: 3px; --toolbarbutton-inner-padding: 6px; --bookmark-block-padding: 1px; } -@media not (-moz-proton) { -:root { - --toolbarbutton-outer-padding: 2px; - --toolbarbutton-inner-padding: 6px; -} -:root[uidensity=compact] { - --toolbarbutton-outer-padding: 1px; -} -} /** END !proton **/ - :root[uidensity=touch] { --toolbarbutton-inner-padding: 9px; --bookmark-block-padding: 7px; } -@media (-moz-proton) { #TabsToolbar { /* Override the inner padding to ensure the dimensions match the tabs, but also making sure different types of buttons (combined-buttons-dropmarker or text) still look correct. */ --toolbarbutton-inner-padding: calc((var(--tab-min-height) - 16px) / 2); } -} /*** END proton ***/ /* ::::: primary toolbar buttons ::::: */ @@ -105,20 +65,6 @@ width: 12px; } -@media not (-moz-proton) { -#TabsToolbar .toolbarbutton-1, -#tabbrowser-arrowscrollbox::part(scrollbutton-up), -#tabbrowser-arrowscrollbox::part(scrollbutton-down) { - margin: 0 0 var(--tabs-navbar-shadow-size) !important; -} - -#tabbrowser-arrowscrollbox::part(scrollbutton-up), -#tabbrowser-arrowscrollbox::part(scrollbutton-down) { - appearance: none; - padding: 0 var(--toolbarbutton-inner-padding) !important; -} -} /*** END !proton ***/ - #navigator-toolbox:not(:hover) #tabbrowser-arrowscrollbox:not([highlight])::part(scrollbutton-down) { transition: 1s background-color ease-out; } @@ -134,7 +80,6 @@ toolbar .toolbarbutton-1 { -moz-box-pack: center; } -@media (-moz-proton) { #TabsToolbar .toolbarbutton-1 { margin: 0 0 var(--tabs-navbar-shadow-size) !important; } @@ -148,23 +93,11 @@ toolbar .toolbarbutton-1 { margin: 0; padding: var(--toolbarbutton-inner-padding) calc(var(--toolbarbutton-inner-padding) - 6px); } -} /*** END proton ***/ -@media not (-moz-proton) { -:root:not([uidensity=compact]) #PanelUI-button { - padding-inline-start: 5px; -} - -:root:not([uidensity=compact]) #PanelUI-menu-button { - padding-inline-end: 5px; -} -} /*** END !proton ***/ -@media (-moz-proton) { /*** Adds padding to end of toolbar while making that space click the first button ***/ #PanelUI-menu-button { padding-inline-end: var(--toolbar-start-end-padding); } -} /*** END proton ***/ toolbar .toolbarbutton-1 > menupopup { margin-top: -3px; @@ -177,13 +110,11 @@ toolbar .toolbarbutton-1 > .toolbarbutton-badge-stack { border-radius: var(--toolbarbutton-border-radius); } -@media (-moz-proton) { #TabsToolbar .toolbarbutton-1 > .toolbarbutton-icon, #TabsToolbar .toolbarbutton-1 > .toolbarbutton-text, #TabsToolbar .toolbarbutton-1 > .toolbarbutton-badge-stack { border-radius: var(--tab-border-radius); } -} /*** END proton ***/ toolbar .toolbarbutton-1 > .toolbarbutton-icon { /* horizontal padding + actual icon width */ @@ -284,64 +215,6 @@ toolbar .toolbarbutton-1:-moz-focusring { outline: none; } -@media not (-moz-proton) { -:root:not([uidensity=compact]) #back-button { - padding-block: 3px; - padding-inline: 3px 0; - position: relative !important; - z-index: 1 !important; - border-radius: 0 10000px 10000px 0; -} - -:root:not([uidensity=compact]) #back-button:-moz-locale-dir(rtl) { - border-radius: 10000px 0 0 10000px; -} - -#back-button > menupopup { - margin-top: -1px !important; -} - -:root:not([uidensity=compact]) #back-button > .toolbarbutton-icon { - background-color: var(--backbutton-background); - background-origin: padding-box; - background-clip: padding-box; - border: 1px solid var(--backbutton-border-color); - border-radius: 10000px; - width: 34px; - height: 34px; - padding: 8px; - transition-property: box-shadow; - transition-duration: var(--toolbarbutton-hover-transition-duration); -} - -:root[uidensity=touch] #back-button:-moz-focusring > .toolbarbutton-icon { - outline-offset: calc(var(--focus-outline-width) * -1 - 2px); -} - -:root[uidensity=touch] #back-button { - padding-block: 1px; - padding-inline-start: 1px; -} - -:root[uidensity=touch] #back-button > .toolbarbutton-icon { - width: 38px; - height: 38px; - padding: 10px; -} - -:root:not([uidensity=compact]) #back-button:not([disabled], [open]):hover > .toolbarbutton-icon { - background-color: var(--backbutton-hover-background) !important; - box-shadow: 0 1px 6px hsla(0,0%,0%,.1); - border-color: hsla(240,5%,5%,.35); -} - -:root:not([uidensity=compact]) #back-button[open] > .toolbarbutton-icon, -:root:not([uidensity=compact]) #back-button:not([disabled]):hover:active > .toolbarbutton-icon { - background-color: var(--backbutton-active-background) !important; - border-color: hsla(240,5%,5%,.40); -} -} /*** END !proton ***/ - /* bookmarks menu button */ #BMB_bookmarksPopup[side="top"], @@ -373,42 +246,6 @@ toolbarbutton.bookmark-item:not(.subviewbutton) { margin-inline: 1px; } -@media not (-moz-proton) { - #PersonalToolbar .toolbarbutton-1, - #personal-toolbar-empty-description, - toolbarbutton.bookmark-item:not(.subviewbutton) { - margin-block: 0; - } - - #PersonalToolbar > #wrapper-import-button + #wrapper-personal-bookmarks > #personal-bookmarks, - #PersonalToolbar > #import-button + #personal-bookmarks { - border-inline-start: 1px solid; - border-image-source: linear-gradient( - transparent 3.75px, - var(--toolbarseparator-color) 3.75px, - var(--toolbarseparator-color) calc(100% - 3.75px), - transparent calc(100% - 3.75px) ); - border-image-slice: 1; - } - - /* Add spacing around the separator between the import button and the bookmark - * items, such that it matches spacing around bookmark separators. */ - #PersonalToolbar > #wrapper-import-button + #wrapper-personal-bookmarks > #personal-bookmarks, - #PersonalToolbar > #import-button + #personal-bookmarks { - /* space before the separator (added to 2px margin on the import button) */ - margin-inline-start: 2px; - /* space after (same as `padding-inline` for separators above) */ - padding-inline-start: 4px; - } - - @media (min-resolution: 2dppx) { - #PersonalToolbar > #wrapper-import-button + #wrapper-personal-bookmarks > #personal-bookmarks, - #PersonalToolbar > #import-button + #personal-bookmarks { - border-inline-start-width: 0.5px; - } - } -} /*** END !proton ***/ - toolbarbutton.bookmark-item:not(.subviewbutton) { max-width: 13em; appearance: none; diff --git a/browser/themes/shared/update-circle-fill-12.svg b/browser/themes/shared/update-circle-fill-12.svg deleted file mode 100644 index 50895ad61084..000000000000 --- a/browser/themes/shared/update-circle-fill-12.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/browser/themes/shared/urlbar-searchbar.inc.css b/browser/themes/shared/urlbar-searchbar.inc.css index 3ad85045f294..bef0444bf34b 100644 --- a/browser/themes/shared/urlbar-searchbar.inc.css +++ b/browser/themes/shared/urlbar-searchbar.inc.css @@ -10,18 +10,6 @@ :root { --toolbar-field-border-color: hsla(240,5%,5%,.25); -} - -@media not (-moz-proton) { -:root { - --toolbar-field-focus-border-color: -moz-accent-color; - /* px because it's used in calc */ - --urlbar-container-padding: 0px; -} -} /*** END !proton ***/ - -@media (-moz-proton) { -:root { --toolbar-field-focus-border-color: var(--focus-outline-color); --urlbar-container-padding: 1px; } @@ -31,7 +19,6 @@ --toolbar-field-focus-border-color: color-mix(in srgb, var(--focus-outline-color) 50%, transparent); } } -} /*** END proton ***/ #urlbar-container, #search-container { @@ -39,12 +26,10 @@ margin-inline: @urlbarMarginInline@; } -@media (-moz-proton) { :root[uidensity=touch] #urlbar-container, :root[uidensity=touch] #search-container { padding-block: 5px; } -} #urlbar, #searchbar { @@ -53,40 +38,19 @@ color: var(--toolbar-field-non-lwt-color, FieldText); } -@media not (-moz-proton) { -#urlbar-container, -#search-container { - padding-block: 3px; -} -} /* END !proton */ - #urlbar-background, #searchbar { background-color: Field; - background-clip: padding-box; + background-clip: border-box; border: 1px solid var(--toolbar-field-border-color); border-radius: var(--toolbarbutton-border-radius); -} - -@media (-moz-proton) { -#urlbar-background, -#searchbar { border-color: transparent; - background-clip: border-box; } #urlbar:not([focused="true"], [open]) > #urlbar-background, #searchbar:not(:focus-within) { background-color: var(--toolbar-field-non-lwt-bgcolor, Field); } -} /*** END proton ***/ - -@media not (-moz-proton) { -#urlbar-background, -#searchbar { - box-shadow: 0 1px 4px rgba(0,0,0,.05); -} -} /*** END !proton ***/ #urlbar-input-container, #searchbar { @@ -106,20 +70,6 @@ outline: none; } -@media not (-moz-proton) { -#urlbar:not([focused="true"]):hover > #urlbar-background, -#searchbar:not(:focus-within):hover { - border-color: @fieldHoverBorderColor@; - box-shadow: 0 1px 6px rgba(0,0,0,.1); -} - -#urlbar[focused="true"] > #urlbar-background, -#searchbar:focus-within { - border-color: var(--toolbar-field-focus-border-color); -} -} /*** END !proton ***/ - -@media (-moz-proton) { #urlbar[focused="true"]:not([suppress-focus-border]) > #urlbar-background { border: var(--focus-outline); /* We used --focus-outline above to inherit its width and style properties, @@ -150,7 +100,6 @@ 0 0 0 1px var(--toolbar-field-focus-border-color) inset; border-color: var(--toolbar-field-focus-border-color); } -} /*** END proton ***/ #urlbar:-moz-lwtheme, #searchbar:-moz-lwtheme { @@ -278,43 +227,17 @@ height: auto; } -#urlbar[breakout][breakout-extend] { - top: -@urlbarBreakoutExtend@; - left: calc(-@urlbarMarginInline@ - @urlbarBreakoutExtend@); - width: calc(100% + 2 * @urlbarMarginInline@ + 2 * @urlbarBreakoutExtend@); -} - -@media (-moz-proton) { #urlbar[breakout][breakout-extend] { top: 0; left: -@urlbarMarginInline@; width: calc(100% + 2 * @urlbarMarginInline@); } -} /*** END proton ***/ -@media not (-moz-proton) { -#urlbar[breakout][breakout-extend] > #urlbar-background { - box-shadow: 0 3px 8px 0 rgba(0,0,0,.15) -} - -#urlbar[breakout][breakout-extend][open] > #urlbar-background { - box-shadow: 0 5px 18px rgba(0,0,0,.2); -} -} /*** END !proton ***/ - -#urlbar[breakout][breakout-extend] > #urlbar-input-container { - height: calc(var(--urlbar-toolbar-height) + 2 * @urlbarBreakoutExtend@); - padding-block: calc(@urlbarBreakoutExtend@ + (var(--urlbar-toolbar-height) - var(--urlbar-height)) / 2); - padding-inline: calc(@urlbarMarginInline@ + @urlbarBreakoutExtend@); -} - -@media (-moz-proton) { #urlbar[breakout][breakout-extend] > #urlbar-input-container { height: var(--urlbar-toolbar-height); padding-block: calc((var(--urlbar-toolbar-height) - var(--urlbar-height)) / 2 + var(--urlbar-container-padding)); padding-inline: calc(@urlbarMarginInline@ + var(--urlbar-container-padding)); } -} /*** END proton ***/ #urlbar.searchButton[breakout][breakout-extend] > #urlbar-input-container > #urlbar-search-button { fill: currentColor; @@ -376,24 +299,6 @@ padding-inline: 8px 6px; } -@media not (-moz-proton) { -#urlbar-search-mode-indicator { - min-width: 16px; /* So the close button never causes motion */ - background-color: #d6ebff; - outline: 1px solid #0060df; /* Blue 60 */ - color: #0060df; /* Blue 60 */ - padding-inline: 0; -} - -/* Invert the colors in the search mode indicator in dark mode. */ -:root[lwt-toolbar-field-brighttext] #urlbar-search-mode-indicator { - background-color: #0060df; - outline-color: #d6ebff; - color: #d6ebff; -} -} /*** END !proton ***/ - -@media (-moz-proton) { #urlbar[searchmode] > #urlbar-input-container > #urlbar-search-mode-indicator { display: inline-flex; } @@ -401,13 +306,6 @@ #urlbar[searchmode] > #urlbar-input-container > #urlbar-label-box { display: none; } -} /*** END proton ***/ - -@media not (-moz-proton) { -#urlbar[searchmode][breakout-extend] > #urlbar-input-container > #urlbar-search-mode-indicator { - display: inline-flex; -} -} /*** END !proton ***/ /* Use system colors for low/high contrast mode */ @media (prefers-contrast) { @@ -422,69 +320,33 @@ padding-inline: 0 3px; opacity: var(--identity-box-label-opacity); } -@media not (-moz-proton) { -#urlbar-search-mode-indicator-title { - padding-inline: 5px; - opacity: 1; -} -} /*** END !proton ***/ #urlbar-search-mode-indicator-close { background: url(chrome://global/skin/icons/close.svg) no-repeat center; background-size: 10px 10px; width: 16px; - height: 100%; + height: 16px; -moz-context-properties: fill, fill-opacity; fill-opacity: 0.6; stroke-opacity: var(--identity-box-label-opacity); fill: var(--lwt-toolbar-field-focus-color); -} - -@media (-moz-proton) { -#urlbar-search-mode-indicator-close { - height: 16px; border-radius: var(--urlbar-icon-border-radius); } + #urlbar-search-mode-indicator-close:hover { background-color: hsla(0,0%,70%,.2); } #urlbar-search-mode-indicator-close:hover:active { background-color: hsla(0,0%,70%,.3); } -} /*** END proton ***/ @media (prefers-contrast) { #urlbar-search-mode-indicator-close { - /* fill should match the urlbar text because background-color is set to - Field below for non-proton themes. */ - fill: FieldText; + fill: HighlightText; fill-opacity: 1.0; } - @media (-moz-proton) { - #urlbar-search-mode-indicator-close { - fill: HighlightText; - } - } /*** END proton ***/ } -@media not (-moz-proton) { -#urlbar-search-mode-indicator-close { - display: none; - margin-inline-start: -16px; - /* background-color should match the urlbar background. */ - background-color: Field; -} - -#urlbar-search-mode-indicator-close:-moz-lwtheme { - /* Background-color should match the urlbar background. */ - background-color: var(--lwt-toolbar-field-focus); -} - -#urlbar-search-mode-indicator:hover > #urlbar-search-mode-indicator-close { - display: block; -} -} /*** END !proton ***/ - /* Page action panel */ .pageAction-panel-button > .toolbarbutton-icon { width: 16px; @@ -761,24 +623,6 @@ animation-duration: 250ms; } -@media not (-moz-proton) { -#urlbar-zoom-button { - background-color: hsla(0,0%,0%,.05); - border: 1px solid hsla(210,4%,50%,.3); - border-radius: 1em; - padding: 0 8px; - margin-block: calc((var(--urlbar-min-height) - 18px) / 2 - 1px /* border */ - var(--urlbar-container-padding)); -} - -#urlbar-zoom-button:hover { - background-color: color-mix(in srgb, currentColor 10%, transparent); -} - -#urlbar-zoom-button:hover:active { - background-color: color-mix(in srgb, currentColor 17%, transparent); -} -} /*** END !proton ***/ - #urlbar-zoom-button:-moz-focusring { outline: var(--toolbarbutton-focus-outline); outline-offset: calc(var(--focus-outline-width) * -1); @@ -812,20 +656,6 @@ width: 16px; } -@media not (-moz-proton) { -.searchbar-search-icon { - fill-opacity: .4; -} - -.searchbar-search-button:hover > .searchbar-search-icon { - fill-opacity: .6; -} - -.searchbar-search-button:hover:active > .searchbar-search-icon { - fill-opacity: .8; -} -} /*** END !proton ***/ - .searchbar-search-icon-overlay { pointer-events: none; } @@ -894,9 +724,7 @@ moz-input-box > menupopup .context-menu-add-engine > .menu-iconic-left::after { opacity: 1; } -@media (-moz-proton) { #urlbar-input::placeholder, .searchbar-textbox::placeholder { opacity: 0.69; } -} /*** END !proton ***/ diff --git a/browser/themes/shared/urlbarView.inc.css b/browser/themes/shared/urlbarView.inc.css index 3c2504543f5e..17381f3950b3 100644 --- a/browser/themes/shared/urlbarView.inc.css +++ b/browser/themes/shared/urlbarView.inc.css @@ -21,38 +21,22 @@ --urlbarView-action-slide-in-distance: 200px; - --urlbarView-item-inline-padding: calc(var(--urlbar-icon-padding) / 2 + 3px); -} - -@media not (-moz-proton) { -:root { - --urlbar-popup-url-color: hsl(210, 77%, 47%); -} -} /*** END !proton ***/ - -@media (-moz-proton) { -:root:-moz-lwtheme { - --urlbar-popup-url-color: rgb(0,97,224); -} -} /*** END proton ***/ - -:root[lwt-toolbar-field-focus-brighttext] { - --urlbar-popup-url-color: var(--lwt-popup-brighttext-url-color); - --urlbar-popup-action-color: #30e60b; -} - -@media (-moz-proton) { -:root { --urlbarView-item-inline-padding: var(--urlbar-icon-padding); } :root:-moz-lwtheme { --urlbar-popup-action-color: rgb(91,91,102); + --urlbar-popup-url-color: rgb(0,97,224); /* Fallback colours for when theme authors don't define lwtheme variables. */ --autocomplete-popup-highlight-background: rgb(0, 99, 255); --autocomplete-popup-highlight-color: white; } +:root[lwt-toolbar-field-focus-brighttext] { + --urlbar-popup-url-color: var(--lwt-popup-brighttext-url-color); + --urlbar-popup-action-color: #30e60b; +} + :root[lwt-toolbar-field-brighttext] { --autocomplete-popup-highlight-background: rgb(0, 99, 225); } @@ -60,7 +44,6 @@ :root[lwt-toolbar-field-focus-brighttext] { --urlbar-popup-action-color: rgb(191,191,201); } -} /*** END proton ***/ :root:-moz-locale-dir(rtl) { --urlbarView-action-slide-in-distance: -200px; @@ -79,18 +62,6 @@ border-inline: 1px solid transparent; } -@media not (-moz-proton) { -.urlbarView { - margin-inline: calc(4px + var(--identity-box-margin-inline)); - width: calc(100% - 2 * (4px + var(--identity-box-margin-inline))); -} -/* If the view is open, offset the toolbar overlap so the view's top border - aligns with the toolbar. */ -#urlbar[open] > .urlbarView { - margin-block-start: -@urlbarBreakoutExtend@; -} -} /*** END !proton ***/ - .urlbarView-body-inner { width: 100%; } @@ -112,24 +83,12 @@ .urlbarView-row { fill: currentColor; fill-opacity: var(--urlbar-icon-fill-opacity); - padding-block: 3px; -} - -@media not (-moz-proton) { -:root[uidensity=compact] .urlbarView-row { - padding-block: 2px; -} -} /*** END !proton ***/ - -@media (-moz-proton) { -.urlbarView-row { padding-block: 2px; } :root:not([uidensity=compact]) .urlbarView-row:not([type=tip], [type=dynamic]) { min-height: 32px; } -} /*** END proton ***/ :root[uidensity=touch] .urlbarView-row:not([type=tip], [type=dynamic]) { padding-block: 11px; @@ -139,7 +98,7 @@ display: flex; flex-wrap: nowrap; overflow: hidden; - border-radius: 2px; + border-radius: var(--toolbarbutton-border-radius); padding-inline: var(--urlbarView-item-inline-padding); padding-block: 6px; } @@ -156,12 +115,6 @@ width: calc(100% - 56px); } -@media (-moz-proton) { -.urlbarView-row-inner { - border-radius: var(--toolbarbutton-border-radius); -} -} /*** END proton ***/ - .urlbarView-row[type=tip] { padding-block-start: 18px; @@ -174,17 +127,10 @@ .urlbarView-no-wrap { display: flex; flex-wrap: nowrap; - align-items: end; + align-items: center; justify-content: start; } -@media (-moz-proton) { -.urlbarView-row-inner, -.urlbarView-no-wrap { - align-items: center; -} -} /*** END proton ***/ - .urlbarView-no-wrap { max-width: 100%; flex-grow: 0; @@ -297,12 +243,6 @@ -moz-context-properties: fill, fill-opacity; } -@media not (-moz-proton) { -.urlbarView-favicon { - /* 2px is from identity-block.inc.css */ - margin-inline-end: calc(var(--urlbar-icon-padding) / 2 + var(--identity-box-margin-inline) + 2px); -} -} /*** END !proton ***/ .urlbarView-row[type=tip] > .urlbarView-row-inner > .urlbarView-favicon { width: 24px; @@ -359,40 +299,6 @@ fill: rgb(251,251,254); } -@media not (-moz-proton) { -.urlbarView-row[type=bookmark] > .urlbarView-row-inner > .urlbarView-no-wrap > .urlbarView-type-icon { - color: #0060df; /* Blue-60 */ -} - -.urlbarView-row[pinned] > .urlbarView-row-inner > .urlbarView-no-wrap > .urlbarView-type-icon { - color: #b1b1b3; /* Grey-40 */ -} - -.urlbarView:not([actionoverride]) .urlbarView-row[type=switchtab] > .urlbarView-row-inner > .urlbarView-no-wrap > .urlbarView-type-icon, -.urlbarView-row[type=remotetab] > .urlbarView-row-inner > .urlbarView-no-wrap > .urlbarView-type-icon { - background-image: url(chrome://browser/skin/tab-12.svg); - color: #008eaf; /* Teal-70 */ - stroke: #fff; -} - -:root[lwt-toolbar-field-focus-brighttext] .urlbarView:not([actionoverride]) .urlbarView-row[type=switchtab] > .urlbarView-row-inner > .urlbarView-no-wrap > .urlbarView-type-icon, -:root[lwt-toolbar-field-focus-brighttext] .urlbarView-row[type=remotetab] > .urlbarView-row-inner > .urlbarView-no-wrap > .urlbarView-type-icon { - color: #00c8d7; /* Teal-60 */ - stroke: #38383d; /* Grey-70 */ -} - -:root[lwt-toolbar-field-focus-brighttext] .urlbarView-row[type=bookmark] > .urlbarView-row-inner > .urlbarView-no-wrap > .urlbarView-type-icon { - color: #0a84ff; /* Blue-50 */ - stroke: #38383d; /* Grey-70 */ -} - -:root[lwt-toolbar-field-focus-brighttext] .urlbarView-row[pinned] > .urlbarView-row-inner > .urlbarView-no-wrap > .urlbarView-type-icon { - color: #d7d7db; /* Grey-30 */ - stroke: #38383d; /* Grey-70 */ -} -} /*** END !proton ***/ - - /* Help button */ /* Help buttons are ghost buttons. */ @@ -410,13 +316,8 @@ margin-inline-end: 4px; fill-opacity: 1; -moz-context-properties: fill, fill-opacity; -} - -@media (-moz-proton) { -.urlbarView-help { border-radius: var(--toolbarbutton-border-radius); } -} /*** END proton ***/ .urlbarView-help[selected] { outline: var(--focus-outline); @@ -482,12 +383,6 @@ margin-inline-end: 4px; } -@media (-moz-proton) { -.urlbarView-tip-button { - border-radius: var(--toolbarbutton-border-radius); -} -} /*** END proton ***/ - .urlbarView-tip-button:hover { background-color: var(--button-hover-bgcolor); } @@ -668,7 +563,6 @@ display: none; } -@media (-moz-proton) { /* Switch-to-tab action text is styled as a chiclet. */ .urlbarView-row:is([type=switchtab], [type=remotetab]) > .urlbarView-row-inner > .urlbarView-no-wrap > .urlbarView-action { background-color: var(--urlbar-box-bgcolor); @@ -722,14 +616,13 @@ margin-inline-start: .4em; border-radius: 4px; } -} /*** END !proton ***/ /* Search one-offs */ #urlbar .search-one-offs:not([hidden]) { display: flex; align-items: start; - padding-block: 16px; + padding-block: 10px; flex-wrap: wrap; } @@ -737,15 +630,9 @@ border-top: 1px solid var(--autocomplete-popup-separator-color); } -@media (-moz-proton) { -#urlbar .search-one-offs:not([hidden]) { - padding-block: 10px; -} - :root[uidensity=touch] #urlbar .search-one-offs:not([hidden]) { padding-block: 15px; } -} /*** END proton ***/ #urlbar .search-panel-one-offs-container { /* Make sure horizontally we can fit four buttons, empty space, settings. */ @@ -770,13 +657,8 @@ min-width: 28px; height: 28px; margin-inline: 0 12px; -} - -@media (-moz-proton) { -#urlbar .searchbar-engine-one-off-item { border-radius: var(--toolbarbutton-border-radius); } -} /*** END proton ***/ #urlbar .searchbar-engine-one-off-item:last-child { /* This applies to both the last one-off and the compact settings button */ @@ -828,29 +710,6 @@ fill-opacity: var(--urlbar-icon-fill-opacity); } -@media not (-moz-proton) { -.urlbarView-row[source="bookmarks"] > .urlbarView-row-inner > .urlbarView-no-wrap > .urlbarView-favicon, -#urlbar-engine-one-off-item-bookmarks { - fill: #0060df; /* Blue-60 */ -} - -.urlbarView-row[source="tabs"] > .urlbarView-row-inner > .urlbarView-no-wrap > .urlbarView-favicon, -#urlbar-engine-one-off-item-tabs { - fill: #008eaf; /* Teal-70 */ - fill-opacity: 1; -} - -:root[lwt-toolbar-field-focus-brighttext] .urlbarView-row[source="bookmarks"]:not([selected]) > .urlbarView-row-inner > .urlbarView-no-wrap > .urlbarView-favicon, -:root[lwt-toolbar-field-focus-brighttext] #urlbar-engine-one-off-item-bookmarks:not([selected]) { - fill: #0a84ff; /* Blue-50 */ -} - -:root[lwt-toolbar-field-focus-brighttext] .urlbarView-row[source="tabs"]:not([selected]) > .urlbarView-row-inner > .urlbarView-no-wrap > .urlbarView-favicon, -:root[lwt-toolbar-field-focus-brighttext] #urlbar-engine-one-off-item-tabs:not([selected]) { - fill: #00c8d7; /* Teal-60 */ -} -} /*** END !proton ***/ - /* search bar popup */ #PopupSearchAutoComplete { @@ -859,7 +718,6 @@ --panel-border-color: var(--arrowpanel-border-color); } -@media (-moz-proton) { #PopupSearchAutoComplete::part(content) { /* Remove the top border since the panel is flush with the input. */ border-top-width: 0; @@ -870,7 +728,6 @@ --panel-color: var(--lwt-toolbar-field-focus-color); --panel-background: var(--lwt-toolbar-field-focus); } -} /*** END proton ***/ #PopupSearchAutoComplete .autocomplete-richlistitem[selected] { background: var(--autocomplete-popup-highlight-background); diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css index 2cb94ab99677..54a11fb3e821 100644 --- a/browser/themes/windows/browser.css +++ b/browser/themes/windows/browser.css @@ -24,18 +24,6 @@ --tabs-border-color: threedshadow; } -@media not (-moz-proton) { -:root { - --toolbarbutton-border-radius: 2px; -} -} /* END !proton */ - -@media not (-moz-proton) { -#tabbrowser-tabs { - --tab-line-color: highlight; -} -} /* end !proton */ - @media (-moz-windows-default-theme) { :root { --toolbar-non-lwt-textcolor: #0c0c0d; @@ -45,20 +33,6 @@ --chrome-content-separator-color: #e1e1e2; } - - @media not (-moz-proton) { - :root { - --toolbarbutton-icon-fill-opacity: .7; - } - - #navigator-toolbox { - --tabs-border-color: rgba(0,0,0,.3); - } - - #tabbrowser-tabs { - --tab-line-color: #0a84ff; - } - } /* END !proton */ } :root:-moz-lwtheme { @@ -71,12 +45,6 @@ --panel-separator-color: rgba(249,249,250,.1); } -@media not (-moz-proton) { -#navigator-toolbox:-moz-lwtheme { - --tabs-border-color: rgba(0,0,0,.3); -} -} /* END !proton */ - #menubar-items { -moz-box-orient: vertical; /* for flex hack */ } @@ -136,7 +104,6 @@ color: var(--toolbar-color); } -@media (-moz-proton) { /* Add a fog for background tabs to be visible on Windows 7 glass window background */ @media (-moz-os-version: windows-win7) { @media (-moz-windows-default-theme) { @@ -145,55 +112,6 @@ } } } -} /*** END proton ***/ - -@media not (-moz-proton) { -/* - * Windows 7 draws the chrome background color as the tab background - * instead of in the tabs toolbar. - */ -@media (-moz-os-version: windows-win7) { - @media (-moz-windows-default-theme) { - #navigator-toolbox:not(:-moz-lwtheme) { - --tabs-border-color: @glassShadowColor@; - } - - #TabsToolbar:not(:-moz-lwtheme) { - color: hsl(240,9%,98%); - } - - /* Always show full-height tab separators on tabs with borders. */ - .tabbrowser-tab:not(:-moz-lwtheme)::before, - .tabbrowser-tab:not(:-moz-lwtheme)::after { - border-image: none !important; - } - - /* Show border on tabs with background colors and - * show the tabs toolbar background color inside tabs. */ - .tabbrowser-tab:not(:-moz-lwtheme) { - background-color: hsl(235,33%,19%) !important; - border-top: 1px solid var(--tabs-border-color); - background-clip: padding-box; - } - - /* The top border on top of the tab background is replaced - * by the slightly transparent outside tabs-border-color. */ - .tab-background:not(:-moz-lwtheme) { - border-top-style: none !important; - } - - /* The border at the end of the tab strip is replaced - * by the slightly transparent outside tabs-border-color. */ - .tabbrowser-tab[last-visible-tab]:not(:-moz-lwtheme) { - border-inline-end: 1px solid var(--tabs-border-color); - } - - .tabbrowser-tab[last-visible-tab]:not(:-moz-lwtheme)::after { - display: none !important; - } - } -} -} /*** END !proton ***/ @media (-moz-windows-compositor: 0), (-moz-windows-default-theme: 0) { @@ -529,14 +447,12 @@ menuitem.bookmark-item { %include ../shared/urlbar-searchbar.inc.css @media not (prefers-contrast) { - @media (-moz-proton) { :root:not(:-moz-lwtheme) #urlbar:not([focused="true"]) { --urlbar-box-bgcolor: white; } :root[lwt-default-theme-in-dark-mode] #urlbar:not([focused="true"]) { --urlbar-box-bgcolor: var(--lwt-toolbar-field-focus); } - } /*** END proton ***/ } #urlbar, @@ -571,12 +487,6 @@ menuitem.bookmark-item { } } -@media not (-moz-proton) { -:root:not(:-moz-lwtheme) { - --urlbar-popup-url-color: -moz-nativehyperlinktext; -} -} /*** END !proton ***/ - /* Autocomplete */ %include ../shared/autocomplete.inc.css @@ -614,15 +524,6 @@ menuitem.bookmark-item { } } -@media not (-moz-proton) { -/* tabbrowser-tab focus ring */ -.keyboard-focused-tab > .tab-stack > .tab-content, -.tabbrowser-tab:focus:not([aria-activedescendant]) > .tab-stack > .tab-content { - outline: 1px dotted; - outline-offset: -6px; -} -} /*** END !proton ***/ - /* All tabs menupopup */ .alltabs-item[selected="true"] { @@ -854,14 +755,6 @@ panel[touchmode] .PanelUI-subView #appMenu-zoom-controls > .subviewbutton-iconic border-radius: var(--arrowpanel-border-radius); } -@media not (-moz-proton) { -@media (-moz-os-version: windows-win7) { - .cui-widget-panelview[id^=PanelUI-webext-] { - border-radius: 4px; - } -} -} - .webextension-popup-browser, .webextension-popup-stack { border-radius: inherit; diff --git a/browser/themes/windows/compacttheme.css b/browser/themes/windows/compacttheme.css index b662e5f72f71..acd263776e1d 100644 --- a/browser/themes/windows/compacttheme.css +++ b/browser/themes/windows/compacttheme.css @@ -26,7 +26,6 @@ } } -@media (-moz-proton) { /* Add a fog for background tabs to be visible on Windows 7 glass window background */ @media (-moz-os-version: windows-win7) { @media (-moz-windows-default-theme) { @@ -37,36 +36,8 @@ } } } -} /*** END proton ***/ - -@media not (-moz-proton) { -@media (-moz-os-version: windows-win7) { - @media (-moz-windows-default-theme) { - /* Always show light toolbar elements on aero surface. */ - #TabsToolbar { - color: hsl(240,9%,98%); - } - - @media not (-moz-proton) { - /* Because we're forcing the tabs toolbar to be [brighttext] to - * get white toolbar button icons, we need to manually set the - * correct color for the tab hover state for the light theme. */ - .tabbrowser-tab:hover > .tab-stack > .tab-background > .tab-line:not([selected=true], [multiselected]):-moz-lwtheme-darktext { - background-color: rgba(0,0,0,.2) !important; - } - } /* end !proton */ - } -} -} /*** END !proton ***/ @media (-moz-windows-glass) { - @media not (-moz-proton) { - /* Use opaque white icons on Aero Glass. */ - #TabsToolbar { - --toolbarbutton-icon-fill: white; - } - } /*** END !proton ***/ - /* Make the menubar text readable on aero glass (copied from browser-aero.css). */ #toolbar-menubar { text-shadow: 0 0 .5em white, 0 0 .5em white, 0 1px 0 rgba(255,255,255,.4); @@ -93,39 +64,6 @@ } } - @media not (-moz-proton) { - /* Always show full-height tab separators on tabs with borders. */ - .tabbrowser-tab::before, - .tabbrowser-tab::after { - border-image: none !important; - } - - /* Show border on tabs with background colors and - * show the tabs toolbar background color inside tabs. */ - .tabbrowser-tab { - background-color: var(--lwt-accent-color) !important; - color: var(--lwt-text-color) !important; - border-top: 1px solid var(--tabs-border-color); - background-clip: padding-box; - } - - /* The top border on top of the tab background is replaced - * by the slightly transparent outside tabs-border-color. */ - .tab-background { - border-top-style: none !important; - } - - /* The border at the end of the tab strip is replaced - * by the slightly transparent outside tabs-border-color. */ - .tabbrowser-tab[last-visible-tab] { - border-inline-end: 1px solid var(--tabs-border-color); - } - - .tabbrowser-tab[last-visible-tab]::after { - display: none !important; - } - } /*** END !proton ***/ - /* Use proper menu text styling in Win7 classic mode (copied from browser.css) */ @media (-moz-windows-compositor: 0), (-moz-windows-default-theme: 0) { diff --git a/toolkit/themes/shared/in-content/common.inc.css b/toolkit/themes/shared/in-content/common.inc.css index e76fb900289d..4f0f8e24012e 100644 --- a/toolkit/themes/shared/in-content/common.inc.css +++ b/toolkit/themes/shared/in-content/common.inc.css @@ -57,7 +57,6 @@ --in-content-table-border-dark-color: #d1d1d1; --in-content-table-header-background: #0a84ff; --in-content-table-header-color: #ffffff; - --in-content-dialog-header-background: #f1f1f1; --in-content-sidebar-width: 240px; --dialog-warning-text-color: var(--red-60); @@ -148,7 +147,6 @@ --in-content-table-border-dark-color: rgba(249,249,250,0.2); --in-content-table-header-background: rgb(5, 64, 150); --in-content-table-header-color: var(--in-content-page-color); - --in-content-dialog-header-background: rgba(249,249,250,0.05); --in-content-accent-color: var(--in-content-primary-button-background); --in-content-accent-color-active: var(--in-content-primary-button-background-hover); @@ -230,7 +228,6 @@ --in-content-table-background: -moz-Dialog; --in-content-table-header-background: -moz-Dialog; --in-content-table-header-color: -moz-DialogText; - --in-content-dialog-header-background: -moz-Dialog; --dialog-warning-text-color: -moz-FieldText;