Bug 1560336 - Stop using the toolbaritem-combined-buttons class for the Firefox account menu item. r=Gijs a=ritu
authorDão Gottwald <dao@mozilla.com>
Thu, 20 Jun 2019 18:56:08 +0000
changeset 537061 29b838345c241ca20986a6dba9843d3f5fc4d09a
parent 537060 4dc07e652294ff5ed28e6cd4b210ec20b162f07b
child 537062 2bee7577b5a687ef6da1cd27852da85d28af2395
push id2082
push userffxbld-merge
push dateMon, 01 Jul 2019 08:34:18 +0000
treeherdermozilla-release@2fb19d0466d2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersGijs, ritu
bugs1560336
milestone68.0
Bug 1560336 - Stop using the toolbaritem-combined-buttons class for the Firefox account menu item. r=Gijs a=ritu Differential Revision: https://phabricator.services.mozilla.com/D35434
browser/components/customizableui/content/panelUI.inc.xul
browser/themes/shared/customizableui/panelUI.inc.css
--- a/browser/components/customizableui/content/panelUI.inc.xul
+++ b/browser/components/customizableui/content/panelUI.inc.xul
@@ -231,17 +231,17 @@
         <toolbarbutton class="panel-banner-item"
                        label-update-available="&updateAvailable.panelUI.label;"
                        label-update-manual="&updateManual.panelUI.label;"
                        label-update-unsupported="&updateUnsupported.panelUI.label;"
                        label-update-restart="&updateRestart.panelUI.label2;"
                        oncommand="PanelUI._onBannerItemSelected(event)"
                        wrap="true"
                        hidden="true"/>
-        <toolbaritem id="appMenu-fxa-container" class="toolbaritem-combined-buttons sync-ui-item">
+        <toolbaritem id="appMenu-fxa-container" class="sync-ui-item">
           <hbox id="appMenu-fxa-status"
                 flex="1"
                 defaultlabel="&fxaSignIn.label;"
 # Despite the name, the tooltip says "Open Sync Preferences" and it is only used when *not* signed in.
 # Bug 1542334 changed the behaviour of the item when signed in so the tooltip was no longer appropriate there.
                 tooltiptext="&fxaSignedIn.tooltip;"
                 errorlabel="&fxaSignInError.label;"
                 unverifiedlabel="&fxaUnverified.label;"
--- a/browser/themes/shared/customizableui/panelUI.inc.css
+++ b/browser/themes/shared/customizableui/panelUI.inc.css
@@ -530,22 +530,16 @@ toolbarbutton[constrain-size="true"][cui
 
 #appMenu-addon-banners:not(:empty) ~ #appMenu-fxa-container,
 .panel-banner-item:not([hidden]) + #appMenu-fxa-container {
   margin-top: 6px;
 }
 
 /* FxAccount indicator bits. */
 
-/* Add the .toolbaritem-combined-buttons class to increase the specificity so as
- * to override the end margin for .toolbaritem-combined-buttons items further down. */
-#appMenu-fxa-container.toolbaritem-combined-buttons:not([fxastatus="signedin"]) {
-  margin-inline-end: 0;
-}
-
 #appMenu-fxa-label {
   -moz-context-properties: fill;
   fill: currentColor;
   list-style-image: url(chrome://browser/skin/sync.svg);
 }
 
 #appMenu-fxa-label {
   -moz-box-flex: 1;