Automatic merge of gitlab-org/gitlab-ce master

89ce6fec · GitLab Bot · ccb8015a · 0fd571bf · 89ce6fec · 89ce6fec
Commit 89ce6fec authored May 07, 2019 by GitLab Bot
Showing with 9 additions and 0 deletions

app/assets/stylesheets/framework/typography.scss app/assets/stylesheets/framework/typography.scss +4 -0

changelogs/unreleased/friendly-wrap-component.yml changelogs/unreleased/friendly-wrap-component.yml +5 -0

No files found.
--- 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;
+}
--- a/changelogs/unreleased/friendly-wrap-component.yml
+++ b/changelogs/unreleased/friendly-wrap-component.yml
+---
+title: Add CSS fix for <wbr> elements on IE11
+merge_request: 27846
+author:
+type: other