CSD code improvements

This commit is contained in:
Rafael Mardojai CM 2019-06-26 22:12:28 -05:00
parent 69d1d57699
commit 91c6e11344
2 changed files with 17 additions and 14 deletions

View File

@ -17,7 +17,3 @@
:root { :root {
--space-above-tabbar: 0 !important; --space-above-tabbar: 0 !important;
} }
#main-window {
-moz-appearance: -moz-window-titlebar !important;
}

View File

@ -2,19 +2,22 @@
@namespace xul url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); @namespace xul url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
/* Navbar */ #main-window {
:root[tabsintitlebar] #nav-bar { -moz-appearance: -moz-window-titlebar !important;
border-radius: 6px 6px 0 0;
position: relative;
} }
/* Window controls: at least 1 button */ /* Headerbar top border corners rounded */
:root[tabsintitlebar]:not([inFullscreen]):not([sizemode="maximized"]) #nav-bar {
border-radius: 7px 7px 0 0 !important;
}
/* Window buttons: at least 1 button */
@media (-moz-gtk-csd-minimize-button), (-moz-gtk-csd-maximize-button), (-moz-gtk-csd-close-button) { @media (-moz-gtk-csd-minimize-button), (-moz-gtk-csd-maximize-button), (-moz-gtk-csd-close-button) {
:root[tabsintitlebar]:not([inFullscreen]) #nav-bar { :root[tabsintitlebar]:not([inFullscreen]) #nav-bar {
padding-right: 50px !important; padding-right: 50px !important;
} }
} }
/* Window controls: at least 2 buttons */ /* Window buttons: at least 2 buttons */
@media (-moz-gtk-csd-minimize-button) and (-moz-gtk-csd-maximize-button), @media (-moz-gtk-csd-minimize-button) and (-moz-gtk-csd-maximize-button),
(-moz-gtk-csd-minimize-button) and (-moz-gtk-csd-close-button), (-moz-gtk-csd-minimize-button) and (-moz-gtk-csd-close-button),
(-moz-gtk-csd-maximize-button) and (-moz-gtk-csd-close-button) { (-moz-gtk-csd-maximize-button) and (-moz-gtk-csd-close-button) {
@ -22,14 +25,14 @@
padding-right: 90px !important; padding-right: 90px !important;
} }
} }
/* Window controls: 3 buttons */ /* Window buttons: 3 buttons */
@media (-moz-gtk-csd-minimize-button) and (-moz-gtk-csd-maximize-button) and (-moz-gtk-csd-close-button) { @media (-moz-gtk-csd-minimize-button) and (-moz-gtk-csd-maximize-button) and (-moz-gtk-csd-close-button) {
:root[tabsintitlebar]:not([inFullscreen]) #nav-bar { :root[tabsintitlebar]:not([inFullscreen]) #nav-bar {
padding-right: 130px !important; padding-right: 130px !important;
} }
} }
/* Fullscreen */ /* Fullscreen headerbar padding for 1 button */
:root[tabsintitlebar][inFullscreen] #nav-bar { :root[tabsintitlebar][inFullscreen] #nav-bar {
padding-right: 50px !important; padding-right: 50px !important;
} }
@ -47,7 +50,7 @@
-moz-appearance: none !important; -moz-appearance: none !important;
} }
/* Window buttons */ /* Window buttons style */
:root[tabsintitlebar] #titlebar .titlebar-button, :root[tabsintitlebar] #titlebar .titlebar-button,
:root[tabsintitlebar][inFullscreen] #window-controls toolbarbutton { :root[tabsintitlebar][inFullscreen] #window-controls toolbarbutton {
-moz-appearance: none !important; -moz-appearance: none !important;
@ -88,6 +91,7 @@
border: var(--gnome-button-border) !important; border: var(--gnome-button-border) !important;
} }
/* Use stack icons for window buttons */
:root[tabsintitlebar] #titlebar .titlebar-buttonbox .titlebar-close .toolbarbutton-icon { :root[tabsintitlebar] #titlebar .titlebar-buttonbox .titlebar-close .toolbarbutton-icon {
filter: var(--gnome-icons-hack-filter); filter: var(--gnome-icons-hack-filter);
list-style-image: url("moz-icon://stock/window-close-symbolic?size=dialog") !important; list-style-image: url("moz-icon://stock/window-close-symbolic?size=dialog") !important;
@ -105,6 +109,7 @@
list-style-image: url("moz-icon://stock/view-restore-symbolic?size=dialog") !important; list-style-image: url("moz-icon://stock/view-restore-symbolic?size=dialog") !important;
} }
/* Remove close and minimize buttons from fullscreen buttons */
:root[tabsintitlebar][inFullscreen] #window-controls #close-button, :root[tabsintitlebar][inFullscreen] #window-controls #close-button,
:root[tabsintitlebar][inFullscreen] #window-controls #minimize-button { :root[tabsintitlebar][inFullscreen] #window-controls #minimize-button {
display: none; display: none;
@ -145,11 +150,13 @@
} }
} }
/* */ /* Prevent menubar from breaking */
:root[tabsintitlebar] #toolbar-menubar:not([inactive=true]) { :root[tabsintitlebar] #toolbar-menubar:not([inactive=true]) {
height: 30px !important; height: 30px !important;
margin-bottom: 8px; margin-bottom: 8px;
} }
/* Remove default style of titlebar */
:root[tabsintitlebar] #titlebar { :root[tabsintitlebar] #titlebar {
-moz-appearance: none !important; -moz-appearance: none !important;
} }