Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-28 05:10:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 5de26737d215 (bug 1373016) for failure like missing chrome://browser/skin/customizableui/info-icon-customizeTip@2x.png referenced from chrome://browser/skin/browser.css

Browse Source
This commit is contained in:
Carsten "Tomcat" Book 2017-06-29 13:36:16 +02:00
parent 319029e2fd
commit 20d1412289
8 changed files with 5 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
browser/base/content/browser.css
View File

@ -1237,6 +1237,7 @@ toolbarpaletteitem[place="palette"] > #downloads-button[indicator] > #downloads-
}
#customization-panelHolder > #widget-overflow-fixed-list {
padding-bottom: 50px; /* Make sure there's always space to drop stuff. */
flex: 0 1 auto; /* Size to content, but allow ourselves to shrink */
display: flex;
flex-direction: column;

4
browser/components/customizableui/CustomizeMode.jsm
View File

@ -412,9 +412,7 @@ CustomizeMode.prototype = {
this._updateEmptyPaletteNotice();
this._updateLWThemeButtonIcon();
if (!AppConstants.MOZ_PHOTON_THEME) {
this.maybeShowTip(panelHolder);
}
this.maybeShowTip(panelHolder);
this._handler.isEnteringCustomizeMode = false;
if (!gPhotonStructure) {

3
browser/components/customizableui/content/panelUI.inc.xul
View File

@ -353,8 +353,7 @@
<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 id="widget-overflow-fixed-list" class="widget-overflow-list" hidden="true"/>
</vbox>
#ifdef MOZ_PHOTON_THEME
</panelview>

1
browser/locales/en-US/chrome/browser/browser.dtd
View File

@ -854,7 +854,6 @@ you can use these alternative items. Otherwise, their values should be empty. -
<!ENTITY customizeMode.lwthemes.menuManage.accessKey "M">
<!ENTITY customizeMode.lwthemes.menuGetMore "Get More Themes">
<!ENTITY customizeMode.lwthemes.menuGetMore.accessKey "G">
<!ENTITY customizeMode.emptyOverflowList.description "Drag and drop items here to keep them within reach but out of your toolbar…">
<!ENTITY getUserMedia.selectCamera.label "Camera to share:">
<!ENTITY getUserMedia.selectCamera.accesskey "C">

27
browser/themes/shared/customizableui/customizeMode.inc.css
View File

@ -570,31 +570,4 @@ toolbarpaletteitem[place="toolbar"]:not([mousedown="true"]):-moz-focusring {
margin-inline-start: 22.35em;
}
%ifdef MOZ_PHOTON_THEME
#customization-panelHolder > #widget-overflow-fixed-list:not(:empty) {
padding-bottom: 50px; /* Make sure there's always space to drop stuff. */
}
#customization-panelHolder > #widget-overflow-fixed-list:empty {
background-image: url("chrome://browser/skin/customizableui/empty-overflow-panel.png");
background-position: center top 10px;
background-size: 218px 134px;
background-repeat: no-repeat;
}
#customization-panelHolder > #widget-overflow-fixed-list:empty::after {
content: attr(emptylabel);
padding: 154px 10px 10px; /* 154 = 134 for the image, 10px space on either side. */
text-align: center;
display: block;
}
@media (min-resolution: 1.1dppx) {
#customization-panelHolder > #widget-overflow-fixed-list:empty {
background-image: url("chrome://browser/skin/customizableui/empty-overflow-panel@2x.png");
}
}
%else
%include customizeTip.inc.css
%endif

BIN
browser/themes/shared/customizableui/empty-overflow-panel.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 14 KiB

BIN
browser/themes/shared/customizableui/empty-overflow-panel@2x.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 35 KiB

9
browser/themes/shared/jar.inc.mn
View File

@ -34,21 +34,16 @@
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/customizeFavicon.ico (../shared/customizableui/customizeFavicon.ico)
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)
#ifdef MOZ_PHOTON_THEME
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)
#else
skin/classic/browser/customizableui/customize-illustration.png (../shared/customizableui/customize-illustration.png)
skin/classic/browser/customizableui/customize-illustration@2x.png (../shared/customizableui/customize-illustration@2x.png)
skin/classic/browser/customizableui/customize-illustration-rtl.png (../shared/customizableui/customize-illustration-rtl.png)
skin/classic/browser/customizableui/customize-illustration-rtl@2x.png (../shared/customizableui/customize-illustration-rtl@2x.png)
skin/classic/browser/customizableui/info-icon-customizeTip.png (../shared/customizableui/info-icon-customizeTip.png)
skin/classic/browser/customizableui/info-icon-customizeTip@2x.png (../shared/customizableui/info-icon-customizeTip@2x.png)
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/panelarrow-customizeTip.png (../shared/customizableui/panelarrow-customizeTip.png)
skin/classic/browser/customizableui/panelarrow-customizeTip@2x.png (../shared/customizableui/panelarrow-customizeTip@2x.png)
#endif
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)