UX: fix group assigns layout after core change (#631)

This commit is contained in:
Kris 2025-02-10 18:05:29 -05:00 committed by GitHub
parent 444440abda
commit afdba465d1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 60 additions and 3 deletions

View File

@ -1,4 +1,5 @@
<section class="user-secondary-navigation group-assignments"> <section class="user-secondary-navigation group-assignments">
{{body-class "group-assign"}}
<MobileNav <MobileNav
@desktopClass="action-list activity-list nav-stacked" @desktopClass="action-list activity-list nav-stacked"
class="activity-nav" class="activity-nav"

View File

@ -16,6 +16,7 @@
margin-right: 0.25em; margin-right: 0.25em;
color: var(--primary-medium); color: var(--primary-medium);
} }
.assign-text { .assign-text {
margin-right: 0.25em; margin-right: 0.25em;
} }
@ -23,7 +24,8 @@
.composer-popup & { .composer-popup & {
margin-left: 0.5em; margin-left: 0.5em;
} }
.assignee:not(:last-child):after {
.assignee:not(:last-child)::after {
content: ", "; content: ", ";
} }
@ -44,7 +46,6 @@
padding: 0.5em; padding: 0.5em;
border: 1px dashed var(--primary-medium); border: 1px dashed var(--primary-medium);
color: var(--primary); color: var(--primary);
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
@ -85,6 +86,7 @@
.select-kit-header { .select-kit-header {
outline: 0 !important; outline: 0 !important;
} }
.select-kit-body { .select-kit-body {
position: absolute !important; position: absolute !important;
transform: none !important; transform: none !important;
@ -166,10 +168,12 @@
align-items: center; align-items: center;
gap: 0.25em; gap: 0.25em;
} }
.avatar { .avatar {
width: 1.19em; width: 1.19em;
height: 1.19em; height: 1.19em;
} }
.avatar.overlap { .avatar.overlap {
z-index: 1; z-index: 1;
margin-right: -0.4em; margin-right: -0.4em;
@ -179,6 +183,7 @@
i.fa { i.fa {
color: var(--primary-medium); color: var(--primary-medium);
} }
.d-icon { .d-icon {
margin-left: 0.165em; margin-left: 0.165em;
margin-right: 0.165em; margin-right: 0.165em;
@ -189,6 +194,7 @@
.group-assignments { .group-assignments {
// a little extra space for long names // a little extra space for long names
min-width: 250px; min-width: 250px;
li a { li a {
display: grid; display: grid;
grid-template-areas: " avatar names count"; grid-template-areas: " avatar names count";
@ -200,6 +206,7 @@
width: 45px; width: 45px;
margin-right: 0.5em; margin-right: 0.5em;
text-align: center; text-align: center;
svg { svg {
width: 40px; width: 40px;
height: 40px; height: 40px;
@ -212,31 +219,38 @@
overflow: hidden; overflow: hidden;
line-height: normal; line-height: normal;
} }
.assign-name { .assign-name {
@include ellipsis; @include ellipsis;
margin-top: 3px; margin-top: 3px;
} }
.assign-username { .assign-username {
font-weight: bold; font-weight: bold;
@include ellipsis; @include ellipsis;
} }
.assign-count { .assign-count {
font-size: $font-up-2; font-size: $font-up-2;
grid-area: count; grid-area: count;
} }
.assign-image { .assign-image {
grid-area: avatar; grid-area: avatar;
a { a {
padding: 0; padding: 0;
padding-right: 0.5em; padding-right: 0.5em;
} }
} }
} }
.search { .search {
width: 100%; width: 100%;
} }
.search-div { .search-div {
padding: 0 13px; padding: 0 0;
} }
} }
@ -263,3 +277,25 @@
color: var(--primary-medium); color: var(--primary-medium);
} }
} }
.desktop-view {
.group-assign {
.user-secondary-navigation {
grid-column: 1;
grid-row: 2/4;
}
.group-assignments {
margin-top: 1.25em;
}
.user-content-wrapper .user-content {
grid-column: 2;
}
.nav-stacked {
width: 100%;
margin-right: 2em;
}
}
}

View File

@ -9,9 +9,11 @@
.topic-list-data { .topic-list-data {
max-width: unset; max-width: unset;
} }
.pull-right .num.activity { .pull-right .num.activity {
margin-right: 0.5em; margin-right: 0.5em;
} }
.topic-item-stats { .topic-item-stats {
display: grid; display: grid;
grid-template-columns: auto auto; grid-template-columns: auto auto;
@ -21,15 +23,18 @@
"left-bottom right-bottom"; "left-bottom right-bottom";
grid-column-start: 1; grid-column-start: 1;
grid-column-end: 3; grid-column-end: 3;
.discourse-tags { .discourse-tags {
grid-area: left-top; grid-area: left-top;
max-width: unset; max-width: unset;
} }
.topic-list-num { .topic-list-num {
grid-area: right-bottom; grid-area: right-bottom;
display: flex; display: flex;
justify-content: end; justify-content: end;
} }
.category { .category {
grid-area: left-bottom; grid-area: left-bottom;
} }
@ -73,13 +78,16 @@
.group-assignments .mobile-nav a.expander > span { .group-assignments .mobile-nav a.expander > span {
display: flex; display: flex;
@include ellipsis; @include ellipsis;
.assign-count { .assign-count {
display: none; display: none;
} }
.assign-name { .assign-name {
margin: 0; margin: 0;
padding: 0; padding: 0;
} }
a { a {
width: 1em; width: 1em;
height: 1em; height: 1em;
@ -88,17 +96,29 @@
.group-assignments { .group-assignments {
min-width: unset; min-width: unset;
li > a { li > a {
.assign-names, .assign-names,
.assign-count { .assign-count {
font-size: $font-0; font-size: $font-0;
} }
.assign-image, .assign-image,
.assign-name { .assign-name {
display: none; display: none;
} }
.assign-username { .assign-username {
font-weight: normal; font-weight: normal;
} }
} }
} }
.group-assignments .activity-nav {
width: 100%;
margin-top: 1em;
}
.user-content-wrapper .user-secondary-navigation li a {
width: auto;
}