Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- Support `@theme reference { … }` for defining theme values without emitting variables ([#13222](https://github.com/tailwindlabs/tailwindcss/pull/13222))

### Fixed

- Don't rely on existence of `--default-transition-*` variables in `transition-*` utilities ([#13219](https://github.com/tailwindlabs/tailwindcss/pull/13219))

## [4.0.0-alpha.8] - 2024-03-11

### Fixed
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ exports[`\`@import 'tailwindcss'\` is replaced with the generated CSS 1`] = `
"@layer theme {
:root {
--default-transition-duration: .15s;
--default-transition-timing-function: var(--transition-timing-function-in-out);
--default-transition-timing-function: cubic-bezier(.4, 0, .2, 1);
--default-font-family: var(--font-family-sans);
--default-font-feature-settings: var(--font-family-sans--font-feature-settings);
--default-font-variation-settings: var(--font-family-sans--font-variation-settings);
Expand Down Expand Up @@ -393,7 +393,6 @@ exports[`\`@import 'tailwindcss'\` is replaced with the generated CSS 1`] = `
--line-height-8: 2rem;
--line-height-9: 2.25rem;
--line-height-10: 2.5rem;
--transition-timing-function: cubic-bezier(.4, 0, .2, 1);
--transition-timing-function-linear: linear;
--transition-timing-function-in: cubic-bezier(.4, 0, 1, 1);
--transition-timing-function-out: cubic-bezier(0, 0, .2, 1);
Expand Down
3 changes: 1 addition & 2 deletions packages/tailwindcss/src/__snapshots__/index.test.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
exports[`compiling CSS > \`@tailwind utilities\` is replaced by utilities using the default theme 1`] = `
":root {
--default-transition-duration: .15s;
--default-transition-timing-function: var(--transition-timing-function-in-out);
--default-transition-timing-function: cubic-bezier(.4, 0, .2, 1);
--default-font-family: var(--font-family-sans);
--default-font-feature-settings: var(--font-family-sans--font-feature-settings);
--default-font-variation-settings: var(--font-family-sans--font-variation-settings);
Expand Down Expand Up @@ -392,7 +392,6 @@ exports[`compiling CSS > \`@tailwind utilities\` is replaced by utilities using
--line-height-8: 2rem;
--line-height-9: 2.25rem;
--line-height-10: 2.5rem;
--transition-timing-function: cubic-bezier(.4, 0, .2, 1);
--transition-timing-function-linear: linear;
--transition-timing-function-in: cubic-bezier(.4, 0, 1, 1);
--transition-timing-function-out: cubic-bezier(0, 0, .2, 1);
Expand Down
2 changes: 2 additions & 0 deletions packages/tailwindcss/src/theme.ts
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,8 @@ export type ThemeKey =
| '--default-border-width'
| '--default-ring-color'
| '--default-ring-width'
| '--default-transition-timing-function'
| '--default-transition-duration'
| '--divide-width'
| '--divide-color'
| '--drop-shadow'
Expand Down
48 changes: 34 additions & 14 deletions packages/tailwindcss/src/utilities.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9713,6 +9713,8 @@ test('transition', () => {
compileCss(
css`
@theme {
--default-transition-timing-function: ease;
--default-transition-duration: 100ms;
--transition-property: color, background-color, border-color, text-decoration-color, fill,
stroke, opacity, box-shadow, transform, filter, backdrop-filter;
--transition-property-opacity: opacity;
Expand All @@ -9732,56 +9734,74 @@ test('transition', () => {
),
).toMatchInlineSnapshot(`
":root {
--default-transition-timing-function: ease;
--default-transition-duration: .1s;
--transition-property: color, background-color, border-color, text-decoration-color, fill, stroke, opacity, box-shadow, transform, filter, backdrop-filter;
--transition-property-opacity: opacity;
}

.transition {
transition-property: color, background-color, border-color, text-decoration-color, fill, stroke, opacity, box-shadow, transform, translate, scale, rotate, filter, -webkit-backdrop-filter, -webkit-backdrop-filter, backdrop-filter;
transition-timing-function: var(--default-transition-timing-function);
transition-duration: var(--default-transition-duration);
transition-duration: .1s;
transition-timing-function: ease;
}

.transition-\\[--value\\] {
transition-property: var(--value);
transition-timing-function: var(--default-transition-timing-function);
transition-duration: var(--default-transition-duration);
transition-duration: .1s;
transition-timing-function: ease;
}

.transition-all {
transition-property: all;
transition-timing-function: var(--default-transition-timing-function);
transition-duration: var(--default-transition-duration);
transition-duration: .1s;
transition-timing-function: ease;
}

.transition-colors {
transition-property: color, background-color, border-color, text-decoration-color, fill, stroke;
transition-timing-function: var(--default-transition-timing-function);
transition-duration: var(--default-transition-duration);
transition-duration: .1s;
transition-timing-function: ease;
}

.transition-opacity {
transition-property: opacity;
transition-timing-function: var(--default-transition-timing-function);
transition-duration: var(--default-transition-duration);
transition-duration: .1s;
transition-timing-function: ease;
}

.transition-shadow {
transition-property: box-shadow;
transition-timing-function: var(--default-transition-timing-function);
transition-duration: var(--default-transition-duration);
transition-duration: .1s;
transition-timing-function: ease;
}

.transition-transform {
transition-property: transform, translate, scale, rotate;
transition-timing-function: var(--default-transition-timing-function);
transition-duration: var(--default-transition-duration);
transition-duration: .1s;
transition-timing-function: ease;
}

.transition-none {
transition-property: none;
}"
`)

expect(
compileCss(
css`
@tailwind utilities;
`,
['transition-all'],
),
).toMatchInlineSnapshot(`
".transition-all {
transition-property: all;
transition-duration: 0s;
transition-timing-function: ease;
}"
`)

expect(
run([
'-transition',
Expand Down
4 changes: 2 additions & 2 deletions packages/tailwindcss/src/utilities.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3322,8 +3322,8 @@ export function createUtilities(theme: Theme) {
}

{
let defaultTimingFunction = 'var(--default-transition-timing-function)'
let defaultDuration = 'var(--default-transition-duration)'
let defaultTimingFunction = theme.get(['--default-transition-timing-function']) ?? 'ease'
let defaultDuration = theme.get(['--default-transition-duration']) ?? '0s'

staticUtility('transition-none', [['transition-property', 'none']])
staticUtility('transition-all', [
Expand Down
3 changes: 1 addition & 2 deletions packages/tailwindcss/theme.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@theme {
/* Defaults */
--default-transition-duration: 150ms;
--default-transition-timing-function: var(--transition-timing-function-in-out);
--default-transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
--default-font-family: var(--font-family-sans);
--default-font-feature-settings: var(--font-family-sans--font-feature-settings);
--default-font-variation-settings: var(--font-family-sans--font-variation-settings);
Expand Down Expand Up @@ -422,7 +422,6 @@
--line-height-10: 2.5rem;

/* Transition timing functions */
--transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
--transition-timing-function-linear: linear;
--transition-timing-function-in: cubic-bezier(0.4, 0, 1, 1);
--transition-timing-function-out: cubic-bezier(0, 0, 0.2, 1);
Expand Down