From 768c11f15c9c9492ded760378fbdf66597b3d727 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Tue, 10 Mar 2020 11:04:08 +0000 Subject: [PATCH] Bundled Themes: Twenty Twenty content font CSS selector is too important - updated. This adds more selectors for headings, tables, addresses, cite, figcaption, file and caption blocks to make the font-family match as before [47133]. Props alexandreb3, ianbelanger. Reviewed by SergeyBiryukov. Merges [47439] to the 5.4 branch. Fixes #49318. Built from https://develop.svn.wordpress.org/branches/5.4@47440 git-svn-id: http://core.svn.wordpress.org/branches/5.4@47227 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-content/themes/twentytwenty/style-rtl.css | 22 ++++++++++++++++++-- wp-content/themes/twentytwenty/style.css | 22 ++++++++++++++++++-- wp-includes/version.php | 2 +- 3 files changed, 41 insertions(+), 5 deletions(-) diff --git a/wp-content/themes/twentytwenty/style-rtl.css b/wp-content/themes/twentytwenty/style-rtl.css index e7d7e7d503..99e9a47f89 100644 --- a/wp-content/themes/twentytwenty/style-rtl.css +++ b/wp-content/themes/twentytwenty/style-rtl.css @@ -3511,17 +3511,35 @@ figure.wp-block-table.is-style-stripes { letter-spacing: normal; } +.entry-content h1, +.entry-content h2, +.entry-content h3, +.entry-content h4, +.entry-content h5, +.entry-content h6, .entry-content cite, .entry-content figcaption, -.entry-content .wp-caption-text { +.entry-content table, +.entry-content address, +.entry-content .wp-caption-text, +.entry-content .wp-block-file { font-family: -apple-system, BlinkMacSystemFont, "Helvetica Neue", Helvetica, sans-serif; } @supports ( font-variation-settings: normal ) { + .entry-content h1, + .entry-content h2, + .entry-content h3, + .entry-content h4, + .entry-content h5, + .entry-content h6, .entry-content cite, .entry-content figcaption, - .entry-content .wp-caption-text { + .entry-content table, + .entry-content address, + .entry-content .wp-caption-text, + .entry-content .wp-block-file { font-family: "Inter var", -apple-system, BlinkMacSystemFont, "Helvetica Neue", Helvetica, sans-serif; } } diff --git a/wp-content/themes/twentytwenty/style.css b/wp-content/themes/twentytwenty/style.css index a07102ae5f..54fa2261fd 100644 --- a/wp-content/themes/twentytwenty/style.css +++ b/wp-content/themes/twentytwenty/style.css @@ -3533,17 +3533,35 @@ figure.wp-block-table.is-style-stripes { letter-spacing: normal; } +.entry-content h1, +.entry-content h2, +.entry-content h3, +.entry-content h4, +.entry-content h5, +.entry-content h6, .entry-content cite, .entry-content figcaption, -.entry-content .wp-caption-text { +.entry-content table, +.entry-content address, +.entry-content .wp-caption-text, +.entry-content .wp-block-file { font-family: -apple-system, BlinkMacSystemFont, "Helvetica Neue", Helvetica, sans-serif; } @supports ( font-variation-settings: normal ) { + .entry-content h1, + .entry-content h2, + .entry-content h3, + .entry-content h4, + .entry-content h5, + .entry-content h6, .entry-content cite, .entry-content figcaption, - .entry-content .wp-caption-text { + .entry-content table, + .entry-content address, + .entry-content .wp-caption-text, + .entry-content .wp-block-file { font-family: "Inter var", -apple-system, BlinkMacSystemFont, "Helvetica Neue", Helvetica, sans-serif; } } diff --git a/wp-includes/version.php b/wp-includes/version.php index 19c1bc2059..deb4c5b9bf 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.4-RC1-47438'; +$wp_version = '5.4-RC1-47440'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.