From cfba8e58508b7fb4ef314f2e5f8df711972e3456 Mon Sep 17 00:00:00 2001
From: ryelle <ryelle@git.wordpress.org>
Date: Tue, 13 Jul 2021 16:18:59 +0000
Subject: [PATCH] Help/About: Update the About section for 5.8.

Update the image links to use the CDN. Use regular text color for headings. Fix two string issues. Remove unnecessary wp-components script & style.
Use a larger image for theme.json on retina screens, and update the spacing of sections on the page.

Props nao, audrasjb, karmatosed, desrosj, javiarce, milana_cap.
Merges [51413] and [51418] to the 5.8 branch.
See #52775.


Built from https://develop.svn.wordpress.org/branches/5.8@51420


git-svn-id: http://core.svn.wordpress.org/branches/5.8@51031 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/about.php      | 58 +++++++++++++++--------------------------
 wp-admin/credits.php    |  4 +--
 wp-includes/version.php |  2 +-
 3 files changed, 24 insertions(+), 40 deletions(-)

diff --git a/wp-admin/about.php b/wp-admin/about.php
index 61a250a1d2..639df3bc08 100644
--- a/wp-admin/about.php
+++ b/wp-admin/about.php
@@ -9,9 +9,6 @@
 /** WordPress Administration Bootstrap */
 require_once __DIR__ . '/admin.php';
 
-wp_enqueue_script( 'wp-components' );
-wp_enqueue_style( 'wp-components' );
-
 /* translators: Page title of the About WordPress page in the admin. */
 $title = _x( 'About', 'page title' );
 
@@ -44,14 +41,14 @@ require_once ABSPATH . 'wp-admin/admin-header.php';
 		<hr />
 
 		<div class="about__section">
-			<h2 class="aligncenter has-accent-color">
+			<h2 class="aligncenter">
 				<?php _e( 'Three Essential Powerhouses' ); ?>
 			</h2>
 		</div>
 
 		<div class="about__section has-2-columns is-wider-left">
-			<div class="column about__image is-vertically-aligned-center is-edge-to-edge">
-				<img src="https://make.wordpress.org/core/files/2021/07/about-58-widgets-blocks.png" alt="" />
+			<div class="column about__image is-vertically-aligned-center">
+				<img src="https://s.w.org/images/core/5.8/about-widgets-blocks.png" alt="" />
 			</div>
 			<div class="column">
 				<h3>
@@ -69,33 +66,23 @@ require_once ABSPATH . 'wp-admin/admin-header.php';
 			</div>
 		</div>
 
-		<hr />
-
 		<div class="about__section has-2-columns is-wider-right">
 			<div class="column">
 				<h3>
 					<?php _e( 'Display Posts with New Blocks and Patterns' ); ?>
 				</h3>
 				<p>
-					<?php
-					printf(
-						/* translators: %s: Query Loop dev note link. */
-						__( 'The Query Loop Block makes it possible to display posts based on specified parameters; like a PHP loop without the code. Easily display posts from a specific category, to do things like create a portfolio or a page full of your favorite recipes. Think of it as a more complex and powerful Latest Posts Block! Plus, pattern suggestions make it easier than ever to create a list of posts with the design you want. For our theme authors, learn more about experimenting with this awesome tool in the <a href="%s">Query Loop Block dev note</a>.' ),
-						'#'
-					);
-					?>
+					<?php _e( 'The Query Loop Block makes it possible to display posts based on specified parameters; like a PHP loop without the code. Easily display posts from a specific category, to do things like create a portfolio or a page full of your favorite recipes. Think of it as a more complex and powerful Latest Posts Block! Plus, pattern suggestions make it easier than ever to create a list of posts with the design you want.' ); ?>
 				</p>
 			</div>
-			<div class="column about__image is-vertically-aligned-center is-edge-to-edge">
-				<img src="https://make.wordpress.org/core/files/2021/07/about-58-patterns.png" alt="" />
+			<div class="column about__image is-vertically-aligned-center">
+				<img src="https://s.w.org/images/core/5.8/about-query-loop.png" alt="" />
 			</div>
 		</div>
 
-		<hr />
-
 		<div class="about__section has-2-columns is-wider-left">
-			<div class="column about__image is-vertically-aligned-center is-edge-to-edge">
-				<img src="https://make.wordpress.org/core/files/2021/07/about-58-template.png" alt="" />
+			<div class="column about__image is-vertically-aligned-center">
+				<img src="https://s.w.org/images/core/5.8/about-template.png" alt="" />
 			</div>
 			<div class="column">
 				<h3>
@@ -112,14 +99,14 @@ require_once ABSPATH . 'wp-admin/admin-header.php';
 		<hr class="is-large" />
 
 		<div class="about__section">
-			<h2 class="aligncenter has-accent-color">
+			<h2 class="aligncenter">
 				<?php _e( 'Three Workflow Helpers' ); ?>
 			</h2>
 		</div>
 
 		<div class="about__section has-2-columns is-wider-left">
-			<div class="column about__image is-vertically-aligned-center is-edge-to-edge">
-				<img src="https://make.wordpress.org/core/files/2021/07/about-58-list-view.png" alt="" />
+			<div class="column about__image is-vertically-aligned-center">
+				<img src="https://s.w.org/images/core/5.8/about-list-view.png" alt="" />
 			</div>
 			<div class="column">
 				<h3>
@@ -133,8 +120,6 @@ require_once ABSPATH . 'wp-admin/admin-header.php';
 			</div>
 		</div>
 
-		<hr />
-
 		<div class="about__section has-2-columns is-wider-right">
 			<div class="column">
 				<h3>
@@ -146,16 +131,14 @@ require_once ABSPATH . 'wp-admin/admin-header.php';
 					?>
 				</p>
 			</div>
-			<div class="column about__image is-vertically-aligned-center is-edge-to-edge">
-				<img src="https://make.wordpress.org/core/files/2021/07/about-58-pattern-suggestions.png" alt="" />
+			<div class="column about__image is-vertically-aligned-center">
+				<img src="https://s.w.org/images/core/5.8/about-pattern-suggestions.png" alt="" />
 			</div>
 		</div>
 
-		<hr />
-
 		<div class="about__section has-2-columns is-wider-left">
-			<div class="column about__image is-vertically-aligned-center is-edge-to-edge">
-				<img src="https://make.wordpress.org/core/files/2021/07/about-58-duotone.png" alt="" />
+			<div class="column about__image is-vertically-aligned-center">
+				<img src="https://s.w.org/images/core/5.8/about-duotone.png" alt="" />
 			</div>
 			<div class="column">
 				<h3>
@@ -172,11 +155,14 @@ require_once ABSPATH . 'wp-admin/admin-header.php';
 		<hr class="is-large" />
 
 		<div class="about__section">
-			<h2 class="aligncenter has-accent-color">
+			<h2 class="aligncenter" style="margin-bottom:0;">
 				<?php _e( 'For Developers to Explore' ); ?>
 			</h2>
-			<div class="column about__image is-vertically-aligned-center is-edge-to-edge">
-				<img src="https://make.wordpress.org/core/files/2021/07/about-58-theme-json.png" alt="" />
+			<div class="column about__image is-vertically-aligned-center">
+				<picture>
+					<source srcset="https://s.w.org/images/core/5.8/about-theme-json.png, https://s.w.org/images/core/5.8/about-theme-json-2x.png 2x">
+					<img src="https://s.w.org/images/core/5.8/about-theme-json.png" alt="">
+				</picture>
 			</div>
 		</div>
 
@@ -197,8 +183,6 @@ require_once ABSPATH . 'wp-admin/admin-header.php';
 			</div>
 		</div>
 
-		<hr />
-
 		<div class="about__section has-3-columns">
 			<div class="column">
 				<h3>
diff --git a/wp-admin/credits.php b/wp-admin/credits.php
index fb3bfbad8f..460b722b76 100644
--- a/wp-admin/credits.php
+++ b/wp-admin/credits.php
@@ -52,7 +52,7 @@ $credits = wp_credits();
 				);
 				?>
 				<br />
-				<a href="https://make.wordpress.org/"><?php _e( 'Get involved in WordPress' ); ?></a>.
+				<a href="https://make.wordpress.org/"><?php _e( 'Get involved in WordPress.' ); ?></a>
 			</p>
 
 			<?php else : ?>
@@ -60,7 +60,7 @@ $credits = wp_credits();
 			<p>
 				<?php _e( 'Want to see your name in lights on this page?' ); ?>
 				<br />
-				<a href="https://make.wordpress.org/"><?php _e( 'Get involved in WordPress' ); ?></a>.
+				<a href="https://make.wordpress.org/"><?php _e( 'Get involved in WordPress.' ); ?></a>
 			</p>
 
 			<?php endif; ?>
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 3e65709028..0f3f40b955 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.8-RC2-51416';
+$wp_version = '5.8-RC2-51420';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.