]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Use word-wrap in .text-break for IE and Edge compatibility.
authorFlorian Lacreuse <florian.lacreuse@kobalt.fr>
Thu, 29 Aug 2019 08:41:17 +0000 (10:41 +0200)
committerMartijn Cuppens <martijn.cuppens@gmail.com>
Sat, 4 Jan 2020 17:26:24 +0000 (18:26 +0100)
scss/_utilities.scss
scss/mixins/_reset-text.scss
site/content/docs/4.3/utilities/text.md

index 7c53a44c40622547cd851d2c6e1e5cea18362b0d..32312daf9887cf0f8f746b4be7da1071f4f5d70c 100644 (file)
@@ -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)
     ),
index bfa9f6e9ad88ce10eac705bfc0559fcc2c5890c6..354f5648b8f860800fee8919b0be4db000624711 100644 (file)
@@ -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;
index 88f595b16ffeb0b57f664b678c855cf60640f482..00057da259f299ba9b6eddfcb4deef0a2aea5f36 100644 (file)
@@ -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>