Skip to content
代码片段 群组 项目
未验证 提交 1b1e250c 编辑于 作者: Peter Hegman's avatar Peter Hegman 提交者: GitLab
浏览文件

Merge branch '416789-Add-spacing-to-badge' into 'master'

Resolve "Add spacing to invited member badge"

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/141181



Merged-by: default avatarPeter Hegman <phegman@gitlab.com>
Approved-by: default avatarPeter Hegman <phegman@gitlab.com>
Co-authored-by: default avatarsean3687 <yonghyun.jin13@gmail.com>
No related branches found
No related tags found
无相关合并请求
......@@ -80,7 +80,7 @@ export default {
filteredAndModifiedFields() {
return FIELDS.filter(
(field) => this.tableFields.includes(field.key) && this.showField(field),
).map(this.modifyFieldDefinition);
).map((item) => this.modifyFieldDefinition(item));
},
userIsLoggedIn() {
return this.currentUserId !== null;
......@@ -279,10 +279,14 @@ export default {
</template>
<template #cell(invited)="{ item: { createdAt, createdBy, invite, state } }">
<created-at :date="createdAt" :created-by="createdBy" />
<gl-badge v-if="inviteBadge(invite, state)" data-testid="invited-badge">{{
inviteBadge(invite, state)
}}</gl-badge>
<div
class="gl-display-flex gl-align-items-center gl-justify-content-end gl-lg-justify-content-start gl-flex-wrap gl-gap-3"
>
<created-at :date="createdAt" :created-by="createdBy" />
<gl-badge v-if="inviteBadge(invite, state)" data-testid="invited-badge"
>{{ inviteBadge(invite, state) }}
</gl-badge>
</div>
</template>
<template #cell(requested)="{ item: { createdAt } }">
......
......@@ -61,7 +61,6 @@
}
}
.members-table {
@include media-breakpoint-up(lg) {
.col-meta {
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册