From 0e7386521b1d33d25170e0d6250f8c4662c69e55 Mon Sep 17 00:00:00 2001
From: ryelle <ryelle@git.wordpress.org>
Date: Mon, 15 Feb 2021 18:56:04 +0000
Subject: [PATCH] Bundled Themes: Support font size option for code block.

Adds font-size support to Twenty Fourteen, Twenty Sixteen, and Twenty Seventeen.

Props poena, paaljoachim, peterwilsoncc.
Fixes #52431.


Built from https://develop.svn.wordpress.org/trunk@50347


git-svn-id: http://core.svn.wordpress.org/trunk@49958 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-content/themes/twentyfourteen/css/blocks.css             | 4 ++++
 wp-content/themes/twentyfourteen/css/editor-blocks.css      | 4 ++++
 wp-content/themes/twentyseventeen/assets/css/blocks.css     | 4 ++++
 .../themes/twentyseventeen/assets/css/editor-blocks.css     | 4 ++++
 wp-content/themes/twentysixteen/css/blocks.css              | 6 ++++--
 wp-includes/version.php                                     | 2 +-
 6 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/wp-content/themes/twentyfourteen/css/blocks.css b/wp-content/themes/twentyfourteen/css/blocks.css
index e0f0e231e7..d6ba5f050f 100644
--- a/wp-content/themes/twentyfourteen/css/blocks.css
+++ b/wp-content/themes/twentyfourteen/css/blocks.css
@@ -168,6 +168,10 @@ p.has-drop-cap:not(:focus)::first-letter {
 	padding: 0;
 }
 
+.wp-block-code code {
+	font-size: inherit;
+}
+
 /* Pullquote */
 
 .wp-block-pullquote {
diff --git a/wp-content/themes/twentyfourteen/css/editor-blocks.css b/wp-content/themes/twentyfourteen/css/editor-blocks.css
index 8cc7c09368..a6d4cb37c7 100644
--- a/wp-content/themes/twentyfourteen/css/editor-blocks.css
+++ b/wp-content/themes/twentyfourteen/css/editor-blocks.css
@@ -357,6 +357,10 @@ p.has-drop-cap:not(:focus)::first-letter {
 	padding: 0;
 }
 
+.editor-styles-wrapper .wp-block-code code {
+	font-size: inherit;
+}
+
 /* Pullquote */
 
 .wp-block-pullquote {
diff --git a/wp-content/themes/twentyseventeen/assets/css/blocks.css b/wp-content/themes/twentyseventeen/assets/css/blocks.css
index 06ef5ca25a..7aba715c8b 100644
--- a/wp-content/themes/twentyseventeen/assets/css/blocks.css
+++ b/wp-content/themes/twentyseventeen/assets/css/blocks.css
@@ -149,6 +149,10 @@ p.has-drop-cap:not(:focus)::first-letter {
 	padding: 0;
 }
 
+.wp-block-code code {
+	font-size: inherit;
+}
+
 /* Pullquote */
 
 .wp-block-pullquote {
diff --git a/wp-content/themes/twentyseventeen/assets/css/editor-blocks.css b/wp-content/themes/twentyseventeen/assets/css/editor-blocks.css
index d820a8192b..6357aca713 100644
--- a/wp-content/themes/twentyseventeen/assets/css/editor-blocks.css
+++ b/wp-content/themes/twentyseventeen/assets/css/editor-blocks.css
@@ -622,6 +622,10 @@ html[lang="th"] .edit-post-visual-editor * {
 	padding: 0;
 }
 
+.editor-styles-wrapper .wp-block-code code {
+	font-size: inherit;
+}
+
 /* Classic */
 
 .wp-block-freeform.block-library-rich-text__tinymce li,
diff --git a/wp-content/themes/twentysixteen/css/blocks.css b/wp-content/themes/twentysixteen/css/blocks.css
index bdc79a598d..72a6873660 100644
--- a/wp-content/themes/twentysixteen/css/blocks.css
+++ b/wp-content/themes/twentysixteen/css/blocks.css
@@ -145,12 +145,14 @@ p.has-drop-cap:not(:focus)::first-letter {
 .wp-block-code {
 	border: 0;
 	font-family: Inconsolata, monospace;
-	font-size: 16px;
-	font-size: 1rem;
 	line-height: 1.75;
 	padding: 0;
 }
 
+.wp-block-code code {
+	font-size: inherit;
+}
+
 /* Pullquote */
 
 .wp-block-pullquote {
diff --git a/wp-includes/version.php b/wp-includes/version.php
index ec250d1224..83c7826fcb 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.7-beta2-50346';
+$wp_version = '5.7-beta2-50347';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.