Bug 1182009 - Remove empty sync button in the Hamburger menu for sync 1.0 users. r=markh, a=ritu
authorEdouard Oger <edouard.oger@gmail.com>
Thu, 30 Jul 2015 14:10:00 -0700
changeset 281822 5fc61b47e3281e13080acb4036581954f051e889
parent 281821 b34e72849f78f717e2c92e28582ebaa844c9d9a8
child 281823 2a7b72e23d85c9a146273de948cc922d97376ff9
push id4932
push userjlund@mozilla.com
push dateMon, 10 Aug 2015 18:23:06 +0000
treeherdermozilla-beta@6dd5a4f5f745 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmarkh, ritu
bugs1182009
milestone41.0a2
Bug 1182009 - Remove empty sync button in the Hamburger menu for sync 1.0 users. r=markh, a=ritu
browser/base/content/browser-fxaccounts.js
browser/themes/shared/customizableui/panelUIOverlay.inc.css
--- a/browser/base/content/browser-fxaccounts.js
+++ b/browser/base/content/browser-fxaccounts.js
@@ -241,20 +241,23 @@ let gFxAccounts = {
     } catch (e) { }
 
     // Bail out if FxA is disabled.
     if (!this.weave.fxAccountsEnabled) {
       // When migration transitions from needs-verification to the null state,
       // fxAccountsEnabled is false because migration has not yet finished.  In
       // that case, hide the button.  We'll get another notification with a null
       // state once migration is complete.
+      this.panelUIFooter.hidden = true;
       this.panelUIFooter.removeAttribute("fxastatus");
       return;
     }
 
+    this.panelUIFooter.hidden = false;
+
     // Make sure the button is disabled in customization mode.
     if (this._inCustomizationMode) {
       this.panelUIStatus.setAttribute("disabled", "true");
       this.panelUILabel.setAttribute("disabled", "true");
       this.panelUIAvatar.setAttribute("disabled", "true");
       this.panelUIIcon.setAttribute("disabled", "true");
     } else {
       this.panelUIStatus.removeAttribute("disabled");
--- a/browser/themes/shared/customizableui/panelUIOverlay.inc.css
+++ b/browser/themes/shared/customizableui/panelUIOverlay.inc.css
@@ -511,17 +511,17 @@ toolbarpaletteitem[place="palette"] > to
 
 #PanelUI-fxa-status {
   display: flex;
   flex: 1 1 0%;
   width: 1px;
 }
 
 #PanelUI-footer-inner,
-#PanelUI-footer-fxa {
+#PanelUI-footer-fxa:not([hidden]) {
   display: flex;
   border-top: 1px solid hsla(210,4%,10%,.14);
 }
 
 #PanelUI-multiView[viewtype="subview"] #PanelUI-footer-inner,
 #PanelUI-multiView[viewtype="subview"] #PanelUI-footer-fxa {
   position: relative;
 }