From dba5fdab48a2d37a47f7031ffdd6927be02bec5e Mon Sep 17 00:00:00 2001 From: Gijs Kruitbosch Date: Wed, 28 Jun 2017 16:55:44 +0100 Subject: [PATCH] Bug 1373016 - switch from a tip panel to a permanent message for empty overflow panels in customize mode for photon, r=jaws MozReview-Commit-ID: GhQoSgPXL9q --HG-- extra : rebase_source : acc57eb6347a5017077358e84c5803719f3331ef --- browser/base/content/browser.css | 1 - .../customizableui/CustomizeMode.jsm | 4 ++- .../customizableui/content/panelUI.inc.xul | 3 +- .../locales/en-US/chrome/browser/browser.dtd | 1 + browser/themes/osx/browser.css | 2 ++ .../customizableui/customizeMode.inc.css | 27 ++++++++++++++++++ .../customizableui/empty-overflow-panel.png | Bin 0 -> 14416 bytes .../empty-overflow-panel@2x.png | Bin 0 -> 35591 bytes browser/themes/shared/jar.inc.mn | 9 ++++-- 9 files changed, 42 insertions(+), 5 deletions(-) create mode 100644 browser/themes/shared/customizableui/empty-overflow-panel.png create mode 100644 browser/themes/shared/customizableui/empty-overflow-panel@2x.png diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css index 5b994f299858..4a1b0efacd7f 100644 --- a/browser/base/content/browser.css +++ b/browser/base/content/browser.css @@ -1237,7 +1237,6 @@ 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; diff --git a/browser/components/customizableui/CustomizeMode.jsm b/browser/components/customizableui/CustomizeMode.jsm index 5e7b8dde3881..a952641eff8d 100644 --- a/browser/components/customizableui/CustomizeMode.jsm +++ b/browser/components/customizableui/CustomizeMode.jsm @@ -412,7 +412,9 @@ CustomizeMode.prototype = { this._updateEmptyPaletteNotice(); this._updateLWThemeButtonIcon(); - this.maybeShowTip(panelHolder); + if (!AppConstants.MOZ_PHOTON_THEME) { + this.maybeShowTip(panelHolder); + } this._handler.isEnteringCustomizeMode = false; if (!gPhotonStructure) { diff --git a/browser/components/customizableui/content/panelUI.inc.xul b/browser/components/customizableui/content/panelUI.inc.xul index 665e90b99183..53ee3dcd6801 100644 --- a/browser/components/customizableui/content/panelUI.inc.xul +++ b/browser/components/customizableui/content/panelUI.inc.xul @@ -353,7 +353,8 @@