diff options
author | skv <skv-headless@yandex.ru> | 2014-02-06 22:16:47 +0400 |
---|---|---|
committer | skv <skv-headless@yandex.ru> | 2014-02-06 22:16:47 +0400 |
commit | 7a8f0019cfffe54e8ad732ee00d779bea751e489 (patch) | |
tree | 657e6a77ad1aea415f1118aef3f413418cacb76e /app/views/projects | |
parent | f7b46fa5fff2b26d8213aeb8619f2212e39f9541 (diff) | |
download | gitlab-ce-7a8f0019cfffe54e8ad732ee00d779bea751e489.tar.gz |
Replace badge to labels, because twbs3 doesn't supprot colored badges
Diffstat (limited to 'app/views/projects')
-rw-r--r-- | app/views/projects/milestones/_issues.html.haml | 2 | ||||
-rw-r--r-- | app/views/projects/milestones/_merge_request.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/milestones/_issues.html.haml b/app/views/projects/milestones/_issues.html.haml index 21939ad0132..c277dcc5364 100644 --- a/app/views/projects/milestones/_issues.html.haml +++ b/app/views/projects/milestones/_issues.html.haml @@ -4,7 +4,7 @@ - issues.each do |issue| %li = link_to [@project, issue] do - %span.badge{class: issue.closed? ? 'badge-important' : 'badge-info'} ##{issue.iid} + %span.label{class: issue.closed? ? 'label-danger' : 'label-info'} ##{issue.iid} = link_to_gfm truncate(issue.title, length: 40), [@project, issue] - if issue.assignee .pull-right diff --git a/app/views/projects/milestones/_merge_request.html.haml b/app/views/projects/milestones/_merge_request.html.haml index 8e30a42a608..faa35a25f2f 100644 --- a/app/views/projects/milestones/_merge_request.html.haml +++ b/app/views/projects/milestones/_merge_request.html.haml @@ -1,5 +1,5 @@ %li = link_to [@project, merge_request] do - %span.badge.badge-info ##{merge_request.iid} + %span.label.label-info ##{merge_request.iid} – = link_to_gfm truncate(merge_request.title, length: 60), [@project, merge_request] |