Bug 1354097 - Style and add a customize button to the overflow panel. r=Gijs, ui-r=shorlander.
MozReview-Commit-ID: 7bNQcVgb7wf
--- a/browser/components/customizableui/content/panelUI.inc.xul
+++ b/browser/components/customizableui/content/panelUI.inc.xul
@@ -405,24 +405,31 @@
context="toolbar-context-menu"
#endif
hidden="true">
#ifdef MOZ_PHOTON_THEME
<photonpanelmultiview mainViewId="widget-overflow-mainView">
<panelview id="widget-overflow-mainView"
context="toolbar-context-menu">
#endif
- <vbox id="widget-overflow-scroller">
- <vbox id="widget-overflow-list" class="widget-overflow-list"
- overflowfortoolbar="nav-bar"/>
- <toolbarseparator id="widget-overflow-fixed-separator" hidden="true"/>
- <vbox id="widget-overflow-fixed-list" class="widget-overflow-list" hidden="true"
- emptylabel="&customizeMode.emptyOverflowList.description;"/>
+ <vbox class="panel-subview-body">
+ <vbox id="widget-overflow-scroller">
+ <vbox id="widget-overflow-list" class="widget-overflow-list"
+ overflowfortoolbar="nav-bar"/>
+ <toolbarseparator id="widget-overflow-fixed-separator" hidden="true"/>
+ <vbox id="widget-overflow-fixed-list" class="widget-overflow-list" hidden="true"
+ emptylabel="&customizeMode.emptyOverflowList.description;"/>
+ </vbox>
</vbox>
#ifdef MOZ_PHOTON_THEME
+ <toolbarbutton command="cmd_CustomizeToolbars"
+ id="overflowMenu-customize-button"
+ class="subviewbutton panel-subview-footer"
+ accesskey="&overflowCustomizeToolbar.accesskey;"
+ label="&overflowCustomizeToolbar.label;"/>
</panelview>
</photonpanelmultiview>
#endif
</panel>
<panel id="customization-tipPanel"
type="arrow"
flip="none"
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -327,16 +327,18 @@ These should match what Safari and other
<!ENTITY viewMenu.label "View">
<!ENTITY viewMenu.accesskey "V">
<!ENTITY viewToolbarsMenu.label "Toolbars">
<!ENTITY viewToolbarsMenu.accesskey "T">
<!ENTITY viewSidebarMenu.label "Sidebar">
<!ENTITY viewSidebarMenu.accesskey "e">
<!ENTITY viewCustomizeToolbar.label "Customize…">
<!ENTITY viewCustomizeToolbar.accesskey "C">
+<!ENTITY overflowCustomizeToolbar.label "Customize Toolbar…">
+<!ENTITY overflowCustomizeToolbar.accesskey "C">
<!ENTITY historyMenu.label "History">
<!ENTITY historyMenu.accesskey "s">
<!ENTITY historyUndoMenu.label "Recently Closed Tabs">
<!-- LOCALIZATION NOTE (historyUndoWindowMenu): see bug 394759 -->
<!ENTITY historyUndoWindowMenu.label "Recently Closed Windows">
<!ENTITY historyRestoreLastSession.label "Restore Previous Session">
--- a/browser/themes/shared/customizableui/panelUI.inc.css
+++ b/browser/themes/shared/customizableui/panelUI.inc.css
@@ -1728,17 +1728,17 @@ toolbarpaletteitem[place=panel] > .toolb
#widget-overflow > .panel-arrowcontainer > .panel-arrowcontent {
padding: 0;
}
.cui-widget-panelview,
%ifndef MOZ_PHOTON_THEME
#widget-overflow-scroller {
%else
-#widget-overflow-mainView {
+#widget-overflow-mainView .panel-subview-body {
%endif
overflow-y: auto;
overflow-x: hidden;
}
#widget-overflow-scroller {
%ifdef MOZ_PHOTON_THEME
margin-top: 4px;