summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2016-10-02 14:18:45 +0000
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2016-10-02 14:18:45 +0000
commit77f832d81385972da1265cff9f9fb4bc153a7af5 (patch)
tree8352e53ca53ee69afea65a468381187a8e33443e
parent3d8900c0d403d6fb97c6f24c21b9d50d9c3678d9 (diff)
parent0968a29fcc5636766c3e3e5f89029302dbe920e9 (diff)
downloadgitlab-ce-77f832d81385972da1265cff9f9fb4bc153a7af5.tar.gz
Merge branch 'fix-issue-title-wrap' into 'master'
Add word-wrap to issue title on issue and milestone boards ## What does this MR do? Adds word-wrap to the issue title found on the issue board and the milestone boards ## Are there points in the code the reviewer needs to double check? Shouldn't be ## Why was this MR needed? Improves UI ## Screenshots (if relevant) Before: ![Screen_Shot_2016-09-19_at_10.19.18_AM](/uploads/7b79fe87c12c0d9a89fff5c725c546a4/Screen_Shot_2016-09-19_at_10.19.18_AM.png) ![Screen_Shot_2016-09-19_at_10.19.14_AM](/uploads/80a7e37433c98a406806249f01fe72fd/Screen_Shot_2016-09-19_at_10.19.14_AM.png) After: ![Screen_Shot_2016-09-19_at_10.18.54_AM](/uploads/e3a9420262a5d521478bea5601afafab/Screen_Shot_2016-09-19_at_10.18.54_AM.png) ![Screen_Shot_2016-09-19_at_10.19.04_AM](/uploads/b87d661bd1492777c4f677ea3ed09dcc/Screen_Shot_2016-09-19_at_10.19.04_AM.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] 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 you do - 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 #22274 See merge request !6412
-rw-r--r--CHANGELOG1
-rw-r--r--app/assets/stylesheets/pages/boards.scss1
-rw-r--r--app/assets/stylesheets/pages/milestone.scss1
3 files changed, 3 insertions, 0 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 92de32d3f71..8510f374c3a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -12,6 +12,7 @@ v 8.13.0 (unreleased)
- Expose expires_at field when sharing project on API
- Allow the Koding integration to be configured through the API
- Added soft wrap button to repository file/blob editor
+ - Add word-wrap to issue title on issue and milestone boards (ClemMakesApps)
- Fix robots.txt disallowing access to groups starting with "s" (Matt Harrison)
- Close open merge request without source project (Katarzyna Kobierska Ula Budziszewska)
- Use a ConnectionPool for Rails.cache on Sidekiq servers
diff --git a/app/assets/stylesheets/pages/boards.scss b/app/assets/stylesheets/pages/boards.scss
index 9c84dceed05..ecc5b24e360 100644
--- a/app/assets/stylesheets/pages/boards.scss
+++ b/app/assets/stylesheets/pages/boards.scss
@@ -197,6 +197,7 @@ lex
a {
color: inherit;
+ word-wrap: break-word;
}
}
diff --git a/app/assets/stylesheets/pages/milestone.scss b/app/assets/stylesheets/pages/milestone.scss
index 6b865730487..8c2ba3ed58c 100644
--- a/app/assets/stylesheets/pages/milestone.scss
+++ b/app/assets/stylesheets/pages/milestone.scss
@@ -33,6 +33,7 @@
// Issue title
span a {
color: $gl-text-color;
+ word-wrap: break-word;
}
}
}