aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Lacreuse <[email protected]>2019-08-29 10:41:17 +0200
committerMartijn Cuppens <[email protected]>2020-01-04 18:26:24 +0100
commitd5270cb811f1cd39b02e7a18b955a693de1f22cd (patch)
tree05d14c62c9ac2fe694f8a8ff3ccef2770e09685e
parent27cc7926151643505a43b799215a61bde2c12f28 (diff)
downloadbootstrap-d5270cb811f1cd39b02e7a18b955a693de1f22cd.tar.xz
bootstrap-d5270cb811f1cd39b02e7a18b955a693de1f22cd.zip
Use word-wrap in .text-break for IE and Edge compatibility.
-rw-r--r--scss/_utilities.scss2
-rw-r--r--scss/mixins/_reset-text.scss2
-rw-r--r--site/content/docs/4.3/utilities/text.md2
3 files changed, 3 insertions, 3 deletions
diff --git a/scss/_utilities.scss b/scss/_utilities.scss
index 7c53a44c4..32312daf9 100644
--- a/scss/_utilities.scss
+++ b/scss/_utilities.scss
@@ -434,7 +434,7 @@ $utilities: map-merge(
values: italic normal
),
"overflow-wrap": (
- property: overflow-wrap word-break, // word-break for IE & < Edge 18
+ property: overflow-wrap word-wrap, // word-wrap for IE & < Edge 18
class: text,
values: (break: break-word)
),
diff --git a/scss/mixins/_reset-text.scss b/scss/mixins/_reset-text.scss
index bfa9f6e9a..354f5648b 100644
--- a/scss/mixins/_reset-text.scss
+++ b/scss/mixins/_reset-text.scss
@@ -1,6 +1,6 @@
@mixin reset-text {
font-family: $font-family-base;
- // We deliberately do NOT reset font-size or word-wrap.
+ // We deliberately do NOT reset font-size or overflow-wrap / word-wrap.
font-style: normal;
font-weight: $font-weight-normal;
line-height: $line-height-base;
diff --git a/site/content/docs/4.3/utilities/text.md b/site/content/docs/4.3/utilities/text.md
index 88f595b16..00057da25 100644
--- a/site/content/docs/4.3/utilities/text.md
+++ b/site/content/docs/4.3/utilities/text.md
@@ -45,7 +45,7 @@ Prevent text from wrapping with a `.text-nowrap` class.
## Word break
-Prevent long strings of text from breaking your components' layout by using `.text-break` to set `overflow-wrap: break-word` (and `word-break: break-word` for IE & Edge compatibility).
+Prevent long strings of text from breaking your components' layout by using `.text-break` to set `overflow-wrap: break-word` (and `word-wrap: break-word` for IE & Edge compatibility).
{{< example >}}
<p class="text-break">mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm</p>