Bug 1506457 - Only show titlebar indicators in the titlebar-secondary-buttonbox on macOS. r=dao
authorMike Conley <mconley@mozilla.com>
Fri, 16 Nov 2018 20:45:36 +0000
changeset 503274 1b441356e3379ee83c3d564c5a9d8702debfb56b
parent 503273 dad98317fee0ff692f30d6f0c845a9241f0d5de4
child 503275 9198c5a03b592b0f4da406d849951cac152fe8b3
push id10290
push userffxbld-merge
push dateMon, 03 Dec 2018 16:23:23 +0000
treeherdermozilla-beta@700bed2445e6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdao
bugs1506457
milestone65.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1506457 - Only show titlebar indicators in the titlebar-secondary-buttonbox on macOS. r=dao Differential Revision: https://phabricator.services.mozilla.com/D12153
browser/base/content/browser.xul
browser/themes/osx/browser.css
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -783,21 +783,24 @@ xmlns="http://www.w3.org/1999/xhtml"
                            removable="false"/>
 
             <hbox class="titlebar-spacer" type="post-tabs"
                   ordinal="1000"
                   skipintoolbarset="true"/>
           </hbox>
         </vbox>
 
+#ifndef XP_MACOSX
         <button class="accessibility-indicator titlebar-item"  tooltiptext="&accessibilityIndicator.tooltip;"
                 ordinal="1000"
                 aria-live="polite" skipintoolbarset="true"/>
         <hbox class="private-browsing-indicator titlebar-item" skipintoolbarset="true"
               ordinal="1000"/>
+#endif
+
 #include titlebar-items.inc.xul
 
 #ifdef XP_MACOSX
         <!-- OS X does not natively support RTL for its titlebar items, so we prevent this secondary
              buttonbox from reversing order in RTL by forcing an LTR direction. -->
         <hbox id="titlebar-secondary-buttonbox" dir="ltr">
           <button class="accessibility-indicator" tooltiptext="&accessibilityIndicator.tooltip;" aria-live="polite"/>
           <hbox class="private-browsing-indicator"/>
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -931,32 +931,16 @@ html|*.addon-webext-perm-list {
 }
 
 /* Customization mode */
 
 %include ../shared/customizableui/customizeMode.inc.css
 
 /* End customization mode */
 
-/* Private browsing and accessibility indicators */
-
-:root[accessibilitymode][tabsintitlebar]:not([inFullscreen]) > #navigator-toolbox > #titlebar > #TabsToolbar > .accessibility-indicator,
-:root[privatebrowsingmode=temporary][tabsintitlebar]:not([inFullscreen]) > #navigator-toolbox > #titlebar > #TabsToolbar > .private-browsing-indicator,
-:root[accessibilitymode]:not([tabsintitlebar]) > #navigator-toolbox > #titlebar > #TabsToolbar > #titlebar-secondary-buttonbox > .accessibility-indicator,
-:root[privatebrowsingmode=temporary]:not([tabsintitlebar]) > #navigator-toolbox > #titlebar > #TabsToolbar > #titlebar-secondary-buttonbox > .private-browsing-indicator {
-  display: none;
-}
-
-#TabsToolbar > .private-browsing-indicator:-moz-locale-dir(rtl),
-#TabsToolbar > .accessibility-indicator:-moz-locale-dir(rtl) {
-  -moz-box-ordinal-group: 0;
-}
-
-/* End private browsing and accessibility indicators */
-
 %include ../shared/UITour.inc.css
 
 #UITourTooltipDescription {
   font-size: 1.18rem;
   line-height: 2rem;
 }
 
 #UITourTooltipClose {