Commit 00747ca5 authored by Clement Ho's avatar Clement Ho
Browse files

Fix bad merge conflict

parent 0dc32f01d1b3
......@@ -169,7 +169,7 @@ def issuables_state_counter_text(issuable_type, state, display_count)
if display_count
count = issuables_count_for_state(issuable_type, state)
html << " " << content_tag(:span, number_with_delimiter(count), class: 'badge')
html << " " << content_tag(:span, number_with_delimiter(count), class: 'badge badge-pill')
end
html.html_safe
......
......@@ -59,5 +59,5 @@
.commit-sha-group
.label.label-monospace
= commit.short_id
= clipboard_button(text: commit.id, title: _("Copy commit SHA to clipboard"), class: "btn btn-default", container: "body")
= clipboard_button(text: commit.id, title: _("Copy commit SHA to clipboard"), class: "btn btn-secondary", container: "body")
= link_to_browse_code(project, commit)
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