Commit 2400d6b2 authored by Mike Conley's avatar Mike Conley
Browse files

Bug 1700198 - Remove subviewbutton-iconic class from History and Synced Tabs panels. r=Gijs 

Depends on D118623

Differential Revision: https://phabricator.services.mozilla.com/D118624
parent d8bdffca

browser/base/content/appmenu-viewcache.inc.xhtml

+7 −7
Original line number Diff line number Diff line
@@ -362,22 +362,22 @@ 
    <vbox class="panel-subview-body">

      <toolbarbutton id="appMenuRecentlyClosedTabs"

                     data-l10n-id="appmenu-recently-closed-tabs"

                     class="subviewbutton subviewbutton-iconic subviewbutton-nav"

                     class="subviewbutton subviewbutton-nav"

                     closemenu="none"

                     oncommand="PanelUI.showSubView('appMenu-library-recentlyClosedTabs', this)"/>

      <toolbarbutton id="appMenuRecentlyClosedWindows"

                     data-l10n-id="appmenu-recently-closed-windows"

                     class="subviewbutton subviewbutton-iconic subviewbutton-nav"

                     class="subviewbutton subviewbutton-nav"

                     closemenu="none"

                     oncommand="PanelUI.showSubView('appMenu-library-recentlyClosedWindows', this)"/>

      <toolbarbutton id="appMenuRestoreSession"

                     data-l10n-id="appmenu-restore-session"

                     class="subviewbutton subviewbutton-iconic"

                     class="subviewbutton"

                     command="Browser:RestoreLastSession"/>

      <toolbarseparator/>

      <toolbarbutton id="appMenuClearRecentHistory"

                     data-l10n-id="appmenu-clear-history"

                     class="subviewbutton subviewbutton-iconic"

                     class="subviewbutton"

                     command="Tools:Sanitize"/>

      <toolbarseparator/>

      <html:h2 id="panelMenu_recentHistory" class="subview-subheader" data-l10n-id="appmenu-recent-history-subheader"></html:h2>
@@ -393,7 +393,7 @@ 
    </vbox>

    <toolbarseparator/>

    <toolbarbutton id="PanelUI-historyMore"

                   class="subviewbutton subviewbutton-iconic panel-subview-footer-button"

                   class="subviewbutton panel-subview-footer-button"

                   data-l10n-id="appmenu-manage-history"

                   oncommand="PlacesCommandHook.showPlacesOrganizer('History'); CustomizableUI.hidePanelForNode(this);"/>

  </panelview>
@@ -626,7 +626,7 @@ 
        <vbox id="PanelUI-remotetabs-buttons">

          <toolbarbutton id="PanelUI-remotetabs-syncnow"

                         align="center"

                         class="subviewbutton subviewbutton-iconic"

                         class="subviewbutton"

                         oncommand="gSync.doSync();"

                         onmouseover="gSync.refreshSyncButtonsTooltip();"

                         closemenu="none">
@@ -640,7 +640,7 @@ 
            </hbox>

          </toolbarbutton>

          <toolbarbutton id="PanelUI-remotetabs-view-managedevices"

                         class="subviewbutton subviewbutton-iconic"

                         class="subviewbutton"

                         data-l10n-id="remote-tabs-manage-account"

                         oncommand="gSync.openDevicesManagementPage('syncedtabs-menupanel');">

                         <observes element="sidebar-box" attribute="positionend"/>

browser/components/customizableui/CustomizableWidgets.jsm

+1 −27
Original line number Diff line number Diff line
@@ -124,17 +124,6 @@ const CustomizableWidgets = [ 
      let document = panelview.ownerDocument;

      let window = document.defaultView;



      // While we support this panel for both Proton and non-Proton versions

      // of the AppMenu, we only want to show icons for the non-Proton

      // version. When Proton ships and we remove the non-Proton variant,

      // we can remove the subviewbutton-iconic classes from the markup.

      if (window.PanelUI.protonAppMenuEnabled) {

        let toolbarbuttons = panelview.querySelectorAll("toolbarbutton");

        for (let toolbarbutton of toolbarbuttons) {

          toolbarbutton.classList.remove("subviewbutton-iconic");

        }

      }



      PanelMultiView.getViewNode(

        document,

        "appMenuRecentlyClosedTabs"
@@ -231,10 +220,7 @@ const CustomizableWidgets = [ 
        element.classList.add("subviewbutton");

        if (element.classList.contains("restoreallitem")) {

          footer = element;

          element.classList.add(

            "subviewbutton-iconic",

            "panel-subview-footer-button"

          );

          element.classList.add("panel-subview-footer-button");

        } else {

          element.classList.add("subviewbutton-iconic", "bookmark-item");

        }
@@ -469,18 +455,6 @@ if (Services.prefs.getBoolPref("identity.fxaccounts.enabled")) { 
    onViewShowing(aEvent) {

      let panelview = aEvent.target;

      let doc = panelview.ownerDocument;

      let window = doc.defaultView;



      // While we support this panel for both Proton and non-Proton versions

      // of the AppMenu, we only want to show icons for the non-Proton

      // version. When Proton ships and we remove the non-Proton variant,

      // we can remove the subviewbutton-iconic classes from the markup.

      if (window.PanelUI.protonAppMenuEnabled) {

        let toolbarbuttons = panelview.querySelectorAll("toolbarbutton");

        for (let toolbarbutton of toolbarbuttons) {

          toolbarbutton.classList.remove("subviewbutton-iconic");

        }

      }



      let syncNowBtn = panelview.querySelector(".syncnow-label");

      let l10nId = syncNowBtn.getAttribute(

browser/themes/osx/customizableui/panelUI.css

+0 −4
Original line number Diff line number Diff line
@@ -26,10 +26,6 @@ panel[type="arrow"][side="right"] { 
}

} /** END Proton **/



.restoreallitem > .toolbarbutton-icon {

  display: none;

}



@media not (-moz-proton) {

.subviewbutton {

  padding-inline-start: 18px;

browser/themes/shared/customizableui/panelUI.inc.css

+0 −1
Original line number Diff line number Diff line
@@ -1437,7 +1437,6 @@ panelview .toolbarbutton-1, 
.subviewbutton-iconic > .toolbarbutton-text,

.subviewbutton[image] > .toolbarbutton-text,

.subviewbutton[targetURI] > .toolbarbutton-text,

.subviewbutton.restoreallitem > .toolbarbutton-text,

.subviewbutton.bookmark-item > .toolbarbutton-text,

.subviewbutton[checked="true"] > .toolbarbutton-text {

  padding-inline-start: 8px; /* See '.subviewbutton-iconic > .toolbarbutton-text' rule above. */