diff --git a/ee/app/assets/stylesheets/framework/badges.scss b/ee/app/assets/stylesheets/framework/badges.scss deleted file mode 100644 index 3b242c4ee5bb58d7aeb8389cf450917bbe0f93e9..0000000000000000000000000000000000000000 --- a/ee/app/assets/stylesheets/framework/badges.scss +++ /dev/null @@ -1,9 +0,0 @@ -.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; -} diff --git a/ee/app/assets/stylesheets/page_bundles/projects.scss b/ee/app/assets/stylesheets/page_bundles/projects.scss index abb4d6e57accb94f5df3f2884611fc22a83157f3..e13976a81e9288c7f501255efaca0f28912e8c10 100644 --- a/ee/app/assets/stylesheets/page_bundles/projects.scss +++ b/ee/app/assets/stylesheets/page_bundles/projects.scss @@ -34,14 +34,6 @@ } } -.projects-list { - .project-details { - .compliance-framework-pill { - margin: 1px 0; - } - } -} - .git-clone-holder { .btn-geo { border-left: 0; diff --git a/ee/app/views/compliance_management/compliance_framework/_compliance_framework_badge.html.haml b/ee/app/views/compliance_management/compliance_framework/_compliance_framework_badge.html.haml index 77543d68456ba91df18fcf175b9789fb9542be10..43ea70a0497459118210aa495b689e66f16d3218 100644 --- a/ee/app/views/compliance_management/compliance_framework/_compliance_framework_badge.html.haml +++ b/ee/app/views/compliance_management/compliance_framework/_compliance_framework_badge.html.haml @@ -4,5 +4,5 @@ - if show_compliance_framework_badge?(project) - 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 diff --git a/ee/spec/views/compliance_management/compliance_framework/_compliance_framework_badge.html.haml_spec.rb b/ee/spec/views/compliance_management/compliance_framework/_compliance_framework_badge.html.haml_spec.rb index 4137a8d36d34b0dc36214544391a966b97ed9762..64fc0c7eeb95e79dd57abcee96d201c7d486d2b8 100644 --- a/ee/spec/views/compliance_management/compliance_framework/_compliance_framework_badge.html.haml_spec.rb +++ b/ee/spec/views/compliance_management/compliance_framework/_compliance_framework_badge.html.haml_spec.rb @@ -15,7 +15,7 @@ it 'renders a badge' do 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 @@ -25,7 +25,7 @@ it 'does not render any badge' do 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