github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-23 01:47:22 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

UX: style improvements to new user tables (#20530)

Browse Source
This commit is contained in:
Kris 2023-03-06 09:30:48 -05:00 committed by GitHub
parent 62dc37ac35
commit d28390054e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 49 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/javascripts/admin/addon/templates/users-list-show.hbs
View File

@ -241,7 +241,13 @@
</div>
{{/if}}
<div class="directory-table__cell user-status">
<div
class="directory-table__cell user-role{{if
(or user.admin user.moderator user.second_factor_enabled)
''
'--empty'
}}"
>
<span class="directory-table__label">
<span>{{i18n "admin.users.status"}}</span>
</span>

11
app/assets/javascripts/discourse/app/templates/group-index.hbs
View File

@ -174,7 +174,12 @@
{{bound-date m.added_at}}
</span>
</div>
<div class="directory-table__cell">
<div
class="directory-table__cell{{unless
m.last_posted_at
'--empty'
}}"
>
{{#if m.last_posted_at}}
<span class="directory-table__label">
<span>{{i18n "last_post"}}</span>
@ -184,7 +189,9 @@
{{bound-date m.last_posted_at}}
</span>
</div>
<div class="directory-table__cell">
<div
class="directory-table__cell{{unless m.last_seen_at '--empty'}}"
>
{{#if m.last_seen_at}}
<span class="directory-table__label">
<span>{{i18n "last_seen"}}</span>

8
app/assets/javascripts/discourse/app/templates/group-requests.hbs
View File

@ -30,9 +30,9 @@
@labelKey="groups.member_requested"
@automatic={{true}}
/>
<div class="directory-table__column-header">{{i18n
"groups.requests.reason"
}}</div>
<div
class="directory-table__column-header group-request-reason__column-header"
>{{i18n "groups.requests.reason"}}</div>
<div class="directory-table__column-header"></div>
</:header>
<:body>
@ -49,7 +49,7 @@
<span>{{bound-date m.requested_at}}</span>
</span>
</div>
<div class="directory-table__cell">
<div class="directory-table__cell group-request-reason__content">
<span class="directory-table__label">
<span>{{i18n "groups.requests.reason"}}</span>
</span>

10
app/assets/stylesheets/common/base/directory.scss
View File

@ -132,6 +132,7 @@
border-bottom: 1px solid var(--primary-low);
justify-content: center;
align-items: center;
box-sizing: border-box;
}
&__column-header {
@ -260,6 +261,7 @@
&__value {
font-size: var(--font-0);
color: var(--primary);
align-self: start;
}
&__row {
@ -269,8 +271,8 @@
display: grid;
grid-template-columns: repeat(auto-fill, minmax(11em, 1fr));
border-bottom: 1px solid var(--primary-low);
padding: 0.85em 0.75em 1em;
gap: 0 15%;
padding: 0.85em 0.5em 1em;
gap: 0 10%;
}
&__header {
@ -303,5 +305,9 @@
}
}
}
[class*="--empty"] {
display: none;
}
}
}

22
app/assets/stylesheets/common/base/group.scss
View File

@ -154,7 +154,7 @@ table.group-manage-logs {
}
&.group-members__requests {
grid-template-columns: 3fr repeat(3, minmax(min-content, 1fr));
grid-template-columns: 3fr repeat(3, minmax(max-content, 1fr));
}
.directory-table__value {
@ -166,7 +166,27 @@ table.group-manage-logs {
gap: 0.5em;
}
[class*="group-request-reason__"] {
justify-content: start;
}
.group-request-reason__content {
.directory-table__value {
white-space: normal;
max-width: 30em;
}
}
@container (max-width: 47em) {
.directory-table__cell {
grid-column-start: 1;
grid-column-end: -1;
}
.group-accept-deny-buttons {
justify-content: start;
}
.directory-table__cell.group-owner {
order: 2;
}

4
app/assets/stylesheets/mobile/group.scss
View File

@ -16,10 +16,6 @@
position: relative;
}
.group-accept-deny-buttons {
justify-content: start;
}
.group-info {
flex-wrap: wrap;
.group-details-button button {