diff options
author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-10-08 00:08:06 +0300 |
---|---|---|
committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-10-08 00:08:06 +0300 |
commit | 28ca8502c254d5c3edfb7ece36fc365e7a715df0 (patch) | |
tree | 223c993ec70abec76f596ca8c4c11fbc0415e527 /app | |
parent | 48099e07bf3d137dd389d56e4faa6ad7371670c6 (diff) | |
parent | 7cf68093275cc3052e75ccd9473cf0ae5d384595 (diff) |
Merge branch '22953-label-with-long-title-overlaps-description-field' into 'master'
Truncate long labels with ellipsis in labels page
## What does this MR do?
Fixes #22953, where long labels overlaps into the description field in the labels page. Truncates long labels with ellipsis. Labels that fit are unaffected.
## Are there points in the code the reviewer needs to double check?
No
## Why was this MR needed?
Fixes #22953.
## Screenshots (if relevant)
Existing behavior:
![image](/uploads/4d85730fe9d039d91036d09bf892d9f2/image.png)
With the change:
![desktop](/uploads/6866389cc3a1e2af5c2def59536a2a7c/desktop.png)
![mobile](/uploads/3d1fbb4a3470abefdd3670f7a794d2a8/mobile.png)
## Does this MR meet the acceptance criteria?
- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
- [ ] Added for this feature/bug
- [ ] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #22953
See merge request !6725
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/stylesheets/pages/labels.scss | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/app/assets/stylesheets/pages/labels.scss b/app/assets/stylesheets/pages/labels.scss index 38c7cd98e41..822830706a5 100644 --- a/app/assets/stylesheets/pages/labels.scss +++ b/app/assets/stylesheets/pages/labels.scss @@ -59,6 +59,13 @@ width: 200px; margin-bottom: 0; } + + .label { + overflow: hidden; + text-overflow: ellipsis; + vertical-align: middle; + max-width: 100%; + } } .label-description { |