wrapper/tailwindcss
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge branch 'next' into next-cli

Browse source 
# Conflicts:
#	defaultConfig.stub.js
This commit is contained in:
mattstypa 2019-03-15 09:02:47 -05:00
commit de6110f258
5 changed files with 29 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

0
defaultConfig.stub.js Normal file
View file

2
src/corePlugins.js
View file

@ -61,6 +61,7 @@ import userSelect from './plugins/userSelect'
import verticalAlign from './plugins/verticalAlign'
import visibility from './plugins/visibility'
import whitespace from './plugins/whitespace'
import wordBreak from './plugins/wordBreak'
import width from './plugins/width'
import zIndex from './plugins/zIndex'
@ -131,6 +132,7 @@ export default function({ corePlugins: corePluginConfig }) {
verticalAlign,
visibility,
whitespace,
wordBreak,
width,
zIndex,
})

13
src/plugins/whitespace.js
View file

@ -7,19 +7,6 @@ export default function() {
'.whitespace-pre': { 'white-space': 'pre' },
'.whitespace-pre-line': { 'white-space': 'pre-line' },
'.whitespace-pre-wrap': { 'white-space': 'pre-wrap' },
'.break-normal': {
'overflow-wrap': 'normal',
'word-break': 'normal',
},
'.break-words': { 'overflow-wrap': 'break-word' },
'.break-all': { 'word-break': 'break-all' },
'.truncate': {
overflow: 'hidden',
'text-overflow': 'ellipsis',
'white-space': 'nowrap',
},
},
config('variants.whitespace')
)

21
src/plugins/wordBreak.js Normal file
View file

@ -0,0 +1,21 @@
export default function() {
return function({ addUtilities, config }) {
addUtilities(
{
'.break-normal': {
'overflow-wrap': 'normal',
'word-break': 'normal',
},
'.break-words': { 'overflow-wrap': 'break-word' },
'.break-all': { 'word-break': 'break-all' },
'.truncate': {
overflow: 'hidden',
'text-overflow': 'ellipsis',
'white-space': 'nowrap',
},
},
config('variants.wordBreak')
)
}
}

12
yarn.lock
View file

@ -927,11 +927,11 @@ atob@^2.1.1:
resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.1.tgz#ae2d5a729477f289d60dd7f96a6314a22dd6c22a"
autoprefixer@^9.4.5:
version "9.4.10"
resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.4.10.tgz#e1be61fc728bacac8f4252ed242711ec0dcc6a7b"
version "9.5.0"
resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.5.0.tgz#7e51d0355c11596e6cf9a0afc9a44e86d1596c70"
dependencies:
browserslist "^4.4.2"
caniuse-lite "^1.0.30000940"
caniuse-lite "^1.0.30000947"
normalize-range "^0.1.2"
num2fraction "^1.2.2"
postcss "^7.0.14"
@ -1116,9 +1116,9 @@ camelcase@^5.0.0:
version "5.2.0"
resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.2.0.tgz#e7522abda5ed94cc0489e1b8466610e88404cf45"
caniuse-lite@^1.0.30000939, caniuse-lite@^1.0.30000940:
version "1.0.30000941"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000941.tgz#f0810802b2ab8d27f4b625d4769a610e24d5a42c"
caniuse-lite@^1.0.30000939, caniuse-lite@^1.0.30000947:
version "1.0.30000947"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000947.tgz#c30305e9701449c22e97f4e9837cea3d76aa3273"
capture-exit@^1.2.0:
version "1.2.0"