Fixed osd, first release for GTK4

This commit is contained in:
Eudaimon 2022-11-08 15:36:47 +01:00
parent 07eb10dbc6
commit 439cb4e870
2 changed files with 17 additions and 13 deletions

View File

@ -2279,7 +2279,7 @@ headerbar button.image-button {
GtkOverlay.osd { GtkOverlay.osd {
background-color: transparent; background-color: transparent;
} }
/*
.osd.button, .osd.button,
.osd.button:active, .osd.button:active,
.osd .button, .osd .button,
@ -2413,6 +2413,7 @@ GtkOverlay.osd {
color: @osd_button_fg_active; color: @osd_button_fg_active;
text-shadow: 0 -1px @osd_button_shadow; text-shadow: 0 -1px @osd_button_shadow;
} }
*/
.osd.toolbar, .osd.toolbar,
.osd toolbar { .osd toolbar {
@ -2430,7 +2431,7 @@ GtkOverlay.osd {
-GtkToolbar-button-relief: normal; -GtkToolbar-button-relief: normal;
} }
/*
.osd.toolbar .button, .osd.toolbar .button,
.osd toolbar button { .osd toolbar button {
padding: 4px; padding: 4px;
@ -2469,7 +2470,7 @@ GtkOverlay.osd {
border-style: solid; border-style: solid;
box-shadow: none; box-shadow: none;
} }*/
.osd.toolbar .separator { .osd.toolbar .separator {
color: shade(@osd_lowlight, 0.80); color: shade(@osd_lowlight, 0.80);
@ -2477,6 +2478,7 @@ GtkOverlay.osd {
/* used by gnome-settings-daemon's media-keys OSD /* used by gnome-settings-daemon's media-keys OSD
and Epiphany */ and Epiphany */
/*
.osd.trough, .osd.trough,
.osd trough { .osd trough {
background-color: @osd_trough_bg; background-color: @osd_trough_bg;
@ -2524,7 +2526,7 @@ progressbar.osd progress {
@progressbar_background_b); @progressbar_background_b);
border-radius: 0; border-radius: 0;
} }
*/

View File

@ -2173,7 +2173,7 @@ popover.menu accelerator:dir(rtl) { margin-right: 12px; }
/************ /************
* Toolbars * * Toolbars *
************/ ************/
toolbar, .toolbar { toolbar, .toolbar, .osd {
padding: 0; padding: 0;
border-radius: 0px; border-radius: 0px;
@ -2367,7 +2367,7 @@ headerbar button.image-button {
GtkOverlay.osd { GtkOverlay.osd {
background-color: transparent; background-color: transparent;
} }
/*
.osd.button, .osd.button,
.osd.button:active, .osd.button:active,
.osd .button, .osd .button,
@ -2501,7 +2501,7 @@ GtkOverlay.osd {
color: @osd_button_fg_active; color: @osd_button_fg_active;
text-shadow: 0 -1px @osd_button_shadow; text-shadow: 0 -1px @osd_button_shadow;
} }
*/
.osd.toolbar, .osd.toolbar,
.osd .toolbar { .osd .toolbar {
color: @osd_fg; color: @osd_fg;
@ -2518,7 +2518,7 @@ GtkOverlay.osd {
/*-GtkToolbar-button-relief: normal;*/ /*-GtkToolbar-button-relief: normal;*/
} }
/*
.osd.toolbar .button, .osd.toolbar .button,
.osd .toolbar button { .osd .toolbar button {
padding: 4px; padding: 4px;
@ -2558,13 +2558,14 @@ GtkOverlay.osd {
box-shadow: none; box-shadow: none;
} }
*/
.osd.toolbar .separator { .osd.toolbar .separator {
color: shade(@osd_lowlight, 0.80); color: shade(@osd_lowlight, 0.80);
} }
/* used by gnome-settings-daemon's media-keys OSD /* used by gnome-settings-daemon's media-keys OSD
and Epiphany */ and Epiphany */
/*
.osd.trough, .osd.trough,
.osd trough { .osd trough {
background-color: @osd_trough_bg; background-color: @osd_trough_bg;
@ -2612,7 +2613,7 @@ progressbar.osd progress {
@progressbar_background_b); @progressbar_background_b);
border-radius: 0; border-radius: 0;
} }
*/
@ -3257,14 +3258,14 @@ window.csd.solid-csd
inset 1px 1px 0 0 shade(@theme_bg_color, 1.4); inset 1px 1px 0 0 shade(@theme_bg_color, 1.4);
} }
.titlebar .titlebutton { windowcontrols > button {
background: none; background: none;
border-color: transparent; border-color: transparent;
border-image: none; border-image: none;
padding: 5px 5px 6px 5px; padding: 5px 5px 6px 5px;
} }
.titlebar .titlebutton:hover, .titlebar .titlebutton:checked { windowcontrols > button:hover, windowcontrols > button:checked {
/*background-image: linear-gradient(to bottom, /*background-image: linear-gradient(to bottom,
shade(@button_gradient_color_a, 1.1), shade(@button_gradient_color_a, 1.1),
shade(@button_gradient_color_b, 1.1));*/ shade(@button_gradient_color_b, 1.1));*/
@ -3274,7 +3275,7 @@ window.csd.solid-csd
color: @selected_fg_color; color: @selected_fg_color;
} }
.titlebar .titlebutton:active { windowcontrols > button:active {
/*background-image: linear-gradient(to bottom, /*background-image: linear-gradient(to bottom,
shade(@button_gradient_color_b, 0.97), shade(@button_gradient_color_b, 0.97),
shade(@button_gradient_color_a, 0.9));*/ shade(@button_gradient_color_a, 0.9));*/
@ -4045,6 +4046,7 @@ button,
.toolbar combobox button, .toolbar combobox button,
.primary-toolbar .toolbar combobox button, .primary-toolbar .toolbar combobox button,
.primary-toolbar.toolbar combobox button, .primary-toolbar.toolbar combobox button,
.osd,
switch slider { switch slider {
border-image: url("assets/button-border-dark.svg") 3 / 3px stretch; border-image: url("assets/button-border-dark.svg") 3 / 3px stretch;
} }