Skip to content

Commit 3389f68

Browse files
hsbasugithub-actions[bot]
authored andcommitted
New upstream snapshot for GTK4
1 parent 43bf193 commit 3389f68

2 files changed

Lines changed: 22 additions & 19 deletions

File tree

gtk/upstream/gtk-4.0/Yaru/_common.scss

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2642,23 +2642,19 @@ check {
26422642
border-radius: 3px;
26432643
-gtk-icon-size: 14px;
26442644

2645-
&:checked { -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("#{$assets}/check-symbolic.symbolic.png")),
2646-
-gtk-recolor(url("#{$assets}/check@2-symbolic.symbolic.png"))); }
2645+
&:checked { -gtk-icon-source: -gtk-recolor(url("#{$assets}/check-symbolic.svg")); }
26472646

2648-
&:indeterminate { -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("#{$assets}/dash-symbolic.symbolic.png")),
2649-
-gtk-recolor(url("#{$assets}/dash@2-symbolic.symbolic.png"))); }
2647+
&:indeterminate { -gtk-icon-source: -gtk-recolor(url("#{$assets}/dash-symbolic.svg")); }
26502648
}
26512649

26522650
%radio,
26532651
radio {
26542652
border-radius: 100%;
26552653
-gtk-icon-size: 14px;
26562654

2657-
&:checked { -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("#{$assets}/bullet-symbolic.symbolic.png")),
2658-
-gtk-recolor(url("#{$assets}/bullet@2-symbolic.symbolic.png"))); }
2655+
&:checked { -gtk-icon-source: -gtk-recolor(url("#{$assets}/bullet-symbolic.svg")); }
26592656

2660-
&:indeterminate { -gtk-icon-source: -gtk-scaled(-gtk-recolor(url("#{$assets}/dash-symbolic.symbolic.png")),
2661-
-gtk-recolor(url("#{$assets}/dash@2-symbolic.symbolic.png"))); }
2657+
&:indeterminate { -gtk-icon-source: -gtk-recolor(url("#{$assets}/dash-symbolic.svg")); }
26622658
}
26632659

26642660
treeview.view check,

gtk/upstream/gtk-4.0/Yaru/_tweaks.scss

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -76,28 +76,35 @@ spinbutton:not(.vertical) {
7676
// titlebutton
7777
windowcontrols {
7878
button {
79-
min-width: 24px;
80-
}
79+
min-width: 24px;
8180

82-
button > image {
8381
$_base_button_color: transparentize($fg_color, 0.9);
8482
$_base_hover_color: transparentize($fg_color, 0.85);
8583
$_base_active_color: transparentize($fg_color, 0.75);
8684

87-
min-height: 20px;
88-
min-width: 20px;
89-
padding: 2px;
90-
margin: 0 3px;
85+
> image {
86+
min-height: 20px;
87+
min-width: 20px;
88+
padding: 2px;
89+
margin: 0 3px;
90+
91+
background: $_base_button_color;
92+
}
9193

92-
background: $_base_button_color;
94+
&:hover > image {
95+
//special case hover colors inside a headerbar
96+
@include button(undecorated-hover,$c:$_base_hover_color);
97+
}
9398

94-
&:hover {
95-
background: $_base_hover_color;
99+
&:active > image,
100+
&:checked > image {
101+
@include button(undecorated-active,$c:$_base_active_color);
96102
}
97103

104+
&:hover,
98105
&:active,
99106
&:checked {
100-
background: $_base_active_color;
107+
background: none;
101108
}
102109
}
103110
}

0 commit comments

Comments
 (0)