diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 11:18:50 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 11:18:50 +0000 |
commit | 8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781 (patch) | |
tree | a77e7fe7a93de11213032ed4ab1f33a3db51b738 /app/views/shared/groups | |
parent | 00b35af3db1abfe813a778f643dad221aad51fca (diff) | |
download | gitlab-ce-8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781.tar.gz |
Add latest changes from gitlab-org/gitlab@13-1-stable-ee
Diffstat (limited to 'app/views/shared/groups')
-rw-r--r-- | app/views/shared/groups/_group.html.haml | 37 |
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) |