Bug 1399145 - Make sure that the start padding for the FxA button in its signed-in state is adjusted on OSX only. r?Gijs draft
authorMike de Boer <mdeboer@mozilla.com>
Wed, 13 Sep 2017 14:16:55 +0200
changeset 663852 7ea76f5112de1c74132b5401943f6090486f3b89
parent 663851 20b0d28f6fd3dd7db64413e0ffc1f6e44cc42679
child 731302 dcfdb7cef309ef49ee35016d16000d16da95e3be
push id79543
push usermdeboer@mozilla.com
push dateWed, 13 Sep 2017 12:54:33 +0000
reviewersGijs
bugs1399145
milestone57.0a1
Bug 1399145 - Make sure that the start padding for the FxA button in its signed-in state is adjusted on OSX only. r?Gijs MozReview-Commit-ID: GSItfXcScLJ
browser/themes/osx/customizableui/panelUI.css
browser/themes/shared/customizableui/panelUI.inc.css
--- a/browser/themes/osx/customizableui/panelUI.css
+++ b/browser/themes/osx/customizableui/panelUI.css
@@ -15,16 +15,26 @@
 .subviewbutton {
   padding-inline-start: 18px;
 }
 
 photonpanelmultiview .toolbaritem-combined-buttons > label {
   padding-inline-start: 42px; /* 18px toolbarbutton padding + 16px icon + 8px label padding start */
 }
 
+#appMenu-fxa-container[fxastatus="signedin"] > #appMenu-fxa-status > #appMenu-fxa-label {
+  /* 18px space before the avatar, then 16px for the avatar */
+  padding-inline-start: 34px;
+  margin-inline-start: -34px;
+}
+
+#appMenu-fxa-container[fxastatus="signedin"] > #appMenu-fxa-status > #appMenu-fxa-avatar {
+  margin-inline-start: 18px;
+}
+
 .subviewbutton[checked="true"] {
   background-position: top 7px left 4px;
 }
 
 .subviewbutton[checked="true"]:-moz-locale-dir(rtl) {
   background-position: top 7px right 4px;
 }
 
--- a/browser/themes/shared/customizableui/panelUI.inc.css
+++ b/browser/themes/shared/customizableui/panelUI.inc.css
@@ -824,23 +824,23 @@ toolbaritem[cui-areatype="menu-panel"][s
 #appMenu-fxa-container[fxastatus="signedin"] > #appMenu-fxa-status > #appMenu-fxa-label > .toolbarbutton-icon,
 #appMenu-fxa-container:not([fxastatus="signedin"]) > toolbarseparator,
 #appMenu-fxa-container:not([fxastatus="signedin"]) > #appMenu-fxa-icon,
 #appMenu-fxa-container:not([fxastatus="signedin"]) > #appMenu-fxa-status > #appMenu-fxa-avatar {
   display: none;
 }
 
 #appMenu-fxa-container[fxastatus="signedin"] > #appMenu-fxa-status > #appMenu-fxa-label {
-  /* 18px space before the avatar, then 16px for the avatar */
-  padding-inline-start: 34px;
-  margin-inline-start: -34px;
+  /* 12px space before the avatar, then 16px for the avatar */
+  padding-inline-start: 28px;
+  margin-inline-start: -28px;
 }
 
 #appMenu-fxa-container[fxastatus="signedin"] > #appMenu-fxa-status > #appMenu-fxa-avatar {
-  margin-inline-start: 18px;
+  margin-inline-start: 12px;
 }
 
 /* Error states */
 #appMenu-fxa-container[fxastatus="unverified"] > #appMenu-fxa-status > #appMenu-fxa-label,
 #appMenu-fxa-container[fxastatus="login-failed"] > #appMenu-fxa-status > #appMenu-fxa-label {
   list-style-image: url(chrome://browser/skin/warning.svg);
   -moz-image-region: rect(0, 16px, 16px, 0);
 }