diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2017-02-17 22:27:34 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2017-02-17 22:27:34 +0000 |
| commit | a0a81caf4c9dcf6b848c967da84849c60bf081b7 (patch) | |
| tree | c0d66887ca07413d300c90846de3adeee4a69112 /app | |
| parent | ebbf8f605443e6bde95eed36b5b21d0783015334 (diff) | |
| parent | fa79fefef8880ac4ba8b4390dd191f8f04171025 (diff) | |
| download | gitlab-ce-a0a81caf4c9dcf6b848c967da84849c60bf081b7.tar.gz | |
Merge branch '23819-fix-milestone-counters-to-top-right-of-panel-headings' into 'master'
Fix position of milestone panel counters
Closes #23819
See merge request !7842
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/pages/milestone.scss | 20 | ||||
| -rw-r--r-- | app/views/shared/milestones/_issuables.html.haml | 6 |
2 files changed, 23 insertions, 3 deletions
diff --git a/app/assets/stylesheets/pages/milestone.scss b/app/assets/stylesheets/pages/milestone.scss index 3da1150f89b..27c47d36818 100644 --- a/app/assets/stylesheets/pages/milestone.scss +++ b/app/assets/stylesheets/pages/milestone.scss @@ -30,6 +30,26 @@ word-wrap: break-word; } } + + .panel-heading { + line-height: $line-height-base; + padding: 14px 16px; + display: -webkit-flex; + display: flex; + + .title { + -webkit-flex: 1; + -webkit-flex-grow: 1; + flex: 1; + flex-grow: 2; + } + + .counter { + -webkit-flex: 1; + flex: 0; + padding-left: 16px; + } + } } .milestone-summary { diff --git a/app/views/shared/milestones/_issuables.html.haml b/app/views/shared/milestones/_issuables.html.haml index 31eb07ca666..a93cbd1041f 100644 --- a/app/views/shared/milestones/_issuables.html.haml +++ b/app/views/shared/milestones/_issuables.html.haml @@ -3,11 +3,11 @@ - panel_class = primary ? 'panel-primary' : 'panel-default' .panel{ class: panel_class } - .panel-heading.split - .left + .panel-heading + .title = title - if show_counter - .right + .counter = number_with_delimiter(issuables.size) - class_prefix = dom_class(issuables).pluralize |