summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Zallmann <tzallmann@gitlab.com>2019-05-07 08:43:18 +0000
committerTim Zallmann <tzallmann@gitlab.com>2019-05-07 08:43:18 +0000
commit0fd571bf4d258d73eaaf09d95d61e60cd613d68b (patch)
treedbfef0e03c916549b49d4150abfd4191c4326be0
parent5cd079e43498982dcef59e32ebf03d6fe6a06286 (diff)
parentef3faea0c77c948e646a83cd269abf3766b51e00 (diff)
downloadgitlab-ce-0fd571bf4d258d73eaaf09d95d61e60cd613d68b.tar.gz
Merge branch 'friendly-wrap-component' into 'master'
Add wbr style for IE11 compatibility See merge request gitlab-org/gitlab-ce!27846
-rw-r--r--app/assets/stylesheets/framework/typography.scss4
-rw-r--r--changelogs/unreleased/friendly-wrap-component.yml5
2 files changed, 9 insertions, 0 deletions
diff --git a/app/assets/stylesheets/framework/typography.scss b/app/assets/stylesheets/framework/typography.scss
index 244b414d334..7c152efd9c7 100644
--- a/app/assets/stylesheets/framework/typography.scss
+++ b/app/assets/stylesheets/framework/typography.scss
@@ -473,3 +473,7 @@ textarea {
/* stylelint-enable */
.lh-100 { line-height: 1; }
+
+wbr {
+ display: inline-block;
+}
diff --git a/changelogs/unreleased/friendly-wrap-component.yml b/changelogs/unreleased/friendly-wrap-component.yml
new file mode 100644
index 00000000000..c16ca0af287
--- /dev/null
+++ b/changelogs/unreleased/friendly-wrap-component.yml
@@ -0,0 +1,5 @@
+---
+title: Add CSS fix for <wbr> elements on IE11
+merge_request: 27846
+author:
+type: other