summaryrefslogtreecommitdiff
path: root/app/views/search
diff options
context:
space:
mode:
authorClement Ho <ClemMakesApps@gmail.com>2018-04-13 14:33:27 -0500
committerClement Ho <ClemMakesApps@gmail.com>2018-04-13 14:33:27 -0500
commit21785171329ef0189a1c99d7b65b106b7bdda48c (patch)
treeaba9d0d5af3b3d2bd229cecc6cfdd77bd61d8d36 /app/views/search
parentb1c4fdecfceaac6509a817325822aa1e04f59046 (diff)
downloadgitlab-ce-21785171329ef0189a1c99d7b65b106b7bdda48c.tar.gz
[skip ci] Convert .label. to .badge.
Diffstat (limited to 'app/views/search')
-rw-r--r--app/views/search/results/_issue.html.haml2
-rw-r--r--app/views/search/results/_merge_request.html.haml4
-rw-r--r--app/views/search/results/_snippet_title.html.haml2
3 files changed, 4 insertions, 4 deletions
diff --git a/app/views/search/results/_issue.html.haml b/app/views/search/results/_issue.html.haml
index bc20d89b4b5..ccaa980b325 100644
--- a/app/views/search/results/_issue.html.haml
+++ b/app/views/search/results/_issue.html.haml
@@ -4,7 +4,7 @@
= link_to [issue.project.namespace.becomes(Namespace), issue.project, issue] do
%span.term.str-truncated= issue.title
- if issue.closed?
- %span.label.label-danger.prepend-left-5 Closed
+ %span.badge.label-danger.prepend-left-5 Closed
.float-right ##{issue.iid}
- if issue.description.present?
.description.term
diff --git a/app/views/search/results/_merge_request.html.haml b/app/views/search/results/_merge_request.html.haml
index e68c08fa54b..44ee512d5a8 100644
--- a/app/views/search/results/_merge_request.html.haml
+++ b/app/views/search/results/_merge_request.html.haml
@@ -3,9 +3,9 @@
= link_to [merge_request.target_project.namespace.becomes(Namespace), merge_request.target_project, merge_request] do
%span.term.str-truncated= merge_request.title
- if merge_request.merged?
- %span.label.label-primary.prepend-left-5 Merged
+ %span.badge.label-primary.prepend-left-5 Merged
- elsif merge_request.closed?
- %span.label.label-danger.prepend-left-5 Closed
+ %span.badge.label-danger.prepend-left-5 Closed
.float-right= merge_request.to_reference
- if merge_request.description.present?
.description.term
diff --git a/app/views/search/results/_snippet_title.html.haml b/app/views/search/results/_snippet_title.html.haml
index 46d4c7291a3..cab95f76304 100644
--- a/app/views/search/results/_snippet_title.html.haml
+++ b/app/views/search/results/_snippet_title.html.haml
@@ -3,7 +3,7 @@
= link_to reliable_snippet_path(snippet_title) do
= truncate(snippet_title.title, length: 60)
- if snippet_title.private?
- %span.label.label-gray
+ %span.badge.label-gray
%i.fa.fa-lock
private
%span.cgray.monospace.tiny.float-right.term