Skip to content

Commit f982fcd

Browse files
vinceliuicevinceliuice
committed
Fixed #292 
1 parent 9371bbf commit f982fcd

14 files changed

+127
-42
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,5 @@ $bubble_button_radius: if($corner_style == 'circular', $circular-radius, $materi
6464
background-color: $system;
6565
border: none;
6666
box-shadow: $shell-shadow-z4;
67-
border-radius: $circular-radius;
6867
padding: $space-size * 2;
6968
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ StWidget.focused .app-well-app-running-dot {
199199
.system-action-icon {
200200
background-color: rgba(0,0,0,0.8);
201201
color: #fff;
202-
border-radius: 99px;
202+
border-radius: $circular-radius;
203203
}
204204

205205
.page-navigation-hint {

‎src/_sass/gnome-shell/widgets/_osd-42.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ $osd_levelbar_height: 4px;
99
spacing: $space-size * 2;
1010
padding: $space-size * 2 $space-size * 3;
1111
margin-bottom: 8em;
12+
border-radius: $circular-radius;
1213

1314
& > * { spacing: 8px; }
1415

@@ -68,4 +69,5 @@ $osd_levelbar_height: 4px;
6869

6970
.resize-popup {
7071
@extend %osd_panel;
72+
border-radius: $window-radius;
7173
}

‎src/_sass/gnome-shell/widgets/_osd.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ $osd_levelbar_height: 4px;
1010
margin: $margin-size * 8; // 32px
1111
min-width: 64px;
1212
min-height: 64px;
13+
border-radius: $window-radius;
1314

1415
StIcon {
1516
icon-size: 96px;

‎src/_sass/gnome-shell/widgets/_switcher-popup.scss

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
// switcher onscreen panel
99
.switcher-list {
1010
@extend %osd_panel;
11+
border-radius: $window-radius;
1112

1213
.item-box {
1314
padding: 8px;
@@ -20,7 +21,7 @@
2021

2122
&:selected {
2223
background-color: $primary;
23-
color: on(dark);
24+
color: on($primary);
2425
}
2526
}
2627

@@ -45,10 +46,11 @@
4546
}
4647

4748
.switcher-arrow {
48-
border-color: rgba(0,0,0,0);
49-
color: $text-disabled;
49+
border-color: on(dark, secondary);
50+
color: on(dark, secondary);
51+
5052
&:highlighted {
51-
color: $text;
53+
color: on($primary);
5254
}
5355
}
5456

‎src/_sass/gnome-shell/widgets/_workspace-switcher.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
.workspace-switcher-container {
77
@extend %osd_panel;
8+
border-radius: $window-radius;
89
}
910

1011
.workspace-switcher {

‎src/gnome-shell/shell-40-0/gnome-shell-Compact.css

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ stage {
8888
background-color: #212121;
8989
border: none;
9090
box-shadow: 0 6px 10px rgba(0, 0, 0, 0.32);
91-
border-radius: 9999px;
9291
padding: 8px;
9392
}
9493

@@ -1768,6 +1767,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
17681767
margin: 16px;
17691768
min-width: 64px;
17701769
min-height: 64px;
1770+
border-radius: 16px;
17711771
}
17721772

17731773
.osd-window StIcon {
@@ -1813,6 +1813,10 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
18131813
spacing: 16px;
18141814
}
18151815

1816+
.switcher-list {
1817+
border-radius: 16px;
1818+
}
1819+
18161820
.switcher-list .item-box {
18171821
padding: 8px;
18181822
border-radius: 10px;
@@ -1847,12 +1851,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
18471851
}
18481852

18491853
.switcher-arrow {
1850-
border-color: rgba(0, 0, 0, 0);
1851-
color: rgba(0, 0, 0, 0.38);
1854+
border-color: rgba(255, 255, 255, 0.7);
1855+
color: rgba(255, 255, 255, 0.7);
18521856
}
18531857

18541858
.switcher-arrow:highlighted {
1855-
color: rgba(0, 0, 0, 0.87);
1859+
color: white;
18561860
}
18571861

18581862
.input-source-switcher-symbol {
@@ -1870,6 +1874,10 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
18701874
padding: 8px;
18711875
}
18721876

1877+
.workspace-switcher-container {
1878+
border-radius: 16px;
1879+
}
1880+
18731881
.workspace-switcher {
18741882
background: transparent;
18751883
border: none;
@@ -2584,7 +2592,7 @@ StWidget.focused .app-well-app-running-dot {
25842592
.system-action-icon {
25852593
background-color: rgba(0, 0, 0, 0.8);
25862594
color: #fff;
2587-
border-radius: 99px;
2595+
border-radius: 9999px;
25882596
}
25892597

25902598
.page-navigation-hint {

‎src/gnome-shell/shell-40-0/gnome-shell-Dark-Compact.css

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ stage {
8888
background-color: #212121;
8989
border: none;
9090
box-shadow: 0 6px 10px rgba(0, 0, 0, 0.32);
91-
border-radius: 9999px;
9291
padding: 8px;
9392
}
9493

@@ -1768,6 +1767,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
17681767
margin: 16px;
17691768
min-width: 64px;
17701769
min-height: 64px;
1770+
border-radius: 16px;
17711771
}
17721772

17731773
.osd-window StIcon {
@@ -1813,6 +1813,10 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
18131813
spacing: 16px;
18141814
}
18151815

1816+
.switcher-list {
1817+
border-radius: 16px;
1818+
}
1819+
18161820
.switcher-list .item-box {
18171821
padding: 8px;
18181822
border-radius: 10px;
@@ -1847,8 +1851,8 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
18471851
}
18481852

18491853
.switcher-arrow {
1850-
border-color: rgba(0, 0, 0, 0);
1851-
color: rgba(255, 255, 255, 0.5);
1854+
border-color: rgba(255, 255, 255, 0.7);
1855+
color: rgba(255, 255, 255, 0.7);
18521856
}
18531857

18541858
.switcher-arrow:highlighted {
@@ -1870,6 +1874,10 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
18701874
padding: 8px;
18711875
}
18721876

1877+
.workspace-switcher-container {
1878+
border-radius: 16px;
1879+
}
1880+
18731881
.workspace-switcher {
18741882
background: transparent;
18751883
border: none;
@@ -2584,7 +2592,7 @@ StWidget.focused .app-well-app-running-dot {
25842592
.system-action-icon {
25852593
background-color: rgba(0, 0, 0, 0.8);
25862594
color: #fff;
2587-
border-radius: 99px;
2595+
border-radius: 9999px;
25882596
}
25892597

25902598
.page-navigation-hint {

‎src/gnome-shell/shell-40-0/gnome-shell-Dark.css

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ stage {
8888
background-color: #212121;
8989
border: none;
9090
box-shadow: 0 6px 10px rgba(0, 0, 0, 0.32);
91-
border-radius: 9999px;
9291
padding: 12px;
9392
}
9493

@@ -1768,6 +1767,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
17681767
margin: 32px;
17691768
min-width: 64px;
17701769
min-height: 64px;
1770+
border-radius: 18px;
17711771
}
17721772

17731773
.osd-window StIcon {
@@ -1813,6 +1813,10 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
18131813
spacing: 24px;
18141814
}
18151815

1816+
.switcher-list {
1817+
border-radius: 18px;
1818+
}
1819+
18161820
.switcher-list .item-box {
18171821
padding: 8px;
18181822
border-radius: 10px;
@@ -1847,8 +1851,8 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
18471851
}
18481852

18491853
.switcher-arrow {
1850-
border-color: rgba(0, 0, 0, 0);
1851-
color: rgba(255, 255, 255, 0.5);
1854+
border-color: rgba(255, 255, 255, 0.7);
1855+
color: rgba(255, 255, 255, 0.7);
18521856
}
18531857

18541858
.switcher-arrow:highlighted {
@@ -1870,6 +1874,10 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
18701874
padding: 12px;
18711875
}
18721876

1877+
.workspace-switcher-container {
1878+
border-radius: 18px;
1879+
}
1880+
18731881
.workspace-switcher {
18741882
background: transparent;
18751883
border: none;
@@ -2584,7 +2592,7 @@ StWidget.focused .app-well-app-running-dot {
25842592
.system-action-icon {
25852593
background-color: rgba(0, 0, 0, 0.8);
25862594
color: #fff;
2587-
border-radius: 99px;
2595+
border-radius: 9999px;
25882596
}
25892597

25902598
.page-navigation-hint {

‎src/gnome-shell/shell-40-0/gnome-shell.css

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ stage {
8888
background-color: #212121;
8989
border: none;
9090
box-shadow: 0 6px 10px rgba(0, 0, 0, 0.32);
91-
border-radius: 9999px;
9291
padding: 12px;
9392
}
9493

@@ -1768,6 +1767,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
17681767
margin: 32px;
17691768
min-width: 64px;
17701769
min-height: 64px;
1770+
border-radius: 18px;
17711771
}
17721772

17731773
.osd-window StIcon {
@@ -1813,6 +1813,10 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
18131813
spacing: 24px;
18141814
}
18151815

1816+
.switcher-list {
1817+
border-radius: 18px;
1818+
}
1819+
18161820
.switcher-list .item-box {
18171821
padding: 8px;
18181822
border-radius: 10px;
@@ -1847,12 +1851,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
18471851
}
18481852

18491853
.switcher-arrow {
1850-
border-color: rgba(0, 0, 0, 0);
1851-
color: rgba(0, 0, 0, 0.38);
1854+
border-color: rgba(255, 255, 255, 0.7);
1855+
color: rgba(255, 255, 255, 0.7);
18521856
}
18531857

18541858
.switcher-arrow:highlighted {
1855-
color: rgba(0, 0, 0, 0.87);
1859+
color: white;
18561860
}
18571861

18581862
.input-source-switcher-symbol {
@@ -1870,6 +1874,10 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
18701874
padding: 12px;
18711875
}
18721876

1877+
.workspace-switcher-container {
1878+
border-radius: 18px;
1879+
}
1880+
18731881
.workspace-switcher {
18741882
background: transparent;
18751883
border: none;
@@ -2584,7 +2592,7 @@ StWidget.focused .app-well-app-running-dot {
25842592
.system-action-icon {
25852593
background-color: rgba(0, 0, 0, 0.8);
25862594
color: #fff;
2587-
border-radius: 99px;
2595+
border-radius: 9999px;
25882596
}
25892597

25902598
.page-navigation-hint {

‎src/gnome-shell/shell-42-0/gnome-shell-Compact.css

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,6 @@ stage {
142142
background-color: #212121;
143143
border: none;
144144
box-shadow: 0 6px 10px rgba(0, 0, 0, 0.32);
145-
border-radius: 9999px;
146145
padding: 8px;
147146
}
148147

@@ -2093,6 +2092,7 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
20932092
spacing: 8px;
20942093
padding: 8px 12px;
20952094
margin-bottom: 8em;
2095+
border-radius: 9999px;
20962096
}
20972097

20982098
.osd-window > * {
@@ -2167,12 +2167,20 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
21672167
width: 15em;
21682168
}
21692169

2170+
.resize-popup {
2171+
border-radius: 16px;
2172+
}
2173+
21702174
/* App Switcher */
21712175
.switcher-popup {
21722176
padding: 8px;
21732177
spacing: 16px;
21742178
}
21752179

2180+
.switcher-list {
2181+
border-radius: 16px;
2182+
}
2183+
21762184
.switcher-list .item-box {
21772185
padding: 8px;
21782186
border-radius: 10px;
@@ -2207,12 +2215,12 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
22072215
}
22082216

22092217
.switcher-arrow {
2210-
border-color: rgba(0, 0, 0, 0);
2211-
color: rgba(0, 0, 0, 0.38);
2218+
border-color: rgba(255, 255, 255, 0.7);
2219+
color: rgba(255, 255, 255, 0.7);
22122220
}
22132221

22142222
.switcher-arrow:highlighted {
2215-
color: rgba(0, 0, 0, 0.87);
2223+
color: white;
22162224
}
22172225

22182226
.input-source-switcher-symbol {
@@ -2230,6 +2238,10 @@ StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
22302238
padding: 8px;
22312239
}
22322240

2241+
.workspace-switcher-container {
2242+
border-radius: 16px;
2243+
}
2244+
22332245
.workspace-switcher {
22342246
background: transparent;
22352247
border: none;
@@ -2944,7 +2956,7 @@ StWidget.focused .app-well-app-running-dot {
29442956
.system-action-icon {
29452957
background-color: rgba(0, 0, 0, 0.8);
29462958
color: #fff;
2947-
border-radius: 99px;
2959+
border-radius: 9999px;
29482960
}
29492961

29502962
.page-navigation-hint {

0 commit comments

Comments
 (0)