Merge titlebar and headerbar code, fix transparent titlebars

master
Christian Medel 2020-06-30 18:31:31 -07:00
parent b5b45a42ef
commit 8d204d4671
1 changed files with 60 additions and 76 deletions

View File

@ -650,7 +650,7 @@ image {
.caja-location-entry {
padding: 3px 5px; }
scrolledwindow viewport.frame {
scrolledwindow.frame, scrolledwindow viewport.frame {
border: none; }
arrow, combobox arrow {
@ -1519,33 +1519,36 @@ colorchooser #add-color-button {
padding-left: 0;
padding-right: 0; }
headerbar, headerbar:not(.titlebar) {
headerbar {
padding: 4px 8px;
border-width: 0;
border-style: solid;
border-color: mix(shade(#D8D8D8, 0.9), #D8D8D8, 0.5);
border-bottom-width: 1px;
box-shadow: 0 1px shade(#D8D8D8, 0.9);
min-height: 30px;
color: #000000;
background-color: #D8D8D8; }
headerbar:backdrop, headerbar:not(.titlebar):backdrop {
border-color: shade(#D8D8D8, 0.9);
background-color: #FFC000;
box-shadow: inset 1px 1px mix(#FFC000, #FFFFFF, 0.4), inset -1px -1px #FFC000; }
headerbar:backdrop {
color: #000000;
background-color: #D8D8D8; }
.titlebar headerbar, .titlebar headerbar:backdrop, .titlebar headerbar:not(.titlebar), .titlebar headerbar:not(.titlebar):backdrop {
background-color: transparent; }
.tiled headerbar:backdrop, .tiled headerbar, .tiled-top headerbar:backdrop, .tiled-top headerbar, .tiled-right headerbar:backdrop, .tiled-right headerbar, .tiled-bottom headerbar:backdrop, .tiled-bottom headerbar, .tiled-left headerbar:backdrop, .tiled-left headerbar, .maximized headerbar:backdrop, .maximized headerbar, .fullscreen headerbar:backdrop, .fullscreen headerbar, .tiled headerbar:not(.titlebar):backdrop, .tiled headerbar:not(.titlebar), .tiled-top headerbar:not(.titlebar):backdrop, .tiled-top headerbar:not(.titlebar), .tiled-right headerbar:not(.titlebar):backdrop, .tiled-right headerbar:not(.titlebar), .tiled-bottom headerbar:not(.titlebar):backdrop, .tiled-bottom headerbar:not(.titlebar), .tiled-left headerbar:not(.titlebar):backdrop, .tiled-left headerbar:not(.titlebar), .maximized headerbar:not(.titlebar):backdrop, .maximized headerbar:not(.titlebar), .fullscreen headerbar:not(.titlebar):backdrop, .fullscreen headerbar:not(.titlebar) {
background-color: #D8D8D8;
box-shadow: inset 1px 1px shade(white, 0.95), inset -1px -1px shade(#D8D8D8, 0.85); }
.tiled headerbar, .tiled headerbar:backdrop, .maximized headerbar, .maximized headerbar:backdrop {
border-radius: 0; }
headerbar .title, headerbar:not(.titlebar) .title {
separator:first-child + headerbar, separator:first-child + headerbar:backdrop, headerbar:first-child, headerbar:first-child:backdrop {
border-top-left-radius: 0px; }
.maximized separator:first-child + headerbar, .tiled separator:first-child + headerbar, .maximized separator:first-child + headerbar:backdrop, .tiled separator:first-child + headerbar:backdrop, .maximized headerbar:first-child, .tiled headerbar:first-child, .maximized headerbar:first-child:backdrop, .tiled headerbar:first-child:backdrop {
border-radius: 0; }
headerbar:last-child, headerbar:last-child:backdrop {
border-top-right-radius: 0px; }
.maximized headerbar:last-child, .tiled headerbar:last-child, .maximized headerbar:last-child:backdrop, .tiled headerbar:last-child:backdrop {
border-radius: 0; }
headerbar .title {
padding-left: 12px;
padding-right: 12px;
font-weight: bold; }
headerbar .subtitle, headerbar:not(.titlebar) .subtitle {
headerbar .subtitle {
font-size: smaller;
padding-left: 12px;
padding-right: 12px;
color: alpha(currentColor, 0.7); }
headerbar button, headerbar:not(.titlebar) button {
headerbar button {
padding: 4px 9px;
border-style: solid;
border-width: 1px;
@ -1558,24 +1561,50 @@ headerbar, headerbar:not(.titlebar) {
outline-offset: 2px;
outline-style: solid;
outline-color: alpha(black, 0.5); }
headerbar button:active, headerbar button:checked, headerbar:not(.titlebar) button:active, headerbar:not(.titlebar) button:checked {
headerbar button:active, headerbar button:checked {
background-color: shade(#D8D8D8, 0.9);
box-shadow: inset -3px -3px shade(#FFFFFF, 0.9), inset -1px -1px shade(#D8D8D8, 0.9), inset 2px 2px shade(#D8D8D8, 0.85), inset 1px 1px shade(#D8D8D8, 0.65); }
headerbar button:active:backdrop, headerbar button:checked:backdrop, headerbar:not(.titlebar) button:active:backdrop, headerbar:not(.titlebar) button:checked:backdrop {
headerbar button:active:backdrop, headerbar button:checked:backdrop {
box-shadow: inset -3px -3px shade(#FFFFFF, 0.9), inset -1px -1px shade(#D8D8D8, 0.9), inset 2px 2px shade(#D8D8D8, 0.85), inset 1px 1px shade(#D8D8D8, 0.65); }
headerbar button:active:disabled, headerbar button:checked:disabled, headerbar:not(.titlebar) button:active:disabled, headerbar:not(.titlebar) button:checked:disabled {
headerbar button:active:disabled, headerbar button:checked:disabled {
background-color: mix(#000000, #D8D8D8, 0.95);
color: mix(#000000, mix(#000000, #D8D8D8, 0.5), 0.1);
box-shadow: inset -3px -3px shade(#FFFFFF, 0.9), inset -1px -1px shade(#D8D8D8, 0.95), inset 2px 2px shade(#D8D8D8, 0.85), inset 1px 1px shade(#D8D8D8, 0.65); }
headerbar button:active:disabled:backdrop, headerbar button:checked:disabled:backdrop, headerbar:not(.titlebar) button:active:disabled:backdrop, headerbar:not(.titlebar) button:checked:disabled:backdrop {
headerbar button:active:disabled:backdrop, headerbar button:checked:disabled:backdrop {
box-shadow: inset -3px -3px shade(#FFFFFF, 0.9), inset -1px -1px shade(#D8D8D8, 0.95), inset 2px 2px shade(#D8D8D8, 0.85), inset 1px 1px shade(#D8D8D8, 0.65); }
headerbar button:disabled, headerbar:not(.titlebar) button:disabled {
headerbar button:disabled {
color: mix(#000000, mix(#000000, #D8D8D8, 0.5), 0.5);
box-shadow: inset 3px 3px white, inset 1px 1px #D8D8D8, inset -2px -2px shade(#D8D8D8, 0.95); }
headerbar button:backdrop, headerbar:not(.titlebar) button:backdrop {
headerbar button:backdrop {
box-shadow: inset 3px 3px white, inset 1px 1px #D8D8D8, inset -2px -2px shade(#D8D8D8, 0.85), inset -1px -1px shade(#D8D8D8, 0.65); }
headerbar entry, headerbar:not(.titlebar) entry {
headerbar entry {
padding: 4px 8px; }
headerbar.titlebar, .titlebar headerbar {
border-radius: 0px 0px 0px 0px; }
headerbar .titlebutton.close, headerbar .titlebutton.maximize, headerbar .titlebutton.minimize, headerbar .titlebutton:not(separator) {
min-width: 14px;
min-height: 14px;
padding: 0;
border: none;
box-shadow: none;
border-radius: 0;
color: transparent;
background-color: transparent;
-gtk-icon-shadow: none;
background-position: center center;
background-repeat: no-repeat; }
headerbar .titlebutton.close {
background: url("assets/close-focused.png") no-repeat no-repeat; }
headerbar .titlebutton.close:backdrop {
background: url("assets/close-unfocused.png") no-repeat no-repeat; }
headerbar .titlebutton.maximize {
background: url("assets/maximize-focused.png") no-repeat no-repeat; }
headerbar .titlebutton.maximize:backdrop {
background: url("assets/maximize-unfocused.png") no-repeat no-repeat; }
headerbar .titlebutton.minimize {
background: url("assets/minimize-focused.png") no-repeat no-repeat; }
headerbar .titlebutton.minimize:backdrop {
background: url("assets/minimize-unfocused.png") no-repeat no-repeat; }
toolbar {
padding: 4px;
@ -1883,9 +1912,13 @@ tooltip {
textview {
color: #000000;
background-color: #FFFFFF; }
textview text:selected, textview text selection, textview text:selected:focus, textview text selection:focus {
color: #FFFFFF;
background-color: #989898; }
textview text {
background-color: #FFFFFF; }
textview text:selected, textview text selection, textview text:selected:focus, textview text selection:focus {
color: #FFFFFF;
background-color: #989898; }
textview text:backdrop {
background-color: #FFFFFF; }
treeview {
-treeview-vertical-separator: 0; }
@ -2353,55 +2386,6 @@ decoration {
window.background.csd.popup {
border-radius: 0px; }
.titlebar {
border-bottom: none;
border-radius: 0px 0px 0px 0px; }
.titlebar .title {
padding-left: 12px;
padding-right: 12px;
font-weight: bold; }
.titlebar .subtitle {
font-size: smaller;
padding-left: 12px;
padding-right: 12px;
color: alpha(currentColor, 0.7); }
.titlebar .titlebutton.close, .titlebar .titlebutton.maximize, .titlebar .titlebutton.minimize, .titlebar .titlebutton:not(separator) {
min-width: 14px;
min-height: 14px;
padding: 0;
border: none;
box-shadow: none;
border-radius: 0;
color: transparent;
background-color: transparent;
-gtk-icon-shadow: none;
background-position: center center;
background-repeat: no-repeat; }
.titlebar .titlebutton.close {
background: url("assets/close-focused.png") no-repeat no-repeat; }
.titlebar .titlebutton.close:backdrop {
background: url("assets/close-unfocused.png") no-repeat no-repeat; }
.titlebar .titlebutton.maximize {
background: url("assets/maximize-focused.png") no-repeat no-repeat; }
.titlebar .titlebutton.maximize:backdrop {
background: url("assets/maximize-unfocused.png") no-repeat no-repeat; }
.titlebar .titlebutton.minimize {
background: url("assets/minimize-focused.png") no-repeat no-repeat; }
.titlebar .titlebutton.minimize:backdrop {
background: url("assets/minimize-unfocused.png") no-repeat no-repeat; }
.tiled .titlebar:not(headerbar), .tiled .titlebar:backdrop:not(headerbar), .maximized .titlebar:not(headerbar), .maximized .titlebar:backdrop:not(headerbar) {
border-radius: 0; }
.titlebar, .titlebar:not(headerbar), headerbar.default-decoration, .csd headerbar.default-decoration, .default-decoration.titlebar:not(headerbar), .csd .default-decoration.titlebar:not(headerbar) {
min-height: 30px;
color: #000000;
background-color: #FFC000;
box-shadow: inset 1px 1px mix(#FFC000, #FFFFFF, 0.4), inset -1px -1px #FFC000; }
.titlebar:backdrop, .titlebar:not(headerbar):backdrop, headerbar.default-decoration:backdrop, .csd headerbar.default-decoration:backdrop, .default-decoration.titlebar:not(headerbar):backdrop, .csd .default-decoration.titlebar:not(headerbar):backdrop {
color: #000000;
background-color: #D8D8D8;
box-shadow: inset 1px 1px shade(white, 0.95), inset -1px -1px shade(#D8D8D8, 0.85); }
messagedialog {
border-bottom-left-radius: 0px;
border-bottom-right-radius: 0px; }