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

Merge branch 'nl-card-border' into 'master'

Add border to board cards

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



Merged-by: default avatarFlorie Guibert <fguibert@gitlab.com>
Approved-by: default avatarNick Brandt <nbrandt@gitlab.com>
Approved-by: default avatarFlorie Guibert <fguibert@gitlab.com>
Reviewed-by: default avatarNick Leonard <nleonard@gitlab.com>
Co-authored-by: default avatarNick Leonard <nleonard@gitlab.com>
No related branches found
No related tags found
无相关合并请求
......@@ -76,7 +76,7 @@ export default {
return this.item.color;
},
cardStyle() {
return this.itemColor ? { borderColor: this.itemColor } : '';
return this.itemColor ? { borderLeftColor: this.itemColor } : '';
},
formattedItem() {
return {
......@@ -145,7 +145,7 @@ export default {
'is-disabled': isDisabled,
'is-active gl-bg-blue-50': isActive,
'gl-cursor-not-allowed gl-bg-gray-10': item.isLoading,
'gl-border-4 gl-pl-4 gl-border-l-solid': itemColor,
'gl-border-l-4 gl-pl-4 gl-border-l-solid': itemColor,
},
]"
:index="index"
......@@ -154,7 +154,7 @@ export default {
:data-item-path="item.referencePath"
:style="cardStyle"
data-testid="board-card"
class="board-card gl-relative gl-mb-3 gl-rounded-base gl-p-4 gl-leading-normal"
class="board-card gl-border gl-relative gl-mb-3 gl-rounded-base gl-p-4 gl-leading-normal"
@click="toggleIssue($event)"
>
<board-card-inner
......
......@@ -107,7 +107,6 @@
.board-card {
background: var(--gl-background-color-default);
box-shadow: 0 1px 2px rgba(var(--black, $black), 0.1);
&:last-child {
margin-bottom: 0;
......
......@@ -198,9 +198,9 @@ describe('Board card', () => {
});
expect(wrapper.classes()).toEqual(
expect.arrayContaining(['gl-pl-4', 'gl-border-l-solid', 'gl-border-4']),
expect.arrayContaining(['gl-pl-4', 'gl-border-l-solid', 'gl-border-l-4']),
);
expect(wrapper.attributes('style')).toContain(`border-color: ${DEFAULT_COLOR}`);
expect(wrapper.attributes('style')).toContain(`border-left-color: ${DEFAULT_COLOR}`);
});
it('does not render border if color is not present', () => {
......@@ -212,7 +212,7 @@ describe('Board card', () => {
});
expect(wrapper.classes()).not.toEqual(
expect.arrayContaining(['gl-pl-4', 'gl-border-l-solid', 'gl-border-4']),
expect.arrayContaining(['gl-pl-4', 'gl-border-l-solid', 'gl-border-l-4']),
);
expect(wrapper.attributes('style')).toBe(undefined);
});
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册