Twenty Twenty-One: Use correct value for the global `line-height` CSS variable.

Props acerempel, mukesh27, dd32, poena.
Fixes #52477.
Built from https://develop.svn.wordpress.org/trunk@50273


git-svn-id: http://core.svn.wordpress.org/trunk@49918 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2021-02-09 17:10:05 +00:00
parent 2fdd20da49
commit 8bd0709dba
9 changed files with 28 additions and 28 deletions

View File

@ -1180,75 +1180,75 @@ h6 strong {
} }
.wp-block-heading h1[style*="--wp--typography--line-height"] { .wp-block-heading h1[style*="--wp--typography--line-height"] {
line-height: --global--line-height-body; line-height: 1.7;
} }
h1[style*="--wp--typography--line-height"] { h1[style*="--wp--typography--line-height"] {
line-height: --global--line-height-body; line-height: 1.7;
} }
.h1[style*="--wp--typography--line-height"] { .h1[style*="--wp--typography--line-height"] {
line-height: --global--line-height-body; line-height: 1.7;
} }
.wp-block-heading h2[style*="--wp--typography--line-height"] { .wp-block-heading h2[style*="--wp--typography--line-height"] {
line-height: --global--line-height-body; line-height: 1.7;
} }
h2[style*="--wp--typography--line-height"] { h2[style*="--wp--typography--line-height"] {
line-height: --global--line-height-body; line-height: 1.7;
} }
.h2[style*="--wp--typography--line-height"] { .h2[style*="--wp--typography--line-height"] {
line-height: --global--line-height-body; line-height: 1.7;
} }
.wp-block-heading h3[style*="--wp--typography--line-height"] { .wp-block-heading h3[style*="--wp--typography--line-height"] {
line-height: --global--line-height-body; line-height: 1.7;
} }
h3[style*="--wp--typography--line-height"] { h3[style*="--wp--typography--line-height"] {
line-height: --global--line-height-body; line-height: 1.7;
} }
.h3[style*="--wp--typography--line-height"] { .h3[style*="--wp--typography--line-height"] {
line-height: --global--line-height-body; line-height: 1.7;
} }
.wp-block-heading h4[style*="--wp--typography--line-height"] { .wp-block-heading h4[style*="--wp--typography--line-height"] {
line-height: --global--line-height-body; line-height: 1.7;
} }
h4[style*="--wp--typography--line-height"] { h4[style*="--wp--typography--line-height"] {
line-height: --global--line-height-body; line-height: 1.7;
} }
.h4[style*="--wp--typography--line-height"] { .h4[style*="--wp--typography--line-height"] {
line-height: --global--line-height-body; line-height: 1.7;
} }
.wp-block-heading h5[style*="--wp--typography--line-height"] { .wp-block-heading h5[style*="--wp--typography--line-height"] {
line-height: --global--line-height-body; line-height: 1.7;
} }
h5[style*="--wp--typography--line-height"] { h5[style*="--wp--typography--line-height"] {
line-height: --global--line-height-body; line-height: 1.7;
} }
.h5[style*="--wp--typography--line-height"] { .h5[style*="--wp--typography--line-height"] {
line-height: --global--line-height-body; line-height: 1.7;
} }
.wp-block-heading h6[style*="--wp--typography--line-height"] { .wp-block-heading h6[style*="--wp--typography--line-height"] {
line-height: --global--line-height-body; line-height: 1.7;
} }
h6[style*="--wp--typography--line-height"] { h6[style*="--wp--typography--line-height"] {
line-height: --global--line-height-body; line-height: 1.7;
} }
.h6[style*="--wp--typography--line-height"] { .h6[style*="--wp--typography--line-height"] {
line-height: --global--line-height-body; line-height: 1.7;
} }
.wp-block-heading h1 { .wp-block-heading h1 {
@ -1766,7 +1766,7 @@ dt {
} }
p { p {
line-height: --global--line-height-body; line-height: 1.7;
} }
p.has-background { p.has-background {

View File

@ -4011,7 +4011,7 @@ dd {
} }
p { p {
line-height: --global--line-height-body; line-height: 1.7;
} }
p.has-background { p.has-background {

View File

@ -1055,7 +1055,7 @@ h5[style*="--wp--typography--line-height"],
.wp-block-heading h6[style*="--wp--typography--line-height"], .wp-block-heading h6[style*="--wp--typography--line-height"],
h6[style*="--wp--typography--line-height"], h6[style*="--wp--typography--line-height"],
.h6[style*="--wp--typography--line-height"] { .h6[style*="--wp--typography--line-height"] {
line-height: var(--wp--typography--line-height, --global--line-height-body); line-height: var(--wp--typography--line-height, var(--global--line-height-body));
} }
.wp-block-heading h1, .wp-block-heading h1,
@ -1415,7 +1415,7 @@ dt {
} }
p { p {
line-height: var(--wp--typography--line-height, --global--line-height-body); line-height: var(--wp--typography--line-height, var(--global--line-height-body));
} }
p.has-background { p.has-background {

View File

@ -25,7 +25,7 @@ h6,
} }
&[style*="--wp--typography--line-height"] { &[style*="--wp--typography--line-height"] {
line-height: var(--wp--typography--line-height, --global--line-height-body); line-height: var(--wp--typography--line-height, var(--global--line-height-body));
} }
} }

View File

@ -1,5 +1,5 @@
p { p {
line-height: var(--wp--typography--line-height, --global--line-height-body); line-height: var(--wp--typography--line-height, var(--global--line-height-body));
&.has-background { &.has-background {
padding: var(--global--spacing-unit); padding: var(--global--spacing-unit);

View File

@ -1,6 +1,6 @@
p { p {
line-height: var(--wp--typography--line-height, --global--line-height-body); line-height: var(--wp--typography--line-height, var(--global--line-height-body));
// inherits general font style set at <body> // inherits general font style set at <body>
&.has-background { &.has-background {

View File

@ -2855,7 +2855,7 @@ dd {
} }
p { p {
line-height: var(--wp--typography--line-height, --global--line-height-body); line-height: var(--wp--typography--line-height, var(--global--line-height-body));
} }
p.has-background { p.has-background {

View File

@ -2865,7 +2865,7 @@ dd {
} }
p { p {
line-height: var(--wp--typography--line-height, --global--line-height-body); line-height: var(--wp--typography--line-height, var(--global--line-height-body));
} }
p.has-background { p.has-background {

View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.7-beta1-50272'; $wp_version = '5.7-beta1-50273';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.