CSD: Use rounded title buttons by default, related to #77

Also remove FF60 obsolete code
This commit is contained in:
Rafael Mardojai CM 2020-01-28 18:02:21 -05:00
parent f25498c45b
commit a7239d64c7
4 changed files with 73 additions and 94 deletions

View File

@ -124,9 +124,7 @@ Alternatively you can run installation script with `-g` flag to auto install GNO
*This feature is included by default for Firefox 70+* *This feature is included by default for Firefox 70+*
- **rounded-title-buttons.css** *GNOMISH*
Rounded title buttons (headerbar window controls).
- **active-tab-contrast.css** - **active-tab-contrast.css**

View File

@ -32,66 +32,6 @@
} }
} }
/* Fullscreen headerbar padding for 1 button */
:root[tabsintitlebar][inFullscreen] #nav-bar {
padding-right: 50px !important;
}
/* Window buttons box */
:root[tabsintitlebar] #titlebar .titlebar-buttonbox-container,
:root[tabsintitlebar] #titlebar-buttonbox-container,
:root[tabsintitlebar][inFullscreen] #window-controls {
-moz-appearance: none !important;
padding: 6px 3px;
position: absolute !important;
right: 0;
top: 0;
display: block !important;
}
:root[tabsintitlebar] #titlebar .titlebar-buttonbox {
-moz-appearance: none !important;
}
/* Window buttons style */
:root[tabsintitlebar] #titlebar .titlebar-button,
:root[tabsintitlebar][inFullscreen] #window-controls toolbarbutton {
-moz-appearance: none !important;
border: 1px solid var(--gnome-button-border-color) !important;
border-color: transparent !important;
border-radius: 5px !important;
height: 34px;
margin: 0 3px !important;
padding: 0 2px !important;
width: 34px;
}
:root[tabsintitlebar] #titlebar .titlebar-button .toolbarbutton-icon,
:root[tabsintitlebar][inFullscreen] #window-controls toolbarbutton .toolbarbutton-icon {
width: 16px;
}
:root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-button .toolbarbutton-icon,
:root[tabsintitlebar][inFullscreen] #window-controls:-moz-window-inactive toolbarbutton .toolbarbutton-icon {
opacity: .3 !important;
}
:root[tabsintitlebar] #titlebar:not(:-moz-window-inactive) .titlebar-button:not([disabled]):hover,
:root[tabsintitlebar][inFullscreen] #window-controls:not(:-moz-window-inactive) toolbarbutton:not([disabled]):hover {
background-image: var(--gnome-button-hover-background);
border-color: var(--gnome-button-border-color) !important;
border-bottom-color: var(--gnome-button-border-accent-color) !important;
box-shadow: var(--gnome-button-box-shadow);
}
:root[tabsintitlebar] #titlebar:not(:-moz-window-inactive) .titlebar-button:not([disabled]):active,
:root[tabsintitlebar][inFullscreen] #window-controls:not(:-moz-window-inactive) toolbarbutton:not([disabled]):active {
background: var(--gnome-button-active-background);
box-shadow: var(--gnome-button-active-box-shadow);
border-color: var(--gnome-button-active-border-color) !important;
}
/* Remove close and minimize buttons from fullscreen buttons */
:root[tabsintitlebar][inFullscreen] #window-controls #close-button,
:root[tabsintitlebar][inFullscreen] #window-controls #minimize-button {
display: none;
}
/* Left window buttons */ /* Left window buttons */
@media (-moz-gtk-csd-reversed-placement) { @media (-moz-gtk-csd-reversed-placement) {
:root[tabsintitlebar]:not([inFullscreen]) #nav-bar { :root[tabsintitlebar]:not([inFullscreen]) #nav-bar {
@ -126,6 +66,18 @@
} }
} }
/* Fullscreen headerbar padding for 1 button */
:root[tabsintitlebar][inFullscreen] #nav-bar {
padding-right: 50px !important;
}
/* Remove close and minimize buttons from fullscreen buttons */
:root[tabsintitlebar][inFullscreen] #window-controls #close-button,
:root[tabsintitlebar][inFullscreen] #window-controls #minimize-button,
:root[tabsintitlebar][inFullscreen] #titlebar .titlebar-buttonbox-container {
display: none !important;
}
/* Remove tabsbar titlebar blank spaces */ /* Remove tabsbar titlebar blank spaces */
:root[tabsintitlebar] #TabsToolbar .titlebar-placeholder { :root[tabsintitlebar] #TabsToolbar .titlebar-placeholder {
display: none !important; display: none !important;
@ -147,21 +99,66 @@
padding-bottom: 0 !important; padding-bottom: 0 !important;
} }
/* FF 60 fixes */ /* Window buttons box */
:root[tabsintitlebar] #titlebar[style="margin-bottom: -1px;"] { :root[tabsintitlebar] #titlebar .titlebar-buttonbox-container,
margin-bottom: -38px !important; :root[tabsintitlebar] #titlebar-buttonbox-container,
} :root[tabsintitlebar][inFullscreen] #window-controls {
:root[tabsintitlebar] #titlebar-content { -moz-appearance: none !important;
padding: 6px 3px;
position: absolute !important;
right: 0;
top: 0;
display: block !important; display: block !important;
position: absolute;
height: 38px !important;
top: 0 !important;
} }
:root[tabsintitlebar] #titlebar-buttonbox { :root[tabsintitlebar] #titlebar .titlebar-buttonbox {
height: auto !important; -moz-appearance: none !important;
padding: 0 !important;
margin: 0 !important;
} }
:root[tabsintitlebar] #titlebar-content .titlebar-button {
padding: 0 7px !important; /* Window buttons style */
:root[tabsintitlebar] #titlebar .titlebar-button,
:root[tabsintitlebar][inFullscreen] #window-controls toolbarbutton {
-moz-appearance: none !important;
border: 1px solid var(--gnome-button-border-color) !important;
border-color: transparent !important;
border-radius: 5px !important;
padding: 0 2px !important;
}
:root[tabsintitlebar] #titlebar .titlebar-button {
border-radius: 100% !important;
height: 30px !important;
margin: 2px 5px !important;
width: 30px;
}
:root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-button {
border-color: var(--gnome-inactive-button-border-color) !important;
}
:root[tabsintitlebar][inFullscreen] #window-controls toolbarbutton {
border-radius: 5px !important;
height: 34px;
margin: 0 3px !important;
width: 34px;
}
:root[tabsintitlebar] #titlebar .titlebar-button .toolbarbutton-icon,
:root[tabsintitlebar][inFullscreen] #window-controls toolbarbutton .toolbarbutton-icon {
width: 16px;
}
:root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-button .toolbarbutton-icon,
:root[tabsintitlebar][inFullscreen] #window-controls:-moz-window-inactive toolbarbutton .toolbarbutton-icon {
opacity: .3 !important;
}
:root[tabsintitlebar] #titlebar:not(:-moz-window-inactive) .titlebar-button:not([disabled]):hover,
:root[tabsintitlebar][inFullscreen] #window-controls:not(:-moz-window-inactive) toolbarbutton:not([disabled]):hover {
background-image: var(--gnome-button-hover-background);
border-color: var(--gnome-button-border-color) !important;
border-bottom-color: var(--gnome-button-border-accent-color) !important;
box-shadow: var(--gnome-button-box-shadow);
}
:root[tabsintitlebar] #titlebar:not(:-moz-window-inactive) .titlebar-button:not([disabled]):active,
:root[tabsintitlebar][inFullscreen] #window-controls:not(:-moz-window-inactive) toolbarbutton:not([disabled]):active {
background: var(--gnome-button-active-background);
box-shadow: var(--gnome-button-active-box-shadow);
border-color: var(--gnome-button-active-border-color) !important;
} }

View File

@ -1,14 +0,0 @@
/* Rounded title buttons (headerbar window controls) */
@namespace xul url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
:root[tabsintitlebar] #titlebar .titlebar-button {
border-radius: 100% !important;
height: 30px !important;
width: 30px !important;
margin: 2px 5px !important;
}
:root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-button {
border-color: var(--gnome-inactive-button-border-color) !important;
}

View File

@ -17,8 +17,6 @@
* This feature is included by default for Firefox 70+ */ * This feature is included by default for Firefox 70+ */
/*@import "theme/matching-autocomplete-width.css"; /**/ /*@import "theme/matching-autocomplete-width.css"; /**/
/* Rounded title buttons (headerbar window controls) (GNOMISH) */
/*@import "theme/rounded-title-buttons.css"; /**/
/* Active tab high contrast */ /* Active tab high contrast */
/*@import "theme/active-tab-contrast.css"; /**/ /*@import "theme/active-tab-contrast.css"; /**/