Bug 1398264 - position private browsing indicator and/or 10.9 fullscreen button to cope with the background on the toolbox, r=adw
authorGijs Kruitbosch <gijskruitbosch@gmail.com>
Mon, 11 Sep 2017 11:41:14 +0100
changeset 429619 cbd4482d8d2ecaad07a477d46f58cb7c1c737c94
parent 429618 4bcd71943cbed359ebc434bf8794fb72ea2a42e5
child 429620 e1eaee9c428c83d6c7954b6a7e8cb434186bcbad
push id7761
push userjlund@mozilla.com
push dateFri, 15 Sep 2017 00:19:52 +0000
treeherdermozilla-beta@c38455951db4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersadw
bugs1398264
milestone57.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 1398264 - position private browsing indicator and/or 10.9 fullscreen button to cope with the background on the toolbox, r=adw MozReview-Commit-ID: 27neu3DHqnp
browser/themes/osx/browser.css
browser/themes/windows/browser.css
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -52,17 +52,24 @@
 }
 
 /** Begin titlebar **/
 
 #titlebar-buttonbox > .titlebar-button {
   display: none;
 }
 
-/* NB: these would be margin-inline-start/end if it wasn't for the fact that OS X
+/* Making the toolbox position:relative (browser.inc.css) occludes titlebar indicators
+ * if the toolbox has a background. Fix this by positioning the relevant elements, too: */
+#titlebar-secondary-buttonbox {
+  position: relative;
+  z-index: 1;
+}
+
+/* These would be margin-inline-start/end if it wasn't for the fact that OS X
  * doesn't reverse the order of the items in the titlebar in RTL mode. */
 .titlebar-placeholder[type="caption-buttons"],
 #titlebar-buttonbox {
   margin-left: 7px;
 }
 
 .titlebar-placeholder[type="fullscreen-button"],
 #titlebar-secondary-buttonbox {
--- a/browser/themes/windows/browser.css
+++ b/browser/themes/windows/browser.css
@@ -1094,16 +1094,19 @@ notification[value="translation"] {
 .private-browsing-indicator {
   display: none;
   pointer-events: none;
 }
 
 #private-browsing-indicator-titlebar {
   display: block;
   position: absolute;
+  /* Need to ensure this gets positioned on top of the position:relative #navigator-toolbox
+   * in case the dark/light themes give that item a background. */
+  z-index: 1;
 }
 
 #main-window[privatebrowsingmode=temporary][tabsintitlebar] #private-browsing-indicator-titlebar > .private-browsing-indicator {
   display: block;
 }
 
 #main-window[privatebrowsingmode=temporary]:-moz-any([inFullscreen],:not([tabsintitlebar])) #TabsToolbar > .private-browsing-indicator {
   display: -moz-box;