diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-13 03:08:33 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-13 03:08:33 +0300 |
commit | 41038b07f78339fb0a02a6917dbeeabf19f47697 (patch) | |
tree | 9fa520e9ce8a56941fb9fb9880d1694afd42d615 /app/assets/javascripts/groups | |
parent | 40a1569568e57bb93632d2ac048dbbf6c9bb9770 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/groups')
-rw-r--r-- | app/assets/javascripts/groups/components/group_item.vue | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/app/assets/javascripts/groups/components/group_item.vue b/app/assets/javascripts/groups/components/group_item.vue index dbad2688451..3cc62cf124c 100644 --- a/app/assets/javascripts/groups/components/group_item.vue +++ b/app/assets/javascripts/groups/components/group_item.vue @@ -1,5 +1,6 @@ <script> import { + GlAvatar, GlLoadingIcon, GlBadge, GlIcon, @@ -7,7 +8,6 @@ import { GlSafeHtmlDirective, } from '@gitlab/ui'; import { visitUrl } from '~/lib/utils/url_utility'; -import identicon from '~/vue_shared/components/identicon.vue'; import UserAccessRoleBadge from '~/vue_shared/components/user_access_role_badge.vue'; import { VISIBILITY_TYPE_ICON, GROUP_VISIBILITY_TYPE } from '../constants'; import eventHub from '../event_hub'; @@ -23,11 +23,11 @@ export default { SafeHtml: GlSafeHtmlDirective, }, components: { + GlAvatar, GlBadge, GlLoadingIcon, GlIcon, UserAccessRoleBadge, - identicon, itemCaret, itemTypeIcon, itemStats, @@ -125,21 +125,21 @@ export default { size="lg" class="d-none d-sm-inline-flex flex-shrink-0 gl-mr-3" /> - <div - :class="{ 'd-sm-flex': !group.isChildrenLoading }" - class="avatar-container rect-avatar s32 d-none flex-grow-0 flex-shrink-0" + <a + :class="{ 'gl-sm-display-flex': !group.isChildrenLoading }" + class="gl-display-none gl-text-decoration-none! gl-mr-3" + :href="group.relativePath" + :aria-label="group.name" > - <a :href="group.relativePath" class="no-expand"> - <img - v-if="hasAvatar" - :src="group.avatarUrl" - data-testid="group-avatar" - class="avatar s40" - :itemprop="microdata.imageItemprop" - /> - <identicon v-else :entity-id="group.id" :entity-name="group.name" size-class="s40" /> - </a> - </div> + <gl-avatar + shape="rect" + :entity-name="group.name" + :src="group.avatarUrl" + :alt="group.name" + :size="32" + :itemprop="microdata.imageItemprop" + /> + </a> <div class="group-text-container d-flex flex-fill align-items-center"> <div class="group-text flex-grow-1 flex-shrink-1"> <div class="d-flex align-items-center flex-wrap title namespace-title gl-mr-3"> |