diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-01-08 08:14:05 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-01-08 08:14:05 +0300 |
| commit | f9528bfb86817efa4af6eaab464936abb3f44ecb (patch) | |
| tree | c6ac3c08327e2be19a4fafeed84ba6f8b1dfe0fa /app/views/issues | |
| parent | b6568db1bc1dcd7f8b4d5a946b0b91f9dacd7327 (diff) | |
| download | gitlab-ce-f9528bfb86817efa4af6eaab464936abb3f44ecb.tar.gz | |
a bit of restyling for issues and merge request lists
Diffstat (limited to 'app/views/issues')
| -rw-r--r-- | app/views/issues/_filter.html.haml | 1 | ||||
| -rw-r--r-- | app/views/issues/_issues.html.haml | 10 | ||||
| -rw-r--r-- | app/views/issues/_show.html.haml | 9 | ||||
| -rw-r--r-- | app/views/issues/show.html.haml | 2 |
4 files changed, 10 insertions, 12 deletions
diff --git a/app/views/issues/_filter.html.haml b/app/views/issues/_filter.html.haml index 6fc7b9d4c40..9b710a71772 100644 --- a/app/views/issues/_filter.html.haml +++ b/app/views/issues/_filter.html.haml @@ -1,6 +1,5 @@ = form_tag project_issues_path(@project), method: 'get' do %fieldset - %legend Status: %ul.nav.nav-pills.nav-stacked %li{class: ("active" if !params[:status])} = link_to project_issues_path(@project, status: nil) do diff --git a/app/views/issues/_issues.html.haml b/app/views/issues/_issues.html.haml index d7ba4300ce7..8821dbb8d98 100644 --- a/app/views/issues/_issues.html.haml +++ b/app/views/issues/_issues.html.haml @@ -3,12 +3,10 @@ - if @issues.present? %li.bottom - .row - .span7= paginate @issues, remote: true, theme: "gitlab" - .span3.right - %span.cgray.right - %span.issue_counter #{@issues.total_count} - issues for this filter + .left= paginate @issues, remote: true, theme: "gitlab" + .right + %span.issue_counter #{@issues.total_count} + issues for this filter - else %li %h4.nothing_here_message Nothing to show here diff --git a/app/views/issues/_show.html.haml b/app/views/issues/_show.html.haml index 4641e8bdc63..dcef901c15f 100644 --- a/app/views/issues/_show.html.haml +++ b/app/views/issues/_show.html.haml @@ -3,10 +3,6 @@ .issue_check = check_box_tag dom_id(issue,"selected"), nil, false, 'data-id' => issue.id, class: "selected_issue", disabled: !can?(current_user, :modify_issue, issue) .right - - issue.labels.each do |label| - %span.label.label-tag.grouped - %i.icon-tag - = label.name - if issue.notes.any? %span.btn.small.disabled.grouped %i.icon-comment @@ -36,3 +32,8 @@ - if issue.votes_count > 0 = render 'votes/votes_inline', votable: issue + %span + - issue.labels.each do |label| + %span.label + %i.icon-tag + = label.name diff --git a/app/views/issues/show.html.haml b/app/views/issues/show.html.haml index 544817192ab..b96af36fcc0 100644 --- a/app/views/issues/show.html.haml +++ b/app/views/issues/show.html.haml @@ -44,7 +44,7 @@ .right - @issue.labels.each do |label| - %span + %span.label %i.icon-tag = label.name |