Bug 1506190 - Make title bar items not overlap the border between the tab bar and the nav bar. r=mconley

Differential Revision: https://phabricator.services.mozilla.com/D11498

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Dão Gottwald 2018-11-14 16:53:51 +00:00
parent 3c0bb272b6
commit d6719bd5bc
2 changed files with 16 additions and 22 deletions

View File

@ -661,18 +661,14 @@ notification[value="translation"] menulist > .menulist-dropmarker {
padding-top: var(--space-above-tabbar);
}
/**
* Titlebar items (window caption buttons, private browsing indicator,
* accessibility indicator, etc)
*/
:root[sizemode="normal"][chromehidden~="menubar"] #TabsToolbar > .titlebar-item,
:root[sizemode="normal"] #toolbar-menubar[autohide="true"][inactive] + #TabsToolbar > .titlebar-item {
/* Center items (window caption buttons, private browsing indicator,
* accessibility indicator, etc) vertically. */
:root[sizemode="normal"] #TabsToolbar > .titlebar-item {
margin-top: calc(-1 * var(--space-above-tabbar));
}
/* Make #TabsToolbar transparent as we style underlying #titlebar with
* -moz-window-titlebar (Gtk+ theme).
*/
* -moz-window-titlebar (Gtk+ theme). */
:root[tabsintitlebar][sizemode="normal"]:not([inFullscreen]) #TabsToolbar,
:root[tabsintitlebar][sizemode="maximized"] #TabsToolbar,
:root[tabsintitlebar] #toolbar-menubar {
@ -682,16 +678,14 @@ notification[value="translation"] menulist > .menulist-dropmarker {
/* The button box must appear on top of the navigator-toolbox in order for
* click and hover mouse events to work properly for the button in the restored
* window state. Otherwise, elements in the navigator-toolbox, like the menubar,
* can swallow those events.
*/
* can swallow those events. */
.titlebar-buttonbox {
z-index: 1;
-moz-box-align: center;
}
/* Render titlebar command buttons according to system config.
* Use full scale icons here as the Gtk+ does.
*/
* Use full scale icons here as the Gtk+ does. */
@media (-moz-gtk-csd-minimize-button) {
.titlebar-min {
-moz-appearance: -moz-window-button-minimize;

View File

@ -954,21 +954,21 @@ notification[value="translation"] {
/* End customization mode */
/**
* Titlebar items (window caption buttons, private browsing indicator,
* accessibility indicator, etc)
*/
:root[sizemode="normal"][chromehidden~="menubar"] .titlebar-item,
:root[sizemode="normal"] #toolbar-menubar[autohide="true"][inactive] + #TabsToolbar > .titlebar-item,
:root[sizemode="normal"] #toolbar-menubar[autohide="true"][inactive] > .titlebar-item {
/* Prevent titlebar items (window caption buttons, private browsing indicator,
* accessibility indicator, etc) from overlapping the nav bar's shadow on the
* tab bar. */
#TabsToolbar > .titlebar-item {
margin-bottom: @navbarTabsShadowSize@;
}
/* Center titlebar items vertically. */
:root[sizemode="normal"] #TabsToolbar > .titlebar-item {
margin-top: calc(-1 * var(--space-above-tabbar));
}
/* Compensate for 4px extra margin on top of the tabs toolbar on Windows 7. */
@media (-moz-os-version: windows-win7) {
:root[sizemode="normal"][chromehidden~="menubar"] .titlebar-item,
:root[sizemode="normal"] #toolbar-menubar[autohide="true"][inactive] + #TabsToolbar > .titlebar-item,
:root[sizemode="normal"] #toolbar-menubar[autohide="true"][inactive] > .titlebar-item {
:root[sizemode="normal"] #TabsToolbar > .titlebar-item {
margin-top: calc(-1 * (var(--space-above-tabbar) + 4px));
}
}