Skip to content
代码片段 群组 项目
提交 e766e04d 编辑于 作者: Coung Ngo's avatar Coung Ngo
浏览文件

Merge branch 'compliance-framework-badge' into 'master'

Compliance framework badge remove custom styles

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



Merged-by: default avatarCoung Ngo <cngo@gitlab.com>
Approved-by: default avatarCoung Ngo <cngo@gitlab.com>
Approved-by: default avatarDiana Zubova <dzubova@gitlab.com>
Approved-by: default avatarJulia Miocene <jmiocene@gitlab.com>
Reviewed-by: default avatarDiana Zubova <dzubova@gitlab.com>
Co-authored-by: default avatarSascha Eggenberger <seggenberger@gitlab.com>
No related branches found
No related tags found
无相关合并请求
.badge.compliance-framework-pill {
border-radius: $label-border-radius;
display: inline-block;
font-size: $gl-font-size-sm;
font-weight: $gl-font-weight-normal;
line-height: $gl-line-height-20;
padding: 0 $label-padding;
vertical-align: middle;
}
...@@ -34,14 +34,6 @@ ...@@ -34,14 +34,6 @@
} }
} }
.projects-list {
.project-details {
.compliance-framework-pill {
margin: 1px 0;
}
}
}
.git-clone-holder { .git-clone-holder {
.btn-geo { .btn-geo {
border-left: 0; border-left: 0;
......
...@@ -4,5 +4,5 @@ ...@@ -4,5 +4,5 @@
- if show_compliance_framework_badge?(project) - if show_compliance_framework_badge?(project)
- framework = project.compliance_framework_setting.compliance_management_framework - framework = project.compliance_framework_setting.compliance_management_framework
= gl_badge_tag(nil, { class: "compliance-framework-pill has-tooltip #{additional_classes}", style: "background-color: #{framework.color}; color: #{text_color_for_bg(framework.color)}", data: { container: 'body' }, title: framework.description}) do = gl_badge_tag(nil, { class: "has-tooltip #{additional_classes}", style: "background-color: #{framework.color}; color: #{text_color_for_bg(framework.color)}", data: { container: 'body', testid: 'compliance-framework-badge' }, title: framework.description}) do
= framework.name = framework.name
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
it 'renders a badge' do it 'renders a badge' do
render('compliance_management/compliance_framework/compliance_framework_badge', project: project) render('compliance_management/compliance_framework/compliance_framework_badge', project: project)
expect(rendered).to have_selector('.compliance-framework-pill') expect(rendered).to have_selector('[data-testid="compliance-framework-badge"]')
end end
end end
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
it 'does not render any badge' do it 'does not render any badge' do
render('compliance_management/compliance_framework/compliance_framework_badge', project: project) render('compliance_management/compliance_framework/compliance_framework_badge', project: project)
expect(rendered).not_to have_selector('.compliance-framework-pill') expect(rendered).not_to have_selector('[data-testid="compliance-framework-badge"]')
end end
end end
end end
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册