Skip to content

Commit f4a9cea

Browse files
authored
Merge pull request #19607 from Simek/ui-reuse-ellipsis-and-nowrap-etends
ui: reuse ellipsis and nowrap extends where applicable
2 parents a9e90c7 + 3e0b87f commit f4a9cea

File tree

21 files changed

+28
-61
lines changed

21 files changed

+28
-61
lines changed

ui/analyse/css/_round-underboard.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,14 @@ $col2-panel-height: 240px;
1616
align-items: flex-start;
1717

1818
> button {
19-
@extend %roboto, %box-radius-top, %page-text, %ellipsis;
19+
@extend %roboto, %box-radius-top, %page-text, %nowrap-ellipsis;
2020

2121
flex: 1 1 0;
2222
text-align: center;
2323
font-size: 0.9em;
2424
padding: 0.4em 0.1em;
2525
cursor: pointer;
2626
position: relative;
27-
white-space: nowrap;
2827
border-bottom: $border;
2928

3029
&:hover {

ui/analyse/css/explorer/_explorer.scss

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,21 @@
11
@import './config';
22

33
.explorer-box {
4-
position: relative;
5-
flex: 3 1 0px;
6-
white-space: nowrap;
7-
84
@include transition;
95

6+
position: relative;
7+
flex: 3 1 0;
8+
white-space: nowrap;
109
transition-delay: 0.3s;
1110
overflow-x: hidden;
1211
overflow-y: auto;
1312
font-size: 0.9em;
1413

1514
&.reduced {
16-
flex: 0.3 3 0px;
15+
flex: 0.3 3 0;
1716

1817
&:hover {
19-
flex: 1 2 0px;
18+
flex: 1 2 0;
2019
}
2120
}
2221

@@ -39,8 +38,7 @@
3938
}
4039

4140
.title {
42-
overflow: hidden;
43-
text-overflow: ellipsis;
41+
@extend %ellipsis;
4442
user-select: text;
4543
}
4644
.explorer-title {

ui/analyse/css/study/_player.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,7 @@ $player-height: 1.6rem;
8989

9090
.team,
9191
.name {
92-
overflow: hidden;
93-
text-overflow: ellipsis;
92+
@extend %ellipsis;
9493
max-width: fit-content;
9594
flex: 1;
9695
}

ui/analyse/css/study/_topics.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,11 @@
1515
background: $m-primary_bg--mix-12;
1616
padding: 0.2em 0.6em;
1717
margin: 0.2em;
18+
white-space: nowrap;
1819

1920
&:hover {
2021
background: $m-primary_bg--mix-15;
2122
}
22-
23-
white-space: nowrap;
2423
}
2524

2625
.box__pad & {

ui/analyse/css/study/relay/_board-player.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,7 @@
7878

7979
.team,
8080
.name {
81-
overflow: hidden;
82-
text-overflow: ellipsis;
81+
@extend %ellipsis;
8382
max-width: fit-content;
8483
flex: 1;
8584
}

ui/analyse/css/study/relay/_tour.scss

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -337,9 +337,8 @@ $hover-bg: $m-primary_bg--mix-30;
337337
}
338338
}
339339
.name {
340+
@include ellipsis;
340341
padding: 0.3em 0 0.3em 1em;
341-
overflow: hidden;
342-
text-overflow: ellipsis;
343342
width: 100%;
344343
}
345344
.time,
@@ -630,8 +629,7 @@ $hover-bg: $m-primary_bg--mix-30;
630629
display: none;
631630
}
632631
.player-intro__name {
633-
overflow: hidden;
634-
text-overflow: ellipsis;
632+
@include ellipsis;
635633
}
636634
}
637635
}

ui/bits/css/build/bits.slist.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,9 @@
4040
td:nth-child(2) {
4141
padding-right: 0;
4242
a.user-link {
43+
@include ellipsis;
4344
display: inline-block;
4445
max-width: min(26ch, 50vw);
45-
overflow: hidden;
46-
text-overflow: ellipsis;
4746
white-space: nowrap;
4847
vertical-align: middle;
4948
}

ui/lib/css/ceval/_settings.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,11 @@
3434
}
3535

3636
select {
37+
@extend %ellipsis;
3738
flex: 1 4 auto;
3839
min-width: 0;
3940
margin-inline-start: 1ch;
4041
padding: 4px;
41-
overflow: hidden;
42-
text-overflow: ellipsis;
4342
}
4443

4544
#select-engine {

ui/lib/css/component/_copy-me.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22
@extend %box-radius, %flex-center-nowrap;
33

44
&__target {
5-
@extend %ellipsis, %box-radius-left;
5+
@extend %nowrap-ellipsis, %box-radius-left;
66
flex: 1 1 auto;
7-
white-space: nowrap;
87
padding: 0 1em;
98
outline: 0;
109
background: none;

ui/lib/css/component/_mini-game.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@
3838
}
3939

4040
.name {
41-
overflow: hidden;
42-
text-overflow: ellipsis;
41+
@extend %ellipsis;
4342
}
4443

4544
.rating {

0 commit comments

Comments
 (0)