From 8bd0709dbad3d09cbce70dc45851754cd50503f0 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Tue, 9 Feb 2021 17:10:05 +0000 Subject: [PATCH] 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 --- .../twentytwentyone/assets/css/ie-editor.css | 38 +++++++++---------- .../themes/twentytwentyone/assets/css/ie.css | 2 +- .../assets/css/style-editor.css | 4 +- .../sass/05-blocks/heading/_editor.scss | 2 +- .../sass/05-blocks/paragraph/_editor.scss | 2 +- .../sass/05-blocks/paragraph/_style.scss | 2 +- .../themes/twentytwentyone/style-rtl.css | 2 +- wp-content/themes/twentytwentyone/style.css | 2 +- wp-includes/version.php | 2 +- 9 files changed, 28 insertions(+), 28 deletions(-) diff --git a/wp-content/themes/twentytwentyone/assets/css/ie-editor.css b/wp-content/themes/twentytwentyone/assets/css/ie-editor.css index e8f547f693..3109cd0491 100644 --- a/wp-content/themes/twentytwentyone/assets/css/ie-editor.css +++ b/wp-content/themes/twentytwentyone/assets/css/ie-editor.css @@ -1180,75 +1180,75 @@ h6 strong { } .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"] { - line-height: --global--line-height-body; + line-height: 1.7; } .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"] { - line-height: --global--line-height-body; + line-height: 1.7; } h2[style*="--wp--typography--line-height"] { - line-height: --global--line-height-body; + line-height: 1.7; } .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"] { - line-height: --global--line-height-body; + line-height: 1.7; } h3[style*="--wp--typography--line-height"] { - line-height: --global--line-height-body; + line-height: 1.7; } .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"] { - line-height: --global--line-height-body; + line-height: 1.7; } h4[style*="--wp--typography--line-height"] { - line-height: --global--line-height-body; + line-height: 1.7; } .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"] { - line-height: --global--line-height-body; + line-height: 1.7; } h5[style*="--wp--typography--line-height"] { - line-height: --global--line-height-body; + line-height: 1.7; } .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"] { - line-height: --global--line-height-body; + line-height: 1.7; } h6[style*="--wp--typography--line-height"] { - line-height: --global--line-height-body; + line-height: 1.7; } .h6[style*="--wp--typography--line-height"] { - line-height: --global--line-height-body; + line-height: 1.7; } .wp-block-heading h1 { @@ -1766,7 +1766,7 @@ dt { } p { - line-height: --global--line-height-body; + line-height: 1.7; } p.has-background { diff --git a/wp-content/themes/twentytwentyone/assets/css/ie.css b/wp-content/themes/twentytwentyone/assets/css/ie.css index 1f805f96ed..30529f3a15 100644 --- a/wp-content/themes/twentytwentyone/assets/css/ie.css +++ b/wp-content/themes/twentytwentyone/assets/css/ie.css @@ -4011,7 +4011,7 @@ dd { } p { - line-height: --global--line-height-body; + line-height: 1.7; } p.has-background { diff --git a/wp-content/themes/twentytwentyone/assets/css/style-editor.css b/wp-content/themes/twentytwentyone/assets/css/style-editor.css index d2b99b31c0..a2236ce007 100644 --- a/wp-content/themes/twentytwentyone/assets/css/style-editor.css +++ b/wp-content/themes/twentytwentyone/assets/css/style-editor.css @@ -1055,7 +1055,7 @@ h5[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"] { - 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, @@ -1415,7 +1415,7 @@ dt { } 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 { diff --git a/wp-content/themes/twentytwentyone/assets/sass/05-blocks/heading/_editor.scss b/wp-content/themes/twentytwentyone/assets/sass/05-blocks/heading/_editor.scss index 4ade8c2763..b1c6a9eeaf 100644 --- a/wp-content/themes/twentytwentyone/assets/sass/05-blocks/heading/_editor.scss +++ b/wp-content/themes/twentytwentyone/assets/sass/05-blocks/heading/_editor.scss @@ -25,7 +25,7 @@ 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)); } } diff --git a/wp-content/themes/twentytwentyone/assets/sass/05-blocks/paragraph/_editor.scss b/wp-content/themes/twentytwentyone/assets/sass/05-blocks/paragraph/_editor.scss index 3e82235d22..3ee367d0c8 100644 --- a/wp-content/themes/twentytwentyone/assets/sass/05-blocks/paragraph/_editor.scss +++ b/wp-content/themes/twentytwentyone/assets/sass/05-blocks/paragraph/_editor.scss @@ -1,5 +1,5 @@ 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 { padding: var(--global--spacing-unit); diff --git a/wp-content/themes/twentytwentyone/assets/sass/05-blocks/paragraph/_style.scss b/wp-content/themes/twentytwentyone/assets/sass/05-blocks/paragraph/_style.scss index f161f1e555..46bca9125b 100644 --- a/wp-content/themes/twentytwentyone/assets/sass/05-blocks/paragraph/_style.scss +++ b/wp-content/themes/twentytwentyone/assets/sass/05-blocks/paragraph/_style.scss @@ -1,6 +1,6 @@ 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 &.has-background { diff --git a/wp-content/themes/twentytwentyone/style-rtl.css b/wp-content/themes/twentytwentyone/style-rtl.css index 9d28f90d48..7da1592bde 100644 --- a/wp-content/themes/twentytwentyone/style-rtl.css +++ b/wp-content/themes/twentytwentyone/style-rtl.css @@ -2855,7 +2855,7 @@ dd { } 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 { diff --git a/wp-content/themes/twentytwentyone/style.css b/wp-content/themes/twentytwentyone/style.css index f9a063c8ae..08241535f4 100644 --- a/wp-content/themes/twentytwentyone/style.css +++ b/wp-content/themes/twentytwentyone/style.css @@ -2865,7 +2865,7 @@ dd { } 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 { diff --git a/wp-includes/version.php b/wp-includes/version.php index 5d51abf590..6ec63559dc 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @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.