Add latest changes from gitlab-org/gitlab@13-1-stable-ee

1 files changed, 19 insertions, 18 deletions

diff --git a/app/views/shared/groups/_group.html.haml b/app/views/shared/groups/_group.html.haml
index 60c9c076a70..5dac400bd5e 100644
--- a/app/views/shared/groups/_group.html.haml
+++ b/app/views/shared/groups/_group.html.haml
@@ -1,28 +1,29 @@
 - user = local_assigns.fetch(:user, current_user)
 - access = user&.max_member_access_for_group(group.id)
 
-%li.group-row.py-3{ class: ('no-description' if group.description.blank?) }
-  .stats
-    %span
+%li.group-row.py-3.gl-align-items-center{ class: "gl-display-flex!#{' no-description' if group.description.blank?}" }
+  .avatar-container.rect-avatar.s40.gl-flex-shrink-0
+    = link_to group do
+      = group_icon(group, class: "avatar s40")
+  .gl-min-w-0.gl-flex-grow-1
+    .title
+      = link_to group.full_name, group, class: 'group-name'
+
+      - if access&.nonzero?
+        %span.user-access-role= Gitlab::Access.human_access(access)
+
+    - if group.description.present?
+      .description
+        = markdown_field(group, :description)
+
+  .stats.gl-text-gray-700.gl-flex-shrink-0
+    %span.gl-ml-5
       = icon('bookmark')
       = number_with_delimiter(group.projects.non_archived.count)
 
-    %span
+    %span.gl-ml-5
       = icon('users')
       = number_with_delimiter(group.users.count)
 
-    %span.visibility-icon.has-tooltip{ data: { container: 'body', placement: 'left' }, title: visibility_icon_description(group) }
+    %span.gl-ml-5.visibility-icon.has-tooltip{ data: { container: 'body', placement: 'left' }, title: visibility_icon_description(group) }
       = visibility_level_icon(group.visibility_level, fw: false)
-
-  .avatar-container.rect-avatar.s40
-    = link_to group do
-      = group_icon(group, class: "avatar s40")
-  .title
-    = link_to group.full_name, group, class: 'group-name'
-
-    - if access&.nonzero?
-      %span.user-access-role= Gitlab::Access.human_access(access)
-
-  - if group.description.present?
-    .description
-      = markdown_field(group, :description)