diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2015-10-22 16:08:45 +0200 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2015-10-22 16:12:11 +0200 |
| commit | 5f1c99b757b7c23d476b6b523160c242db09259f (patch) | |
| tree | f693d29aeb430c146b983a52b1ec126f00b37a0b | |
| parent | 7924dd5c9f5d55daaa49132844e71d28169d0e20 (diff) | |
| download | gitlab-ce-rs-issuable-filter-count-style.tar.gz | |
Fix alignment of the filter counter for Issuablesrs-issuable-filter-count-style
| -rw-r--r-- | app/assets/stylesheets/pages/issuable.scss | 8 | ||||
| -rw-r--r-- | app/views/projects/issues/_issues.html.haml | 7 | ||||
| -rw-r--r-- | app/views/projects/merge_requests/_merge_requests.html.haml | 6 |
3 files changed, 16 insertions, 5 deletions
diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss index 9da085a3473..c60aa5c7fe7 100644 --- a/app/assets/stylesheets/pages/issuable.scss +++ b/app/assets/stylesheets/pages/issuable.scss @@ -80,3 +80,11 @@ } } } + +.issuable-filter-count { + span { + display: block; + margin-bottom: -16px; + padding: 13px 0; + } +} diff --git a/app/views/projects/issues/_issues.html.haml b/app/views/projects/issues/_issues.html.haml index a3399c57aa2..ca5b1a8386d 100644 --- a/app/views/projects/issues/_issues.html.haml +++ b/app/views/projects/issues/_issues.html.haml @@ -5,8 +5,9 @@ .nothing-here-block No issues to show - if @issues.present? - .pull-right - %span.issue_counter #{@issues.total_count} - issues for this filter + .issuable-filter-count + %span.pull-right + = @issues.total_count + issues for this filter = paginate @issues, theme: "gitlab" diff --git a/app/views/projects/merge_requests/_merge_requests.html.haml b/app/views/projects/merge_requests/_merge_requests.html.haml index d86707b3d97..0af970e4b92 100644 --- a/app/views/projects/merge_requests/_merge_requests.html.haml +++ b/app/views/projects/merge_requests/_merge_requests.html.haml @@ -5,8 +5,10 @@ .nothing-here-block No merge requests to show - if @merge_requests.present? - .pull-right - %span.cgray.pull-right #{@merge_requests.total_count} merge requests for this filter + .issuable-filter-count + %span.pull-right + = @merge_requests.total_count + merge requests for this filter = paginate @merge_requests, theme: "gitlab" |