From 66d46430a7600af28f091c730bde1ef9db371f09 Mon Sep 17 00:00:00 2001
From: desrosj <desrosj@git.wordpress.org>
Date: Thu, 17 Dec 2020 14:22:05 +0000
Subject: [PATCH] Twenty Twenty-One: Make text within code blocks readable in
 Dark Mode.

This change ensures that the primary text color specific to Dark Mode is used instead of the one specified for normal mode. The latter is not legible in Dark Mode.

Props slaFFik, poena, mukesh27, justinahinon.
Fixes #51985.
Built from https://develop.svn.wordpress.org/trunk@49825


git-svn-id: http://core.svn.wordpress.org/trunk@49544 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-content/themes/twentytwentyone/assets/css/ie.css             | 1 +
 .../twentytwentyone/assets/sass/05-blocks/code/_style.scss      | 1 +
 wp-content/themes/twentytwentyone/style-rtl.css                 | 1 +
 wp-content/themes/twentytwentyone/style.css                     | 1 +
 wp-includes/version.php                                         | 2 +-
 5 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/wp-content/themes/twentytwentyone/assets/css/ie.css b/wp-content/themes/twentytwentyone/assets/css/ie.css
index 2333dd849d..61ea77b3e7 100644
--- a/wp-content/themes/twentytwentyone/assets/css/ie.css
+++ b/wp-content/themes/twentytwentyone/assets/css/ie.css
@@ -2573,6 +2573,7 @@ input[type=reset]:hover {
 }
 
 .wp-block-code code {
+	color: #28303d;
 	font-size: 1rem;
 	white-space: pre;
 	overflow-x: auto;
diff --git a/wp-content/themes/twentytwentyone/assets/sass/05-blocks/code/_style.scss b/wp-content/themes/twentytwentyone/assets/sass/05-blocks/code/_style.scss
index ce783f954f..58f8a7c15e 100644
--- a/wp-content/themes/twentytwentyone/assets/sass/05-blocks/code/_style.scss
+++ b/wp-content/themes/twentytwentyone/assets/sass/05-blocks/code/_style.scss
@@ -6,6 +6,7 @@
 	padding: var(--global--spacing-unit);
 
 	code {
+		color: var(--global--color-primary);
 		font-size: var(--global--font-size-xs);
 		white-space: pre;
 		overflow-x: auto;
diff --git a/wp-content/themes/twentytwentyone/style-rtl.css b/wp-content/themes/twentytwentyone/style-rtl.css
index 5ba5e36c87..b1d08af057 100644
--- a/wp-content/themes/twentytwentyone/style-rtl.css
+++ b/wp-content/themes/twentytwentyone/style-rtl.css
@@ -1870,6 +1870,7 @@ input[type=reset]:hover,
 }
 
 .wp-block-code code {
+	color: var(--global--color-primary);
 	font-size: var(--global--font-size-xs);
 	white-space: pre;
 	overflow-x: auto;
diff --git a/wp-content/themes/twentytwentyone/style.css b/wp-content/themes/twentytwentyone/style.css
index 033847aaf3..747d34d103 100644
--- a/wp-content/themes/twentytwentyone/style.css
+++ b/wp-content/themes/twentytwentyone/style.css
@@ -1880,6 +1880,7 @@ input[type=reset]:hover,
 }
 
 .wp-block-code code {
+	color: var(--global--color-primary);
 	font-size: var(--global--font-size-xs);
 	white-space: pre;
 	overflow-x: auto;
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 6eafc20b03..43ae4c7857 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.7-alpha-49823';
+$wp_version = '5.7-alpha-49825';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.