From e948fc20bc2458328390487dc634910049be9e2d Mon Sep 17 00:00:00 2001
From: artoscinote <85488244+artoscinote@users.noreply.github.com>
Date: Mon, 7 Mar 2022 17:11:35 +0100
Subject: [PATCH] Fix members dropdown CSS, order [SCI-6595] (#3919)

---
 .../access_permissions/access_modal.scss      | 29 +++++++++++++++++++
 .../_public_members_dropdown.html.erb         |  2 +-
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/access_permissions/access_modal.scss b/app/assets/stylesheets/access_permissions/access_modal.scss
index d89a466a3..66e0678e4 100644
--- a/app/assets/stylesheets/access_permissions/access_modal.scss
+++ b/app/assets/stylesheets/access_permissions/access_modal.scss
@@ -68,6 +68,35 @@
   hr {
     margin: 1em 0;
   }
+
+  .group-members-button {
+    cursor: pointer;
+    margin-left: .5em;
+  }
+
+  .group-members-content {
+    max-height: 180px;
+    min-width: 260px;
+    overflow: auto;
+    padding: .6em 1em;
+
+    .title {
+      @include font-small;
+      color: $color-silver-chalice;
+      padding-bottom: .5em;
+    }
+
+    .name {
+      @include font-button;
+      padding: .4em 0;
+    }
+
+    .no-members {
+      @include font-button;
+      font-style: italic;
+      padding: .4em 0;
+    }
+  }
 }
 
 .permission-object-tag {
diff --git a/app/views/access_permissions/partials/_public_members_dropdown.html.erb b/app/views/access_permissions/partials/_public_members_dropdown.html.erb
index 8df77bf2b..dd7c7a362 100644
--- a/app/views/access_permissions/partials/_public_members_dropdown.html.erb
+++ b/app/views/access_permissions/partials/_public_members_dropdown.html.erb
@@ -5,7 +5,7 @@
       <div class="title">
         <%= t('.title', team: team.name) %>
       </div>
-      <% team.users.where.not(id: project.manually_assigned_users.select(:id)).each do |user| %>
+      <% team.users.order(full_name: :asc).where.not(id: project.manually_assigned_users.select(:id)).each do |user| %>
         <div class="name">
           <%= user.full_name %>
         </div>