diff options
| author | Max Kostikov <max@kostikov.co> | 2020-12-04 14:33:34 +0100 |
|---|---|---|
| committer | Max Kostikov <max@kostikov.co> | 2020-12-04 14:33:34 +0100 |
| commit | a9dd6d6bdbc27e11ffe71644670686d82e05420f (patch) | |
| tree | 05dd57d1c3f2a8b7541598544b92dbbfe964c329 /vendor/twbs/bootstrap/scss/utilities | |
| parent | c9ce562369556ae01044dfb91541c4e4ee35af9e (diff) | |
| parent | 9c7ec55b4049599f3a61192eaf020e3a112dfa0e (diff) | |
| download | volse-hubzilla-a9dd6d6bdbc27e11ffe71644670686d82e05420f.tar.gz volse-hubzilla-a9dd6d6bdbc27e11ffe71644670686d82e05420f.tar.bz2 volse-hubzilla-a9dd6d6bdbc27e11ffe71644670686d82e05420f.zip | |
Merge branch 'dev' into 'dev'
Dev sync
See merge request kostikov/core!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 |