diff options
| author | Sam Rose <sam@gitlab.com> | 2016-12-19 10:25:46 -0500 |
|---|---|---|
| committer | Sam Rose <sam@gitlab.com> | 2016-12-19 14:18:08 -0500 |
| commit | e7c56dd1f63a0065b5930accb3ff24314430f82c (patch) | |
| tree | 85a8d0b169615e710177491e4c2d67d2f67a21f2 | |
| parent | ffcd20cec8b848e24b54fc37658d9841d34f5c35 (diff) | |
| download | gitlab-ce-25810-misaligned-count.tar.gz | |
Align milestone column header with count number25810-misaligned-count
| -rw-r--r-- | app/assets/stylesheets/framework/panels.scss | 14 | ||||
| -rw-r--r-- | app/views/shared/milestones/_issuables.html.haml | 8 |
2 files changed, 19 insertions, 3 deletions
diff --git a/app/assets/stylesheets/framework/panels.scss b/app/assets/stylesheets/framework/panels.scss index 5ba0486177f..9d8d08dff88 100644 --- a/app/assets/stylesheets/framework/panels.scss +++ b/app/assets/stylesheets/framework/panels.scss @@ -18,6 +18,20 @@ margin-top: -2px; margin-left: 5px; } + + &.split { + display: flex; + align-items: center; + } + + .left { + flex: 1 1 auto; + } + + .right { + flex: 0 0 auto; + text-align: right; + } } .panel-body { diff --git a/app/views/shared/milestones/_issuables.html.haml b/app/views/shared/milestones/_issuables.html.haml index 8619939dde7..15ff5b8a27e 100644 --- a/app/views/shared/milestones/_issuables.html.haml +++ b/app/views/shared/milestones/_issuables.html.haml @@ -3,10 +3,12 @@ - panel_class = primary ? 'panel-primary' : 'panel-default' .panel{ class: panel_class } - .panel-heading - = title + .panel-heading.split + .left + = title - if show_counter - .pull-right= issuables.size + .right + = issuables.size - class_prefix = dom_class(issuables).pluralize %ul{ class: "well-list #{class_prefix}-sortable-list", id: "#{class_prefix}-list-#{id}", "data-state" => id } |