From 9179db7c66f7849ecf2b551195cdfd54445e4d21 Mon Sep 17 00:00:00 2001
From: Gary Pendergast <pento@git.wordpress.org>
Date: Tue, 19 Feb 2019 01:56:43 +0000
Subject: [PATCH] Admin: Update the About page design to match mockups.

This commit also moves the images to s.w.org, removes the old "Gutenberg has been deactivated" warning, as well as removing some old JS from About pages of years gone past.

Props melchoyce, ryelle, paaljoachim, karmatosed, pento.
Fixes #46161.



git-svn-id: https://develop.svn.wordpress.org/trunk@44749 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/about.php     | 232 +++++++------------------------------
 src/wp-admin/css/about.css | 148 +++++++++++------------
 2 files changed, 110 insertions(+), 270 deletions(-)

diff --git a/src/wp-admin/about.php b/src/wp-admin/about.php
index a096f2abfe..876521e38d 100644
--- a/src/wp-admin/about.php
+++ b/src/wp-admin/about.php
@@ -25,34 +25,6 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 
 		<p class="about-text"><?php printf( __( 'Thank you for updating to the latest version!' ), $display_version ); ?></p>
 
-		<?php
-		if (
-			// Was the Gutenberg plugin installed before upgrading to 5.0.x?
-			get_option( 'upgrade_500_was_gutenberg_active' ) == '1' &&
-			current_user_can( 'activate_plugins' ) &&
-			// Has it not been reactivated since?
-			is_plugin_inactive( 'gutenberg/gutenberg.php' ) &&
-			// Is it still installed?
-			file_exists( WP_PLUGIN_DIR . '/gutenberg/gutenberg.php' )
-		) :
-			?>
-			<div class="about-text" style="font-style:italic;">
-				<?php
-				printf(
-					/* translators: 1: WordPress version, 2: HTML start tag of link, 3: HTML end tag of link */
-					__( 'The Gutenberg plugin has been deactivated, as the features are now included in WordPress %1$s by default. If you&#8217;d like to continue to test the upcoming changes in the WordPress editing experience, please %2$sreactivate the Gutenberg plugin%3$s.' ),
-					$display_version,
-					'<a href="' . esc_url( self_admin_url( 'plugins.php?s=gutenberg&plugin_status=all' ) ) . '">',
-					'</a>'
-				);
-				?>
-			</div>
-		<?php elseif ( ! file_exists( WP_PLUGIN_DIR . '/classic-editor/classic-editor.php' ) ) : ?>
-			<p class="about-text">
-				&#x2139; <a href="#classic-editor"><?php _e( 'Learn how to keep using the old editor.' ); ?></a>
-			</p>
-		<?php endif; ?>
-
 		<div class="wp-badge"><?php printf( __( 'Version %s' ), $display_version ); ?></div>
 
 		<h2 class="nav-tab-wrapper wp-clearfix">
@@ -62,70 +34,58 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 			<a href="freedoms.php?privacy-notice" class="nav-tab"><?php _e( 'Privacy' ); ?></a>
 		</h2>
 
-		<div class="feature-section one-col">
-			<div class="col">
-				<h2><?php _e( 'A Little Better Every Day' ); ?></h2>
-			</div>
-		</div>
+		<h2 class="feature-section-header"><?php _e( 'A Little Better Every Day' ); ?></h2>
 
-		<div class="feature-section one-col">
+		<div class="feature-section headline-feature one-col">
 			<div class="col">
-				<picture>
-					<img src="https://make.wordpress.org/core/files/2019/01/Servehappy-Notice-with-custom-link.png" alt="" width="200">
-				</picture>
+				<div class="inline-svg">
+					<img src="https://s.w.org/images/core/5.1/update.svg" alt="">
+				</div>
 				<p><?php _e( 'You&#8217;ve successfully upgraded to WordPress 5.1! Following WordPress 5.0&#8212;a major release which introduced the new block editor&#8212;5.1 focuses on polish, in particular by improving overall performance of the editor. In addition, this release paves the way for a better, faster, and more secure WordPress with some essential tools for site administrators and developers.' ); ?></p>
 			</div>
 		</div>
 
-		<div class="feature-section one-col">
+		<div class="feature-section one-col is-wide wp-clearfix">
 			<div class="col">
-				<h2><?php _e( 'Site Health' ); ?></h2>
+				<h3><?php _e( 'Site Health' ); ?></h2>
+				<div class="inline-svg alignright">
+					<img src="https://s.w.org/images/core/5.1/site-health.svg" alt="">
+				</div>
 				<p><?php printf( __( 'With security and speed in mind, this release introduces WordPress&#8217;s first <a href="%s">Site Health</a> features. WordPress will start showing notices to administrators of sites that run long-outdated versions of PHP, which is the programming language that powers WordPress.' ), 'https://make.wordpress.org/core/2019/01/14/php-site-health-mechanisms-in-5-1/' ); ?></p>
 
 				<p><?php _e( 'When installing new plugins, WordPress&#8217;s Site Health features will check whether a plugin requires a version of PHP incompatible with your site. If so, WordPress will prevent you from installing that plugin.' ); ?></p>
+
+				<?php
+				$response = wp_check_php_version();
+				if ( $response && isset( $response['is_acceptable'] ) && ! $response['is_acceptable'] && current_user_can( 'update_php' ) ) :
+					?>
+					<p><em><?php _e( 'WordPress has detected your site is running an outdated version of PHP. You will see this notice on your dashboard with instructions for contacting your host.' ); ?></em></p>
+				<?php endif; ?>
+
+				<p><a class="button button-default button-hero" href="<?php echo esc_url( wp_get_update_php_url() ); ?>"><?php _e( 'Learn more about updating PHP' ); ?></a></p>
 			</div>
 		</div>
 
-
-		<div class="feature-section one-col cta">
-			<?php
-			$response = wp_check_php_version();
-			if ( $response && isset( $response['is_acceptable'] ) && ! $response['is_acceptable'] && current_user_can( 'update_php' ) ) :
-				?>
-				<p><em><?php _e( 'WordPress has detected your site is running an outdated version of PHP. You will see this notice on your dashboard with instructions for contacting your host.' ); ?></em></p>
-			<?php endif; ?>
-
+		<div class="feature-section one-col is-wide wp-clearfix">
 			<div class="col">
-				<a class="button button-primary button-hero" href=""><?php _e( 'Learn more about updating PHP' ); ?></a>
-			</div>
-		</div>
-
-		<div class="feature-section one-col">
-			<div class="col">
-				<h2><?php _e( 'Editor Performance' ); ?></h2>
-				<p><?php _e( 'Introduced in WordPress 5.0, the new block editor continues to improve. Most significantly, WordPress 5.1 includes solid performance improvements within the editor. The editor should feel a little quicker to start, and typing should feel smoother. Nevertheless, expect more performance improvements in the next releases.' ); ?></p>
-			</div>
-		</div>
-
-		<?php if ( current_user_can( 'edit_posts' ) ) { ?>
-			<div class="feature-section one-col cta">
-				<div class="col">
-					<a class="button button-primary button-hero" href="<?php echo esc_url( admin_url( 'post-new.php' ) ); ?>"><?php _e( 'Build your first post' ); ?></a>
+				<h3><?php _e( 'Editor Performance' ); ?></h2>
+				<div class="inline-svg alignright">
+					<img src="https://s.w.org/images/core/5.1/editor-performance.svg" alt="">
 				</div>
+				<p><?php _e( 'Introduced in WordPress 5.0, the new block editor continues to improve. Most significantly, WordPress 5.1 includes solid performance improvements within the editor. The editor should feel a little quicker to start, and typing should feel smoother. Nevertheless, expect more performance improvements in the next releases.' ); ?></p>
+				<?php if ( current_user_can( 'edit_posts' ) ) : ?>
+					<p><a class="button button-default button-hero" href="<?php echo esc_url( admin_url( 'post-new.php' ) ); ?>"><?php _e( 'Build your first post' ); ?></a></p>
+				<?php endif; ?>
 			</div>
-		<?php } ?>
+		</div>
 
 		<hr />
 
-		<div class="under-the-hood feature-section">
-			<div class="col">
-				<h2><?php _e( 'Developer Happiness' ); ?></h2>
-			</div>
-		</div>
+		<h3 class="under-the-hood-header"><?php _e( 'Developer Happiness' ); ?></h3>
 
 		<div class="under-the-hood feature-section three-col">
 			<div class="col">
-				<h3><?php _e( 'Multisite Metadata' ); ?></h3>
+				<h4><?php _e( 'Multisite Metadata' ); ?></h4>
 				<p>
 					<?php _e( '5.1 introduces a new database table to store metadata associated with sites and allows for the storage of arbitrary site data relevant in a multisite / network context.' ); ?>
 					<br>
@@ -133,7 +93,7 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 				</p>
 			</div>
 			<div class="col">
-				<h3><?php _e( 'Cron API' ); ?></h3>
+				<h4><?php _e( 'Cron API' ); ?></h4>
 				<p>
 					<?php _e( 'The Cron API has been updated with new functions to assist with returning data and includes new filters for modifying cron storage. Other changes in behavior affect cron spawning on servers running FastCGI and PHP-FPM versions 7.0.16 and above.' ); ?>
 					<br>
@@ -141,48 +101,40 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 				</p>
 			</div>
 			<div class="col">
-				<h3><?php _e( 'New JS Build Processes' ); ?></h3>
+				<h4><?php _e( 'New JS Build Processes' ); ?></h4>
 				<p>
 					<?php _e( 'WordPress 5.1 features a new JavaScript build option, following the large reorganization of code started in the 5.0 release.' ); ?>
 					<br>
 					<?php printf( __( '<a href="%s">Read more.</a>' ), 'https://make.wordpress.org/core/2018/05/16/preparing-wordpress-for-a-javascript-future-part-1-build-step-and-folder-reorganization/' ); ?>
 				</p>
 			</div>
-			<div class="col">
-				<h3><?php _e( 'Other Developer Goodness' ); ?></h3>
+		</div>
+
+		<div class="under-the-hood feature-section two-col">
+			<div class="col is-span-two">
+				<h4><?php _e( 'Other Developer Goodness' ); ?></h4>
 				<p>
 					<?php _e( 'Miscellaneous improvements include updates to values for the <code>WP_DEBUG_LOG</code> constant, new test config file constant in the test suite, new plugin action hooks, short-circuit filters for <code>wp_unique_post_slug()</code> and <code>WP_User_Query</code> and <code>count_users()</code>, a new <code>human_readable_duration</code> function, improved taxonomy metabox sanitization, limited <code>LIKE</code> support for meta keys when using <code>WP_Meta_Query</code>, a new “doing it wrong” notice when registering REST API endpoints, and more!' ); ?>
 					<br>
 					<?php printf( __( '<a href="%s">Read more.</a>' ), 'https://make.wordpress.org/core/2019/01/23/miscellaneous-developer-focused-changes-in-5-1/' ); ?>
 				</p>
+				<p>
+					<a class="button button-default button-hero" href="<?php echo esc_url( 'https://developer.wordpress.org/' ); ?>"><?php _e( 'Learn how to get started' ); ?></a>
+				</p>
 			</div>
-		</div>
-
-		<div class="under-the-hood feature-section one-col cta">
 			<div class="col">
-				<a class="button button-primary button-hero" href="<?php echo esc_url( 'https://developer.wordpress.org/' ); ?>"><?php _e( 'Learn how to get started' ); ?></a>
+				<div class="inline-svg">
+					<img src="https://s.w.org/images/core/5.1/under-the-hood.svg" alt="">
+				</div>
 			</div>
 		</div>
 
 		<hr />
 
 		<?php if ( ! file_exists( WP_PLUGIN_DIR . '/classic-editor/classic-editor.php' ) ) : ?>
+			<h2 class="feature-section-header"><?php _e( 'Keep it Classic' ); ?></h2>
+
 			<div class="feature-section one-col" id="classic-editor">
-				<div class="col">
-					<h2><?php _e( 'Keep it Classic' ); ?></h2>
-				</div>
-			</div>
-
-			<div class="full-width">
-				<picture>
-					<source type="image/webp" media="(max-width: 782px)" srcset="https://s.w.org/images/core/5.0/classic/Classic%20Mobile1x.webp 1x, https://s.w.org/images/core/5.0/classic/Classic%20Mobile.webp 2x" />
-					<source media="(max-width: 782px)" srcset="https://s.w.org/images/core/5.0/classic/Classic%20Mobile1x.jpg 1x, https://s.w.org/images/core/5.0/classic/Classic%20Mobile.jpg 2x" />
-					<source type="image/webp" srcset="https://s.w.org/images/core/5.0/classic/Classic@1x.webp 1x, https://s.w.org/images/core/5.0/classic/Classic.webp 2x" />
-					<img src="https://s.w.org/images/core/5.0/classic/Classic@1x.jpg" srcset="https://s.w.org/images/core/5.0/classic/Classic@1x.jpg 1x, https://s.w.org/images/core/5.0/header/Classic.jpg 2x" alt="">
-				</picture>
-			</div>
-
-			<div class="feature-section one-col">
 				<div class="col">
 					<p><?php _e( 'Prefer to stick with the familiar Classic Editor? No problem! Support for the Classic Editor plugin will remain in WordPress through 2021.' ); ?></p>
 					<p><?php _e( 'The Classic Editor plugin restores the previous WordPress editor and the Edit Post screen. It lets you keep using plugins that extend it, add old-style meta boxes, or otherwise depend on the previous editor. To install, visit your plugins page and click the &#8220;Install Now&#8221; button next to &#8220;Classic Editor&#8221;. After the plugin finishes installing, click &#8220;Activate&#8221;. That’s it!' ); ?></p>
@@ -207,100 +159,6 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 			<a href="<?php echo esc_url( self_admin_url() ); ?>"><?php is_blog_admin() ? _e( 'Go to Dashboard &rarr; Home' ) : _e( 'Go to Dashboard' ); ?></a>
 		</div>
 	</div>
-
-	<script>
-		(function( $ ) {
-			$( function() {
-				var $window = $( window );
-				var $adminbar = $( '#wpadminbar' );
-				var $sections = $( '.floating-header-section' );
-				var offset = 0;
-
-				// Account for Admin bar.
-				if ( $adminbar.length ) {
-					offset += $adminbar.height();
-				}
-
-				function setup() {
-					$sections.each( function( i, section ) {
-						var $section = $( section );
-						// If the title is long, switch the layout
-						var $title = $section.find( 'h2' );
-						if ( $title.innerWidth() > 300 ) {
-							$section.addClass( 'has-long-title' );
-						}
-					} );
-				}
-
-				var adjustScrollPosition = _.throttle( function adjustScrollPosition() {
-					$sections.each( function( i, section ) {
-						var $section = $( section );
-						var $header = $section.find( 'h2' );
-						var width = $header.innerWidth();
-						var height = $header.innerHeight();
-
-						if ( $section.hasClass( 'has-long-title' ) ) {
-							return;
-						}
-
-						var sectionStart = $section.offset().top - offset;
-						var sectionEnd = sectionStart + $section.innerHeight();
-						var scrollPos = $window.scrollTop();
-
-						// If we're scrolled into a section, stick the header
-						if ( scrollPos >= sectionStart && scrollPos < sectionEnd - height ) {
-							$header.css( {
-								position: 'fixed',
-								top: offset + 'px',
-								bottom: 'auto',
-								width: width + 'px'
-							} );
-						// If we're at the end of the section, stick the header to the bottom
-						} else if ( scrollPos >= sectionEnd - height && scrollPos < sectionEnd ) {
-							$header.css( {
-								position: 'absolute',
-								top: 'auto',
-								bottom: 0,
-								width: width + 'px'
-							} );
-						// Unstick the header
-						} else {
-							$header.css( {
-								position: 'static',
-								top: 'auto',
-								bottom: 'auto',
-								width: 'auto'
-							} );
-						}
-					} );
-				}, 100 );
-
-				function enableFixedHeaders() {
-					if ( $window.width() > 782 ) {
-						setup();
-						adjustScrollPosition();
-						$window.on( 'scroll', adjustScrollPosition );
-					} else {
-						$window.off( 'scroll', adjustScrollPosition );
-						$sections.find( '.section-header' )
-							.css( {
-								width: 'auto'
-							} );
-						$sections.find( 'h2' )
-							.css( {
-								position: 'static',
-								top: 'auto',
-								bottom: 'auto',
-								width: 'auto'
-							} );
-					}
-				}
-				$( window ).resize( enableFixedHeaders );
-				enableFixedHeaders();
-			} );
-		})( jQuery );
-	</script>
-
 <?php
 
 include( ABSPATH . 'wp-admin/admin-footer.php' );
diff --git a/src/wp-admin/css/about.css b/src/wp-admin/css/about.css
index 041c6c7725..358b1f01d2 100644
--- a/src/wp-admin/css/about.css
+++ b/src/wp-admin/css/about.css
@@ -149,6 +149,11 @@
 	line-height: 1.5;
 }
 
+.about-wrap .under-the-hood-header {
+	margin: 40px 0 0;
+	text-align: center;
+}
+
 .about-wrap h4 {
 	color: #23282d;
 }
@@ -187,11 +192,20 @@
 	flex-wrap: wrap;
 }
 
-.about-wrap .feature-section.one-col {
+.about-wrap .one-col {
 	margin: 0 auto;
 	max-width: 680px;
 }
 
+.about-wrap .one-col.is-wide {
+	max-width: 760px;
+}
+
+.about-wrap .under-the-hood {
+	margin: auto;
+	max-width: 1020px;
+}
+
 .about-wrap .inline-svg img {
 	max-width: 100%;
 	width: 100%;
@@ -202,44 +216,31 @@
 	margin-bottom: 120px;
 }
 
+.about-wrap .under-the-hood .inline-svg {
+	margin-left: 100px;
+}
+
 .about-wrap [class$="-col"] .col {
 	flex: 1;
-}
-
-.about-wrap .two-col .col {
-	min-width: 47%;
-	max-width: 47%;
-}
-
-.about-wrap .three-col,
-.about-wrap .four-col {
-	margin: auto;
-	max-width: 1020px;
-}
-
-.about-wrap .three-col .col {
 	align-self: flex-start;
-	min-width: 31%;
-	max-width: 31%;
 }
 
-.about-wrap .four-col .col {
-	align-self: flex-start;
-	min-width: 23%;
-	max-width: 23%;
+.about-wrap [class$="-col"] .col + .col {
+	margin-left: 20px;
 }
 
-.about-wrap .feature-section.eight-col .col {
-	align-self: flex-start;
-	margin-top: 6px;
-	min-width: 12%;
-	max-width: 12%;
+.about-wrap [class$="-col"] .is-span-two {
+	flex: 2;
 }
 
 .about-wrap .one-col img {
 	margin: 1em 0 2em;
 }
 
+.about-wrap .one-col .alignright img {
+	margin-top: 0;
+}
+
 .about-wrap .two-col img {
 	margin-bottom: 1.5em;
 }
@@ -256,14 +257,24 @@
 	margin: 1.5em auto;
 }
 
+.about-wrap .inline-svg.alignright {
+	margin-left: 80px;
+}
+
 .about-wrap .cta {
 	text-align: center;
 }
+
 .about-wrap .cta .button {
 	margin: 0 auto 5px;
 	font-weight: 600;
 }
 
+.about-wrap .feature-section .button {
+	margin-top: 1.5em;
+	font-weight: 600;
+}
+
 /* 1.3 - Point Releases */
 
 .about-wrap .point-releases {
@@ -285,6 +296,10 @@
 
 /* 2.1 - Typography */
 
+.about-wrap .feature-section-header {
+	margin: 50px 0 0;
+}
+
 .about-wrap .feature-section.two-col h3 {
 	margin-top: 0;
 }
@@ -323,22 +338,8 @@
 
 /* 2.2 - Structure */
 
-.about-wrap .headline-feature.feature-video {
-	position: relative;
-	margin: 40px 0;
-	padding-bottom: 56.25%;
-	width: 100%;
-	max-width: 100%;
-	height: 0;
-	text-align: center;
-}
-
-.about-wrap .feature-video embed {
-	position: absolute;
-	top: 0;
-	left: 0;
-	width: 100%;
-	height: 100%;
+.about-wrap .headline-feature {
+	margin-bottom: 40px;
 }
 
 .about-wrap .featured-image {
@@ -500,32 +501,22 @@
   4.0 - Media Queries
 ------------------------------------------------------------------------------*/
 
-@media screen and (max-width: 1250px) {
-	.about-wrap .floating-header-section.has-long-title .section-item:nth-child(1),
-	.about-wrap .floating-header-section.has-long-title .section-item:nth-child(2) {
-		margin: 0 0 60px;
-	}
-
-	.about-wrap .floating-header-section.has-long-title .section-item:nth-child(3),
-	.about-wrap .floating-header-section.has-long-title .section-item:nth-child(4) {
-		margin: 0;
-	}
-
-	.about-wrap .floating-header-section.has-long-title .section-item:nth-child(2),
-	.about-wrap .floating-header-section.has-long-title .section-item:nth-child(4) {
-		margin-left: 60px;
-	}
-}
-
 @media screen and (max-width: 782px) {
 	.about-wrap .two-col-text {
 		column-count: 1;
 	}
 
+	.about-wrap .one-col .alignright {
+		margin-left: 20px;
+		max-width: 150px;
+	}
+
 	.about-wrap .two-col .col,
 	.about-wrap .three-col .col,
 	.about-wrap .four-col .col {
 		min-width: 48% !important;
+		max-width: 48% !important;
+		margin-left: 0 !important;
 	}
 
 	.about-wrap .eight-col .col {
@@ -549,18 +540,8 @@
 		text-shadow: none;
 	}
 
-	.about-wrap .floating-header-section {
-		display: block;
-	}
-
-	.about-wrap .floating-header-section .section-header,
-	.about-wrap .floating-header-section .section-content {
-		max-width: 100%;
-	}
-
-	.about-wrap .floating-header-section h2 {
-		position: static;
-		margin-bottom: 60px;
+	.about-wrap .under-the-hood .inline-svg {
+		margin-left: 40px;
 	}
 }
 
@@ -585,6 +566,10 @@
 		width: 100%;
 	}
 
+	.about-wrap .one-col .alignright {
+		max-width: 120px;
+	}
+
 	.about-wrap .feature-section .col {
 		margin-top: 1em;
 	}
@@ -616,24 +601,21 @@
 		margin-top: 1.25em;
 	}
 
-	.about-wrap .floating-header-section {
-		margin-bottom: 60px;
-		grid-gap: 30px 0;
+	.about-wrap .under-the-hood .inline-svg {
+		display: none;
 	}
 
 	.about-wrap .inline-svg.full-width {
 		margin-bottom: 60px;
 	}
+}
 
-	.about-wrap .floating-header-section h2 {
-		word-break: break-all;
-		-webkit-hyphens: auto;
-		-ms-hyphens: auto;
-		hyphens: auto;
+@media only screen and (max-width: 320px) {
+	.about-wrap .one-col .alignright {
+		float: none;
+		margin: 0 auto;
 	}
-
-	.about-wrap .floating-header-section .section-content .section-item {
-		max-width: 100%;
-		margin: 0 0 60px;
+	.about-wrap .one-col .alignright img {
+		margin: 0 0 1em;
 	}
 }