Skip to content

Commit 38b36e3

Browse files
hsbasugithub-actions[bot]
authored andcommitted
New upstream snapshot for GTK3
1 parent 43bf193 commit 38b36e3

132 files changed

Lines changed: 1501 additions & 59 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

gtk/upstream/gtk-3.0/Yaru/README

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,12 @@ Summary
33

44
* Do not edit the CSS directly, edit the source SCSS files
55
* To be able to use the latest/adequate version of SASS, install sassc
6-
* The configure script will detect whether or not you have sassc installed;
6+
* Meson will detect whether or not you have sassc installed;
77
if you do, it will regenerate the CSS every time you modify the SCSS files
88
and rebuild GTK+.
9+
* When submitting a MR with SCSS changes remember to also include the
10+
corresponding CSS changes (generated locally by Meson as described earlier
11+
or manually generated by running parse-sass.sh script).
912

1013
How to tweak the theme
1114
----------------------

gtk/upstream/gtk-3.0/Yaru/_colors.scss

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,13 @@
22
// it gets @if ed depending on $variant
33
@import 'palette';
44

5+
$light_bg_color: #FAFAFA;
6+
$dark_bg_color: lighten($jet, 8%);
7+
58
$base_color: if($variant == 'light', #ffffff, lighten($jet, 6%));
69
$text_color: if($variant == 'light', black, white);
710
$caret_color: if($variant == 'light', lighten($text_color, 5%), darken($text_color, 3%));
8-
$bg_color: if($variant == 'light', #FAFAFA, lighten($jet, 8%));
11+
$bg_color: if($variant =='light', $light_bg_color, $dark_bg_color);
912
$fg_color: if($variant == 'light', $inkstone, $porcelain);
1013

1114
$selected_fg_color: $accent_fg_color;

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ $asset_suffix: if($variant=='dark', '-dark', '');
77
$backdrop_transition: 200ms ease-out;
88
$button_transition: all 200ms $ease-out-quad;
99
$button_radius: 6px; // Yaru change: sync radius with Gtk4
10-
$menu_radius: 6px; // Yaru change: ↑↑↑
11-
$window_radius: $button_radius + 6; // Yaru change: ↑↑↑
10+
$menu_radius: 8px;
11+
$window_radius: 15px; // Yaru change: ↑↑↑
1212
$popover_radius: $window_radius; // Yaru change: ↑↑↑
1313

1414
// Optional compact sizes for buttons, headerbar and headerbar widgets
@@ -3064,21 +3064,21 @@ check {
30643064
border-radius: 3px;
30653065

30663066
&:checked { -gtk-icon-source: image(-gtk-recolor(url("assets/check-symbolic.svg")),
3067-
-gtk-recolor(url("assets/check-symbolic.symbolic.png"))); }
3067+
url("assets/check-symbolic.symbolic.png")); }
30683068

30693069
&:indeterminate { -gtk-icon-source: image(-gtk-recolor(url("assets/dash-symbolic.svg")),
3070-
-gtk-recolor(url("assets/dash-symbolic.symbolic.png"))); }
3070+
url("assets/dash-symbolic.symbolic.png")); }
30713071
}
30723072

30733073
%radio,
30743074
radio {
30753075
border-radius: 100%;
30763076

30773077
&:checked { -gtk-icon-source: image(-gtk-recolor(url("assets/bullet-symbolic.svg")),
3078-
-gtk-recolor(url("assets/bullet-symbolic.symbolic.png"))); }
3078+
url("assets/bullet-symbolic.symbolic.png")); }
30793079

30803080
&:indeterminate { -gtk-icon-source: image(-gtk-recolor(url("assets/dash-symbolic.svg")),
3081-
-gtk-recolor(url("assets/dash-symbolic.symbolic.png"))); }
3081+
url("assets/dash-symbolic.symbolic.png")); }
30823082
}
30833083

30843084
// ANIMATION:
Lines changed: 63 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,71 @@
11
// Style DING (Desktop Icons NG) menus like GS ones
22

3+
// These definitions match the gnome shell ones.
4+
$base_border_radius: 8px;
5+
$modal_radius: $base_border_radius * 2;
6+
$menuitem_border_radius: $base_border_radius * 1.5;
7+
$shell_menu_radius: $modal_radius * 1.25;
8+
9+
$outer_borders_color: if($variant == 'light', darken($bg_color, 7%), lighten($bg_color, 5%));
10+
$shadow_color: if($variant == 'light', rgba(0,0,0,.05), rgba(0,0,0,0.2));
11+
312
menu.desktopmenu {
13+
.csd & {
14+
border: 1px solid $outer_borders_color;
15+
border-radius: $shell_menu_radius;
16+
}
17+
418
menuitem {
5-
margin: 0 .25rem;
6-
padding: .5rem;
7-
border-radius: $menu_radius - 1px;
19+
margin: 0 6px;
20+
&:first-child {
21+
margin-top: 2px;
22+
}
23+
&:last-child {
24+
margin-bottom: 2px;
25+
}
26+
27+
padding: 10px 0;
28+
29+
&:dir(ltr) {
30+
padding-left: 5px;
31+
padding-right: 10px;
32+
}
33+
&:dir(rtl) {
34+
padding-left: 10px;
35+
padding-right: 5px;
36+
}
37+
38+
border-radius: $menuitem_border_radius;
839
}
9-
40+
1041
separator {
11-
margin: .25rem 1rem;
42+
margin: 8px 1rem;
43+
44+
&:dir(ltr) {
45+
margin-left: 2.5em;
46+
}
47+
&:dir(rtl) {
48+
margin-right: 2.5em;
49+
}
50+
}
51+
52+
> arrow {
53+
&.top {
54+
border-top-right-radius: $menuitem_border_radius;
55+
border-top-left-radius: $menuitem_border_radius;
56+
}
57+
58+
&.bottom {
59+
border-bottom-right-radius: $menuitem_border_radius;
60+
border-bottom-left-radius: $menuitem_border_radius;
61+
}
62+
}
63+
}
64+
65+
decoration {
66+
.desktopmenu.csd.popup & {
67+
border-radius: $shell_menu_radius;
68+
box-shadow: 0 1px 2px transparentize(black, 0.8),
69+
0 2px 4px 0 $shadow_color;
1270
}
1371
}

0 commit comments

Comments
 (0)