From 272bca28ef61517ca5e3fad2490b8c1fc31a52ad Mon Sep 17 00:00:00 2001 From: Rafael Mardojai CM Date: Sat, 16 Feb 2019 21:34:41 -0500 Subject: [PATCH] Fix CSD for newer Firefox versions --- ui/parts/csd.css | 98 +++++++++++++++++++-------------------------- ui/parts/popups.css | 2 +- 2 files changed, 43 insertions(+), 57 deletions(-) diff --git a/ui/parts/csd.css b/ui/parts/csd.css index 2223634..c15a734 100644 --- a/ui/parts/csd.css +++ b/ui/parts/csd.css @@ -4,13 +4,25 @@ /* Navbar position */ :root[tabsintitlebar] #nav-bar { - margin-top: -47px !important; + margin-top: 5px !important; padding-right: 7px !important; position: relative; } +:root[tabsintitlebar] #navigator-toolbox { + margin-top: -5px; +} +:root[tabsintitlebar] #toolbar-menubar:not([inactive=true]) { + height: 30px !important; + margin-bottom: 8px; +} +:root[tabsintitlebar] #titlebar { + -moz-appearance: none !important; +} -:root[tabsintitlebar] #toolbar-menubar { - padding-bottom: 0 !important; +:root[tabsintitlebar] #TabsToolbar-customization-target { + height: 37px !important; + margin-top: -8px !important; + -moz-appearance: none !important; } /* Add window controls separator */ @@ -23,39 +35,29 @@ border-right: 1px solid rgba(0, 0, 0, .1); } -:root[tabsintitlebar] #titlebar { - height: 52px !important; - margin-bottom: 0px !important; -} -:root[tabsintitlebar] #titlebar-content { - margin-bottom: 0px !important; -} - /* Move window buttons next to the header bar */ -:root[tabsintitlebar] #titlebar-buttonbox { +:root[tabsintitlebar] #titlebar .titlebar-buttonbox-container { + position: absolute !important; + right: 0; + top: 5px; + -moz-appearance: none !important; +} +:root[tabsintitlebar] #titlebar .titlebar-buttonbox { background-image: var(--gnome-headerbar-bgimage) !important; - border: none !important; border-bottom: var(--gnome-headerbar-border-bottom) !important; box-shadow: var(--gnome-headerbar-box-shadow); height: unset !important; - margin-top: 0 !important; - padding-bottom: 0 !important; - padding-right: 3px; - padding-top: 0 !important; + padding-right: 3px; -moz-appearance: none !important; } - -:root[tabsintitlebar] #titlebar-buttonbox:-moz-window-inactive { +:root[tabsintitlebar] #titlebar .titlebar-buttonbox:-moz-window-inactive { background-image: var(--gnome-inactive-headerbar-bgimage) !important; border-bottom: var(--gnome-inactive-headerbar-border-bottom) !important; - box-shadow: var(--gnome-inactive-headerbar-box-shadow); -} -:root[tabsintitlebar] #navigator-toolbox { - margin-top: -5px; + box-shadow: var(--gnome-inactive-headerbar-box-shadow) !important; } /* Window buttons */ -:root[tabsintitlebar] #titlebar toolbarbutton { +:root[tabsintitlebar] #titlebar .titlebar-button { -moz-appearance: none !important; border: var(--gnome-headerbar-button-border) !important; border-color: transparent !important; @@ -63,70 +65,54 @@ height: 34px; margin: 6px 3px !important; padding: 0 2px !important; - position: relative; transition: all .3s ease-out; width: 34px; } -:root[tabsintitlebar] #titlebar toolbarbutton image { +:root[tabsintitlebar] #titlebar .titlebar-button .toolbarbutton-icon { filter: invert(85%); - margin-left: 6px; width: 16px; } -:root[tabsintitlebar] #titlebar:-moz-window-inactive toolbarbutton image { + +:root[tabsintitlebar] #titlebar:-moz-window-inactive .titlebar-button .toolbarbutton-icon { opacity: .7 !important; } -:root[tabsintitlebar] #titlebar:not(:-moz-window-inactive) toolbarbutton:not([disabled]):hover { +:root[tabsintitlebar] #titlebar:not(:-moz-window-inactive) .titlebar-button:not([disabled]):hover { background-image: var(--gnome-headerbar-button-hover-bgimage); border: var(--gnome-headerbar-button-border) !important; } -:root[tabsintitlebar] #titlebar:not(:-moz-window-inactive) toolbarbutton:not([disabled]):active { +:root[tabsintitlebar] #titlebar:not(:-moz-window-inactive) .titlebar-button:not([disabled]):active { background-image: var(--gnome-headerbar-button-active-bgimage); box-shadow: var(--gnome-headerbar-button-active-box-shadow); border: var(--gnome-headerbar-button-border) !important; } -:root[tabsintitlebar] #titlebar:not(:-moz-window-inactive) toolbarbutton[disabled] { +:root[tabsintitlebar] #titlebar:not(:-moz-window-inactive) .titlebar-button[disabled] { background-color: var(--gnome-headerbar-button-disabled-bgcolor); box-shadow: var(--gnome-headerbar-button-disabled-box-shadow); border: var(--gnome-headerbar-button-border) !important; } -:root[tabsintitlebar] #titlebar-close .toolbarbutton-icon { +:root[tabsintitlebar] #titlebar .titlebar-buttonbox .titlebar-close .toolbarbutton-icon { filter: var(--gnome-icons-hack-filter); list-style-image: url("moz-icon://stock/window-close-symbolic?size=dialog") !important; } -:root[tabsintitlebar] #titlebar-max .toolbarbutton-icon { +:root[tabsintitlebar] #titlebar .titlebar-buttonbox .titlebar-max .toolbarbutton-icon { filter: var(--gnome-icons-hack-filter); list-style-image: url("moz-icon://stock/window-maximize-symbolic?size=dialog") !important; } -:root[tabsintitlebar] #titlebar-min .toolbarbutton-icon { +:root[tabsintitlebar] #titlebar .titlebar-buttonbox .titlebar-min .toolbarbutton-icon { filter: var(--gnome-icons-hack-filter); list-style-image: url("moz-icon://stock/window-minimize-symbolic?size=dialog") !important; } -/* Remove ugly line before tabs */ -:root[tabsintitlebar] .titlebar-placeholder[type="pre-tabs"] { - border-inline-end: 0px solid !important; -} - -/* Remove blank space after tabs when window is maximized */ -:root[tabsintitlebar] #main-window:not([sizemode="normal"]) .titlebar-placeholder[type="post-tabs"] { - display: none !important; -} - -/* Remove window controls blank space after tabs */ -:root[tabsintitlebar] .titlebar-placeholder[type="caption-buttons"] { - display: none !important; -} - -/* Remove blank space before and after tabs */ -:root[tabsintitlebar] .titlebar-placeholder[type="pre-tabs"], -:root[tabsintitlebar] .titlebar-placeholder[type="post-tabs"] { - display: none !important; +/* Blank spaces on tabs start and end */ +:root[tabsintitlebar] .titlebar-spacer { + border-inline-end: 0px !important; + width: 6px !important; } /* Fix the issue when dragging tabs */ -:root[tabsintitlebar] #TabsToolbar[movingtab] + #nav-bar { - margin-top: -47px !important; +:root[tabsintitlebar] #navigator-toolbox[movingtab] #TabsToolbar { + padding-bottom: 0 !important; } /* Window controls: at least 1 button */ @@ -154,7 +140,7 @@ :root[tabsintitlebar]:not([sizemode="maximized"]) #nav-bar { border-top-left-radius: 8px; } -:root[tabsintitlebar]:not([sizemode="maximized"]) #titlebar-buttonbox { +:root[tabsintitlebar]:not([sizemode="maximized"]) #TabsToolbar .titlebar-buttonbox { border-top-right-radius: 8px; } diff --git a/ui/parts/popups.css b/ui/parts/popups.css index c63eb74..553b783 100644 --- a/ui/parts/popups.css +++ b/ui/parts/popups.css @@ -136,7 +136,7 @@ panelview vbox.panel-subview-body > toolbarbutton label { /* Customization overflow menu position */ #customization-panel-container { padding: 0 75px 25px !important; - margin-top: -39px; + margin-top: 10px; z-index: 10; } #customization-panelWrapper > .panel-arrowbox {