Commit 65663d64 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'rs-issuable-filter-count-style' into 'master'

Fix alignment of the filter counter for Issuables

## Before:

![Screen_Shot_2015-10-22_at_4.00.15_PM](/uploads/5f54faf3b056c1b3e2cb1b6d5c27614b/Screen_Shot_2015-10-22_at_4.00.15_PM.png)

## After:

![Screen_Shot_2015-10-22_at_3.58.04_PM](/uploads/127a90795aed7d41c053a735bbee0e3b/Screen_Shot_2015-10-22_at_3.58.04_PM.png)


See merge request !1667
parents 8655f479 5f1c99b7
...@@ -80,3 +80,11 @@ ...@@ -80,3 +80,11 @@
} }
} }
} }
.issuable-filter-count {
span {
display: block;
margin-bottom: -16px;
padding: 13px 0;
}
}
...@@ -5,8 +5,9 @@ ...@@ -5,8 +5,9 @@
.nothing-here-block No issues to show .nothing-here-block No issues to show
- if @issues.present? - if @issues.present?
.pull-right .issuable-filter-count
%span.issue_counter #{@issues.total_count} %span.pull-right
= @issues.total_count
issues for this filter issues for this filter
= paginate @issues, theme: "gitlab" = paginate @issues, theme: "gitlab"
...@@ -5,8 +5,10 @@ ...@@ -5,8 +5,10 @@
.nothing-here-block No merge requests to show .nothing-here-block No merge requests to show
- if @merge_requests.present? - if @merge_requests.present?
.pull-right .issuable-filter-count
%span.cgray.pull-right #{@merge_requests.total_count} merge requests for this filter %span.pull-right
= @merge_requests.total_count
merge requests for this filter
= paginate @merge_requests, theme: "gitlab" = paginate @merge_requests, theme: "gitlab"
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