Commit 7572a314 authored by Fatih Acet's avatar Fatih Acet

Merge branch '25810-misaligned-count' into 'master'

Align milestone column header with count number

## What does this MR do?
- Aligns the milestone column header with the count number
- Prevents the count from wrapping below the column header

## Why was this MR needed?
- Count number was being pushed below the column header text if the text was too long

## Screenshots (if relevant)
- see issue sceenshots for before #25810 
- fixed version
![milestones](/uploads/ca12c290abe814b457ad3b2fb86f7696/milestones.png)


## Does this MR meet the acceptance criteria?

- [ ] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
  - [ ] Added for this feature/bug
  - [ ] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

## What are the relevant issue numbers?


Closes #25810

See merge request !8177
parents 54c723f9 e7c56dd1
...@@ -18,6 +18,20 @@ ...@@ -18,6 +18,20 @@
margin-top: -2px; margin-top: -2px;
margin-left: 5px; margin-left: 5px;
} }
&.split {
display: flex;
align-items: center;
}
.left {
flex: 1 1 auto;
}
.right {
flex: 0 0 auto;
text-align: right;
}
} }
.panel-body { .panel-body {
......
...@@ -3,10 +3,12 @@ ...@@ -3,10 +3,12 @@
- panel_class = primary ? 'panel-primary' : 'panel-default' - panel_class = primary ? 'panel-primary' : 'panel-default'
.panel{ class: panel_class } .panel{ class: panel_class }
.panel-heading .panel-heading.split
= title .left
= title
- if show_counter - if show_counter
.pull-right= issuables.size .right
= issuables.size
- class_prefix = dom_class(issuables).pluralize - class_prefix = dom_class(issuables).pluralize
%ul{ class: "well-list #{class_prefix}-sortable-list", id: "#{class_prefix}-list-#{id}", "data-state" => id } %ul{ class: "well-list #{class_prefix}-sortable-list", id: "#{class_prefix}-list-#{id}", "data-state" => id }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment