зеркало из https://github.com/mozilla/gecko-dev.git
Bug 593950 - When drawing in the title bar and using Glass, the title bar should be smaller. r=gavin
This commit is contained in:
Родитель
4e0c9ba9a4
Коммит
fcbf88eb81
|
@ -3634,7 +3634,7 @@ var FullScreen = {
|
||||||
// The user may quit fullscreen during an animation
|
// The user may quit fullscreen during an animation
|
||||||
clearInterval(this._animationInterval);
|
clearInterval(this._animationInterval);
|
||||||
clearTimeout(this._animationTimeout);
|
clearTimeout(this._animationTimeout);
|
||||||
gNavToolbox.style.marginTop = "0px";
|
gNavToolbox.style.marginTop = "";
|
||||||
if (this._isChromeCollapsed)
|
if (this._isChromeCollapsed)
|
||||||
this.mouseoverToggle(true);
|
this.mouseoverToggle(true);
|
||||||
this._isAnimating = false;
|
this._isAnimating = false;
|
||||||
|
@ -3767,7 +3767,7 @@ var FullScreen = {
|
||||||
if (animateFrameAmount >= gNavToolbox.boxObject.height) {
|
if (animateFrameAmount >= gNavToolbox.boxObject.height) {
|
||||||
// We've animated enough
|
// We've animated enough
|
||||||
clearInterval(FullScreen._animationInterval);
|
clearInterval(FullScreen._animationInterval);
|
||||||
gNavToolbox.style.marginTop = "0px";
|
gNavToolbox.style.marginTop = "";
|
||||||
FullScreen._isAnimating = false;
|
FullScreen._isAnimating = false;
|
||||||
FullScreen._shouldAnimate = false; // Just to make sure
|
FullScreen._shouldAnimate = false; // Just to make sure
|
||||||
FullScreen.mouseoverToggle(false);
|
FullScreen.mouseoverToggle(false);
|
||||||
|
|
|
@ -81,6 +81,10 @@
|
||||||
background: transparent;
|
background: transparent;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#main-window[chromemargin^="0,"][sizemode="normal"]:not([inFullscreen="true"]) #navigator-toolbox {
|
||||||
|
margin-top: -7px;
|
||||||
|
}
|
||||||
|
|
||||||
#main-window:not(:-moz-lwtheme)[inFullscreen="true"] {
|
#main-window:not(:-moz-lwtheme)[inFullscreen="true"] {
|
||||||
-moz-appearance: none;
|
-moz-appearance: none;
|
||||||
background-color: #556;
|
background-color: #556;
|
||||||
|
@ -95,7 +99,7 @@
|
||||||
text-shadow: 0 0 .5em white, 0 0 .5em white, 0 1px 0 rgba(255,255,255,.4);
|
text-shadow: 0 0 .5em white, 0 0 .5em white, 0 1px 0 rgba(255,255,255,.4);
|
||||||
}
|
}
|
||||||
|
|
||||||
#main-window[sizemode="normal"] #navigator-toolbox[tabsontop="true"] > toolbar:not(#toolbar-menubar):not(#TabsToolbar):not(:-moz-lwtheme) {
|
#main-window[sizemode="normal"]:not([inFullscreen="true"]) #navigator-toolbox[tabsontop="true"] > toolbar:not(#toolbar-menubar):not(#TabsToolbar):not(:-moz-lwtheme) {
|
||||||
border-left: 1px solid @glassToolbarBorderColor@;
|
border-left: 1px solid @glassToolbarBorderColor@;
|
||||||
border-right: 1px solid @glassToolbarBorderColor@;
|
border-right: 1px solid @glassToolbarBorderColor@;
|
||||||
}
|
}
|
||||||
|
@ -104,13 +108,13 @@
|
||||||
border-color: @glassToolbarBorderColor@ !important;
|
border-color: @glassToolbarBorderColor@ !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
#main-window[sizemode="normal"] #navigator-toolbox[tabsontop="true"] > #nav-bar:not(:-moz-lwtheme),
|
#main-window[sizemode="normal"]:not([inFullscreen="true"]) #navigator-toolbox[tabsontop="true"] > #nav-bar:not(:-moz-lwtheme),
|
||||||
#main-window[sizemode="normal"] #navigator-toolbox[tabsontop="true"]:not([customizing]) > #nav-bar[collapsed="true"] + toolbar:not(:-moz-lwtheme),
|
#main-window[sizemode="normal"]:not([inFullscreen="true"]) #navigator-toolbox[tabsontop="true"]:not([customizing]) > #nav-bar[collapsed="true"] + toolbar:not(:-moz-lwtheme),
|
||||||
#main-window[sizemode="normal"] #navigator-toolbox[tabsontop="true"]:not([customizing]) > #nav-bar[collapsed="true"] + #customToolbars + #PersonalToolbar:not(:-moz-lwtheme) {
|
#main-window[sizemode="normal"]:not([inFullscreen="true"]) #navigator-toolbox[tabsontop="true"]:not([customizing]) > #nav-bar[collapsed="true"] + #customToolbars + #PersonalToolbar:not(:-moz-lwtheme) {
|
||||||
border-top-left-radius: 3.5px;
|
border-top-left-radius: 3.5px;
|
||||||
border-top-right-radius: 3.5px;
|
border-top-right-radius: 3.5px;
|
||||||
}
|
}
|
||||||
#main-window[sizemode="normal"] #TabsToolbar[tabsontop="true"]:not(:-moz-lwtheme) {
|
#main-window[sizemode="normal"]:not([inFullscreen="true"]) #TabsToolbar[tabsontop="true"]:not(:-moz-lwtheme) {
|
||||||
padding-left: 4px;
|
padding-left: 4px;
|
||||||
padding-right: 4px;
|
padding-right: 4px;
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче