Prepare for the v3.2.5 release (#10531)
* Revert "add caption-side utilities (#10470)" This reverts commitf395cc4ae5. * Revert "Add support for configuring default `font-variation-settings` for a `font-family` (#10515)" This reverts commit8bd2846b5b. * Revert "feat: add hyphens (#10071)" This reverts commitf58a43fd75. * Revert "Add logical properties support for inline direction" * Revert "Add `delay-0` and `duration-0` by default" * Revert "Support using variables as arbitrary values without `var()`" * Revert "Add `line-height` modifier support to `font-size` utilities"
This commit is contained in:
parent
04c5b224d2
commit
cb46ebdf22
26 changed files with 324 additions and 822 deletions
|
|
@ -16,10 +16,6 @@ const placeholderRe = new RegExp(placeholder, 'g')
|
|||
// This is not a data type, but rather a function that can normalize the
|
||||
// correct values.
|
||||
export function normalize(value, isRoot = true) {
|
||||
if (value.startsWith('--')) {
|
||||
return `var(${value})`
|
||||
}
|
||||
|
||||
// Keep raw strings if it starts with `url(`
|
||||
if (value.includes('url(')) {
|
||||
return value
|
||||
|
|
|
|||
|
|
@ -133,14 +133,6 @@ export function parseColorFormat(value) {
|
|||
return value
|
||||
}
|
||||
|
||||
function unwrapArbitraryModifier(modifier) {
|
||||
modifier = modifier.slice(1, -1)
|
||||
if (modifier.startsWith('--')) {
|
||||
modifier = `var(${modifier})`
|
||||
}
|
||||
return modifier
|
||||
}
|
||||
|
||||
export function asColor(modifier, options = {}, { tailwindConfig = {} } = {}) {
|
||||
if (options.values?.[modifier] !== undefined) {
|
||||
return parseColorFormat(options.values?.[modifier])
|
||||
|
|
@ -161,7 +153,7 @@ export function asColor(modifier, options = {}, { tailwindConfig = {} } = {}) {
|
|||
normalizedColor = parseColorFormat(normalizedColor)
|
||||
|
||||
if (isArbitraryValue(alpha)) {
|
||||
return withAlphaValue(normalizedColor, unwrapArbitraryModifier(alpha))
|
||||
return withAlphaValue(normalizedColor, alpha.slice(1, -1))
|
||||
}
|
||||
|
||||
if (tailwindConfig.theme?.opacity?.[alpha] === undefined) {
|
||||
|
|
@ -295,7 +287,7 @@ export function* getMatchingTypes(types, rawModifier, options, tailwindConfig) {
|
|||
if (configValue !== null) {
|
||||
utilityModifier = configValue
|
||||
} else if (isArbitraryValue(utilityModifier)) {
|
||||
utilityModifier = unwrapArbitraryModifier(utilityModifier)
|
||||
utilityModifier = utilityModifier.slice(1, -1)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue