Skip to content

Commit 3b85ff2

Browse files
committed
Fixed header/titlebar (maybe?)...
And some adaptions in gtk4.
1 parent 28edc1c commit 3b85ff2

11 files changed

+5551
-143
lines changed

gtk-3.0/gtk.css

Lines changed: 8 additions & 138 deletions
Original file line numberDiff line numberDiff line change
@@ -1964,32 +1964,6 @@ filechooserbutton:drop(active) {
19641964
/***************
19651965
* Header bars *
19661966
***************/
1967-
.raven .raven-header.top,
1968-
headerbar {
1969-
padding: 0 6px;
1970-
min-height: 40px;
1971-
border-width: 0 0 1px;
1972-
border-style: solid;
1973-
border-color: #070707;
1974-
border-radius: 0;
1975-
background: #1b1b1b linear-gradient(to top, #262626, #2b2b2b);
1976-
box-shadow: inset 0 1px rgba(238, 238, 236, 0.07);
1977-
/* Darken switchbuttons for headerbars. issue #1588 */
1978-
/* hide the close button separator */
1979-
}
1980-
1981-
.raven .raven-header.top:backdrop,
1982-
headerbar:backdrop {
1983-
border-color: #1b1b1b;
1984-
background-image: linear-gradient(to top, #353535, #353535);
1985-
box-shadow: inset 0 1px rgba(238, 238, 236, 0.07);
1986-
transition: 200ms ease-out;
1987-
}
1988-
1989-
.raven .raven-header.top:backdrop > *,
1990-
headerbar:backdrop > * {
1991-
opacity: 0.5;
1992-
}
19931967

19941968
.raven .raven-header.top leaflet:backdrop,
19951969
headerbar leaflet:backdrop {
@@ -2023,14 +1997,9 @@ headerbar button:not(.flat).toggle:checked {
20231997
border-top-color: #070707;
20241998
}
20251999

2026-
.tiled .raven .raven-header.top, .raven .tiled .raven-header.top, .tiled-top .raven .raven-header.top, .raven .tiled-top .raven-header.top, .tiled-right .raven .raven-header.top, .raven .tiled-right .raven-header.top, .tiled-bottom .raven .raven-header.top, .raven .tiled-bottom .raven-header.top, .tiled-left .raven .raven-header.top, .raven .tiled-left .raven-header.top, .maximized .raven .raven-header.top, .raven .maximized .raven-header.top, .fullscreen .raven .raven-header.top, .raven .fullscreen .raven-header.top, .tiled headerbar, .tiled-top headerbar, .tiled-right headerbar, .tiled-bottom headerbar, .tiled-left headerbar, .maximized headerbar, .fullscreen headerbar {
2000+
.tiled .raven .raven-header.top, .raven .tiled .raven-header.top, .tiled-top .raven .raven-header.top, .raven .tiled-top .raven-header.top, .tiled-right .raven .raven-header.top, .raven .tiled-right .raven-header.top, .tiled-bottom .raven .raven-header.top, .raven .tiled-bottom .raven-header.top, .tiled-left .raven .raven-header.top, .raven .tiled-left .raven-header.top, .maximized .raven .raven-header.top, .raven .maximized .raven-header.top, .fullscreen .raven .raven-header.top, .raven .fullscreen .raven-header.top, .tiled headerbar, .tiled-top headerbar, .tiled-right headerbar, .tiled-bottom headerbar, .tiled-left headerbar, .maximized headerbar, .fullscreen headerbar, .fullscreen .titlebar:not(headerbar), .maximized .titlebar:not(headerbar), .tiled .titlebar:not(headerbar), .tiled-top .titlebar:not(headerbar), .tiled-right .titlebar:not(headerbar), .tiled-bottom .titlebar:not(headerbar), .tiled-left .titlebar:not(headerbar) {
20272001
border-radius: 0;
2028-
}
2029-
2030-
.raven .default-decoration.raven-header.top,
2031-
headerbar.default-decoration {
2032-
min-height: 24px;
2033-
padding: 4px;
2002+
border: 1px solid #5c3566;
20342003
}
20352004

20362005
.raven .default-decoration.raven-header.top:backdrop,
@@ -2039,11 +2008,6 @@ headerbar.default-decoration:backdrop {
20392008
opacity: 1.0;
20402009
}
20412010

2042-
.raven .raven-header.top separator.titlebutton,
2043-
headerbar separator.titlebutton {
2044-
opacity: 0;
2045-
}
2046-
20472011
.solid-csd .raven .raven-header.top:dir(rtl), .raven .solid-csd .raven-header.top:dir(rtl), .solid-csd .raven .raven-header.top:dir(ltr), .raven .solid-csd .raven-header.top:dir(ltr), .solid-csd headerbar:backdrop:dir(rtl), .solid-csd headerbar:backdrop:dir(ltr), .solid-csd headerbar:dir(rtl), .solid-csd headerbar:dir(ltr) {
20482012
margin-left: -1px;
20492013
margin-right: -1px;
@@ -2067,21 +2031,11 @@ headerbar switch {
20672031
margin-bottom: 8px;
20682032
}
20692033

2070-
headerbar.titlebar headerbar:not(.titlebar) {
2071-
background: none;
2072-
box-shadow: none;
2073-
}
2074-
20752034
headerbar button.color {
20762035
min-width: 22px;
20772036
min-height: 14px;
20782037
}
20792038

2080-
.background .titlebar:backdrop, .background .titlebar {
2081-
border-top-left-radius: 8px;
2082-
border-top-right-radius: 8px;
2083-
}
2084-
20852039
.background.tiled .titlebar:backdrop, .background.tiled .titlebar,
20862040
.background.tiled-top .titlebar:backdrop,
20872041
.background.tiled-top .titlebar,
@@ -2097,6 +2051,7 @@ headerbar button.color {
20972051
.background.solid-csd .titlebar {
20982052
border-top-left-radius: 0;
20992053
border-top-right-radius: 0;
2054+
border: 1px solid #5c3566;
21002055
}
21012056

21022057
window separator:first-child + headerbar:backdrop, window separator:first-child + headerbar, window headerbar:first-child:backdrop, window headerbar:first-child {
@@ -2115,6 +2070,7 @@ window stack headerbar:first-child:backdrop, window stack headerbar:first-child,
21152070
window.tiled headerbar, window.tiled headerbar:first-child, window.tiled headerbar:last-child, window.tiled headerbar:only-child, window.tiled headerbar:backdrop, window.tiled headerbar:backdrop:first-child, window.tiled headerbar:backdrop:last-child, window.tiled headerbar:backdrop:only-child, window.tiled-top headerbar, window.tiled-top headerbar:first-child, window.tiled-top headerbar:last-child, window.tiled-top headerbar:only-child, window.tiled-top headerbar:backdrop, window.tiled-top headerbar:backdrop:first-child, window.tiled-top headerbar:backdrop:last-child, window.tiled-top headerbar:backdrop:only-child, window.tiled-right headerbar, window.tiled-right headerbar:first-child, window.tiled-right headerbar:last-child, window.tiled-right headerbar:only-child, window.tiled-right headerbar:backdrop, window.tiled-right headerbar:backdrop:first-child, window.tiled-right headerbar:backdrop:last-child, window.tiled-right headerbar:backdrop:only-child, window.tiled-bottom headerbar, window.tiled-bottom headerbar:first-child, window.tiled-bottom headerbar:last-child, window.tiled-bottom headerbar:only-child, window.tiled-bottom headerbar:backdrop, window.tiled-bottom headerbar:backdrop:first-child, window.tiled-bottom headerbar:backdrop:last-child, window.tiled-bottom headerbar:backdrop:only-child, window.tiled-left headerbar, window.tiled-left headerbar:first-child, window.tiled-left headerbar:last-child, window.tiled-left headerbar:only-child, window.tiled-left headerbar:backdrop, window.tiled-left headerbar:backdrop:first-child, window.tiled-left headerbar:backdrop:last-child, window.tiled-left headerbar:backdrop:only-child, window.maximized headerbar, window.maximized headerbar:first-child, window.maximized headerbar:last-child, window.maximized headerbar:only-child, window.maximized headerbar:backdrop, window.maximized headerbar:backdrop:first-child, window.maximized headerbar:backdrop:last-child, window.maximized headerbar:backdrop:only-child, window.fullscreen headerbar, window.fullscreen headerbar:first-child, window.fullscreen headerbar:last-child, window.fullscreen headerbar:only-child, window.fullscreen headerbar:backdrop, window.fullscreen headerbar:backdrop:first-child, window.fullscreen headerbar:backdrop:last-child, window.fullscreen headerbar:backdrop:only-child, window.solid-csd headerbar, window.solid-csd headerbar:first-child, window.solid-csd headerbar:last-child, window.solid-csd headerbar:only-child, window.solid-csd headerbar:backdrop, window.solid-csd headerbar:backdrop:first-child, window.solid-csd headerbar:backdrop:last-child, window.solid-csd headerbar:backdrop:only-child {
21162071
border-top-left-radius: 0;
21172072
border-top-right-radius: 0;
2073+
border: 1px solid #5c3566;
21182074
}
21192075

21202076
.titlebar:not(headerbar) separator {
@@ -5005,7 +4961,8 @@ viewswitcherbar actionbar > revealer > box {
50054961
*********************/
50064962
decoration {
50074963
border-radius: 8px 8px 0 0;
5008-
border-width: 0px;
4964+
border-width: 1px;
4965+
border-color: #5c3566;
50094966
box-shadow: 0 1px 3px 3px transparent, 0 2px 8px 2px rgba(0, 0, 0, 0.13), 0 3px 20px 10px rgba(0, 0, 0, 0.09), 0 6px 32px 16px rgba(0, 0, 0, 0.04), 0 0 0 1px rgba(0, 0, 0, 0.75);
50104967
margin: 10px;
50114968
}
@@ -6679,94 +6636,7 @@ dialog.xfsm-logout-dialog.keycap separator.horizontal {
66796636
border-radius: 0;
66806637
}
66816638

6682-
/* Changes for Modern theme
6683-
(this should work, i guess) */
6684-
6685-
/* Settings for header/titlebar */
6686-
.raven .raven-header.top, .titlebar:not(headerbar), headerbar {
6687-
padding: 0 6px;
6688-
min-height: 16px;
6689-
border-width: 0 0 1px;
6690-
border-style: solid;
6691-
border-color: #5c3566;
6692-
border-radius: 8px 8px 0 0;
6693-
background: linear-gradient(to top, #75507b, #8A5F91);
6694-
box-shadow: inset 0 1px rgba(238, 238, 236, 0.07);
6695-
}
6696-
6697-
.titlebar:backdrop:not(headerbar), headerbar:backdrop {
6698-
border-color: #202020;
6699-
background-color: #75507b;
6700-
background-image: none;
6701-
box-shadow: inset 0 1px rgba(238, 238, 236, 0.07);
6702-
transition: 200ms ease-out;
6703-
}
6704-
6705-
.titlebar:not(headerbar) separator {
6706-
background: #5c3566
6707-
}
6708-
6709-
.default-decoration.titlebar:not(headerbar), headerbar.default-decoration {
6710-
min-height: 16px;
6711-
padding: 2px 4px;
6712-
border-radius: 8px 8px 0 0;
6713-
}
6714-
6715-
6716-
/* Settings for header/titlebar buttons */
6717-
6718-
button.titlebutton {
6719-
min-height: 16px;
6720-
min-width: 16px;
6721-
padding: 2px 2px;
6722-
border-radius: 5px;
6723-
}
6724-
6725-
.raven .default-decoration.raven-header.top button.titlebutton,
6726-
headerbar.default-decoration button.titlebutton {
6727-
min-height: 16px;
6728-
min-width: 16px;
6729-
margin: 0;
6730-
padding: 0;
6731-
}
6732-
6733-
button.titlebutton:not(.appmenu) {
6734-
border-radius: 5px;
6735-
padding: 1px;
6736-
margin: 0;
6737-
min-width: 16px;
6738-
min-height: 16px;
6739-
}
6740-
6741-
button.titlebutton, .default-decoration.titlebar:not(headerbar) button.titlebutton, .incognito-mode headerbar button.titlebutton, .incognito-mode actionbar button.titlebutton {
6742-
padding: 1px;
6743-
border-color: #5c3566;
6744-
background: linear-gradient(180deg, #A06EA8, #8A5F91);
6745-
}
6746-
6747-
titlebar button, headerbar button, .titlebar button.destructive-action, .titlebar .linked button, .titlebar button:first-child {
6748-
border-color: #5c3566;
6749-
background: linear-gradient(180deg, #A06EA8, #8A5F91);
6750-
}
6751-
6752-
titlebar button:hover, headerbar button:hover, .titlebar button.destructive-action:hover, .titlebar .linked button:hover, .titlebar button:hover:first-child, .incognito-mode headerbar button:hover, .incognito-mode actionbar button:hover {
6753-
border-color: #5c3566;
6754-
background: #A06EA8;
6755-
}
6756-
6757-
titlebar button:hover:active, headerbar button:hover:active, .titlebar button.destructive-action:hover:active, .titlebar .linked button:hover:active, .titlebar button:hover:active:first-child, .incognito-mode headerbar button:hover:active, .incognito-mode actionbar button:hover:active {
6758-
border-color: #5c3566;
6759-
background: #75507b;
6760-
}
6761-
6762-
titlebar button:checked, headerbar button:checked, .titlebar button.destructive-action:checked, .titlebar .linked button:checked, .titlebar button:checked:first-child, .incognito-mode headerbar button:checked, .incognito-mode actionbar button:checked {
6763-
border-color: #5c3566;
6764-
background: #75507b;
6765-
}
6766-
6767-
button.titlebutton:backdrop, .default-decoration.titlebar:not(headerbar) button.titlebutton:backdrop, .titlebar button:backdrop, .titlebar .linked button:backdrop, .titlebar button.suggested-action:backdrop, .titlebar button.destructive-action:backdrop {
6768-
background: #75507b;
6769-
}
6639+
@import url("th-gtk-tweaks.css");
67706640

67716641
/* GTK NAMED COLORS
67726642
----------------
@@ -6840,7 +6710,7 @@ read if you used those and something break with a version upgrade you're on your
68406710
@define-color wm_bg_a #2b2b2b;
68416711
@define-color wm_bg_b #262626;
68426712
@define-color wm_shadow alpha(black, 0.35);
6843-
@define-color wm_border #070707;
6713+
@define-color wm_border #5c3566;
68446714
@define-color wm_button_hover_color_a #111111;
68456715
@define-color wm_button_hover_color_b #353535;
68466716
@define-color wm_button_active_color_a #070707;

gtk-3.0/th-gtk-tweaks.css

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
/* Changes for Modern theme
2+
(this should work, i guess) */
3+
4+
/* Settings for header/titlebar */
5+
.raven .raven-header.top, .titlebar:not(headerbar), headerbar {
6+
padding: 0px 6px;
7+
min-height: 24px;
8+
border-bottom-style: 1px solid #5c3566;
9+
border-radius: 8px 8px 0 0;
10+
background: linear-gradient(to top, #75507b, #8A5F91);
11+
}
12+
13+
.titlebar:backdrop:not(headerbar), headerbar:backdrop {
14+
border-color: #202020;
15+
background-color: #75507b;
16+
background-image: none;
17+
box-shadow: inset 0 1px rgba(238, 238, 236, 0.07);
18+
transition: 200ms ease-out;
19+
}
20+
21+
.titlebar:not(headerbar) separator {
22+
background: #5c3566;
23+
}
24+
25+
.default-decoration.titlebar:not(headerbar), headerbar.default-decoration {
26+
min-height: 24px;
27+
padding: 2px 4px;
28+
border-radius: 8px 8px 0 0;
29+
}
30+
31+
/* Settings for header/titlebar buttons */
32+
33+
button.titlebutton {
34+
min-height: 18px;
35+
min-width: 18px;
36+
padding: 1px;
37+
border-radius: 5px;
38+
}
39+
40+
.raven .default-decoration.raven-header.top button.titlebutton,
41+
headerbar.default-decoration button.titlebutton {
42+
min-height: 18px;
43+
min-width: 18px;
44+
margin: 0;
45+
padding: 1px;
46+
}
47+
48+
button.titlebutton:not(.appmenu) {
49+
border-radius: 5px;
50+
padding: 1px;
51+
margin: 0;
52+
min-width: 18px;
53+
min-height: 18px;
54+
}
55+
56+
button.titlebutton, .default-decoration.titlebar:not(headerbar) button.titlebutton, .incognito-mode headerbar button.titlebutton, .incognito-mode actionbar button.titlebutton {
57+
padding: 1px;
58+
border-color: #5c3566;
59+
background: linear-gradient(180deg, #A06EA8, #8A5F91);
60+
}
61+
62+
titlebar button, headerbar button, .titlebar button.destructive-action, .titlebar .linked button, .titlebar button:first-child {
63+
border-color: #5c3566;
64+
background: linear-gradient(180deg, #A06EA8, #8A5F91);
65+
}
66+
67+
titlebar button:hover, headerbar button:hover, .titlebar button.destructive-action:hover, .titlebar .linked button:hover, .titlebar button:hover:first-child, .incognito-mode headerbar button:hover, .incognito-mode actionbar button:hover {
68+
border-color: #5c3566;
69+
background: #A06EA8;
70+
}
71+
72+
titlebar button:hover:active, headerbar button:hover:active, .titlebar button.destructive-action:hover:active, .titlebar .linked button:hover:active, .titlebar button:hover:active:first-child, .incognito-mode headerbar button:hover:active, .incognito-mode actionbar button:hover:active {
73+
border-color: #5c3566;
74+
background: #75507b;
75+
}
76+
77+
titlebar button:checked, headerbar button:checked, .titlebar button.destructive-action:checked, .titlebar .linked button:checked, .titlebar button:checked:first-child, .incognito-mode headerbar button:checked, .incognito-mode actionbar button:checked {
78+
border-color: #5c3566;
79+
background: #75507b;
80+
}
81+
82+
button.titlebutton:backdrop, .default-decoration.titlebar:not(headerbar) button.titlebutton:backdrop, .titlebar button:backdrop, .titlebar .linked button:backdrop, .titlebar button.suggested-action:backdrop, .titlebar button.destructive-action:backdrop {
83+
background: #75507b;
84+
}
165 Bytes
Loading
268 Bytes
Loading
244 Bytes
Loading
369 Bytes
Loading
130 Bytes
Loading
183 Bytes
Loading

gtk-4.0/assets/devel-symbolic.svg

Lines changed: 1 addition & 0 deletions
Loading

0 commit comments

Comments
 (0)