Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Improve before and after variants #5820

Merged
merged 10 commits into from
Oct 18, 2021
Merged

Improve before and after variants #5820

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a0c81b4
remove unused `withRule`
RobinMalfait Oct 18, 2021
c81d105
ensure all ::before and ::after elements have content
RobinMalfait Oct 18, 2021
b299084
update --tw-content for the content plugin
RobinMalfait Oct 18, 2021
cc232b6
simplify `before` and `after` variants
RobinMalfait Oct 18, 2021
7944eee
update tests, to reflect changes
RobinMalfait Oct 18, 2021
7f4388b
make new `format` and `wrap` API's private for now
RobinMalfait Oct 18, 2021
41efe7e
allow returning a format string from `addVariant` callback
RobinMalfait Oct 18, 2021
39f75cd
add `content: var(--tw-content)` for before/after variants
RobinMalfait Oct 18, 2021
f8b20b7
update tests to add `content: var(--tw-content)`
RobinMalfait Oct 18, 2021
325cc74
update changelog
RobinMalfait Oct 18, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
add content: var(--tw-content) for before/after variants
  • Loading branch information
@RobinMalfait
RobinMalfait committed Oct 18, 2021
commit 39f75cd654e811c7e73d45cd9506f266be78f32a
31 changes: 29 additions & 2 deletions src/corePlugins.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,35 @@ export let variantPlugins = {

addVariant('file', '&::file-selector-button')

addVariant('before', '&::before')
addVariant('after', '&::after')
addVariant('before', ({ container }) => {
container.walkRules((rule) => {
let foundContent = false
rule.walkDecls('content', () => {
foundContent = true
})

if (!foundContent) {
rule.prepend(postcss.decl({ prop: 'content', value: 'var(--tw-content)' }))
}
})

return '&::before'
})

addVariant('after', ({ container }) => {
container.walkRules((rule) => {
let foundContent = false
rule.walkDecls('content', () => {
foundContent = true
})

if (!foundContent) {
rule.prepend(postcss.decl({ prop: 'content', value: 'var(--tw-content)' }))
}
})

return '&::after'
})
},

pseudoClassVariants: ({ addVariant }) => {
Expand Down
1 change: 0 additions & 1 deletion src/css/preflight.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
::before,
::after {
--tw-content: '';
content: var(--tw-content);
}

/*
Expand Down