diff options
| author | Andrew Smith <espadav8@gmail.com> | 2016-11-30 23:17:21 +1000 |
|---|---|---|
| committer | Andrew Smith <espadav8@gmail.com> | 2017-02-15 07:26:47 +1000 |
| commit | fa79fefef8880ac4ba8b4390dd191f8f04171025 (patch) | |
| tree | 4936cec879f07ad58c228221bc6663032cd2b3f3 | |
| parent | edb8ed36cd5ce315ca45a047bd06ab1dfcf44203 (diff) | |
| download | gitlab-ce-fa79fefef8880ac4ba8b4390dd191f8f04171025.tar.gz | |
Fix position of counters within milestone panels
3 files changed, 27 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 diff --git a/changelogs/unreleased/23819-fix-milestone-counters-to-top-right-of-panel-headings.yml b/changelogs/unreleased/23819-fix-milestone-counters-to-top-right-of-panel-headings.yml new file mode 100644 index 00000000000..628db8a5419 --- /dev/null +++ b/changelogs/unreleased/23819-fix-milestone-counters-to-top-right-of-panel-headings.yml @@ -0,0 +1,4 @@ +--- +title: Fix position of counter in milestone panels +merge_request: 7842 +author: Andrew Smith (EspadaV8) |