From afdba465d1950caf30eb87559755033b542daa8d Mon Sep 17 00:00:00 2001
From: Kris <kris.aubuchon@discourse.org>
Date: Mon, 10 Feb 2025 18:05:29 -0500
Subject: [PATCH] UX: fix group assigns layout after core change (#631)

---
 .../discourse/templates/group/assigned.hbs    |  1 +
 assets/stylesheets/assigns.scss               | 42 +++++++++++++++++--
 assets/stylesheets/mobile/assigns.scss        | 20 +++++++++
 3 files changed, 60 insertions(+), 3 deletions(-)

diff --git a/assets/javascripts/discourse/templates/group/assigned.hbs b/assets/javascripts/discourse/templates/group/assigned.hbs
index 2c8e22f..d30e834 100644
--- a/assets/javascripts/discourse/templates/group/assigned.hbs
+++ b/assets/javascripts/discourse/templates/group/assigned.hbs
@@ -1,4 +1,5 @@
 <section class="user-secondary-navigation group-assignments">
+  {{body-class "group-assign"}}
   <MobileNav
     @desktopClass="action-list activity-list nav-stacked"
     class="activity-nav"
diff --git a/assets/stylesheets/assigns.scss b/assets/stylesheets/assigns.scss
index 6d50e06..c2cc6e7 100644
--- a/assets/stylesheets/assigns.scss
+++ b/assets/stylesheets/assigns.scss
@@ -16,6 +16,7 @@
     margin-right: 0.25em;
     color: var(--primary-medium);
   }
+
   .assign-text {
     margin-right: 0.25em;
   }
@@ -23,7 +24,8 @@
   .composer-popup & {
     margin-left: 0.5em;
   }
-  .assignee:not(:last-child):after {
+
+  .assignee:not(:last-child)::after {
     content: ", ";
   }
 
@@ -44,7 +46,6 @@
   padding: 0.5em;
   border: 1px dashed var(--primary-medium);
   color: var(--primary);
-
   display: flex;
   justify-content: space-between;
   align-items: center;
@@ -85,6 +86,7 @@
     .select-kit-header {
       outline: 0 !important;
     }
+
     .select-kit-body {
       position: absolute !important;
       transform: none !important;
@@ -166,10 +168,12 @@
     align-items: center;
     gap: 0.25em;
   }
+
   .avatar {
     width: 1.19em;
     height: 1.19em;
   }
+
   .avatar.overlap {
     z-index: 1;
     margin-right: -0.4em;
@@ -179,6 +183,7 @@
   i.fa {
     color: var(--primary-medium);
   }
+
   .d-icon {
     margin-left: 0.165em;
     margin-right: 0.165em;
@@ -189,6 +194,7 @@
 .group-assignments {
   // a little extra space for long names
   min-width: 250px;
+
   li a {
     display: grid;
     grid-template-areas: " avatar names count";
@@ -200,6 +206,7 @@
       width: 45px;
       margin-right: 0.5em;
       text-align: center;
+
       svg {
         width: 40px;
         height: 40px;
@@ -212,31 +219,38 @@
       overflow: hidden;
       line-height: normal;
     }
+
     .assign-name {
       @include ellipsis;
       margin-top: 3px;
     }
+
     .assign-username {
       font-weight: bold;
       @include ellipsis;
     }
+
     .assign-count {
       font-size: $font-up-2;
       grid-area: count;
     }
+
     .assign-image {
       grid-area: avatar;
+
       a {
         padding: 0;
         padding-right: 0.5em;
       }
     }
   }
+
   .search {
     width: 100%;
   }
+
   .search-div {
-    padding: 0 13px;
+    padding: 0 0;
   }
 }
 
@@ -263,3 +277,25 @@
     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;
+    }
+  }
+}
diff --git a/assets/stylesheets/mobile/assigns.scss b/assets/stylesheets/mobile/assigns.scss
index 168598e..38e4c37 100644
--- a/assets/stylesheets/mobile/assigns.scss
+++ b/assets/stylesheets/mobile/assigns.scss
@@ -9,9 +9,11 @@
   .topic-list-data {
     max-width: unset;
   }
+
   .pull-right .num.activity {
     margin-right: 0.5em;
   }
+
   .topic-item-stats {
     display: grid;
     grid-template-columns: auto auto;
@@ -21,15 +23,18 @@
       "left-bottom right-bottom";
     grid-column-start: 1;
     grid-column-end: 3;
+
     .discourse-tags {
       grid-area: left-top;
       max-width: unset;
     }
+
     .topic-list-num {
       grid-area: right-bottom;
       display: flex;
       justify-content: end;
     }
+
     .category {
       grid-area: left-bottom;
     }
@@ -73,13 +78,16 @@
 .group-assignments .mobile-nav a.expander > span {
   display: flex;
   @include ellipsis;
+
   .assign-count {
     display: none;
   }
+
   .assign-name {
     margin: 0;
     padding: 0;
   }
+
   a {
     width: 1em;
     height: 1em;
@@ -88,17 +96,29 @@
 
 .group-assignments {
   min-width: unset;
+
   li > a {
     .assign-names,
     .assign-count {
       font-size: $font-0;
     }
+
     .assign-image,
     .assign-name {
       display: none;
     }
+
     .assign-username {
       font-weight: normal;
     }
   }
 }
+
+.group-assignments .activity-nav {
+  width: 100%;
+  margin-top: 1em;
+}
+
+.user-content-wrapper .user-secondary-navigation li a {
+  width: auto;
+}