Bug 1537648 - remove change avatar button from FxA menu r=Gijs, a=pascalc
authorVijay Budhram <vbudhram@mozilla.com>
Fri, 22 Mar 2019 20:52:47 +0000
changeset 525848 f83ea1d76d6e4a785c84bad975659e24c40f5c85
parent 525847 0b05c9bed71b2c90b490dca27c38623236e90691
child 525849 d03bf065608b3254ff3d6c7934e18f3b10ee77bc
push id2032
push userffxbld-merge
push dateMon, 13 May 2019 09:36:57 +0000
treeherdermozilla-release@455c1065dcbe [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersGijs, pascalc
bugs1537648
milestone67.0
Bug 1537648 - remove change avatar button from FxA menu r=Gijs, a=pascalc Differential Revision: https://phabricator.services.mozilla.com/D24527
browser/base/content/browser-sync.js
browser/components/customizableui/content/panelUI.inc.xul
browser/themes/shared/customizableui/panelUI.inc.css
--- a/browser/base/content/browser-sync.js
+++ b/browser/base/content/browser-sync.js
@@ -478,21 +478,16 @@ var gSync = {
   },
 
   openSendToDevicePromo() {
     let url = this.PRODUCT_INFO_BASE_URL;
     url += "send-tabs/?utm_source=" + Services.appinfo.name.toLowerCase();
     switchToTabHavingURI(url, true, { replaceQueryString: true });
   },
 
-  async openFxAChangeAvatar(entryPoint) {
-    const url = await FxAccounts.config.promiseChangeAvatarURI(entryPoint);
-    switchToTabHavingURI(url, true, { replaceQueryString: true });
-  },
-
   async openFxAEmailFirstPage(entryPoint) {
     const url = await FxAccounts.config.promiseEmailFirstURI(entryPoint);
     switchToTabHavingURI(url, true, { replaceQueryString: true });
   },
 
   async openFxAManagePage(entryPoint) {
     const url = await FxAccounts.config.promiseManageURI(entryPoint);
     switchToTabHavingURI(url, true, { replaceQueryString: true });
--- a/browser/components/customizableui/content/panelUI.inc.xul
+++ b/browser/components/customizableui/content/panelUI.inc.xul
@@ -732,20 +732,18 @@
         </vbox>
         <vbox id="PanelUI-fxa-unverified" class="PanelUI-fxa-unverified-instruction-box">
           <image class="fxaGraphicMail"/>
           <label class="PanelUI-fxa-signin-instruction-callout">&fxa.unverified.callout.label;</label>
           <label class="PanelUI-fxa-signin-instruction-label">&fxa.unverified.description.label;</label>
           <toolbarbutton class="PanelUI-fxa-signin-button" label="&fxa.unverified.button.label;" oncommand="gSync.openPrefs('fxa_discoverability_native');"/>
         </vbox>
         <vbox id="PanelUI-fxa-menu">
-          <hbox flex="1" pack="center" class="fxa-avatar-subpanel">
-            <toolbarbutton align="left" oncommand="gSync.openFxAChangeAvatar('fxa_discoverability_native');">
-              <image id="fxa-menu-avatar"/>
-            </toolbarbutton>
+          <hbox flex="1" align="center" class="fxa-avatar-subpanel">
+            <image role="presentation" id="fxa-menu-avatar"/>
             <vbox flex="1">
               <label class="fxa-avatar-subpanel-description" >&fxa.menu.signedInAs.label;</label>
               <label id="fxa-menu-email"></label>
             </vbox>
           </hbox>
           <toolbarseparator/>
           <toolbarbutton id="PanelUI-fxa-menu-sendtab-button"
                          class="subviewbutton subviewbutton-iconic subviewbutton-nav"
--- a/browser/themes/shared/customizableui/panelUI.inc.css
+++ b/browser/themes/shared/customizableui/panelUI.inc.css
@@ -669,17 +669,16 @@ toolbarbutton[constrain-size="true"][cui
 
 :root[lwt-popup-brighttext] #appMenu-fxa-container[fxastatus="login-failed"] > #appMenu-fxa-status:hover:active,
 :root[lwt-popup-brighttext] #appMenu-fxa-container[fxastatus="unverified"] > #appMenu-fxa-status:hover:active {
   background-color: @appmenuWarningBackgroundColorActiveBrightText@;
 }
 
 /* Firefox Account Toolbar Panel */
 
-#fxa-menu-avatar,
 #fxa-avatar-image {
   width: 16px;
   height: 16px;
 }
 
 :root {
   --avatar-image-url: url(chrome://browser/skin/fxa/avatar.svg);
 }
@@ -743,18 +742,18 @@ toolbarbutton[constrain-size="true"][cui
 
 .fxa-avatar-subpanel-description {
   color: var(--panel-disabled-color);
 }
 
 #fxa-menu-avatar {
   height: 32px;
   width: 32px;
-  pointer-events: none;
   margin-inline-start: 20px;
+  margin-inline-end: 5px;
   -moz-context-properties: fill, fill-opacity;
   fill: var(--arrowpanel-color);
 }
 
 /* From the FxA menu -> remote tabs, we don't need to clutter the view with
    redundant buttons because these are accessible from the main menu */
 panelmultiview[mainViewId="PanelUI-fxa"] #PanelUI-remotetabs-view-sidebar,
 panelmultiview[mainViewId="PanelUI-fxa"] #PanelUI-remotetabs-syncnow {