Skip to content

Commit b775e6a

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

File tree

3 files changed

+1
-12
lines changed

3 files changed

+1
-12
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,6 @@ exports[`\`@import 'tailwindcss'\` is replaced with the generated CSS 1`] = `
3939
-webkit-tap-highlight-color: transparent;
4040
}
4141
42-
body {
43-
line-height: inherit;
44-
}
45-
4642
hr {
4743
height: 0;
4844
color: inherit;

packages/tailwindcss/preflight.css

Lines changed: 0 additions & 8 deletions
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)

0 commit comments

Comments
 (0)