--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -335,30 +335,17 @@ toolbarpaletteitem {
#main-window[inFullscreen] #high-priority-global-notificationbox {
visibility: collapse;
}
#navigator-toolbox[fullscreenShouldAnimate] {
transition: 1.5s margin-top ease-out;
}
-/* Rules to help integrate SDK widgets */
-toolbaritem[sdkstylewidget="true"] > toolbarbutton,
-toolbarpaletteitem > toolbaritem[sdkstylewidget="true"] > iframe,
-toolbarpaletteitem > toolbaritem[sdkstylewidget="true"] > .toolbarbutton-text {
- display: none;
-}
-
-toolbarpaletteitem:-moz-any([place="palette"], [place="panel"]) > toolbaritem[sdkstylewidget="true"] > toolbarbutton {
- display: -moz-box;
-}
-
-toolbarpaletteitem > toolbaritem[sdkstylewidget="true"][cui-areatype="toolbar"] > .toolbarbutton-text {
- display: -moz-box;
-}
+/* Rules to help integrate WebExtension buttons */
.webextension-browser-action > .toolbarbutton-badge-stack > .toolbarbutton-icon {
height: 16px;
width: 16px;
}
@media not all and (min-resolution: 1.1dppx) {
.webextension-browser-action {
@@ -1191,21 +1178,16 @@ toolbarpaletteitem[place="palette"] > #d
var(--animation-easing-function), ease-in-out;
}
#BMB_bookmarksPopup[animate="cancel"] {
transform: none;
}
%endif
-/* Customize mode */
-#PanelUI-contents > .panel-customization-placeholder > .panel-customization-placeholder-child {
- list-style-image: none;
-}
-
/* Apply crisp rendering for favicons at exactly 2dppx resolution */
@media (resolution: 2dppx) {
#PanelUI-remotetabs-tabslist > toolbarbutton > .toolbarbutton-icon,
#PanelUI-recentlyClosedWindows > toolbarbutton > .toolbarbutton-icon,
#PanelUI-recentlyClosedTabs > toolbarbutton > .toolbarbutton-icon,
#PanelUI-historyItems > toolbarbutton > .toolbarbutton-icon {
image-rendering: -moz-crisp-edges;
}
--- a/browser/components/customizableui/CustomizeMode.jsm
+++ b/browser/components/customizableui/CustomizeMode.jsm
@@ -102,17 +102,16 @@ function CustomizeMode(aWindow) {
this.browser = aWindow.gBrowser;
this.areas = new Set();
// There are two palettes - there's the palette that can be overlayed with
// toolbar items in browser.xul. This is invisible, and never seen by the
// user. Then there's the visible palette, which gets populated and displayed
// to the user when in customizing mode.
this.visiblePalette = this.document.getElementById(kPaletteId);
- this.paletteEmptyNotice = this.document.getElementById("customization-empty");
this.pongArena = this.document.getElementById("customization-pong-arena");
if (Services.prefs.getCharPref("general.skins.selectedSkin") != "classic/1.0") {
let lwthemeButton = this.document.getElementById("customization-lwtheme-button");
lwthemeButton.setAttribute("hidden", "true");
}
if (AppConstants.CAN_DRAW_IN_TITLEBAR) {
this._updateTitlebarCheckbox();
this._updateDragSpaceCheckbox();
@@ -405,17 +404,16 @@ CustomizeMode.prototype = {
CustomizableUI.removeListener(this);
this.document.removeEventListener("keypress", this);
let window = this.window;
let document = this.document;
this.togglePong(false);
- this.paletteEmptyNotice.hidden = true;
// Disable the reset and undo reset buttons while transitioning:
let resetButton = this.document.getElementById("customization-reset-button");
let undoResetButton = this.document.getElementById("customization-undo-reset-button");
undoResetButton.hidden = resetButton.disabled = true;
this._transitioning = true;
@@ -1531,17 +1529,16 @@ CustomizeMode.prototype = {
this._updateUndoResetButton();
this._updateEmptyPaletteNotice();
}
CustomizableUI.dispatchToolboxEvent("customizationchange");
},
_updateEmptyPaletteNotice() {
let paletteItems = this.visiblePalette.getElementsByTagName("toolbarpaletteitem");
- this.paletteEmptyNotice.hidden = !!paletteItems.length;
let whimsyButton = this.document.getElementById("whimsy-button");
if (paletteItems.length == 1 &&
paletteItems[0].id.includes("wrapper-customizableui-special-spring")) {
whimsyButton.hidden = false;
} else {
this.togglePong(false);
whimsyButton.hidden = true;
@@ -2726,17 +2723,17 @@ CustomizeMode.prototype = {
let window = this.window;
rAFHandle = window.requestAnimationFrame(function animate() {
update();
draw();
if (quit) {
elements.score.textContent = score;
elements.lives && elements.lives.setAttribute("lives", lives);
elements.arena.setAttribute("score", score);
- elements.arena.setAttribute("lives", "0");
+ elements.arena.setAttribute("lives", lives);
} else {
rAFHandle = window.requestAnimationFrame(animate);
}
});
return uninit;
},
};
--- a/browser/components/customizableui/content/customizeMode.inc.xul
+++ b/browser/components/customizableui/content/customizeMode.inc.xul
@@ -3,25 +3,16 @@
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<box id="customization-container" flex="1" hidden="true">
<box id="customization-content-container">
<box flex="1" id="customization-palette-container">
<label id="customization-header">
&customizeMode.menuAndToolbars.header3;
</label>
- <hbox id="customization-empty" hidden="true">
- <label>&customizeMode.menuAndToolbars.empty;</label>
- <label onclick="BrowserOpenAddonsMgr('addons://discover/');"
- onkeypress="BrowserOpenAddonsMgr('addons://discover/');"
- id="customization-more-tools"
- class="text-link">
- &customizeMode.menuAndToolbars.emptyLink;
- </label>
- </hbox>
<vbox id="customization-palette" class="customization-palette" hidden="true"/>
<vbox id="customization-pong-arena" hidden="true"/>
<spacer id="customization-spacer"/>
</box>
<vbox id="customization-panel-container">
<vbox id="customization-panelWrapper">
<box class="panel-arrowbox">
<image class="panel-arrow" side="top"/>
--- a/browser/components/customizableui/content/panelUI.inc.xul
+++ b/browser/components/customizableui/content/panelUI.inc.xul
@@ -1,335 +1,12 @@
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- 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/. -->
-<panel id="PanelUI-popup"
- role="group"
- type="arrow"
- hidden="true"
- flip="slide"
- position="bottomcenter topright"
- noautofocus="true">
- <panelmultiview id="PanelUI-multiView" mainViewId="PanelUI-mainView"
- viewCacheId="appMenu-viewCache">
- <panelview id="PanelUI-mainView" context="customizationPanelContextMenu"
- descriptionheightworkaround="true" blockinboxworkaround="true">
- <vbox id="PanelUI-contents-scroller">
- <vbox id="PanelUI-contents" class="panelUI-grid"/>
- </vbox>
-
- <footer id="PanelUI-footer">
- <vbox id="PanelUI-footer-addons"></vbox>
- <toolbarbutton class="panel-banner-item"
- label-update-available="&updateAvailable.panelUI.label;"
- label-update-manual="&updateManual.panelUI.label;"
- label-update-restart="&updateRestart.panelUI.label2;"
- oncommand="PanelUI._onBannerItemSelected(event)"
- wrap="true"
- hidden="true"/>
- <hbox id="PanelUI-fxa-container">
- <hbox id="PanelUI-fxa-status"
- label="&fxaSignedIn.tooltip;"
- defaultlabel="&fxaSignIn.label;"
- signedinTooltiptext="&fxaSignedIn.tooltip;"
- tooltiptext="&fxaSignedIn.tooltip;"
- errorlabel="&fxaSignInError.label;"
- unverifiedlabel="&fxaUnverified.label;"
- onclick="if (event.which == 1) gSync.onMenuPanelCommand();">
- <image id="PanelUI-fxa-avatar"/>
- <toolbarbutton id="PanelUI-fxa-label"
- label="&fxaSignIn.label;"
- fxabrandname="&syncBrand.fxAccount.label;"/>
- </hbox>
- <toolbarseparator/>
- <toolbarbutton id="PanelUI-fxa-icon"
- oncommand="gSync.doSync();"
- closemenu="none">
- <observes element="sync-status" attribute="syncstatus"/>
- <observes element="sync-status" attribute="tooltiptext"/>
- </toolbarbutton>
- </hbox>
-
- <hbox id="PanelUI-footer-inner">
- <toolbarbutton id="PanelUI-customize" label="&appMenuCustomize.label;"
- exitLabel="&appMenuCustomizeExit.label;"
- tooltiptext="&appMenuCustomize.tooltip;"
- exitTooltiptext="&appMenuCustomizeExit.tooltip;"
- closemenu="none"
- oncommand="gCustomizeMode.toggle();"/>
- <toolbarseparator/>
- <toolbarbutton id="PanelUI-help" label="&helpMenu.label;"
- closemenu="none"
- tooltiptext="&appMenuHelp.tooltip;"
- oncommand="PanelUI.showHelpView(this);"/>
- <toolbarseparator/>
- <toolbarbutton id="PanelUI-quit"
-#ifdef XP_WIN
- label="&quitApplicationCmdWin2.label;"
- tooltiptext="&quitApplicationCmdWin2.tooltip;"
-#else
-#ifdef XP_MACOSX
- label="&quitApplicationCmdMac2.label;"
-#else
- label="&quitApplicationCmd.label;"
-#endif
-#endif
- command="cmd_quitApplication"/>
- </hbox>
- </footer>
- </panelview>
-
- <panelview id="PanelUI-history" flex="1">
- <vbox class="panel-subview-body">
- <toolbarbutton id="appMenuViewHistorySidebar"
- label="&appMenuHistory.viewSidebar.label;"
- type="checkbox"
- class="subviewbutton subviewbutton-iconic"
- key="key_gotoHistory"
- oncommand="SidebarUI.toggle('viewHistorySidebar'); PanelUI.hide();">
- <observes element="viewHistorySidebar" attribute="checked"/>
- </toolbarbutton>
- <toolbarbutton id="appMenuClearRecentHistory"
- label="&appMenuHistory.clearRecent.label;"
- class="subviewbutton subviewbutton-iconic"
- command="Tools:Sanitize"/>
- <toolbarseparator/>
- <toolbarbutton id="appMenuRecentlyClosedTabs"
- label="&historyUndoMenu.label;"
- class="subviewbutton subviewbutton-iconic subviewbutton-nav"
- closemenu="none"
- oncommand="PanelUI.showSubView('appMenu-library-recentlyClosedTabs', this)"/>
- <toolbarbutton id="appMenuRecentlyClosedWindows"
- label="&historyUndoWindowMenu.label;"
- class="subviewbutton subviewbutton-iconic subviewbutton-nav"
- closemenu="none"
- oncommand="PanelUI.showSubView('appMenu-library-recentlyClosedWindows', this)"/>
- <toolbarseparator/>
- <label value="&appMenuHistory.recentHistory.label;"
- class="subview-subheader"/>
- <toolbaritem id="appMenu_historyMenu"
- orient="vertical"
- smoothscroll="false"
- flatList="true"
- tooltip="bhTooltip">
- <!-- history menu items will go here -->
- </toolbaritem>
- </vbox>
- <toolbarbutton id="PanelUI-historyMore"
- class="panel-subview-footer subviewbutton"
- label="&appMenuHistory.showAll.label;"
- oncommand="PlacesCommandHook.showPlacesOrganizer('History'); CustomizableUI.hidePanelForNode(this);"/>
- </panelview>
-
- <panelview id="appMenu-library-recentlyClosedTabs"/>
- <panelview id="appMenu-library-recentlyClosedWindows"/>
-
- <panelview id="PanelUI-remotetabs" flex="1" class="PanelUI-subView"
- descriptionheightworkaround="true">
- <vbox class="panel-subview-body">
- <!-- this widget has 3 boxes in the body, but only 1 is ever visible -->
- <!-- When Sync is ready to sync -->
- <vbox id="PanelUI-remotetabs-main" observes="sync-syncnow-state">
- <vbox id="PanelUI-remotetabs-buttons">
- <toolbarbutton id="PanelUI-remotetabs-view-sidebar"
- class="subviewbutton subviewbutton-iconic"
- observes="viewTabsSidebar"
- label="&appMenuRemoteTabs.sidebar.label;"/>
- <toolbarbutton id="PanelUI-remotetabs-view-managedevices"
- class="subviewbutton subviewbutton-iconic"
- label="&appMenuRemoteTabs.managedevices.label;"
- oncommand="gSync.openDevicesManagementPage('syncedtabs-menupanel');"/>
- <toolbarbutton id="PanelUI-remotetabs-syncnow"
- observes="sync-status"
- class="subviewbutton subviewbutton-iconic"
- oncommand="gSync.doSync();"
- closemenu="none"/>
- <menuseparator id="PanelUI-remotetabs-separator"/>
- </vbox>
- <deck id="PanelUI-remotetabs-deck">
- <!-- Sync is ready to Sync and the "tabs" engine is enabled -->
- <vbox id="PanelUI-remotetabs-tabspane">
- <vbox id="PanelUI-remotetabs-tabslist"
- showAllLabel="&appMenuRemoteTabs.showAll.label;"
- showAllTooltipText="&appMenuRemoteTabs.showAll.tooltip;"
- showMoreLabel="&appMenuRemoteTabs.showMore.label;"
- showMoreTooltipText="&appMenuRemoteTabs.showMore.tooltip;"
- notabsforclientlabel="&appMenuRemoteTabs.notabs.label;"
- />
- </vbox>
- <!-- Sync is ready to Sync but the "tabs" engine isn't enabled-->
- <hbox id="PanelUI-remotetabs-tabsdisabledpane" pack="center" flex="1">
- <vbox class="PanelUI-remotetabs-instruction-box" align="center">
- <hbox pack="center">
- <image class="fxaSyncIllustration"/>
- </hbox>
- <label class="PanelUI-remotetabs-instruction-label">&appMenuRemoteTabs.tabsnotsyncing.label;</label>
- <hbox pack="center">
- <toolbarbutton class="PanelUI-remotetabs-prefs-button"
- label="&appMenuRemoteTabs.openprefs.label;"
- oncommand="gSync.openPrefs('synced-tabs');"/>
- </hbox>
- </vbox>
- </hbox>
- <!-- Sync is ready to Sync but we are still fetching the tabs to show -->
- <vbox id="PanelUI-remotetabs-fetching">
- <!-- Show intentionally blank panel, see bug 1239845 -->
- </vbox>
- <!-- Sync has only 1 (ie, this) device connected -->
- <hbox id="PanelUI-remotetabs-nodevicespane" pack="center" flex="1">
- <vbox class="PanelUI-remotetabs-instruction-box">
- <hbox pack="center">
- <image class="fxaSyncIllustration"/>
- </hbox>
- <label class="PanelUI-remotetabs-instruction-title">&appMenuRemoteTabs.noclients.title;</label>
- <label class="PanelUI-remotetabs-instruction-label">&appMenuRemoteTabs.noclients.subtitle;</label>
- <!-- The inner HTML for PanelUI-remotetabs-mobile-promo is built at runtime -->
- <label id="PanelUI-remotetabs-mobile-promo" fxAccountsBrand="&syncBrand.fxAccount.label;"/>
- </vbox>
- </hbox>
- </deck>
- </vbox>
- <!-- a box to ensure contained boxes are centered horizonally -->
- <hbox pack="center" flex="1">
- <!-- When Sync is not configured -->
- <vbox id="PanelUI-remotetabs-setupsync"
- flex="1"
- align="center"
- class="PanelUI-remotetabs-instruction-box"
- observes="sync-setup-state">
- <image class="fxaSyncIllustration"/>
- <label class="PanelUI-remotetabs-instruction-label">&appMenuRemoteTabs.notsignedin.label;</label>
- <toolbarbutton class="PanelUI-remotetabs-prefs-button"
- label="&appMenuRemoteTabs.signin.label;"
- oncommand="gSync.openPrefs('synced-tabs');"/>
- </vbox>
- <!-- When Sync needs re-authentication. This uses the exact same messaging
- as "Sync is not configured" but remains a separate box so we get
- the goodness of observing broadcasters to manage the hidden states -->
- <vbox id="PanelUI-remotetabs-reauthsync"
- flex="1"
- align="center"
- class="PanelUI-remotetabs-instruction-box"
- observes="sync-reauth-state">
- <image class="fxaSyncIllustration"/>
- <label class="PanelUI-remotetabs-instruction-label">&appMenuRemoteTabs.notsignedin.label;</label>
- <toolbarbutton class="PanelUI-remotetabs-prefs-button"
- label="&appMenuRemoteTabs.signin.label;"
- oncommand="gSync.openPrefs('synced-tabs');"/>
- </vbox>
- </hbox>
- </vbox>
- </panelview>
-
- <panelview id="PanelUI-bookmarks" flex="1" class="PanelUI-subView">
- <vbox class="panel-subview-body">
- <toolbarbutton id="panelMenuBookmarkThisPage"
- class="subviewbutton subviewbutton-iconic"
- observes="bookmarkThisPageBroadcaster"
- command="Browser:AddBookmarkAs"
- onclick="PanelUI.hide();"/>
- <toolbarbutton id="panelMenu_bookmarkingTools"
- label="&bookmarkingTools.label;"
- class="subviewbutton subviewbutton-iconic subviewbutton-nav"
- closemenu="none"
- oncommand="BookmarkingUI.showBookmarkingTools(this);"/>
- <toolbarbutton id="panelMenu_searchBookmarks"
- label="&searchBookmarks.label;"
- class="subviewbutton subviewbutton-iconic"
- oncommand="PlacesCommandHook.searchBookmarks(); PanelUI.hide();"/>
- <toolbarseparator/>
- <label id="panelMenu_recentBookmarks"
- value="&recentBookmarks.label;"
- class="subview-subheader"/>
- <toolbaritem id="panelMenu_bookmarksMenu"
- orient="vertical"
- smoothscroll="false"
- flatList="true"
- tooltip="bhTooltip">
- <!-- bookmarks menu items will go here -->
- </toolbaritem>
- </vbox>
- <toolbarbutton id="panelMenu_showAllBookmarks"
- label="&showAllBookmarks2.label;"
- class="subviewbutton panel-subview-footer"
- command="Browser:ShowAllBookmarks"
- onclick="PanelUI.hide();"/>
- </panelview>
-
- <panelview id="PanelUI-feeds" flex="1" oncommand="FeedHandler.subscribeToFeed(null, event);">
- </panelview>
-
- <panelview id="PanelUI-containers" flex="1">
- <vbox id="PanelUI-containersItems"/>
- </panelview>
-
- <panelview id="PanelUI-helpView" flex="1" class="PanelUI-subView">
- <vbox id="PanelUI-helpItems" class="panel-subview-body"/>
- </panelview>
-
- <panelview id="PanelUI-developer" flex="1">
- <vbox id="PanelUI-developerItems" class="panel-subview-body"/>
- </panelview>
-
- <panelview id="PanelUI-characterEncodingView" flex="1">
- <vbox class="panel-subview-body">
- <vbox id="PanelUI-characterEncodingView-pinned"
- class="PanelUI-characterEncodingView-list"/>
- <toolbarseparator/>
- <vbox id="PanelUI-characterEncodingView-charsets"
- class="PanelUI-characterEncodingView-list"/>
- <toolbarseparator/>
- <vbox>
- <label id="PanelUI-characterEncodingView-autodetect-label"/>
- <vbox id="PanelUI-characterEncodingView-autodetect"
- class="PanelUI-characterEncodingView-list"/>
- </vbox>
- </vbox>
- </panelview>
-
- <panelview id="PanelUI-panicView" flex="1"
- descriptionheightworkaround="true">
- <vbox class="panel-subview-body">
- <hbox id="PanelUI-panic-timeframe">
- <image id="PanelUI-panic-timeframe-icon" alt=""/>
- <vbox flex="1">
- <hbox id="PanelUI-panic-header">
- <image id="PanelUI-panic-timeframe-icon-small" alt=""/>
- <description id="PanelUI-panic-mainDesc" flex="1">&panicButton.view.mainTimeframeDesc;</description>
- </hbox>
- <radiogroup id="PanelUI-panic-timeSpan" aria-labelledby="PanelUI-panic-mainDesc" closemenu="none">
- <radio id="PanelUI-panic-5min" label="&panicButton.view.5min;" selected="true"
- value="5" class="subviewradio"/>
- <radio id="PanelUI-panic-2hr" label="&panicButton.view.2hr;"
- value="2" class="subviewradio"/>
- <radio id="PanelUI-panic-day" label="&panicButton.view.day;"
- value="6" class="subviewradio"/>
- </radiogroup>
- </vbox>
- </hbox>
- <vbox id="PanelUI-panic-explanations">
- <label id="PanelUI-panic-actionlist-main-label">&panicButton.view.mainActionDesc;</label>
-
- <label id="PanelUI-panic-actionlist-windows" class="PanelUI-panic-actionlist">&panicButton.view.deleteTabsAndWindows;</label>
- <label id="PanelUI-panic-actionlist-cookies" class="PanelUI-panic-actionlist">&panicButton.view.deleteCookies;</label>
- <label id="PanelUI-panic-actionlist-history" class="PanelUI-panic-actionlist">&panicButton.view.deleteHistory;</label>
- <label id="PanelUI-panic-actionlist-newwindow" class="PanelUI-panic-actionlist">&panicButton.view.openNewWindow;</label>
-
- <label id="PanelUI-panic-warning">&panicButton.view.undoWarning;</label>
- </vbox>
- <button id="PanelUI-panic-view-button"
- label="&panicButton.view.forgetButton;"/>
- </vbox>
- </panelview>
-
- </panelmultiview>
-
-</panel>
-
<panel id="widget-overflow"
role="group"
type="arrow"
noautofocus="true"
position="bottomcenter topright"
photon="true"
hidden="true">
<photonpanelmultiview mainViewId="widget-overflow-mainView" disablekeynav="true">
@@ -670,16 +347,259 @@
#else
label="&quitApplicationCmd.label;"
#endif
key="key_quitApplication"
command="cmd_quitApplication"/>
#endif
</vbox>
</panelview>
+ <panelview id="PanelUI-history" flex="1">
+ <vbox class="panel-subview-body">
+ <toolbarbutton id="appMenuViewHistorySidebar"
+ label="&appMenuHistory.viewSidebar.label;"
+ type="checkbox"
+ class="subviewbutton subviewbutton-iconic"
+ key="key_gotoHistory"
+ oncommand="SidebarUI.toggle('viewHistorySidebar'); PanelUI.hide();">
+ <observes element="viewHistorySidebar" attribute="checked"/>
+ </toolbarbutton>
+ <toolbarbutton id="appMenuClearRecentHistory"
+ label="&appMenuHistory.clearRecent.label;"
+ class="subviewbutton subviewbutton-iconic"
+ command="Tools:Sanitize"/>
+ <toolbarseparator/>
+ <toolbarbutton id="appMenuRecentlyClosedTabs"
+ label="&historyUndoMenu.label;"
+ class="subviewbutton subviewbutton-iconic subviewbutton-nav"
+ closemenu="none"
+ oncommand="PanelUI.showSubView('appMenu-library-recentlyClosedTabs', this)"/>
+ <toolbarbutton id="appMenuRecentlyClosedWindows"
+ label="&historyUndoWindowMenu.label;"
+ class="subviewbutton subviewbutton-iconic subviewbutton-nav"
+ closemenu="none"
+ oncommand="PanelUI.showSubView('appMenu-library-recentlyClosedWindows', this)"/>
+ <toolbarseparator/>
+ <label value="&appMenuHistory.recentHistory.label;"
+ class="subview-subheader"/>
+ <toolbaritem id="appMenu_historyMenu"
+ orient="vertical"
+ smoothscroll="false"
+ flatList="true"
+ tooltip="bhTooltip">
+ <!-- history menu items will go here -->
+ </toolbaritem>
+ </vbox>
+ <toolbarbutton id="PanelUI-historyMore"
+ class="panel-subview-footer subviewbutton"
+ label="&appMenuHistory.showAll.label;"
+ oncommand="PlacesCommandHook.showPlacesOrganizer('History'); CustomizableUI.hidePanelForNode(this);"/>
+ </panelview>
+
+ <panelview id="appMenu-library-recentlyClosedTabs"/>
+ <panelview id="appMenu-library-recentlyClosedWindows"/>
+
+ <panelview id="PanelUI-remotetabs" flex="1" class="PanelUI-subView"
+ descriptionheightworkaround="true">
+ <vbox class="panel-subview-body">
+ <!-- this widget has 3 boxes in the body, but only 1 is ever visible -->
+ <!-- When Sync is ready to sync -->
+ <vbox id="PanelUI-remotetabs-main" observes="sync-syncnow-state">
+ <vbox id="PanelUI-remotetabs-buttons">
+ <toolbarbutton id="PanelUI-remotetabs-view-sidebar"
+ class="subviewbutton subviewbutton-iconic"
+ observes="viewTabsSidebar"
+ label="&appMenuRemoteTabs.sidebar.label;"/>
+ <toolbarbutton id="PanelUI-remotetabs-view-managedevices"
+ class="subviewbutton subviewbutton-iconic"
+ label="&appMenuRemoteTabs.managedevices.label;"
+ oncommand="gSync.openDevicesManagementPage('syncedtabs-menupanel');"/>
+ <toolbarbutton id="PanelUI-remotetabs-syncnow"
+ observes="sync-status"
+ class="subviewbutton subviewbutton-iconic"
+ oncommand="gSync.doSync();"
+ closemenu="none"/>
+ <menuseparator id="PanelUI-remotetabs-separator"/>
+ </vbox>
+ <deck id="PanelUI-remotetabs-deck">
+ <!-- Sync is ready to Sync and the "tabs" engine is enabled -->
+ <vbox id="PanelUI-remotetabs-tabspane">
+ <vbox id="PanelUI-remotetabs-tabslist"
+ showAllLabel="&appMenuRemoteTabs.showAll.label;"
+ showAllTooltipText="&appMenuRemoteTabs.showAll.tooltip;"
+ showMoreLabel="&appMenuRemoteTabs.showMore.label;"
+ showMoreTooltipText="&appMenuRemoteTabs.showMore.tooltip;"
+ notabsforclientlabel="&appMenuRemoteTabs.notabs.label;"
+ />
+ </vbox>
+ <!-- Sync is ready to Sync but the "tabs" engine isn't enabled-->
+ <hbox id="PanelUI-remotetabs-tabsdisabledpane" pack="center" flex="1">
+ <vbox class="PanelUI-remotetabs-instruction-box" align="center">
+ <hbox pack="center">
+ <image class="fxaSyncIllustration"/>
+ </hbox>
+ <label class="PanelUI-remotetabs-instruction-label">&appMenuRemoteTabs.tabsnotsyncing.label;</label>
+ <hbox pack="center">
+ <toolbarbutton class="PanelUI-remotetabs-prefs-button"
+ label="&appMenuRemoteTabs.openprefs.label;"
+ oncommand="gSync.openPrefs('synced-tabs');"/>
+ </hbox>
+ </vbox>
+ </hbox>
+ <!-- Sync is ready to Sync but we are still fetching the tabs to show -->
+ <vbox id="PanelUI-remotetabs-fetching">
+ <!-- Show intentionally blank panel, see bug 1239845 -->
+ </vbox>
+ <!-- Sync has only 1 (ie, this) device connected -->
+ <hbox id="PanelUI-remotetabs-nodevicespane" pack="center" flex="1">
+ <vbox class="PanelUI-remotetabs-instruction-box">
+ <hbox pack="center">
+ <image class="fxaSyncIllustration"/>
+ </hbox>
+ <label class="PanelUI-remotetabs-instruction-title">&appMenuRemoteTabs.noclients.title;</label>
+ <label class="PanelUI-remotetabs-instruction-label">&appMenuRemoteTabs.noclients.subtitle;</label>
+ <!-- The inner HTML for PanelUI-remotetabs-mobile-promo is built at runtime -->
+ <label id="PanelUI-remotetabs-mobile-promo" fxAccountsBrand="&syncBrand.fxAccount.label;"/>
+ </vbox>
+ </hbox>
+ </deck>
+ </vbox>
+ <!-- a box to ensure contained boxes are centered horizonally -->
+ <hbox pack="center" flex="1">
+ <!-- When Sync is not configured -->
+ <vbox id="PanelUI-remotetabs-setupsync"
+ flex="1"
+ align="center"
+ class="PanelUI-remotetabs-instruction-box"
+ observes="sync-setup-state">
+ <image class="fxaSyncIllustration"/>
+ <label class="PanelUI-remotetabs-instruction-label">&appMenuRemoteTabs.notsignedin.label;</label>
+ <toolbarbutton class="PanelUI-remotetabs-prefs-button"
+ label="&appMenuRemoteTabs.signin.label;"
+ oncommand="gSync.openPrefs('synced-tabs');"/>
+ </vbox>
+ <!-- When Sync needs re-authentication. This uses the exact same messaging
+ as "Sync is not configured" but remains a separate box so we get
+ the goodness of observing broadcasters to manage the hidden states -->
+ <vbox id="PanelUI-remotetabs-reauthsync"
+ flex="1"
+ align="center"
+ class="PanelUI-remotetabs-instruction-box"
+ observes="sync-reauth-state">
+ <image class="fxaSyncIllustration"/>
+ <label class="PanelUI-remotetabs-instruction-label">&appMenuRemoteTabs.notsignedin.label;</label>
+ <toolbarbutton class="PanelUI-remotetabs-prefs-button"
+ label="&appMenuRemoteTabs.signin.label;"
+ oncommand="gSync.openPrefs('synced-tabs');"/>
+ </vbox>
+ </hbox>
+ </vbox>
+ </panelview>
+
+ <panelview id="PanelUI-bookmarks" flex="1" class="PanelUI-subView">
+ <vbox class="panel-subview-body">
+ <toolbarbutton id="panelMenuBookmarkThisPage"
+ class="subviewbutton subviewbutton-iconic"
+ observes="bookmarkThisPageBroadcaster"
+ command="Browser:AddBookmarkAs"
+ onclick="PanelUI.hide();"/>
+ <toolbarbutton id="panelMenu_bookmarkingTools"
+ label="&bookmarkingTools.label;"
+ class="subviewbutton subviewbutton-iconic subviewbutton-nav"
+ closemenu="none"
+ oncommand="BookmarkingUI.showBookmarkingTools(this);"/>
+ <toolbarbutton id="panelMenu_searchBookmarks"
+ label="&searchBookmarks.label;"
+ class="subviewbutton subviewbutton-iconic"
+ oncommand="PlacesCommandHook.searchBookmarks(); PanelUI.hide();"/>
+ <toolbarseparator/>
+ <label id="panelMenu_recentBookmarks"
+ value="&recentBookmarks.label;"
+ class="subview-subheader"/>
+ <toolbaritem id="panelMenu_bookmarksMenu"
+ orient="vertical"
+ smoothscroll="false"
+ flatList="true"
+ tooltip="bhTooltip">
+ <!-- bookmarks menu items will go here -->
+ </toolbaritem>
+ </vbox>
+ <toolbarbutton id="panelMenu_showAllBookmarks"
+ label="&showAllBookmarks2.label;"
+ class="subviewbutton panel-subview-footer"
+ command="Browser:ShowAllBookmarks"
+ onclick="PanelUI.hide();"/>
+ </panelview>
+
+ <panelview id="PanelUI-feeds" flex="1" oncommand="FeedHandler.subscribeToFeed(null, event);">
+ </panelview>
+
+ <panelview id="PanelUI-containers" flex="1">
+ <vbox id="PanelUI-containersItems"/>
+ </panelview>
+
+ <panelview id="PanelUI-helpView" flex="1" class="PanelUI-subView">
+ <vbox id="PanelUI-helpItems" class="panel-subview-body"/>
+ </panelview>
+
+ <panelview id="PanelUI-developer" flex="1">
+ <vbox id="PanelUI-developerItems" class="panel-subview-body"/>
+ </panelview>
+
+ <panelview id="PanelUI-characterEncodingView" flex="1">
+ <vbox class="panel-subview-body">
+ <vbox id="PanelUI-characterEncodingView-pinned"
+ class="PanelUI-characterEncodingView-list"/>
+ <toolbarseparator/>
+ <vbox id="PanelUI-characterEncodingView-charsets"
+ class="PanelUI-characterEncodingView-list"/>
+ <toolbarseparator/>
+ <vbox>
+ <label id="PanelUI-characterEncodingView-autodetect-label"/>
+ <vbox id="PanelUI-characterEncodingView-autodetect"
+ class="PanelUI-characterEncodingView-list"/>
+ </vbox>
+ </vbox>
+ </panelview>
+
+ <panelview id="PanelUI-panicView" flex="1"
+ descriptionheightworkaround="true">
+ <vbox class="panel-subview-body">
+ <hbox id="PanelUI-panic-timeframe">
+ <image id="PanelUI-panic-timeframe-icon" alt=""/>
+ <vbox flex="1">
+ <hbox id="PanelUI-panic-header">
+ <image id="PanelUI-panic-timeframe-icon-small" alt=""/>
+ <description id="PanelUI-panic-mainDesc" flex="1">&panicButton.view.mainTimeframeDesc;</description>
+ </hbox>
+ <radiogroup id="PanelUI-panic-timeSpan" aria-labelledby="PanelUI-panic-mainDesc" closemenu="none">
+ <radio id="PanelUI-panic-5min" label="&panicButton.view.5min;" selected="true"
+ value="5" class="subviewradio"/>
+ <radio id="PanelUI-panic-2hr" label="&panicButton.view.2hr;"
+ value="2" class="subviewradio"/>
+ <radio id="PanelUI-panic-day" label="&panicButton.view.day;"
+ value="6" class="subviewradio"/>
+ </radiogroup>
+ </vbox>
+ </hbox>
+ <vbox id="PanelUI-panic-explanations">
+ <label id="PanelUI-panic-actionlist-main-label">&panicButton.view.mainActionDesc;</label>
+
+ <label id="PanelUI-panic-actionlist-windows" class="PanelUI-panic-actionlist">&panicButton.view.deleteTabsAndWindows;</label>
+ <label id="PanelUI-panic-actionlist-cookies" class="PanelUI-panic-actionlist">&panicButton.view.deleteCookies;</label>
+ <label id="PanelUI-panic-actionlist-history" class="PanelUI-panic-actionlist">&panicButton.view.deleteHistory;</label>
+ <label id="PanelUI-panic-actionlist-newwindow" class="PanelUI-panic-actionlist">&panicButton.view.openNewWindow;</label>
+
+ <label id="PanelUI-panic-warning">&panicButton.view.undoWarning;</label>
+ </vbox>
+ <button id="PanelUI-panic-view-button"
+ label="&panicButton.view.forgetButton;"/>
+ </vbox>
+ </panelview>
+
<panelview id="appMenu-moreView" title="&moreMenu.label;" class="PanelUI-subView">
<vbox class="panel-subview-body">
<toolbarbutton id="appMenu-characterencoding-button"
class="subviewbutton subviewbutton-nav"
label="&charsetMenu2.label;"
closemenu="none"
oncommand="PanelUI.showSubView('PanelUI-characterEncodingView', this)"/>
<toolbarbutton id="appMenu-workoffline-button"
--- a/browser/components/customizableui/test/browser.ini
+++ b/browser/components/customizableui/test/browser.ini
@@ -36,19 +36,16 @@ skip-if = os == "linux"
[browser_914138_widget_API_overflowable_toolbar.js]
skip-if = os == "linux"
[browser_918049_skipintoolbarset_dnd.js]
[browser_923857_customize_mode_event_wrapping_during_reset.js]
[browser_927717_customize_drag_empty_toolbar.js]
-[browser_932928_show_notice_when_palette_empty.js]
-disabled=Bug 1163231 - Fails on all platforms
-
[browser_934113_menubar_removable.js]
# Because this test is about the menubar, it can't be run on mac
skip-if = os == "mac"
[browser_934951_zoom_in_toolbar.js]
[browser_938980_navbar_collapsed.js]
[browser_938995_indefaultstate_nonremovable.js]
[browser_940013_registerToolbarNode_calls_registerArea.js]
deleted file mode 100644
--- a/browser/components/customizableui/test/browser_932928_show_notice_when_palette_empty.js
+++ /dev/null
@@ -1,35 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * 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/. */
-
-"use strict";
-
-// There should be an advert to get more addons when the palette is empty.
-add_task(async function() {
- await startCustomizing();
- let visiblePalette = document.getElementById("customization-palette");
- let emptyPaletteNotice = document.getElementById("customization-empty");
- is(emptyPaletteNotice.hidden, true, "The empty palette notice should not be shown when there are items in the palette.");
-
- while (visiblePalette.childElementCount) {
- gCustomizeMode.addToToolbar(visiblePalette.children[0]);
- }
- is(visiblePalette.childElementCount, 0, "There shouldn't be any items remaining in the visible palette.");
- is(emptyPaletteNotice.hidden, false, "The empty palette notice should be shown when there are no items in the palette.");
-
- await endCustomizing();
- await startCustomizing();
- visiblePalette = document.getElementById("customization-palette");
- emptyPaletteNotice = document.getElementById("customization-empty");
- is(emptyPaletteNotice.hidden, false,
- "The empty palette notice should be shown when there are no items in the palette and cust. mode is re-entered.");
-
- gCustomizeMode.removeFromArea(document.getElementById("wrapper-home-button"));
- is(emptyPaletteNotice.hidden, true,
- "The empty palette notice should not be shown when there is at least one item in the palette.");
-});
-
-add_task(async function asyncCleanup() {
- await endCustomizing();
- await resetCustomization();
-});
--- a/browser/components/customizableui/test/browser_switch_to_customize_mode.js
+++ b/browser/components/customizableui/test/browser_switch_to_customize_mode.js
@@ -23,12 +23,10 @@ add_task(async function() {
is(newKidCount, paletteKidCount, "Should have just as many items in the palette as before.");
await endCustomizing();
is(startedCount, 1, "Should have only started once");
gNavToolbox.removeEventListener("customizationstarting", handler);
let customizableToolbars = document.querySelectorAll("toolbar[customizable=true]:not([autohide=true])");
for (let toolbar of customizableToolbars) {
ok(!toolbar.hasAttribute("customizing"), "Toolbar " + toolbar.id + " is no longer customizing");
}
- let menuitem = document.getElementById("PanelUI-customize");
- isnot(menuitem.getAttribute("label"), menuitem.getAttribute("exitLabel"), "Should have exited successfully");
});
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -343,27 +343,22 @@ These should match what Safari and other
<!ENTITY historyUndoMenu.label "Recently Closed Tabs">
<!-- LOCALIZATION NOTE (historyUndoWindowMenu): see bug 394759 -->
<!ENTITY historyUndoWindowMenu.label "Recently Closed Windows">
<!ENTITY historyRestoreLastSession.label "Restore Previous Session">
<!ENTITY showAllHistoryCmd2.label "Show All History">
<!ENTITY showAllHistoryCmd.commandkey "H">
-<!ENTITY appMenuCustomize.label "Customize">
-<!ENTITY appMenuCustomize.tooltip "Customize the Menu and Toolbars">
-<!ENTITY appMenuCustomizeExit.label "Exit Customize">
-<!ENTITY appMenuCustomizeExit.tooltip "Finish Customizing">
<!ENTITY appMenuHistory.showAll.label "Show All History">
<!ENTITY appMenuHistory.clearRecent.label "Clear Recent History…">
<!ENTITY appMenuHistory.restoreSession.label "Restore Previous Session">
<!ENTITY appMenuHistory.viewSidebar.label "View History Sidebar">
<!ENTITY appMenuHistory.recentHistory.label "Recent History">
<!ENTITY appMenuHelp.label "Help">
-<!ENTITY appMenuHelp.tooltip "Open Help Menu">
<!ENTITY appMenuRemoteTabs.label "Synced Tabs">
<!-- LOCALIZATION NOTE (appMenuRemoteTabs.notabs.label): This is shown beneath
the name of a device when that device has no open tabs -->
<!ENTITY appMenuRemoteTabs.notabs.label "No open tabs">
<!-- LOCALIZATION NOTE (appMenuRemoteTabs.showMore.label, appMenuRemoteTabs.showMore.tooltip):
This is shown after the tabs list if we can display more tabs by clicking on the button -->
<!ENTITY appMenuRemoteTabs.showMore.label "Show More">
@@ -826,18 +821,16 @@ you can use these alternative items. Oth
<!ENTITY syncSignIn.accesskey "Y">
<!ENTITY syncSyncNowItem.label "Sync Now">
<!ENTITY syncSyncNowItem.accesskey "S">
<!ENTITY syncReAuthItem.label "Reconnect to &syncBrand.shortName.label;…">
<!ENTITY syncReAuthItem.accesskey "R">
<!ENTITY syncToolbarButton.label "Sync">
<!ENTITY customizeMode.menuAndToolbars.header3 "Drag your favorite items into the toolbar or overflow menu.">
-<!ENTITY customizeMode.menuAndToolbars.empty "Want more tools?">
-<!ENTITY customizeMode.menuAndToolbars.emptyLink "Choose from thousands of add-ons">
<!ENTITY customizeMode.restoreDefaults "Restore Defaults">
<!ENTITY customizeMode.done "Done">
<!ENTITY customizeMode.titlebar "Title Bar">
<!ENTITY customizeMode.extraDragSpace "Drag Space">
<!ENTITY customizeMode.toolbars2 "Toolbars">
<!ENTITY customizeMode.lwthemes "Themes">
<!ENTITY customizeMode.lwthemes.myThemes "My Themes">
<!ENTITY customizeMode.lwthemes.recommended "Recommended">
--- a/browser/themes/linux/jar.mn
+++ b/browser/themes/linux/jar.mn
@@ -6,22 +6,16 @@ browser.jar:
% skin browser classic/1.0 %skin/classic/browser/
% override chrome://global/skin/icons/warning-16.png moz-icon://stock/gtk-dialog-warning?size=menu
#include ../shared/jar.inc.mn
skin/classic/browser/sanitizeDialog.css
skin/classic/browser/aboutSessionRestore-window-icon.png
* skin/classic/browser/syncedtabs/sidebar.css (syncedtabs/sidebar.css)
* skin/classic/browser/browser.css
* skin/classic/browser/compacttheme.css
- skin/classic/browser/menuPanel-customize.png
- skin/classic/browser/menuPanel-customize@2x.png
- skin/classic/browser/menuPanel-exit.png
- skin/classic/browser/menuPanel-exit@2x.png
- skin/classic/browser/menuPanel-help.png
- skin/classic/browser/menuPanel-help@2x.png
skin/classic/browser/monitor.png
skin/classic/browser/monitor_16-10.png
* skin/classic/browser/pageInfo.css
skin/classic/browser/pageInfo.png
skin/classic/browser/page-livemarks.png
skin/classic/browser/searchbar.css
skin/classic/browser/setDesktopBackground.css
skin/classic/browser/slowStartup-16.png
deleted file mode 100644
index e0b0a70a3b82a18c974bd1bc5f1dff863405dd61..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 5ce3b766a1bb9b298120472bdf42b0bc63404918..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 8daaffe9556f3fc93fbfa7883fa0639b72e0a26e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index d48426546fa492f78bd3e22676184b7dece8bcb3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 962001ff652e963009be9837e12859f48d1b29da..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index b8f0a80fa168230973a6eb53f8bfe93d2cc981df..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
--- a/browser/themes/osx/jar.mn
+++ b/browser/themes/osx/jar.mn
@@ -6,22 +6,16 @@ browser.jar:
% skin browser classic/1.0 %skin/classic/browser/
#include ../shared/jar.inc.mn
skin/classic/browser/sanitizeDialog.css
skin/classic/browser/aboutSessionRestore-window-icon.png
* skin/classic/browser/syncedtabs/sidebar.css (syncedtabs/sidebar.css)
* skin/classic/browser/browser.css
* skin/classic/browser/compacttheme.css
skin/classic/browser/subtle-pattern.png
- skin/classic/browser/menuPanel-customize.png
- skin/classic/browser/menuPanel-customize@2x.png
- skin/classic/browser/menuPanel-exit.png
- skin/classic/browser/menuPanel-exit@2x.png
- skin/classic/browser/menuPanel-help.png
- skin/classic/browser/menuPanel-help@2x.png
skin/classic/browser/panel-expander-closed.png
skin/classic/browser/panel-expander-closed@2x.png
skin/classic/browser/panel-expander-open.png
skin/classic/browser/panel-expander-open@2x.png
skin/classic/browser/panel-plus-sign.png
skin/classic/browser/page-livemarks.png
skin/classic/browser/pageInfo.css
skin/classic/browser/searchbar.css
@@ -65,29 +59,16 @@ browser.jar:
* skin/classic/browser/preferences/preferences.css (preferences/preferences.css)
* skin/classic/browser/preferences/in-content/preferences.css (preferences/in-content/preferences.css)
* skin/classic/browser/preferences/in-content/dialog.css (preferences/in-content/dialog.css)
skin/classic/browser/preferences/applications.css (preferences/applications.css)
skin/classic/browser/tabbrowser/tabDragIndicator.png (tabbrowser/tabDragIndicator.png)
skin/classic/browser/tabbrowser/tabDragIndicator@2x.png (tabbrowser/tabDragIndicator@2x.png)
skin/classic/browser/sync-desktopIcon.svg (../shared/sync-desktopIcon.svg)
skin/classic/browser/sync-mobileIcon.svg (../shared/sync-mobileIcon.svg)
- skin/classic/browser/yosemite/menuPanel-customize.png (menuPanel-customize-yosemite.png)
- skin/classic/browser/yosemite/menuPanel-customize@2x.png (menuPanel-customize-yosemite@2x.png)
- skin/classic/browser/yosemite/menuPanel-exit.png (menuPanel-exit-yosemite.png)
- skin/classic/browser/yosemite/menuPanel-exit@2x.png (menuPanel-exit-yosemite@2x.png)
- skin/classic/browser/yosemite/menuPanel-help.png (menuPanel-help-yosemite.png)
- skin/classic/browser/yosemite/menuPanel-help@2x.png (menuPanel-help-yosemite@2x.png)
skin/classic/browser/e10s-64@2x.png (../shared/e10s-64@2x.png)
[extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar:
% override chrome://browser/skin/feeds/audioFeedIcon.png chrome://browser/skin/feeds/feedIcon.png
% override chrome://browser/skin/feeds/audioFeedIcon16.png chrome://browser/skin/feeds/feedIcon16.png
% override chrome://browser/skin/feeds/videoFeedIcon.png chrome://browser/skin/feeds/feedIcon.png
% override chrome://browser/skin/feeds/videoFeedIcon16.png chrome://browser/skin/feeds/feedIcon16.png
% override chrome://browser/skin/notification-icons/geo-detailed.svg chrome://browser/skin/notification-icons/geo.svg
-
-% override chrome://browser/skin/menuPanel-customize.png chrome://browser/skin/yosemite/menuPanel-customize.png os=Darwin osversion>=10.10
-% override chrome://browser/skin/menuPanel-customize@2x.png chrome://browser/skin/yosemite/menuPanel-customize@2x.png os=Darwin osversion>=10.10
-% override chrome://browser/skin/menuPanel-exit.png chrome://browser/skin/yosemite/menuPanel-exit.png os=Darwin osversion>=10.10
-% override chrome://browser/skin/menuPanel-exit@2x.png chrome://browser/skin/yosemite/menuPanel-exit@2x.png os=Darwin osversion>=10.10
-% override chrome://browser/skin/menuPanel-help.png chrome://browser/skin/yosemite/menuPanel-help.png os=Darwin osversion>=10.10
-% override chrome://browser/skin/menuPanel-help@2x.png chrome://browser/skin/yosemite/menuPanel-help@2x.png os=Darwin osversion>=10.10
deleted file mode 100644
index b3b40e394dbfa412189a8a452c73f72d227fc4a4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 93b6606928039af13895a3bb66ac27806a733671..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 43cde4a68273f05a025b9a3f369e8c644ff0ab06..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index b0772d82223f86362416ff69417fbd44c4731ed5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index aba481aeb49b48bfc317bdeaeb00ea4048869533..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 4115b53ec7dcf32351bf1fdb97ce321fa7e7e411..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index af3160621c36d2c8b067cec4d4b05acb339881c7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 126cde0880537831e032e3627450cc34ec7b93d1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 1ccdd65b97db020dd98ff6d9e788447449fb72af..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index ad1783de69ea14968959e182f8ef3767d6c3307f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 4a4c3bcaeb0b070b71d109888233678e60bf8f9f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index a9b34c132043b4ec2023846582f2e2fb8d15fcd1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index acf2e531cb81cd1dba010a7b55c79b04e0fd13f3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
--- a/browser/themes/shared/controlcenter/panel.inc.css
+++ b/browser/themes/shared/controlcenter/panel.inc.css
@@ -190,17 +190,17 @@
.identity-popup-headline {
margin: 3px 0 4px;
font-size: 150%;
}
.identity-popup-host {
word-wrap: break-word;
/* 1em + 2em + 24px is #identity-popup-security-content padding
- * 30em is .panel-mainview:not([panelid="PanelUI-popup"]) width */
+ * 30em is .panel-mainview width */
max-width: calc(30rem - 3rem - 24px - @identityPopupExpanderWidth@);
}
.identity-popup-warning-gray {
padding-inline-start: 24px;
background: url(chrome://browser/skin/controlcenter/warning-gray.svg) no-repeat 0 50%;
}
--- a/browser/themes/shared/customizableui/customizeMode.inc.css
+++ b/browser/themes/shared/customizableui/customizeMode.inc.css
@@ -19,18 +19,17 @@
text-shadow: none;
}
#customization-container:-moz-lwtheme {
background-color: transparent;
background-image: linear-gradient(var(--toolbar-bgcolor), var(--toolbar-non-lwt-bgcolor) 45px);
}
-#customization-palette,
-#customization-empty {
+#customization-palette {
padding: 5px 20px 20px;
}
#customization-header {
font-weight: 500;
font-size: 1.2em;
margin: 20px 20px 15px;
}
deleted file mode 100644
index 07be6a76a86efd878a2476d39f68c84b4ad4e2bc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 7562e138c3d7db91dc7828c01d2277bcb8990ce2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
--- a/browser/themes/shared/customizableui/panelUI.inc.css
+++ b/browser/themes/shared/customizableui/panelUI.inc.css
@@ -24,79 +24,16 @@
:root {
--panel-ui-exit-subview-gutter-width: 38px;
--appmenu-yellow-warning-border-color: hsl(45, 100%, 77%);
--appmenu-yellow-warning-color: #FFEFBF;
--appmenu-yellow-warning-hover-color: #FFE8A2;
--appmenu-yellow-warning-active-color: #FFE38F;
}
-#PanelUI-popup #PanelUI-contents:empty {
- height: 128px;
-}
-
-#PanelUI-popup #PanelUI-contents:empty::before {
- content: "";
- background-image: url(chrome://browser/skin/customizableui/whimsy.png);
- background-size: 64px 64px;
- display: block;
- width: 64px;
- height: 64px;
- position: absolute;
- transition: transform 1s ease-out;
- animation: whimsyMoveX 3.05s linear 0s infinite alternate,
- whimsyMoveY 3.4s linear 0s infinite alternate;
-}
-
-#PanelUI-popup #PanelUI-contents:not(:hover):empty::before {
- filter: grayscale(100%);
-}
-
-#PanelUI-popup #PanelUI-contents:active:empty::before {
- animation: whimsyMoveX 3.05s linear 0s infinite alternate,
- whimsyMoveY 3.4s linear 0s infinite alternate,
- whimsyRotate 1s linear 0s infinite normal;
-}
-
-#PanelUI-popup #PanelUI-contents:-moz-locale-dir(rtl):empty::before {
- animation: whimsyMoveXRTL 3.05s linear 0s infinite alternate,
- whimsyMoveY 3.4s linear 0s infinite alternate;
-}
-
-#PanelUI-popup #PanelUI-contents:-moz-locale-dir(rtl):active:empty::before {
- animation: whimsyMoveXRTL 3.05s linear 0s infinite alternate,
- whimsyMoveY 3.4s linear 0s infinite alternate,
- whimsyRotate 1s linear 0s infinite normal;
-}
-
-@media (min-resolution: 2dppx) {
- #PanelUI-popup #PanelUI-contents:empty::before {
- background-image: url(chrome://browser/skin/customizableui/whimsy@2x.png);
- }
-}
-
-@keyframes whimsyMoveX {
- /* These values are adjusted for the padding on the panel. */
- from { margin-left: -15px; } to { margin-left: calc(100% - 49px); }
-}
-
-@keyframes whimsyMoveXRTL {
- /* These values are adjusted for the padding on the panel. */
- from { margin-right: -15px; } to { margin-right: calc(100% - 49px); }
-}
-
-@keyframes whimsyMoveY {
- /* These values are adjusted for the padding and height of the panel. */
- from { margin-top: -.5em; } to { margin-top: calc(64px - .5em); }
-}
-
-@keyframes whimsyRotate {
- to { transform: perspective(5000px) rotateY(360deg); }
-}
-
:root:not([uidensity=compact]):not([chromehidden~="toolbar"]) #PanelUI-button {
margin-inline-start: 3px;
border-inline-start: 1px solid;
border-image: linear-gradient(transparent 4px, rgba(0,0,0,.1) 4px, rgba(0,0,0,.1) calc(100% - 4px), transparent calc(100% - 4px));
border-image-slice: 1;
}
:root:not([uidensity=compact]):not([chromehidden~="toolbar"]) #nav-bar[brighttext] > #PanelUI-button {
@@ -265,50 +202,42 @@ panelview {
-moz-box-flex: 1;
}
.panel-view-body-unscrollable {
overflow: hidden;
-moz-box-flex: 1;
}
-#PanelUI-popup .panel-subview-body {
- margin: -4px;
- padding: 4px 4px;
-}
-
.subviewbutton.panel-subview-footer {
box-sizing: border-box;
min-height: 41px;
}
.cui-widget-panelview menuitem.subviewbutton.panel-subview-footer {
margin: 4px 0 0;
}
.cui-widget-panelview .subviewbutton.panel-subview-footer > .menu-text {
-moz-box-flex: 1;
}
-#appMenu-popup > arrowscrollbox > autorepeatbutton,
-#PanelUI-popup > arrowscrollbox > autorepeatbutton {
+#appMenu-popup > arrowscrollbox > autorepeatbutton {
display: none;
}
-#appMenu-popup > arrowscrollbox > scrollbox,
-#PanelUI-popup > arrowscrollbox > scrollbox {
+#appMenu-popup > arrowscrollbox > scrollbox {
overflow: visible;
}
#appMenu-popup > .panel-arrowcontainer > .panel-arrowcontent,
panel[photon] > .panel-arrowcontainer > .panel-arrowcontent {
overflow: hidden;
}
-#PanelUI-popup > .panel-arrowcontainer > .panel-arrowcontent,
.cui-widget-panel > .panel-arrowcontainer > .panel-arrowcontent > .popup-internal-box {
padding: 0;
}
.panelUI-grid .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-multiline-text,
.panelUI-grid .toolbarbutton-1 > .toolbarbutton-multiline-text {
line-height: 1.2;
max-height: 2.4em;
@@ -337,22 +266,18 @@ panel[photon] > .panel-arrowcontainer >
margin: -1px 0 0;
}
#wrapper-edit-controls:-moz-any([place="palette"],[place="panel"]) > #edit-controls,
#wrapper-zoom-controls:-moz-any([place="palette"],[place="panel"]) > #zoom-controls {
margin-inline-start: 0;
}
-#PanelUI-contents {
- max-width: @menuPanelWidth@;
-}
-
#BMB_bookmarksPopup,
-.panel-mainview:not([panelid="PanelUI-popup"]) {
+.panel-mainview {
max-width: @standaloneSubviewWidth@;
}
#pageActionFeedback > .panel-arrowcontainer > .panel-arrowbox {
/* Don't display the arrow but keep the popup at the same vertical
offset as other arrow panels. */
visibility: hidden;
}
@@ -546,167 +471,32 @@ photonpanelmultiview .panel-subview-body
transform: scale(.5);
}
}
toolbarpaletteitem[place=panel] > .toolbarbutton-1 {
-moz-box-flex: 1;
}
-/* Help SDK buttons fit in. */
+/* Help webextension buttons fit in. */
toolbarpaletteitem[place="palette"] > toolbarbutton[constrain-size="true"] > .toolbarbutton-icon,
toolbarpaletteitem[place="palette"] > toolbarbutton[constrain-size="true"] > .toolbarbutton-badge-stack > .toolbarbutton-icon,
-toolbarpaletteitem[place="palette"] > toolbaritem[sdkstylewidget="true"] > .toolbarbutton-1 > .toolbarbutton-icon,
-toolbarpaletteitem[place="panel"] > toolbaritem[sdkstylewidget="true"] > .toolbarbutton-1 > .toolbarbutton-icon,
toolbarbutton[constrain-size="true"][cui-areatype="menu-panel"] > .toolbarbutton-icon,
toolbarbutton[constrain-size="true"][cui-areatype="menu-panel"] > .toolbarbutton-badge-stack > .toolbarbutton-icon {
height: @panelPaletteIconSize@;
width: @panelPaletteIconSize@;
}
#customization-palette .toolbarbutton-1 {
-moz-appearance: none;
-moz-box-orient: vertical;
padding: 12px 0 9px;
margin: 0;
}
-.panelUI-grid .toolbarbutton-1 > .toolbarbutton-menubutton-button {
- -moz-appearance: none;
- -moz-box-orient: vertical;
- width: calc(@menuPanelButtonWidth@ - 2px);
- height: calc(49px + 2.2em);
- border: 0;
-}
-
-.panelUI-grid .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-text,
-.panelUI-grid .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-multiline-text {
- margin-top: 2px; /* Hack needed to get the label of type=menu-button aligned with other buttons */
-}
-
-.panel-customization-placeholder-child {
- margin: 6px 0 0;
- padding: 2px 6px;
- border: 1px solid transparent;
-}
-
-.panelUI-grid .toolbarbutton-1[type="menu"] {
- background-image: url("chrome://browser/skin/toolbarbutton-dropdown-arrow.png");
- background-position: right 3px top 16px;
- background-repeat: no-repeat;
-}
-
-.panelUI-grid .toolbarbutton-1[type="menu"]:-moz-locale-dir(rtl) {
- background-position: left 3px top 16px;
-}
-
-.panelUI-grid .toolbarbutton-1 > .toolbarbutton-menu-dropmarker {
- display: none;
-}
-
-.panelUI-grid .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker {
- -moz-box-align: center;
- width: 16px;
- margin-inline-start: -16px;
- height: 51px;
- margin-bottom: 2.2em;
- padding: 0;
-}
-
-.panelUI-grid .toolbarbutton-1:not([buttonover])@buttonStateHover@ > .toolbarbutton-menubutton-dropmarker {
- background-color: var(--arrowpanel-dimmed) !important;
- border-radius: 0 0 0 2px;
-}
-
-.panelUI-grid .toolbarbutton-1:not([buttonover])@buttonStateHover@ > .toolbarbutton-menubutton-dropmarker:-moz-locale-dir(rtl) {
- border-radius: 0 0 2px 0;
-}
-
-#main-window:not([customizing]) .panel-combined-button[disabled] > .toolbarbutton-icon {
- opacity: .5;
-}
-
-toolbaritem[cui-areatype="menu-panel"][sdkstylewidget="true"]:not(.panel-wide-item) {
- width: calc(@menuPanelButtonWidth@);
- margin: 0 !important;
-}
-
-toolbaritem[cui-areatype="menu-panel"][sdkstylewidget="true"]:not(.panel-wide-item) {
- -moz-box-align: center;
- -moz-box-pack: center;
-}
-
-toolbaritem[cui-areatype="menu-panel"][sdkstylewidget="true"] > iframe {
- margin: 4px auto;
-}
-
-#PanelUI-multiView[viewtype="subview"] > .panel-viewcontainer > .panel-viewstack > .panel-mainview > #PanelUI-mainView {
- background-color: var(--arrowpanel-dimmed);
-}
-
-#PanelUI-multiView[viewtype="subview"] #PanelUI-mainView > #PanelUI-contents-scroller > #PanelUI-contents > .panel-wide-item,
-#PanelUI-multiView[viewtype="subview"] #PanelUI-mainView > #PanelUI-contents-scroller > #PanelUI-contents > .toolbarbutton-1:not([panel-multiview-anchor="true"]),
-#PanelUI-multiView[viewtype="subview"] #PanelUI-mainView > #PanelUI-footer > .panel-banner-item,
-#PanelUI-multiView[viewtype="subview"] #PanelUI-mainView > #PanelUI-footer > #PanelUI-fxa-container > #PanelUI-fxa-status > #PanelUI-fxa-avatar,
-#PanelUI-multiView[viewtype="subview"] #PanelUI-mainView > #PanelUI-footer > #PanelUI-fxa-container > #PanelUI-fxa-status > #PanelUI-fxa-label,
-#PanelUI-multiView[viewtype="subview"] #PanelUI-mainView > #PanelUI-footer > #PanelUI-fxa-container > #PanelUI-fxa-icon,
-#PanelUI-multiView[viewtype="subview"] #PanelUI-mainView > #PanelUI-footer > #PanelUI-footer-inner > #PanelUI-footer-inner > toolbarseparator,
-#PanelUI-multiView[viewtype="subview"] #PanelUI-mainView > #PanelUI-footer > #PanelUI-footer-inner > #PanelUI-customize,
-#PanelUI-multiView[viewtype="subview"] #PanelUI-mainView > #PanelUI-footer > #PanelUI-footer-inner > #PanelUI-help:not([panel-multiview-anchor="true"]) {
- opacity: .5;
-}
-
-/*
- * XXXgijs: this is a workaround for a layout issue that was caused by these iframes,
- * which was affecting subview display. Because of this, we're hiding the iframe *only*
- * when displaying a subview. The discerning user might notice this, but it's not nearly
- * as bad as the brokenness.
- * This hack should be removed once https://bugzilla.mozilla.org/show_bug.cgi?id=975375
- * is addressed.
- */
-#PanelUI-multiView[viewtype="subview"] toolbaritem[cui-areatype="menu-panel"][sdkstylewidget="true"]:not(.panel-wide-item) > iframe {
- visibility: hidden;
-}
-
-toolbaritem[cui-areatype="menu-panel"][sdkstylewidget="true"]:not(.panel-wide-item) > .toolbarbutton-text {
- text-align: center;
-}
-
-.panelUI-grid .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon,
-.panelUI-grid .toolbarbutton-1 > .toolbarbutton-icon,
-.panelUI-grid .toolbarbutton-1 > .toolbarbutton-badge-stack,
-.customization-palette .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon,
-.customization-palette .toolbarbutton-1 > .toolbarbutton-icon,
-.customization-palette .toolbarbutton-1 > .toolbarbutton-badge-stack,
-.panel-customization-placeholder-child > .toolbarbutton-icon {
- width: @panelPaletteIconSize@;
- height: @panelPaletteIconSize@;
- min-width: @panelPaletteIconSize@;
- min-height: @panelPaletteIconSize@;
-}
-
-.panelUI-grid .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon,
-.panelUI-grid .toolbarbutton-1 > .toolbarbutton-icon,
-.panelUI-grid .toolbarbutton-1 > .toolbarbutton-badge-stack,
-.panel-customization-placeholder-child > .toolbarbutton-icon {
- /* Explanation for the below formula (A / B - C)
- A
- Each button is @menuPanelButtonWidth@ wide
- B
- Each button has two margins.
- C (46px / 2 = 23px)
- The button icon is 32 pixels wide.
- The button has 12px of horizontal padding (6 on each side).
- The button has 2px of horizontal border (1 on each side).
- Total width of button's icon + button padding should therefore be 46px,
- which means each horizontal margin should be the half the button's width - (46/2) px.
- */
- margin: 4px calc(@menuPanelButtonWidth@ / 2 - 23px);
-}
-
/* above we treat the container as the icon for the margins, that is so the
/* badge itself is positioned correctly. Here we make sure that the icon itself
/* has the minimum size we want, but no padding/margin. */
.customization-palette .toolbarbutton-1 > .toolbarbutton-badge-stack > .toolbarbutton-icon,
.panelUI-grid .toolbarbutton-1 > .toolbarbutton-badge-stack > .toolbarbutton-icon {
width: @panelPaletteIconSize@;
height: @panelPaletteIconSize@;
min-width: @panelPaletteIconSize@;
@@ -723,46 +513,16 @@ toolbaritem[cui-areatype="menu-panel"][s
}
#zoom-in-button > .toolbarbutton-text,
#zoom-out-button > .toolbarbutton-text,
#zoom-reset-button > .toolbarbutton-icon {
display: none;
}
-#PanelUI-footer {
- display: flex;
- flex-shrink: 0;
- flex-direction: column;
- background-color: var(--arrowpanel-dimmed);
- padding: 0;
- margin: 0;
-}
-
-#main-window[customizing] #PanelUI-fxa-container {
- display: none;
-}
-
-#PanelUI-fxa-container:not([fxastatus="signedin"]) > toolbarseparator,
-#PanelUI-fxa-container:not([fxastatus="signedin"]) > #PanelUI-fxa-icon {
- display: none;
-}
-
-#PanelUI-fxa-container[fxastatus="login-failed"] > #PanelUI-fxa-status::after,
-#PanelUI-fxa-container[fxastatus="unverified"] > #PanelUI-fxa-status::after {
- content: url(chrome://browser/skin/warning.svg);
- filter: drop-shadow(0 1px 0 hsla(206,50%,10%,.15));
- width: 47px;
- padding-top: 1px;
- display: block;
- text-align: center;
- position: relative;
- top: 25%;
-}
-
.addon-banner-item::after,
.panel-banner-item::after {
content: "";
width: 16px;
height: 16px;
margin-inline-end: 16.5px;
display: -moz-box;
}
@@ -771,16 +531,17 @@ toolbaritem[cui-areatype="menu-panel"][s
background-color: var(--appmenu-yellow-warning-color);
/* Force border to override `.addon-banner-item` selector below */
border-top: 1px solid var(--appmenu-yellow-warning-border-color) !important;
display: flex;
flex: 1 1 0%;
width: calc(@menuPanelWidth@ + 30px);
padding-inline-start: 15px;
border-inline-start-style: none;
+ -moz-image-region: rect(0, 16px, 16px, 0);
}
.addon-banner-item:hover {
background-color: var(--appmenu-yellow-warning-hover-color);
}
.addon-banner-item:active {
background-color: var(--appmenu-yellow-warning-active-color);
@@ -790,87 +551,49 @@ toolbaritem[cui-areatype="menu-panel"][s
width: 16px;
height: 16px;
}
.addon-banner-item::after {
background: #FFBF00 url(chrome://browser/skin/update-badge-failed.svg) no-repeat center;
}
-#PanelUI-fxa-status {
- display: flex;
- flex: 1 1 0%;
- width: 1px;
-}
-
-#PanelUI-footer-inner,
-#PanelUI-fxa-container:not([hidden]) {
- display: flex;
- border-top: 1px solid var(--panel-separator-color);
-}
-
-#PanelUI-multiView[viewtype="subview"] #PanelUI-footer-inner,
-#PanelUI-multiView[viewtype="subview"] #PanelUI-fxa-container {
- position: relative;
-}
-
-#PanelUI-footer-inner > toolbarseparator,
-#PanelUI-fxa-container > toolbarseparator {
- border: 0;
- border-left: 1px solid var(--panel-separator-color);
- margin: 7px 0 7px;
- -moz-appearance: none;
-}
-
-#PanelUI-footer-inner:hover > toolbarseparator,
-#PanelUI-fxa-container:hover > toolbarseparator {
- margin: 0;
-}
-
.addon-banner-item,
-.panel-banner-item,
-#PanelUI-help,
-#PanelUI-fxa-label,
-#PanelUI-fxa-icon,
-#PanelUI-customize,
-#PanelUI-quit {
+.panel-banner-item {
margin: 0;
padding: 11px 0;
box-sizing: border-box;
min-height: 40px;
-moz-appearance: none;
box-shadow: none;
border: none;
border-radius: 0;
transition: background-color;
-moz-box-orient: horizontal;
}
.panel-banner-item {
border-top: 1px solid var(--panel-separator-color);
- border-bottom: 1px solid transparent;
- margin-bottom: -1px;
-}
-
-/* in Photon, we have a bottom border as well. Reconcile with the above rule
- * after photon launch. */
-#appMenu-mainView > .panel-subview-body > .panel-banner-item {
border-bottom: 1px solid var(--panel-separator-color);
margin-bottom: 3px;
padding-inline-start: 12px;
}
#appMenu-addon-banners > .addon-banner-item {
padding-inline-start: 12px;
}
.panel-banner-item > .toolbarbutton-text {
width: 0; /* Fancy cropping solution for flexbox. */
}
+.panel-banner-item > .toolbarbutton-icon {
+ width: 16px;
+}
+
/* FxAccount indicator bits. */
/* Add the .toolbaritem-combined-buttons class to increase the specificity so as
* to override the end margin for .toolbaritem-combined-buttons items further down. */
#appMenu-fxa-container.toolbaritem-combined-buttons:not([fxastatus="signedin"]) {
margin-inline-end: 0;
}
@@ -941,71 +664,34 @@ toolbaritem[cui-areatype="menu-panel"][s
background-color: var(--appmenu-yellow-warning-hover-color);
}
#appMenu-fxa-container[fxastatus="login-failed"] > #appMenu-fxa-status:hover:active,
#appMenu-fxa-container[fxastatus="unverified"] > #appMenu-fxa-status:hover:active {
background-color: var(--appmenu-yellow-warning-active-color);
}
-#PanelUI-help,
-#PanelUI-quit {
- min-width: 46px;
-}
-
.addon-banner-item > .toolbarbutton-text,
-.panel-banner-item > .toolbarbutton-text,
-#PanelUI-fxa-label > .toolbarbutton-text,
-#PanelUI-customize > .toolbarbutton-text {
+.panel-banner-item > .toolbarbutton-text {
margin: 0;
padding: 0 6px;
text-align: start;
}
-#PanelUI-help > .toolbarbutton-text,
-#PanelUI-quit > .toolbarbutton-text,
-#PanelUI-fxa-avatar > .toolbarbutton-text {
- display: none;
-}
-
.addon-banner-item > .toolbarbutton-icon,
-.panel-banner-item > .toolbarbutton-icon,
-#PanelUI-fxa-label > .toolbarbutton-icon,
-#PanelUI-fxa-icon > .toolbarbutton-icon,
-#PanelUI-customize > .toolbarbutton-icon,
-#PanelUI-help > .toolbarbutton-icon,
-#PanelUI-quit > .toolbarbutton-icon {
+.panel-banner-item > .toolbarbutton-icon {
margin-inline-end: 0;
}
-#PanelUI-fxa-icon {
- padding-inline-start: 15px;
- padding-inline-end: 15px;
-}
-
-#PanelUI-fxa-label,
-.addon-banner-item,
-#PanelUI-customize {
+.addon-banner-item {
flex: 1;
padding-inline-start: 15px;
border-inline-start-style: none;
}
-#PanelUI-fxa-container[fxastatus="signedin"] > #PanelUI-fxa-status > #PanelUI-fxa-label {
- padding-inline-start: 0px;
-}
-
-/* descend from #PanelUI-footer to add specificity, or else the
- padding-inline-start will be overridden */
-#PanelUI-footer > .panel-banner-item {
- width: calc(@menuPanelWidth@ + 30px);
- padding-inline-start: 15px;
- border-inline-start-style: none;
-}
-
#PanelUI-remotetabs {
--panel-ui-sync-illustration-height: 157.5px;
}
.PanelUI-remotetabs-instruction-title,
.PanelUI-remotetabs-instruction-label,
#PanelUI-remotetabs-mobile-promo {
/* If you change the margin here, the min-height of the synced tabs panel
@@ -1115,171 +801,29 @@ toolbaritem[cui-areatype="menu-panel"][s
#PanelUI-remotetabs-deck:not([selectedIndex="3"]) > #PanelUI-remotetabs-nodevicespane {
visibility: collapse;
}
#PanelUI-remotetabs-main[devices-status="single"] > #PanelUI-remotetabs-buttons {
display: none;
}
-#PanelUI-customize {
- list-style-image: url(chrome://browser/skin/menuPanel-customize.png);
-}
-
-#customization-panelHolder #PanelUI-customize {
- list-style-image: url(chrome://browser/skin/customizableui/menuPanel-customizeFinish.png);
-}
-
-#PanelUI-help {
- list-style-image: url(chrome://browser/skin/menuPanel-help.png);
-}
-
-#PanelUI-quit {
- border-inline-end-style: none;
- list-style-image: url(chrome://browser/skin/menuPanel-exit.png);
-}
-
-#PanelUI-fxa-label,
-#PanelUI-fxa-icon,
-.addon-banner-item,
-#PanelUI-customize,
-#PanelUI-help,
-#PanelUI-quit {
- -moz-image-region: rect(0, 16px, 16px, 0);
-}
-
-#PanelUI-fxa-container[fxastatus="signedin"] > #PanelUI-fxa-status > #PanelUI-fxa-label > .toolbarbutton-icon,
-#PanelUI-fxa-container:not([fxastatus="signedin"]) > #PanelUI-fxa-status > #PanelUI-fxa-avatar {
- display: none;
-}
-
-#PanelUI-fxa-avatar {
- width: 32px;
- height: 32px;
- border-radius: 50%;
- background-repeat: no-repeat;
- background-position: 0 0;
- background-size: contain;
- align-self: center;
- margin: 0px 7px;
- padding: 0px;
- border: 0px none;
- margin-inline-end: 0;
-}
-
-#PanelUI-fxa-container > #PanelUI-fxa-status > #PanelUI-fxa-avatar {
- list-style-image: url(chrome://browser/skin/fxa/default-avatar.svg);
-}
-
-#PanelUI-customize:hover,
-#PanelUI-help:not([disabled]):hover,
-#PanelUI-quit:not([disabled]):hover {
- -moz-image-region: rect(0, 32px, 16px, 16px);
-}
-
-#PanelUI-customize:hover:active,
-#PanelUI-help:not([disabled]):hover:active,
-#PanelUI-quit:not([disabled]):hover:active {
- -moz-image-region: rect(0, 48px, 16px, 32px);
-}
-
-#PanelUI-help[panel-multiview-anchor="true"] {
- -moz-image-region: rect(0, 64px, 16px, 48px);
-}
-
-#PanelUI-help[disabled],
-#PanelUI-quit[disabled] {
- opacity: 0.4;
-}
-
-#PanelUI-fxa-status:hover,
-#PanelUI-fxa-icon:hover,
-#PanelUI-help:not([disabled]):hover,
-#PanelUI-customize:hover,
-#PanelUI-quit:not([disabled]):hover {
- outline: 1px solid var(--arrowpanel-dimmed);
- background-color: var(--arrowpanel-dimmed);
-}
-
-#PanelUI-fxa-status:hover:active,
-#PanelUI-fxa-icon:hover:active,
-#PanelUI-help:not([disabled]):hover:active,
-#PanelUI-customize:hover:active,
-#PanelUI-quit:not([disabled]):hover:active {
- outline: 1px solid var(--arrowpanel-dimmed-further);
- background-color: var(--arrowpanel-dimmed-further);
- box-shadow: 0 1px 0 hsla(210,4%,10%,.05) inset;
-}
-
-#PanelUI-fxa-status:hover,
-#PanelUI-fxa-status:hover:active,
-#PanelUI-fxa-icon:hover,
-#PanelUI-fxa-icon:hover:active {
- outline: none;
-}
-
-#PanelUI-fxa-container[fxastatus="login-failed"],
-#PanelUI-fxa-container[fxastatus="unverified"] {
- background-color: hsl(42,94%,88%);
- border-top: 1px solid hsl(42,94%,70%);
-}
-
-#PanelUI-fxa-container[fxastatus="login-failed"] > #PanelUI-fxa-status:hover,
-#PanelUI-fxa-container[fxastatus="unverified"] > #PanelUI-fxa-status:hover {
- background-color: hsl(42,94%,85%);
-}
-
-#PanelUI-fxa-container[fxastatus="login-failed"] > #PanelUI-fxa-status:hover:active,
-#PanelUI-fxa-container[fxastatus="unverified"] > #PanelUI-fxa-status:hover:active {
- background-color: hsl(42,94%,82%);
- box-shadow: 0 1px 0 hsla(210,4%,10%,.05) inset;
-}
-
.panel-banner-item {
color: black;
background-color: hsla(96,65%,75%,.5);
}
.panel-banner-item:not([disabled]):hover {
background-color: hsla(96,65%,75%,.8);
}
.panel-banner-item:not([disabled]):hover:active {
background-color: hsl(96,65%,75%);
}
-#PanelUI-quit:not([disabled]):hover {
- background-color: #d94141;
- outline-color: #c23a3a;
-}
-
-#PanelUI-quit:not([disabled]):hover:active {
- background-color: #ad3434;
- outline-color: #992e2e;
-}
-
-#customization-panelHolder #PanelUI-customize {
- color: white;
- background-color: hsl(108,66%,30%);
- text-shadow: none;
- margin-top: -1px;
-}
-
-#customization-panelHolder #PanelUI-customize + toolbarseparator {
- display: none;
-}
-
-#customization-panelHolder #PanelUI-customize:hover {
- background-color: hsl(109,65%,26%);
-}
-
-#customization-panelHolder #PanelUI-customize:hover:active {
- background-color: hsl(109,65%,22%);
-}
-
#customization-palette .toolbarbutton-multiline-text,
#customization-palette .toolbarbutton-text {
display: none;
}
.subview-subheader,
panelview .toolbarbutton-1,
.subviewbutton,
@@ -1419,16 +963,25 @@ panelview .toolbarbutton-1,
/* This is a <label> but it should fit in with the menu font- and colorwise. */
#PanelUI-characterEncodingView-autodetect-label {
font: menu;
color: inherit;
}
/* START photon adjustments */
+.subviewbutton[checked="true"] {
+ background: url(chrome://browser/skin/check.svg) center left 7px / 11px 11px no-repeat transparent;
+ fill: currentColor;
+}
+
+.subviewbutton[checked="true"]:-moz-locale-dir(rtl) {
+ background-position: center right 7px;
+}
+
photonpanelmultiview .subviewbutton[checked="true"] {
background: none;
list-style-image: url(chrome://browser/skin/check.svg);
}
photonpanelmultiview .subviewbutton > .menu-iconic-left {
-moz-appearance: none;
margin-inline-end: 0;
@@ -1662,63 +1215,16 @@ menuitem.panel-subview-footer@menuStateA
#PanelUI-remotetabs-tabslist > toolbarbutton[itemtype="tab"] > .toolbarbutton-icon,
#PanelUI-recentlyClosedWindows > toolbarbutton > .toolbarbutton-icon,
#PanelUI-recentlyClosedTabs > toolbarbutton > .toolbarbutton-icon,
#PanelUI-historyItems > toolbarbutton > .toolbarbutton-icon {
width: 16px;
height: 16px;
}
-toolbarbutton[panel-multiview-anchor="true"],
-toolbarbutton[panel-multiview-anchor="true"] > .toolbarbutton-menubutton-button {
- color: HighlightText;
- background-color: Highlight;
-}
-
-#PanelUI-help[panel-multiview-anchor="true"] + toolbarseparator {
- display: none;
-}
-
-#PanelUI-help[panel-multiview-anchor="true"] {
- background-image: linear-gradient(rgba(255,255,255,0.3), transparent);
- background-position: 0;
-}
-
-#PanelUI-help[panel-multiview-anchor="true"]::after {
- content: "";
- position: absolute;
- top: 0;
- height: 100%;
- width: var(--panel-ui-exit-subview-gutter-width);
- background-image: url(chrome://browser/skin/customizableui/subView-arrow-back-inverted.png),
- linear-gradient(rgba(255,255,255,0.3), transparent);
- background-repeat: no-repeat;
- background-color: Highlight;
- background-position: left 10px center, 0;
-}
-
-#PanelUI-help[panel-multiview-anchor="true"]:-moz-locale-dir(rtl)::after {
- background-image: url(chrome://browser/skin/customizableui/subView-arrow-back-inverted-rtl.png),
- linear-gradient(rgba(255,255,255,0.3), transparent);
- background-position: right 10px center, 0;
-}
-
-toolbarbutton[panel-multiview-anchor="true"] {
- background-image: url(chrome://browser/skin/customizableui/subView-arrow-back-inverted.png),
- linear-gradient(rgba(255,255,255,0.3), transparent);
- background-position: right calc(@menuPanelButtonWidth@ / 2 - var(--panel-ui-exit-subview-gutter-width) + 2px) center;
- background-repeat: no-repeat, repeat;
-}
-
-toolbarbutton[panel-multiview-anchor="true"]:-moz-locale-dir(rtl) {
- background-image: url(chrome://browser/skin/customizableui/subView-arrow-back-inverted-rtl.png),
- linear-gradient(rgba(255,255,255,0.3), transparent);
- background-position: left calc(@menuPanelButtonWidth@ / 2 - var(--panel-ui-exit-subview-gutter-width) + 2px) center;
-}
-
toolbarpaletteitem[place="palette"] > .toolbarbutton-1 > .toolbarbutton-menu-dropmarker,
#bookmarks-menu-button[cui-areatype="menu-panel"] > .toolbarbutton-menu-dropmarker,
#bookmarks-menu-button[overflowedItem] > .toolbarbutton-menu-dropmarker,
toolbarpaletteitem[place="palette"] > .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker,
#bookmarks-menu-button[cui-areatype="menu-panel"] > .toolbarbutton-menubutton-dropmarker {
display: none;
}
@@ -1824,16 +1330,17 @@ toolbaritem[overflowedItem=true],
.widget-overflow-list .toolbarbutton-1 {
-moz-box-align: center;
-moz-box-orient: horizontal;
}
.widget-overflow-list .subviewbutton-nav:-moz-locale-dir(ltr)::after {
transform: scaleX(-1);
}
+
.widget-overflow-list .subviewbutton-nav::after {
margin-inline-start: 10px;
-moz-context-properties: fill;
content: url(chrome://browser/skin/back-12.svg);
fill: GrayText;
float: right;
}
@@ -1841,24 +1348,16 @@ toolbarpaletteitem[place=panel] > .subvi
opacity: 0.5;
}
.widget-overflow-list .toolbarbutton-1:not(.toolbarbutton-combined) > .toolbarbutton-text {
text-align: start;
padding-inline-start: .5em;
}
-.subviewbutton[checked="true"] {
- background: url("chrome://global/skin/menu/shared-menu-check.png") center left 7px / 11px 11px no-repeat transparent;
-}
-
-.subviewbutton[checked="true"]:-moz-locale-dir(rtl) {
- background-position: center right 7px;
-}
-
.subviewbutton > .menu-iconic-left {
-moz-appearance: none;
margin-inline-end: 3px;
}
menuitem[checked="true"].subviewbutton > .menu-iconic-left {
visibility: hidden;
}
@@ -2048,87 +1547,20 @@ menuitem[checked="true"].subviewbutton >
}
#panic-button-success-closebutton:hover:active {
background-color: #d0d0d0;
border-color: #aaa;
}
@media (min-resolution: 1.1dppx) {
- #PanelUI-help[panel-multiview-anchor="true"]::after,
- toolbarbutton[panel-multiview-anchor="true"] {
- background-image: url(chrome://browser/skin/customizableui/subView-arrow-back-inverted@2x.png),
- linear-gradient(rgba(255,255,255,0.3), transparent);
- background-size: 16px, auto;
- }
-
- #PanelUI-help[panel-multiview-anchor="true"]:-moz-locale-dir(rtl)::after,
- toolbarbutton[panel-multiview-anchor="true"]:-moz-locale-dir(rtl) {
- background-image: url(chrome://browser/skin/customizableui/subView-arrow-back-inverted-rtl@2x.png),
- linear-gradient(rgba(255,255,255,0.3), transparent);
- }
-
.panel-banner-item[notificationid^=update] {
list-style-image: url(chrome://branding/content/icon32.png);
}
- #PanelUI-customize {
- list-style-image: url(chrome://browser/skin/menuPanel-customize@2x.png);
- }
-
- #customization-panelHolder #PanelUI-customize {
- list-style-image: url(chrome://browser/skin/customizableui/menuPanel-customizeFinish@2x.png);
- }
-
- #PanelUI-help {
- list-style-image: url(chrome://browser/skin/menuPanel-help@2x.png);
- }
-
- #PanelUI-quit {
- list-style-image: url(chrome://browser/skin/menuPanel-exit@2x.png);
- }
-
- #PanelUI-fxa-label,
- #PanelUI-fxa-icon,
- #PanelUI-customize,
- #PanelUI-help,
- #PanelUI-quit {
- -moz-image-region: rect(0, 32px, 32px, 0);
- }
-
- .panel-banner-item > .toolbarbutton-icon,
- #PanelUI-fxa-label > .toolbarbutton-icon,
- #PanelUI-fxa-icon > .toolbarbutton-icon,
- #PanelUI-customize > .toolbarbutton-icon,
- #PanelUI-help > .toolbarbutton-icon,
- #PanelUI-quit > .toolbarbutton-icon {
- width: 16px;
- }
-
- #PanelUI-customize:hover,
- #PanelUI-help:not([disabled]):hover,
- #PanelUI-quit:not([disabled]):hover {
- -moz-image-region: rect(0, 64px, 32px, 32px);
- }
-
- #PanelUI-customize:hover:active,
- #PanelUI-help:not([disabled]):hover:active,
- #PanelUI-quit:not([disabled]):hover:active {
- -moz-image-region: rect(0, 96px, 32px, 64px);
- }
-
- #PanelUI-help[panel-multiview-anchor="true"] {
- -moz-image-region: rect(0, 128px, 32px, 96px);
- background-size: auto;
- }
-
- .subviewbutton[checked="true"] {
- background-image: url("chrome://global/skin/menu/shared-menu-check@2x.png");
- }
-
#panic-button-success-icon,
#PanelUI-panic-timeframe-icon {
list-style-image: url(chrome://browser/skin/panic-panel/header@2x.png);
}
#PanelUI-panic-timeframe-icon-small {
list-style-image: url(chrome://browser/skin/panic-panel/header-small@2x.png);
}
deleted file mode 100644
index cf4198c60004b0f0f0a55b6c18d6660f631588d3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index bb250403d47d3bdc55e39b9eca61c77e17a5d4ca..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 86178abfecd2e16d60e721c88cb2e2b57b4dce53..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 1c8e86db37d9406c3c64f2194c773b5f0f132dbb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 61f55f60fff5f5f044d6449bdb08d1a9def95c4a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
--- a/browser/themes/shared/jar.inc.mn
+++ b/browser/themes/shared/jar.inc.mn
@@ -23,29 +23,22 @@
* skin/classic/browser/controlcenter/conn-not-secure.svg (../shared/controlcenter/conn-not-secure.svg)
skin/classic/browser/controlcenter/connection.svg (../shared/controlcenter/connection.svg)
skin/classic/browser/controlcenter/mcb-disabled.svg (../shared/controlcenter/mcb-disabled.svg)
skin/classic/browser/controlcenter/extension.svg (../shared/controlcenter/extension.svg)
* skin/classic/browser/controlcenter/permissions.svg (../shared/controlcenter/permissions.svg)
* skin/classic/browser/controlcenter/tracking-protection.svg (../shared/controlcenter/tracking-protection.svg)
skin/classic/browser/controlcenter/warning-gray.svg (../shared/controlcenter/warning-gray.svg)
skin/classic/browser/controlcenter/warning-yellow.svg (../shared/controlcenter/warning-yellow.svg)
- skin/classic/browser/customizableui/menuPanel-customizeFinish.png (../shared/customizableui/menuPanel-customizeFinish.png)
- skin/classic/browser/customizableui/menuPanel-customizeFinish@2x.png (../shared/customizableui/menuPanel-customizeFinish@2x.png)
skin/classic/browser/customizableui/empty-overflow-panel.png (../shared/customizableui/empty-overflow-panel.png)
skin/classic/browser/customizableui/empty-overflow-panel@2x.png (../shared/customizableui/empty-overflow-panel@2x.png)
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/subView-arrow-back-inverted.png (../shared/customizableui/subView-arrow-back-inverted.png)
- skin/classic/browser/customizableui/subView-arrow-back-inverted@2x.png (../shared/customizableui/subView-arrow-back-inverted@2x.png)
- skin/classic/browser/customizableui/subView-arrow-back-inverted-rtl.png (../shared/customizableui/subView-arrow-back-inverted-rtl.png)
- skin/classic/browser/customizableui/subView-arrow-back-inverted-rtl@2x.png (../shared/customizableui/subView-arrow-back-inverted-rtl@2x.png)
skin/classic/browser/customizableui/whimsy.png (../shared/customizableui/whimsy.png)
- skin/classic/browser/customizableui/whimsy@2x.png (../shared/customizableui/whimsy@2x.png)
skin/classic/browser/downloads/contentAreaDownloadsView.css (../shared/downloads/contentAreaDownloadsView.css)
skin/classic/browser/downloads/download-blocked.svg (../shared/downloads/download-blocked.svg)
skin/classic/browser/downloads/download-summary.svg (../shared/downloads/download-summary.svg)
skin/classic/browser/downloads/download-icons.svg (../shared/downloads/download-icons.svg)
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/fullscreen/insecure.svg (../shared/fullscreen/insecure.svg)
skin/classic/browser/fullscreen/secure.svg (../shared/fullscreen/secure.svg)
@@ -202,17 +195,16 @@
skin/classic/browser/tabbrowser/indicator-tab-attention.svg (../shared/tabbrowser/indicator-tab-attention.svg)
skin/classic/browser/tabbrowser/pendingpaint.png (../shared/tabbrowser/pendingpaint.png)
skin/classic/browser/tabbrowser/tab-audio-playing.svg (../shared/tabbrowser/tab-audio-playing.svg)
skin/classic/browser/tabbrowser/tab-audio-muted.svg (../shared/tabbrowser/tab-audio-muted.svg)
skin/classic/browser/tabbrowser/tab-audio-blocked.svg (../shared/tabbrowser/tab-audio-blocked.svg)
skin/classic/browser/tabbrowser/tab-audio-small.svg (../shared/tabbrowser/tab-audio-small.svg)
skin/classic/browser/tabbrowser/tab-overflow-indicator.png (../shared/tabbrowser/tab-overflow-indicator.png)
- skin/classic/browser/toolbarbutton-dropdown-arrow.png (../shared/toolbarbutton-dropdown-arrow.png)
skin/classic/browser/translating-16.png (../shared/translation/translating-16.png)
skin/classic/browser/translating-16@2x.png (../shared/translation/translating-16@2x.png)
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-badge-failed.svg (../shared/update-badge-failed.svg)
skin/classic/browser/warning.svg (../shared/warning.svg)
skin/classic/browser/warning-white.svg (../shared/warning-white.svg)
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -961,17 +961,21 @@ notification[value="translation"] {
notification[value="translation"] button[anonid="translate"]:hover,
notification[value="translation"] button[anonid="translate"]:active {
background-color: #008ACB;
}
notification[value="translation"] button[type="menu"] > .button-box > .button-menu-dropmarker,
notification[value="translation"] menulist > .menulist-dropmarker {
- list-style-image: url("chrome://browser/skin/toolbarbutton-dropdown-arrow.png");
+ list-style-image: url(chrome://global/skin/icons/arrow-dropdown-16.svg);
+ }
+ notification[value="translation"] menulist > .menulist-dropmarker > .dropmarker-icon {
+ width: 11px;
+ height: 11px;
}
notification[value="translation"] button > .button-box,
notification[value="translation"] button[type="menu"] > .button-box > .button-menu-dropmarker {
padding: 0;
margin-inline-start: 3ch;
}
--- a/browser/themes/windows/jar.mn
+++ b/browser/themes/windows/jar.mn
@@ -5,32 +5,25 @@
browser.jar:
% skin browser classic/1.0 %skin/classic/browser/
#include ../shared/jar.inc.mn
skin/classic/browser/sanitizeDialog.css
skin/classic/browser/aboutSessionRestore-window-icon.png
* skin/classic/browser/syncedtabs/sidebar.css (syncedtabs/sidebar.css)
* skin/classic/browser/browser.css
* skin/classic/browser/compacttheme.css
- skin/classic/browser/menuPanel-customize.png
- skin/classic/browser/menuPanel-customize@2x.png
- skin/classic/browser/menuPanel-exit.png
- skin/classic/browser/menuPanel-exit@2x.png
- skin/classic/browser/menuPanel-help.png
- skin/classic/browser/menuPanel-help@2x.png
skin/classic/browser/monitor.png
skin/classic/browser/monitor_16-10.png
skin/classic/browser/pageInfo.css
skin/classic/browser/pageInfo.png
skin/classic/browser/searchbar.css
skin/classic/browser/setDesktopBackground.css
skin/classic/browser/slowStartup-16.png
skin/classic/browser/sync-desktopIcon.svg (../shared/sync-desktopIcon.svg)
skin/classic/browser/sync-mobileIcon.svg (../shared/sync-mobileIcon.svg)
- skin/classic/browser/toolbarbutton-dropdown-arrow-win7.png
skin/classic/browser/webRTC-indicator.css (../shared/webRTC-indicator.css)
* skin/classic/browser/controlcenter/panel.css (controlcenter/panel.css)
skin/classic/browser/customizableui/menu-arrow.svg (customizableui/menu-arrow.svg)
* skin/classic/browser/customizableui/panelUI.css (customizableui/panelUI.css)
* skin/classic/browser/downloads/allDownloadsViewOverlay.css (downloads/allDownloadsViewOverlay.css)
* skin/classic/browser/downloads/downloads.css (downloads/downloads.css)
skin/classic/browser/feeds/feedIcon.png (feeds/feedIcon.png)
skin/classic/browser/feeds/feedIcon16.png (feeds/feedIcon16.png)
@@ -75,10 +68,8 @@ browser.jar:
skin/classic/browser/e10s-64@2x.png (../shared/e10s-64@2x.png)
[extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}] chrome.jar:
% override chrome://browser/skin/page-livemarks.png chrome://browser/skin/feeds/feedIcon16.png
% override chrome://browser/skin/feeds/audioFeedIcon.png chrome://browser/skin/feeds/feedIcon.png
% override chrome://browser/skin/feeds/audioFeedIcon16.png chrome://browser/skin/feeds/feedIcon16.png
% override chrome://browser/skin/feeds/videoFeedIcon.png chrome://browser/skin/feeds/feedIcon.png
% override chrome://browser/skin/feeds/videoFeedIcon16.png chrome://browser/skin/feeds/feedIcon16.png
-
-% override chrome://browser/skin/toolbarbutton-dropdown-arrow.png chrome://browser/skin/toolbarbutton-dropdown-arrow-win7.png os=WINNT osversion<=6.1
deleted file mode 100644
index 82cd8748308aba98d718599b31d0c1d57d23fd78..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 161426f8940172261ebd2f48f7ad376ba7ac8a85..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 5ce3b766a1bb9b298120472bdf42b0bc63404918..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 8daaffe9556f3fc93fbfa7883fa0639b72e0a26e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index d48426546fa492f78bd3e22676184b7dece8bcb3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index 2f2b010bc7028fdbd4fe331c2004ea0b3e4f9cce..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
deleted file mode 100644
index b8f0a80fa168230973a6eb53f8bfe93d2cc981df..0000000000000000000000000000000000000000
GIT binary patch
literal 0
Hc$@<O00001
--- a/toolkit/themes/shared/jar.inc.mn
+++ b/toolkit/themes/shared/jar.inc.mn
@@ -53,18 +53,16 @@ toolkit.jar:
skin/classic/global/narrateControls.css (../../shared/narrateControls.css)
skin/classic/global/narrate/arrow.svg (../../shared/narrate/arrow.svg)
skin/classic/global/narrate/back.svg (../../shared/narrate/back.svg)
skin/classic/global/narrate/fast.svg (../../shared/narrate/fast.svg)
skin/classic/global/narrate/forward.svg (../../shared/narrate/forward.svg)
skin/classic/global/narrate/slow.svg (../../shared/narrate/slow.svg)
skin/classic/global/narrate/start.svg (../../shared/narrate/start.svg)
skin/classic/global/narrate/stop.svg (../../shared/narrate/stop.svg)
- skin/classic/global/menu/shared-menu-check@2x.png (../../shared/menu-check@2x.png)
- skin/classic/global/menu/shared-menu-check.png (../../shared/menu-check.png)
skin/classic/global/menu/shared-menu-check-active.svg (../../shared/menu-check-active.svg)
skin/classic/global/menu/shared-menu-check-black.svg (../../shared/menu-check-black.svg)
skin/classic/global/menu/shared-menu-check-hover.svg (../../shared/menu-check-hover.svg)
skin/classic/global/in-content/check.svg (../../shared/in-content/check.svg)
skin/classic/global/in-content/check-partial.svg (../../shared/in-content/check-partial.svg)
skin/classic/global/in-content/dropdown.svg (../../shared/in-content/dropdown.svg)
skin/classic/global/in-content/help-glyph.svg (../../shared/in-content/help-glyph.svg)
skin/classic/global/in-content/radio.svg (../../shared/in-content/radio.svg)
