Bug 1008183 - Show a private browsing indicator on Windows in fullscreen mode if tabs are in the titlebar. r=jaws.

This commit is contained in:
Mike Conley 2014-05-16 08:00:00 -04:00
parent c421d08cf2
commit 1567ec4e7f
2 changed files with 25 additions and 4 deletions

View File

@ -422,7 +422,11 @@
background-image: url("chrome://browser/skin/privatebrowsing-mask-tabstrip-XPVista7.png");
}
#private-browsing-indicator-titlebar > .private-browsing-indicator {
/* We're intentionally using the titlebar asset here for fullscreen mode.
* See bug 1008183.
*/
#private-browsing-indicator-titlebar > .private-browsing-indicator,
#main-window[inFullscreen] #TabsToolbar > .private-browsing-indicator {
background-image: url("chrome://browser/skin/privatebrowsing-mask-titlebar-XPVista7.png");
}
}

View File

@ -2855,7 +2855,7 @@ chatbox {
display: block;
}
#main-window[privatebrowsingmode=temporary]:not([tabsintitlebar]) #TabsToolbar > .private-browsing-indicator {
#main-window[privatebrowsingmode=temporary]:-moz-any([inFullscreen],:not([tabsintitlebar])) #TabsToolbar > .private-browsing-indicator {
display: -moz-box;
}
@ -2865,7 +2865,12 @@ chatbox {
width: 48px;
}
#private-browsing-indicator-titlebar > .private-browsing-indicator {
/* Bug 1008183: We're intentionally using the titlebar asset here for fullscreen
* mode, since the tabstrip "mimics" the titlebar in that case with its own
* min/max/close window buttons.
*/
#private-browsing-indicator-titlebar > .private-browsing-indicator,
#main-window[inFullscreen] #TabsToolbar > .private-browsing-indicator {
background: url("chrome://browser/skin/privatebrowsing-mask-titlebar.png") no-repeat center 0px;
-moz-margin-end: 4px;
width: 40px;
@ -2883,6 +2888,14 @@ chatbox {
background-image: url("chrome://browser/skin/privatebrowsing-mask-titlebar-XPVista7-tall.png");
height: 28px;
}
/* We're intentionally using the titlebar asset here for fullscreen mode.
* See bug 1008183.
*/
#main-window[inFullscreen] #TabsToolbar > .private-browsing-indicator {
background-image: url("chrome://browser/skin/privatebrowsing-mask-titlebar-XPVista7.png");
}
#main-window[sizemode="maximized"] > #titlebar > #titlebar-content > #titlebar-buttonbox-container > #private-browsing-indicator-titlebar > .private-browsing-indicator {
top: -5px;
}
@ -2893,7 +2906,11 @@ chatbox {
%endif
@media (-moz-windows-classic) {
#private-browsing-indicator-titlebar > .private-browsing-indicator {
/* We're intentionally using the titlebar asset here for fullscreen mode.
* See bug 1008183.
*/
#private-browsing-indicator-titlebar > .private-browsing-indicator,
#main-window[inFullscreen] #TabsToolbar > .private-browsing-indicator {
background-image: url("chrome://browser/skin/privatebrowsing-mask-titlebar-XPVista7.png");
}
/**