Skip to content
This repository was archived by the owner on Jul 14, 2025. It is now read-only.

Commit afdba46

Browse files
authored
UX: fix group assigns layout after core change (#631)
1 parent 444440a commit afdba46

File tree

3 files changed

+60
-3
lines changed

3 files changed

+60
-3
lines changed

assets/javascripts/discourse/templates/group/assigned.hbs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<section class="user-secondary-navigation group-assignments">
2+
{{body-class "group-assign"}}
23
<MobileNav
34
@desktopClass="action-list activity-list nav-stacked"
45
class="activity-nav"

assets/stylesheets/assigns.scss

Lines changed: 39 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,16 @@
1616
margin-right: 0.25em;
1717
color: var(--primary-medium);
1818
}
19+
1920
.assign-text {
2021
margin-right: 0.25em;
2122
}
2223

2324
.composer-popup & {
2425
margin-left: 0.5em;
2526
}
26-
.assignee:not(:last-child):after {
27+
28+
.assignee:not(:last-child)::after {
2729
content: ", ";
2830
}
2931

@@ -44,7 +46,6 @@
4446
padding: 0.5em;
4547
border: 1px dashed var(--primary-medium);
4648
color: var(--primary);
47-
4849
display: flex;
4950
justify-content: space-between;
5051
align-items: center;
@@ -85,6 +86,7 @@
8586
.select-kit-header {
8687
outline: 0 !important;
8788
}
89+
8890
.select-kit-body {
8991
position: absolute !important;
9092
transform: none !important;
@@ -166,10 +168,12 @@
166168
align-items: center;
167169
gap: 0.25em;
168170
}
171+
169172
.avatar {
170173
width: 1.19em;
171174
height: 1.19em;
172175
}
176+
173177
.avatar.overlap {
174178
z-index: 1;
175179
margin-right: -0.4em;
@@ -179,6 +183,7 @@
179183
i.fa {
180184
color: var(--primary-medium);
181185
}
186+
182187
.d-icon {
183188
margin-left: 0.165em;
184189
margin-right: 0.165em;
@@ -189,6 +194,7 @@
189194
.group-assignments {
190195
// a little extra space for long names
191196
min-width: 250px;
197+
192198
li a {
193199
display: grid;
194200
grid-template-areas: " avatar names count";
@@ -200,6 +206,7 @@
200206
width: 45px;
201207
margin-right: 0.5em;
202208
text-align: center;
209+
203210
svg {
204211
width: 40px;
205212
height: 40px;
@@ -212,31 +219,38 @@
212219
overflow: hidden;
213220
line-height: normal;
214221
}
222+
215223
.assign-name {
216224
@include ellipsis;
217225
margin-top: 3px;
218226
}
227+
219228
.assign-username {
220229
font-weight: bold;
221230
@include ellipsis;
222231
}
232+
223233
.assign-count {
224234
font-size: $font-up-2;
225235
grid-area: count;
226236
}
237+
227238
.assign-image {
228239
grid-area: avatar;
240+
229241
a {
230242
padding: 0;
231243
padding-right: 0.5em;
232244
}
233245
}
234246
}
247+
235248
.search {
236249
width: 100%;
237250
}
251+
238252
.search-div {
239-
padding: 0 13px;
253+
padding: 0 0;
240254
}
241255
}
242256

@@ -263,3 +277,25 @@
263277
color: var(--primary-medium);
264278
}
265279
}
280+
281+
.desktop-view {
282+
.group-assign {
283+
.user-secondary-navigation {
284+
grid-column: 1;
285+
grid-row: 2/4;
286+
}
287+
288+
.group-assignments {
289+
margin-top: 1.25em;
290+
}
291+
292+
.user-content-wrapper .user-content {
293+
grid-column: 2;
294+
}
295+
296+
.nav-stacked {
297+
width: 100%;
298+
margin-right: 2em;
299+
}
300+
}
301+
}

assets/stylesheets/mobile/assigns.scss

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@
99
.topic-list-data {
1010
max-width: unset;
1111
}
12+
1213
.pull-right .num.activity {
1314
margin-right: 0.5em;
1415
}
16+
1517
.topic-item-stats {
1618
display: grid;
1719
grid-template-columns: auto auto;
@@ -21,15 +23,18 @@
2123
"left-bottom right-bottom";
2224
grid-column-start: 1;
2325
grid-column-end: 3;
26+
2427
.discourse-tags {
2528
grid-area: left-top;
2629
max-width: unset;
2730
}
31+
2832
.topic-list-num {
2933
grid-area: right-bottom;
3034
display: flex;
3135
justify-content: end;
3236
}
37+
3338
.category {
3439
grid-area: left-bottom;
3540
}
@@ -73,13 +78,16 @@
7378
.group-assignments .mobile-nav a.expander > span {
7479
display: flex;
7580
@include ellipsis;
81+
7682
.assign-count {
7783
display: none;
7884
}
85+
7986
.assign-name {
8087
margin: 0;
8188
padding: 0;
8289
}
90+
8391
a {
8492
width: 1em;
8593
height: 1em;
@@ -88,17 +96,29 @@
8896

8997
.group-assignments {
9098
min-width: unset;
99+
91100
li > a {
92101
.assign-names,
93102
.assign-count {
94103
font-size: $font-0;
95104
}
105+
96106
.assign-image,
97107
.assign-name {
98108
display: none;
99109
}
110+
100111
.assign-username {
101112
font-weight: normal;
102113
}
103114
}
104115
}
116+
117+
.group-assignments .activity-nav {
118+
width: 100%;
119+
margin-top: 1em;
120+
}
121+
122+
.user-content-wrapper .user-secondary-navigation li a {
123+
width: auto;
124+
}

0 commit comments

Comments
 (0)