Commit ce96e743 authored by Enrique Alcántara's avatar Enrique Alcántara

Merge branch 'gl-badge-mr' into 'master'

Add gl-badge for badges in MRs and issues nav

See merge request gitlab-org/gitlab!57942
parents 49da2048 3141fee4
...@@ -199,7 +199,7 @@ module IssuablesHelper ...@@ -199,7 +199,7 @@ module IssuablesHelper
count = issuables_count_for_state(issuable_type, state) count = issuables_count_for_state(issuable_type, state)
if count != -1 if count != -1
html << " " << content_tag(:span, number_with_delimiter(count), class: 'badge badge-pill') html << " " << content_tag(:span, number_with_delimiter(count), class: 'badge badge-muted badge-pill gl-badge gl-tab-counter-badge sm')
end end
html.html_safe html.html_safe
......
---
title: Add gl-badge for badges in MRs and issues nav
merge_request: 57942
author: Yogi (@yo)
type: changed
...@@ -133,13 +133,13 @@ RSpec.describe IssuablesHelper do ...@@ -133,13 +133,13 @@ RSpec.describe IssuablesHelper do
it 'returns navigation with badges' do it 'returns navigation with badges' do
expect(helper.issuables_state_counter_text(:issues, :opened, true)) expect(helper.issuables_state_counter_text(:issues, :opened, true))
.to eq('<span>Open</span> <span class="badge badge-pill">42</span>') .to eq('<span>Open</span> <span class="badge badge-muted badge-pill gl-badge gl-tab-counter-badge sm">42</span>')
expect(helper.issuables_state_counter_text(:issues, :closed, true)) expect(helper.issuables_state_counter_text(:issues, :closed, true))
.to eq('<span>Closed</span> <span class="badge badge-pill">42</span>') .to eq('<span>Closed</span> <span class="badge badge-muted badge-pill gl-badge gl-tab-counter-badge sm">42</span>')
expect(helper.issuables_state_counter_text(:merge_requests, :merged, true)) expect(helper.issuables_state_counter_text(:merge_requests, :merged, true))
.to eq('<span>Merged</span> <span class="badge badge-pill">42</span>') .to eq('<span>Merged</span> <span class="badge badge-muted badge-pill gl-badge gl-tab-counter-badge sm">42</span>')
expect(helper.issuables_state_counter_text(:merge_requests, :all, true)) expect(helper.issuables_state_counter_text(:merge_requests, :all, true))
.to eq('<span>All</span> <span class="badge badge-pill">42</span>') .to eq('<span>All</span> <span class="badge badge-muted badge-pill gl-badge gl-tab-counter-badge sm">42</span>')
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment