From dc2631ac791c1cdc6ba45f6e468cd657c5bbab8e Mon Sep 17 00:00:00 2001 From: Mike Conley Date: Mon, 1 Mar 2021 17:27:52 +0000 Subject: [PATCH] Bug 1695348 - Mass rename browser.proton.appmenu.enabled to browser.proton.enabled. r=emalysz,desktop-theme-reviewers Differential Revision: https://phabricator.services.mozilla.com/D106800 --- .../customizableui/PanelMultiView.jsm | 2 +- .../customizableui/content/panelUI.js | 2 +- browser/components/uitour/UITour.jsm | 2 +- browser/themes/osx/customizableui/panelUI.css | 2 +- .../shared/browser-custom-colors.inc.css | 2 +- .../panelUI-custom-colors.inc.css | 2 +- .../shared/customizableui/panelUI.inc.css | 36 +++++++++---------- browser/themes/shared/menupanel.inc.css | 4 +-- 8 files changed, 26 insertions(+), 26 deletions(-) diff --git a/browser/components/customizableui/PanelMultiView.jsm b/browser/components/customizableui/PanelMultiView.jsm index 21c1fa6f81cf..ab7f7e187ceb 100644 --- a/browser/components/customizableui/PanelMultiView.jsm +++ b/browser/components/customizableui/PanelMultiView.jsm @@ -120,7 +120,7 @@ XPCOMUtils.defineLazyGetter(this, "gBundle", function() { XPCOMUtils.defineLazyPreferenceGetter( this, "gProtonAppMenuEnabled", - "browser.proton.appmenu.enabled", + "browser.proton.enabled", false ); diff --git a/browser/components/customizableui/content/panelUI.js b/browser/components/customizableui/content/panelUI.js index 613bd58e0da9..bf9febb1714f 100644 --- a/browser/components/customizableui/content/panelUI.js +++ b/browser/components/customizableui/content/panelUI.js @@ -97,7 +97,7 @@ const PanelUI = { XPCOMUtils.defineLazyPreferenceGetter( this, "protonAppMenuEnabled", - "browser.proton.appmenu.enabled", + "browser.proton.enabled", false ); diff --git a/browser/components/uitour/UITour.jsm b/browser/components/uitour/UITour.jsm index cc877e19e8bb..73247de0c92f 100644 --- a/browser/components/uitour/UITour.jsm +++ b/browser/components/uitour/UITour.jsm @@ -348,7 +348,7 @@ var UITour = { XPCOMUtils.defineLazyPreferenceGetter( this, "protonAppMenuEnabled", - "browser.proton.appmenu.enabled", + "browser.proton.enabled", false ); diff --git a/browser/themes/osx/customizableui/panelUI.css b/browser/themes/osx/customizableui/panelUI.css index e2642e76e2ad..e1155e298f89 100644 --- a/browser/themes/osx/customizableui/panelUI.css +++ b/browser/themes/osx/customizableui/panelUI.css @@ -9,7 +9,7 @@ display: none; } -@supports not -moz-bool-pref("browser.proton.appmenu.enabled") { +@supports not -moz-bool-pref("browser.proton.enabled") { .subviewbutton { padding-inline-start: 18px; } diff --git a/browser/themes/shared/browser-custom-colors.inc.css b/browser/themes/shared/browser-custom-colors.inc.css index fa6a6eeefedd..371505db97bc 100644 --- a/browser/themes/shared/browser-custom-colors.inc.css +++ b/browser/themes/shared/browser-custom-colors.inc.css @@ -2,7 +2,7 @@ * 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/. */ -@supports -moz-bool-pref("browser.proton.appmenu.enabled") { +@supports -moz-bool-pref("browser.proton.enabled") { @media not (prefers-contrast) { :root:not(:-moz-lwtheme) { --buttons-secondary-bgcolor: rgb(240,240,244); diff --git a/browser/themes/shared/customizableui/panelUI-custom-colors.inc.css b/browser/themes/shared/customizableui/panelUI-custom-colors.inc.css index daabb76dce45..10ce98f53542 100644 --- a/browser/themes/shared/customizableui/panelUI-custom-colors.inc.css +++ b/browser/themes/shared/customizableui/panelUI-custom-colors.inc.css @@ -2,7 +2,7 @@ * 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/. */ -@supports -moz-bool-pref("browser.proton.appmenu.enabled") { +@supports -moz-bool-pref("browser.proton.enabled") { @media not (prefers-contrast) { :root:not(:-moz-lwtheme) { --panelview-toolbarbutton-hover-bgcolor: rgb(224,224,230); diff --git a/browser/themes/shared/customizableui/panelUI.inc.css b/browser/themes/shared/customizableui/panelUI.inc.css index 45fda9650425..61da02e57b22 100644 --- a/browser/themes/shared/customizableui/panelUI.inc.css +++ b/browser/themes/shared/customizableui/panelUI.inc.css @@ -57,7 +57,7 @@ --panel-banner-item-active-bgcolor: rgba(48,230,11,.2); } -@supports -moz-bool-pref("browser.proton.appmenu.enabled") { +@supports -moz-bool-pref("browser.proton.enabled") { :root { --arrowpanel-menuitem-margin: 0 8px; --arrowpanel-menuitem-padding: 8px; @@ -131,7 +131,7 @@ background: #FFE900 url(chrome://browser/skin/update-badge.svg) no-repeat center; } -@supports -moz-bool-pref("browser.proton.appmenu.enabled") { +@supports -moz-bool-pref("browser.proton.enabled") { .panel-banner-item[notificationid="update-available"] > .toolbarbutton-icon, .panel-banner-item[notificationid="update-downloading"] > .toolbarbutton-icon, .panel-banner-item[notificationid="update-manual"] > .toolbarbutton-icon, @@ -147,7 +147,7 @@ } } -@supports not -moz-bool-pref("browser.proton.appmenu.enabled") { +@supports not -moz-bool-pref("browser.proton.enabled") { .panel-banner-item[notificationid="update-available"]::after, .panel-banner-item[notificationid="update-downloading"]::after, .panel-banner-item[notificationid="update-manual"]::after, @@ -271,7 +271,7 @@ panelmultiview[transitioning] > .panel-viewcontainer > .panel-viewstack > panelv padding: var(--panel-subview-body-padding); } -@supports -moz-bool-pref("browser.proton.appmenu.enabled") { +@supports -moz-bool-pref("browser.proton.enabled") { toolbarseparator + .panel-subview-body, .subview-subheader + .panel-subview-body { padding: 0; @@ -628,7 +628,7 @@ toolbarbutton[constrain-size="true"][cui-areatype="menu-panel"] > .toolbarbutton -moz-box-orient: horizontal; } -@supports -moz-bool-pref("browser.proton.appmenu.enabled") { +@supports -moz-bool-pref("browser.proton.enabled") { .addon-banner-item, .panel-banner-item { margin: 0 8px 4px; @@ -640,7 +640,7 @@ toolbarbutton[constrain-size="true"][cui-areatype="menu-panel"] > .toolbarbutton } /** END Proton **/ -@supports not -moz-bool-pref("browser.proton.appmenu.enabled") { +@supports not -moz-bool-pref("browser.proton.enabled") { .panel-banner-item { border-block: 1px solid var(--panel-separator-color); padding-inline-start: 12px; @@ -762,7 +762,7 @@ toolbarbutton[constrain-size="true"][cui-areatype="menu-panel"] > .toolbarbutton background-color: @appmenuWarningBackgroundColorActive@; } -@supports -moz-bool-pref("browser.proton.appmenu.enabled") { +@supports -moz-bool-pref("browser.proton.enabled") { #appMenu-fxa-status2[fxastatus] { margin: 0; padding: 0; @@ -833,7 +833,7 @@ toolbarbutton[constrain-size="true"][cui-areatype="menu-panel"] > .toolbarbutton text-align: start; } -@supports not -moz-bool-pref("browser.proton.appmenu.enabled") { +@supports not -moz-bool-pref("browser.proton.enabled") { .addon-banner-item > .toolbarbutton-text, .panel-banner-item > .toolbarbutton-text { margin: 0; @@ -841,7 +841,7 @@ toolbarbutton[constrain-size="true"][cui-areatype="menu-panel"] > .toolbarbutton } } /** END not Proton **/ -@supports -moz-bool-pref("browser.proton.appmenu.enabled") { +@supports -moz-bool-pref("browser.proton.enabled") { .addon-banner-item > .toolbarbutton-text, .panel-banner-item > .toolbarbutton-text { margin-inline-start: 8px; @@ -1002,7 +1002,7 @@ panelmultiview[mainViewId="PanelUI-fxa"] #PanelUI-remotetabs-syncnow { display: none; } -@supports not -moz-bool-pref("browser.proton.appmenu.enabled") { +@supports not -moz-bool-pref("browser.proton.enabled") { #PanelUI-fxa-menu-account-signout-button { list-style-image: url(chrome://browser/skin/sign-out.svg); } @@ -1234,7 +1234,7 @@ panelview .toolbarbutton-1, color: var(--panel-disabled-color); } -@supports not -moz-bool-pref("browser.proton.appmenu.enabled") { +@supports not -moz-bool-pref("browser.proton.enabled") { .subviewbutton > .toolbarbutton-text { padding: 0; padding-inline-start: 24px; /* This is 16px for the icon + 8px for the padding as defined below. */ @@ -1281,7 +1281,7 @@ panelview .toolbarbutton-1, fill: currentColor; } -@supports -moz-bool-pref("browser.proton.appmenu.enabled") { +@supports -moz-bool-pref("browser.proton.enabled") { #appMenu-zoomReduce-button2@buttonStateHoverOrFocus@, #appMenu-zoomReduce-button2@buttonStateActive@, #appMenu-zoomEnlarge-button2@buttonStateHoverOrFocus@, @@ -1542,7 +1542,7 @@ panelview .toolbarbutton-1 { margin-top: 6px; } -@supports not -moz-bool-pref("browser.proton.appmenu.enabled") { +@supports not -moz-bool-pref("browser.proton.enabled") { panelview .toolbarbutton-1@buttonStateHoverOrFocus@, toolbarbutton.subviewbutton@buttonStateHoverOrFocus@, .navigable.subviewbutton@buttonStateHoverOrFocus@, @@ -1555,7 +1555,7 @@ panelview .toolbarbutton-1 { } } /** END not Proton **/ -@supports -moz-bool-pref("browser.proton.appmenu.enabled") { +@supports -moz-bool-pref("browser.proton.enabled") { /** * Focus in Proton uses a box-shadow because we want the stroke to be * internal to the rect without affecting the surrounding layout. This @@ -1646,7 +1646,7 @@ menuitem.panel-subview-footer@menuStateActive@, padding: 0; } -@supports -moz-bool-pref("browser.proton.appmenu.enabled") { +@supports -moz-bool-pref("browser.proton.enabled") { .PanelUI-subView toolbarseparator.proton-zap { border-image: var(--panel-separator-zap-gradient) 1; } @@ -1976,7 +1976,7 @@ toolbarpaletteitem[place="menu-panel"] > .subviewbutton-nav::after { } @media (min-resolution: 1.1dppx) { - @supports not -moz-bool-pref("browser.proton.appmenu.enabled") { + @supports not -moz-bool-pref("browser.proton.enabled") { .panel-banner-item[notificationid^=update] { list-style-image: url(chrome://branding/content/icon32.png); } @@ -2011,13 +2011,13 @@ toolbarpaletteitem[place="menu-panel"] > .subviewbutton-nav::after { padding: 4px; } -@supports -moz-bool-pref("browser.proton.appmenu.enabled") { +@supports -moz-bool-pref("browser.proton.enabled") { .panel-header { padding-top: 8px; } } /** END Proton **/ -@supports not -moz-bool-pref("browser.proton.appmenu.enabled") { +@supports not -moz-bool-pref("browser.proton.enabled") { .panel-header { border-bottom: 1px solid var(--panel-separator-color); } diff --git a/browser/themes/shared/menupanel.inc.css b/browser/themes/shared/menupanel.inc.css index f8c7c748dc7d..9e316f5a9062 100644 --- a/browser/themes/shared/menupanel.inc.css +++ b/browser/themes/shared/menupanel.inc.css @@ -4,7 +4,7 @@ /* Menu panel and palette styles */ -@supports not -moz-bool-pref("browser.proton.appmenu.enabled") { +@supports not -moz-bool-pref("browser.proton.enabled") { #appMenu-new-window-button { list-style-image: url(chrome://browser/skin/new-window.svg); } @@ -180,7 +180,7 @@ toolbarpaletteitem[place="palette"] > #bookmarks-menu-button, } } /** END not Proton **/ -@supports -moz-bool-pref("browser.proton.appmenu.enabled") { +@supports -moz-bool-pref("browser.proton.enabled") { /** * These are placeholder icons until we get the proper Proton * assets for zoom/fullscreen/sync.