Skip to content

Commit 14c2ee9

Browse files
Merge branch 'main' into chore/--theme-as-var
2 parents feb93a9 + 1564bf0 commit 14c2ee9

File tree

4 files changed

+1
-293
lines changed

4 files changed

+1
-293
lines changed

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
3131
### Changed
3232

3333
- The `--theme(…)` function now returns CSS variables from your theme variables unless used inside positions where CSS variables are invalid (e.g. inside `@media` queries) ([#17036](https://github.com/tailwindlabs/tailwindcss/pull/17036))
34+
- Remove redundant `line-height: initial` from Preflight ([#15212](https://github.com/tailwindlabs/tailwindcss/pull/15212))
3435

3536
## [4.0.14] - 2025-03-13
3637

packages/@tailwindcss-postcss/src/__snapshots__/index.test.ts.snap

-281
This file was deleted.

packages/tailwindcss/preflight.css

-8
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,6 @@ html,
4545
-webkit-tap-highlight-color: transparent; /* 7 */
4646
}
4747

48-
/*
49-
Inherit line-height from `html` so users can set them as a class directly on the `html` element.
50-
*/
51-
52-
body {
53-
line-height: inherit;
54-
}
55-
5648
/*
5749
1. Add the correct height in Firefox.
5850
2. Correct the inheritance of border color in Firefox. (https://bugzilla.mozilla.org/show_bug.cgi?id=190655)

packages/tailwindcss/src/__snapshots__/index.test.ts.snap

-4
Original file line numberDiff line numberDiff line change
@@ -128,10 +128,6 @@ exports[`compiling CSS > prefix all CSS variables inside preflight 1`] = `
128128
-webkit-tap-highlight-color: transparent;
129129
}
130130
131-
body {
132-
line-height: inherit;
133-
}
134-
135131
hr {
136132
height: 0;
137133
color: inherit;

0 commit comments

Comments
 (0)