diff options
| author | Mario <mario@mariovavti.com> | 2021-01-13 09:50:53 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2021-01-13 09:50:53 +0000 |
| commit | 5eefdc6485b2f6082f6fe5dfd6f1731fae7e3a2a (patch) | |
| tree | 7521f4800e393538d19c393c6f495ea2d41cbf5a /vendor/twbs/bootstrap/scss/utilities | |
| parent | 0bc4c7d1a0e4348018e533be600ad1c648fd97fb (diff) | |
| parent | 4d2bcbc5837a7d99dc541595ca8087c335242af0 (diff) | |
| download | volse-hubzilla-5eefdc6485b2f6082f6fe5dfd6f1731fae7e3a2a.tar.gz volse-hubzilla-5eefdc6485b2f6082f6fe5dfd6f1731fae7e3a2a.tar.bz2 volse-hubzilla-5eefdc6485b2f6082f6fe5dfd6f1731fae7e3a2a.zip | |
Merge branch '5.2RC'5.2
Diffstat (limited to 'vendor/twbs/bootstrap/scss/utilities')
| -rw-r--r-- | vendor/twbs/bootstrap/scss/utilities/_borders.scss | 2 | ||||
| -rw-r--r-- | vendor/twbs/bootstrap/scss/utilities/_text.scss | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/vendor/twbs/bootstrap/scss/utilities/_borders.scss b/vendor/twbs/bootstrap/scss/utilities/_borders.scss index 302f6bf84..205f3fc24 100644 --- a/vendor/twbs/bootstrap/scss/utilities/_borders.scss +++ b/vendor/twbs/bootstrap/scss/utilities/_borders.scss @@ -1,4 +1,4 @@ -// stylelint-disable property-blacklist, declaration-no-important +// stylelint-disable property-disallowed-list, declaration-no-important // // Border diff --git a/vendor/twbs/bootstrap/scss/utilities/_text.scss b/vendor/twbs/bootstrap/scss/utilities/_text.scss index 5d0f1c845..3a9f83edf 100644 --- a/vendor/twbs/bootstrap/scss/utilities/_text.scss +++ b/vendor/twbs/bootstrap/scss/utilities/_text.scss @@ -63,8 +63,8 @@ .text-decoration-none { text-decoration: none !important; } .text-break { - word-break: break-word !important; // IE & < Edge 18 - overflow-wrap: break-word !important; + word-break: break-word !important; // Deprecated, but avoids issues with flex containers + word-wrap: break-word !important; // Used instead of `overflow-wrap` for IE & Edge Legacy } // Reset |