diff --git a/app/assets/javascripts/admin/addon/templates/users-list-show.hbs b/app/assets/javascripts/admin/addon/templates/users-list-show.hbs index 20ff75eb77c..257d3eea350 100644 --- a/app/assets/javascripts/admin/addon/templates/users-list-show.hbs +++ b/app/assets/javascripts/admin/addon/templates/users-list-show.hbs @@ -241,7 +241,13 @@ {{/if}} -
+
{{i18n "admin.users.status"}} diff --git a/app/assets/javascripts/discourse/app/templates/group-index.hbs b/app/assets/javascripts/discourse/app/templates/group-index.hbs index 4530989e774..f3e208d146b 100644 --- a/app/assets/javascripts/discourse/app/templates/group-index.hbs +++ b/app/assets/javascripts/discourse/app/templates/group-index.hbs @@ -174,7 +174,12 @@ {{bound-date m.added_at}}
-
+
{{#if m.last_posted_at}} {{i18n "last_post"}} @@ -184,7 +189,9 @@ {{bound-date m.last_posted_at}}
-
+
{{#if m.last_seen_at}} {{i18n "last_seen"}} diff --git a/app/assets/javascripts/discourse/app/templates/group-requests.hbs b/app/assets/javascripts/discourse/app/templates/group-requests.hbs index 2f03497cb6c..c4ecb91a017 100644 --- a/app/assets/javascripts/discourse/app/templates/group-requests.hbs +++ b/app/assets/javascripts/discourse/app/templates/group-requests.hbs @@ -30,9 +30,9 @@ @labelKey="groups.member_requested" @automatic={{true}} /> -
{{i18n - "groups.requests.reason" - }}
+
{{i18n "groups.requests.reason"}}
<:body> @@ -49,7 +49,7 @@ {{bound-date m.requested_at}}
-
+
{{i18n "groups.requests.reason"}} diff --git a/app/assets/stylesheets/common/base/directory.scss b/app/assets/stylesheets/common/base/directory.scss index 8fe088e7a0b..134339f0ff5 100644 --- a/app/assets/stylesheets/common/base/directory.scss +++ b/app/assets/stylesheets/common/base/directory.scss @@ -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; + } } } diff --git a/app/assets/stylesheets/common/base/group.scss b/app/assets/stylesheets/common/base/group.scss index d961bedb60e..54116873acc 100644 --- a/app/assets/stylesheets/common/base/group.scss +++ b/app/assets/stylesheets/common/base/group.scss @@ -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; } diff --git a/app/assets/stylesheets/mobile/group.scss b/app/assets/stylesheets/mobile/group.scss index 37a3e0b6d81..56a5002b246 100644 --- a/app/assets/stylesheets/mobile/group.scss +++ b/app/assets/stylesheets/mobile/group.scss @@ -16,10 +16,6 @@ position: relative; } -.group-accept-deny-buttons { - justify-content: start; -} - .group-info { flex-wrap: wrap; .group-details-button button {