diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-10-22 15:44:34 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-10-22 15:44:34 +0000 |
| commit | 65663d64bced54c0f7c5ac18428b87377d51a92e (patch) | |
| tree | d7c5b8876ace6cd532613b9ed7a3b8eae41c7249 | |
| parent | 8655f4793e14b1361ca7f1900a74390b21cb2b1d (diff) | |
| parent | 5f1c99b757b7c23d476b6b523160c242db09259f (diff) | |
| download | gitlab-ce-65663d64bced54c0f7c5ac18428b87377d51a92e.tar.gz | |
Merge branch 'rs-issuable-filter-count-style' into 'master'
Fix alignment of the filter counter for Issuables
## Before:
## After:
See merge request !1667
| -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" |