Skip to content

Commit d301c46

Browse files
vinceliuicevinceliuice
committed
update
1 parent 609eeeb commit d301c46

27 files changed

+729
-705
lines changed

‎src/_sass/_tweaks.scss

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,11 @@ $check_radio: 'default';
1515

1616
// Default corner radius value
1717
$default_corner: 12px;
18+
19+
$corner-style: 'default';
20+
21+
@if ($default_corner / 1px >= 10) {
22+
$corner-style: 'circular';
23+
} @else {
24+
$corner-style: 'square';
25+
}

‎src/gnome-shell/sass/_colors.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ $accent_color: lighten($primary_color, 3%);
8080
$panel_bg: if($blackness == 'true', #000000, #202020);
8181
$panel_bg_color: if($opacity == 'default', rgba(black, 0.5), $panel_bg);
8282
$panel_fg_color: if($panel == 'dark', #dedede, #dedede);
83-
$menu_bg_color: if($opacity == 'default', rgba($base_color, 0.95), $base_color);
83+
$menu_bg_color: if($opacity == 'default', rgba($base_color, 0.97), $base_color);
8484
$system_bg_color: if($blackness == 'true' and $variant == 'dark', #121212, #222222);
8585

8686
$link_color: $primary_color;

‎src/gnome-shell/sass/_common-3-28.scss

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -766,6 +766,9 @@ $mdborder_color: if($variant == 'light', transparent, rgba($white, 0.15));
766766
//
767767
// Popovers/Menus
768768
//
769+
770+
$submenu_item_radius: $popup_radius - $container_padding;
771+
769772
.popup-menu {
770773
min-width: 15em;
771774
color: $fg_color;
@@ -777,14 +780,14 @@ $mdborder_color: if($variant == 'light', transparent, rgba($white, 0.15));
777780
margin: 0 $container_padding;
778781
color: rgba(black, 0.75);
779782
background-color: if($variant == 'light', rgba(black, 0.10), rgba(white, 0.95));
780-
border-radius: 0 0 $buttons_radius $buttons_radius;
783+
border-radius: 0 0 $submenu_item_radius $submenu_item_radius;
781784
border: none;
782785
box-shadow: none;
783786
background-image: none;
784787

785788
.popup-menu-item {
786789
margin: 0;
787-
border-radius: $buttons_radius;
790+
border-radius: $submenu_item_radius;
788791
color: rgba(black, 0.75);
789792
background-image: none;
790793

@@ -816,7 +819,7 @@ $mdborder_color: if($variant == 'light', transparent, rgba($white, 0.15));
816819
padding: 6px;
817820
color: $fg_color;
818821
transition-duration: $shorter_duration;
819-
border-radius: $circular_radius;
822+
border-radius: if($corner-style == 'circular', $circular_radius, $submenu_item_radius);
820823
background-image: none;
821824

822825
&:ltr { padding-right: 1.5em; padding-left: 0; }
@@ -826,7 +829,7 @@ $mdborder_color: if($variant == 'light', transparent, rgba($white, 0.15));
826829
background-color: if($variant == 'light', rgba(black, 0.15), #eaeaea);
827830
color: rgba(black, 0.75);
828831
font-weight: normal;
829-
border-radius: $buttons_radius $buttons_radius 0 0;
832+
border-radius: $submenu_item_radius $submenu_item_radius 0 0;
830833
border: none;
831834
box-shadow: none;
832835

‎src/gnome-shell/sass/_common.scss

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ stage {
1414
color: $inverse_hint_fg_color;
1515
}
1616

17+
$bubble_button_radius: if($corner-style == 'circular', $circular_radius, $material_radius);
18+
1719
%bubble_button {
1820
border: none;
1921
margin-bottom: $container-padding;
@@ -29,20 +31,20 @@ stage {
2931
&:first-child {
3032
margin-left: $container-padding !important;
3133
margin-right: 0 !important;
32-
border-radius: $circular_radius 0 0 $circular_radius;
34+
border-radius: $bubble_button_radius 0 0 $bubble_button_radius;
3335
}
3436

3537
&:last-child {
3638
margin-left: 0 !important;
3739
margin-right: $container-padding !important;
3840
border-right-width: 0;
39-
border-radius: 0 $circular_radius $circular_radius 0;
41+
border-radius: 0 $bubble_button_radius $bubble_button_radius 0;
4042
}
4143

4244
&:first-child:last-child {
4345
margin: 0 $container-padding $container-padding $container-padding !important;
4446
border-right-width: 0;
45-
border-radius: $circular_radius;
47+
border-radius: $bubble_button_radius;
4648
}
4749
}
4850

‎src/gnome-shell/sass/_drawing.scss

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@
9999
caret-color: $secondary_fg_color;
100100
color: $secondary_fg_color;
101101
background-color: if($variant == 'light', $base_color, $inverse_divider_color);
102-
border-radius: 100px;
103102
margin: 2px 6px 6px;
104103
border: 2px solid transparent;
105104
box-shadow: 0 3px 3px rgba(black, 0.24), 0 5px 8px rgba(black, 0.05);
@@ -132,7 +131,6 @@
132131
caret-color: rgba(black, 0.75);
133132
color: rgba(black, 0.75);
134133
background-color: rgba(white, 0.75);
135-
border-radius: 100px;
136134
border-color: transparent;
137135
box-shadow: none;
138136
}

‎src/gnome-shell/sass/_tweaks.scss

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,11 @@ $theme: 'default';
1212

1313
// Default corner radius value
1414
$default_corner: 12px;
15+
16+
$corner-style: 'default';
17+
18+
@if ($default_corner / 1px >= 10) {
19+
$corner-style: 'circular';
20+
} @else {
21+
$corner-style: 'square';
22+
}

‎src/gnome-shell/sass/_variables.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ $bar_size: 4px;
3636
$menuitem_size: if($laptop == 'false', 32px, 28px);
3737

3838
// radiuses
39-
$popup_radius: $default_corner + 2px;
40-
$material_radius: $default_corner / 2 + 2px;
41-
$buttons_radius: $default_corner / 2;
39+
$popup_radius: $default_corner / 2 + $container_padding + 2px;
40+
$material_radius: $default_corner / 2 + 4px;
41+
$buttons_radius: $default_corner / 2 + 2px;
4242
$circular_radius: 9999px;
4343

4444
// durations

‎src/gnome-shell/sass/widgets/_app-grid.scss

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191

9292
& .folder-name-entry {
9393
min-height: 28px;
94-
padding: 6px;
94+
padding: $container_padding;
9595
border: none;
9696
color: $light_fg_color;
9797
background-color: rgba(white, 0.15);
@@ -123,10 +123,10 @@
123123
background-color: $inverse_divider_color;
124124
color: $inverse_secondary_fg_color;
125125
border: none;
126-
padding: 4px;
127-
width: 36px;
128-
height: 36px;
129-
border-radius: $circular-radius;
126+
height: 32px;
127+
width: 32px;
128+
padding: $container_padding;
129+
border-radius: if($corner-style == 'circular', $circular_radius, $buttons_radius);
130130

131131
& > StIcon { icon-size: 16px }
132132

‎src/gnome-shell/sass/widgets/_dash.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ $dash_placeholder_size: 32px;
55
$dash_padding: 10px;
66
$dash_spacing: 2px;
77
$dash_bottom_margin: 16px;
8-
$dash_border_radius: $circular_radius;
8+
$dash_border_radius: if($corner-style == 'circular', $circular_radius, $buttons_radius + $dash_padding + $dash_spacing);
99

1010
#dash {
1111
// font-size: 1em;
@@ -25,14 +25,14 @@ $dash_border_radius: $circular_radius;
2525

2626
.overview-icon {
2727
padding: $dash_padding / 2;
28-
border-radius: $circular_radius;
28+
border-radius: if($corner-style == 'circular', $circular_radius, $buttons_radius);
2929
}
3030
}
3131

3232
.dash-background {
3333
background-color: $dash_background_color;
3434
margin-bottom: $dash_bottom_margin;
35-
padding: $dash_padding;
35+
padding: $dash_padding + $dash_spacing $dash_padding;
3636
border-radius: $dash_border_radius;
3737
}
3838

@@ -49,7 +49,7 @@ $dash_border_radius: $circular_radius;
4949

5050
// OSD Tooltip
5151
.dash-label {
52-
border-radius: $circular_radius;
52+
border-radius: if($corner-style == 'circular', $circular_radius, $material_radius);
5353
padding: $container_padding $container_padding * 2;
5454
color: $inverse_fg_color;
5555
background-color: rgba(black, 0.75);

‎src/gnome-shell/sass/widgets/_dialogs.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ $mdborder_color: if($variant == 'light', rgba(black, 0.15), rgba(black, 0.75));
55
.headline { @include font(title); }
66

77
.modal-dialog {
8-
border-radius: 20px + $container_padding;
8+
border-radius: if($corner-style == 'circular', 20px + $container_padding, $material_radius + $container_padding);
99
color: $fg_color;
1010
background-color: $base_color;
1111
border: 0 none $mdborder_color;

‎src/gnome-shell/sass/widgets/_entries.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
StEntry {
44
min-height: $medium_size;
55
padding: 0 8px;
6-
border-radius: 0;
6+
border-radius: if($corner-style == 'circular', $circular_radius, $buttons_radius);
77
border-width: 0;
88
selection-background-color: $primary_color;
99
selected-color: $light_fg_color !important;

‎src/gnome-shell/sass/widgets/_panel.scss

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ $panel_transition_duration: 250ms; // same as the overview transition duration
2121
height: $medium_size - 2px;
2222
} @else {
2323
margin: $container_padding / 2;
24-
border-radius: $circular_radius;
24+
border-radius: if($corner-style == 'circular', $circular_radius, $material_radius + $container_padding / 2);
2525
height: $medium_size + 2px;
2626
}
2727

@@ -54,9 +54,13 @@ $panel_transition_duration: 250ms; // same as the overview transition duration
5454
-minimum-hpadding: $container_padding;
5555
transition-duration: 150ms;
5656
border: $container_padding / 2 solid transparent;
57-
border-radius: $circular_radius;
57+
border-radius: if($corner-style == 'circular', $circular_radius, $material_radius + $container_padding / 2);
5858
margin: 0;
5959

60+
&.clock-display .clock {
61+
border-radius: if($corner-style == 'circular', $circular_radius, $material_radius + $container_padding / 2);
62+
}
63+
6064
&:hover {
6165
background-color: transparent;
6266
box-shadow: inset 0 0 0 1000px $inverse_divider_color;
@@ -152,6 +156,7 @@ $panel_transition_duration: 250ms; // same as the overview transition duration
152156
Gjs_arcmenu_arcmenu_com_menuButton_ArcMenu_MenuButton.panel-button {
153157
border: none !important;
154158
margin: $container_padding / 2 !important;
159+
border-radius: if($corner-style == 'circular', $circular_radius, $material_radius);
155160

156161
&:hover {
157162
background-color: $inverse_divider_color;

‎src/gnome-shell/sass/widgets/_popovers-42.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ $submenu_item_radius: $popup_radius - $container_padding;
4141
padding: $container_padding;
4242
color: $fg_color !important;
4343
transition-duration: $shorter_duration;
44-
border-radius: $circular_radius;
44+
border-radius: if($corner-style == 'circular', $circular_radius, $submenu_item_radius);
4545
background-image: none;
4646
border: none;
4747

‎src/gnome-shell/sass/widgets/_popovers.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ $submenu_item_radius: $popup_radius - $container_padding;
4040
margin: 0 $container_padding;
4141
color: $fg_color;
4242
transition-duration: $shorter_duration;
43-
border-radius: $circular_radius;
43+
border-radius: if($corner-style == 'circular', $circular_radius, $submenu_item_radius);
4444
background-image: none;
4545

4646
&:ltr { padding-right:1.75em; padding-left: 0; }

‎src/gnome-shell/sass/widgets/_window-picker.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ $window_close_button_padding: 3px;
1515
.window-caption {
1616
color: $inverse_fg_color;
1717
background-color: $dark_bg_color;
18-
border-radius: 99px;
18+
border-radius: if($corner-style == 'circular', $circular_radius, $material_radius);
1919
padding: $container_padding $container_padding * 2;
2020
}
2121

0 commit comments

Comments
 (0)