diff -r 3d4e9c994f10 -r a86126ab1dd4 wp/wp-admin/css/about.css
--- a/wp/wp-admin/css/about.css	Tue Oct 22 16:11:46 2019 +0200
+++ b/wp/wp-admin/css/about.css	Tue Dec 15 13:49:49 2020 +0100
@@ -1,18 +1,679 @@
 /*------------------------------------------------------------------------------
   22.0 - About Pages
 
-   1.0 Global: About, Credits, Freedoms
-    1.1 Typography
-    1.2 Structure
-    1.3 Point Releases
-   2.0 About Page
-    2.1 Typography
-    2.2 Structure
-   3.0 Credits & Freedoms Pages
+   1.0 Global: About, Credits, Freedoms, Privacy
+    1.1 Layout
+    1.2 Typography & Elements
+    1.3 Header
+   2.0 Credits Page
+   3.0 Freedoms Page
+   x.2.0 Legacy About Styles: Global
+    x.2.1 Typography
+    x.2.2 Structure
+    x.2.3 Point Releases
+   x.3.0 Legacy About Styles: About Page
+    x.3.1 Typography
+    x.3.2 Structure
+   x.4.0 Legacy About Styles: Credits & Freedoms Pages
+   x.5.0 Legacy About Styles: Media Queries
+------------------------------------------------------------------------------*/
+
+.about__container {
+	/* Section backgrounds */
+	--background: #fff;
+	--subtle-background: #f2edd4;
+	/* Main text color */
+	--text: #322d2b;
+	--text-light: #f2edd4;
+	/* Accent colors: used in header, on special classes. */
+	--accent-1: #ebcd3d; /* Accent background */
+	--accent-2: #bd7331;
+	--accent-3: #b04329;
+	/* Navigation colors. */
+	--nav-background: var(--subtle-background);
+	--nav-border: var(--accent-1);
+	--nav-color: var(--accent-3);
+	--nav-current: var(--accent-3);
+}
+
+/*------------------------------------------------------------------------------
+  1.0 - Global: About, Credits, Freedoms, Privacy
 ------------------------------------------------------------------------------*/
 
+.about-php,
+.credits-php,
+.freedoms-php,
+.privacy-php {
+	background: #fff;
+}
+
+.about-php #wpcontent,
+.credits-php #wpcontent,
+.freedoms-php #wpcontent,
+.privacy-php #wpcontent {
+	background: white;
+	padding: 0 24px;
+}
+
+@media screen and (max-width: 782px) {
+	.about-php.auto-fold #wpcontent,
+	.credits-php.auto-fold #wpcontent,
+	.freedoms-php.auto-fold #wpcontent,
+	.privacy-php.auto-fold #wpcontent {
+		padding-left: 24px;
+	}
+}
+
+.about__container {
+	max-width: 1000px;
+	margin: 24px auto;
+	clear: both;
+}
+
+.about__container .alignleft {
+	float: left;
+}
+
+.about__container .alignright {
+	float: right;
+}
+
+.about__container .aligncenter {
+	text-align: center;
+}
+
+.about__container .is-vertically-aligned-top {
+	-ms-grid-row-align: start;
+	align-self: start;
+}
+
+.about__container .is-vertically-aligned-center {
+	-ms-grid-row-align: center;
+	align-self: center;
+}
+
+.about__container .is-vertically-aligned-bottom {
+	-ms-grid-row-align: end;
+	align-self: end;
+}
+
+.about__section {
+	background: #fff;
+	background: var(--background);
+	clear: both;
+}
+
+.about__container .has-accent-background-color {
+	background-color: #ebcd3d;
+	background-color: var(--accent-1);
+}
+
+.about__container .has-transparent-background-color {
+	background-color: transparent;
+}
+
+.about__container .has-accent-color {
+	color: #b04329;
+	color: var(--accent-3);
+}
+
+.about__container .has-subtle-background-color {
+	background-color: #f2edd4;
+	background-color: var(--subtle-background);
+	color: #322d2b;
+	color: var(--text);
+}
+
+/* 1.1 - Layout */
+
+.about__section {
+	margin: 0;
+}
+
+.about__section .column {
+	padding: 32px;
+}
+
+.about__section + .about__section .column {
+	padding-top: 0;
+}
+
+.about__section .column.is-edge-to-edge {
+	padding: 0;
+}
+
+.about__section .column p:first-of-type {
+	margin-top: 0;
+}
+
+.about__section .column p:last-of-type {
+	margin-bottom: 0;
+}
+
+.about__section .has-text-columns {
+	columns: 2;
+	column-gap: 64px;
+}
+
+.about__section .is-section-header {
+	margin-bottom: 0;
+	padding: 32px 32px 0;
+}
+
+.about__section .is-section-header p:last-child {
+	margin-bottom: 0;
+}
+
+/* Section header is alone in a container. */
+.about__section .is-section-header:first-child:last-child {
+	padding: 0;
+}
+
+.about__section.is-feature {
+	padding: 32px;
+}
+
+.about__section.is-feature p {
+	margin: 0;
+}
+
+.about__section.is-feature p + p {
+	margin-top: 1rem;
+}
+
+.about__section.has-1-column {
+	margin-left: auto;
+	margin-right: auto;
+	max-width: 36em;
+}
+
+.about__section.has-2-columns,
+.about__section.has-3-columns,
+.about__section.has-4-columns {
+	display: -ms-grid;
+	display: grid;
+}
+
+.about__section.has-2-columns {
+	-ms-grid-columns: 1fr 1fr;
+	grid-template-columns: 1fr 1fr;
+}
+
+.about__section.has-2-columns.is-wider-right {
+	-ms-grid-columns: 1fr 2fr;
+	grid-template-columns: 1fr 2fr;
+}
+
+.about__section.has-2-columns.is-wider-left {
+	-ms-grid-columns: 2fr 1fr;
+	grid-template-columns: 2fr 1fr;
+}
+
+.about__section.has-2-columns .is-section-header {
+	-ms-grid-column: 1;
+	grid-column-start: 1;
+	-ms-grid-column-span: 2;
+	grid-column-end: span 2;
+}
+
+.about__section.has-2-columns .column:nth-of-type(2n+1) {
+	-ms-grid-column: 1;
+	grid-column-start: 1;
+}
+
+.about__section.has-2-columns .column:nth-of-type(2n) {
+	-ms-grid-column: 2;
+	grid-column-start: 2;
+}
+
+.about__section.has-3-columns {
+	-ms-grid-columns: (1fr)[3];
+	grid-template-columns: repeat(3, 1fr);
+}
+
+.about__section.has-3-columns .is-section-header {
+	-ms-grid-column: 1;
+	grid-column-start: 1;
+	-ms-grid-column-span: 3;
+	grid-column-end: span 3;
+}
+
+.about__section.has-3-columns .column:nth-of-type(3n+1) {
+	-ms-grid-column: 1;
+	grid-column-start: 1;
+}
+
+.about__section.has-3-columns .column:nth-of-type(3n+2) {
+	-ms-grid-column: 2;
+	grid-column-start: 2;
+}
+
+.about__section.has-3-columns .column:nth-of-type(3n) {
+	-ms-grid-column: 3;
+	grid-column-start: 3;
+}
+
+.about__section.has-4-columns {
+	-ms-grid-columns: (1fr)[4];
+	grid-template-columns: repeat(4, 1fr);
+}
+
+.about__section.has-4-columns .is-section-header {
+	-ms-grid-column: 1;
+	grid-column-start: 1;
+	-ms-grid-column-span: 4;
+	grid-column-end: span 4;
+}
+
+.about__section.has-4-columns .column:nth-of-type(4n+1) {
+	-ms-grid-column: 1;
+	grid-column-start: 1;
+}
+
+.about__section.has-4-columns .column:nth-of-type(4n+2) {
+	-ms-grid-column: 2;
+	grid-column-start: 2;
+}
+
+.about__section.has-4-columns .column:nth-of-type(4n+3) {
+	-ms-grid-column: 3;
+	grid-column-start: 3;
+}
+
+.about__section.has-4-columns .column:nth-of-type(4n) {
+	-ms-grid-column: 4;
+	grid-column-start: 4;
+}
+
+/* Any columns following a section header need to be expicitly put into the second row, for IE support. */
+.about__section.has-2-columns .is-section-header ~ .column,
+.about__section.has-3-columns .is-section-header ~ .column,
+.about__section.has-4-columns .is-section-header ~ .column {
+	-ms-grid-row: 2;
+	grid-row-start: 2;
+}
+
+@media screen and (max-width: 782px) {
+	.about__section.has-2-columns.is-wider-right,
+	.about__section.has-2-columns.is-wider-left,
+	.about__section.has-3-columns,
+	.about__section.has-4-columns {
+		display: block;
+		padding-bottom: 16px;
+	}
+
+	.about__section.has-3-columns .column:nth-of-type(n),
+	.about__section.has-4-columns .column:nth-of-type(n) {
+		padding-top: 16px;
+		padding-bottom: 16px;
+	}
+}
+
+@media screen and (max-width: 600px) {
+	.about__section.has-2-columns {
+		display: flex; /* This is flex, not block, so we can use order below. */
+		flex-wrap: wrap;
+		align-content: stretch;
+		padding-bottom: 16px;
+	}
+
+	.about__section.has-2-columns .column:nth-of-type(n) {
+		padding-top: 16px;
+		padding-bottom: 16px;
+	}
+
+	.about__section.has-2-columns .is-edge-to-edge {
+		order: -1;
+	}
+}
+
+/* 1.2 - Typography & Elements */
+
+.about__container {
+	line-height: 1.4;
+}
+
+.about__container h1 {
+	margin: 0 0 1em;
+	padding: 0;
+	font-weight: 600;
+	color: inherit;
+}
+
+.about__container h1,
+.about__container h2 {
+	margin-top: 0;
+	font-size: 1.4em;
+	line-height: 1.4;
+}
+
+.about__container h3,
+.about__container h2.is-smaller-heading {
+	margin-top: 0;
+	font-size: 1em;
+}
+
+.about__container p {
+	font-size: inherit;
+	line-height: inherit;
+}
+
+.about__section a {
+	color: #b04329;
+	color: var(--accent-3);
+	text-decoration: underline;
+}
+
+.about__section a:hover,
+.about__section a:active,
+.about__section a:focus {
+	color: #bd7331;
+	color: var(--accent-2);
+	text-decoration: none;
+}
+
+.wp-credits-list a {
+	text-decoration: none;
+}
+
+.wp-credits-list a:hover,
+.wp-credits-list a:active,
+.wp-credits-list a:focus {
+	text-decoration: underline;
+}
+
+.about__container ul {
+	list-style: disc;
+	margin-left: 16px;
+}
+
+.about__container img {
+	margin: 0;
+	max-width: 100%;
+	vertical-align: middle;
+}
+
+.about__container .about__image {
+	margin: 0;
+}
+
+.about__container .about__image img {
+	max-width: 100%;
+	width: 100%;
+	height: auto;
+}
+
+.about__container .about__image .wp-video {
+	margin-left: auto;
+	margin-right: auto;
+}
+
+.about__container .about__image + h3 {
+	margin-top: 1.5em;
+}
+
+.about__container hr {
+	margin: 0;
+	height: 32px;
+	border: none;
+}
+
+.about__container hr.is-small {
+	height: 8px;
+}
+
+.about__container div.updated,
+.about__container div.error,
+.about__container .notice {
+	display: none !important;
+}
+
+.about__section {
+	font-size: 1.2em;
+}
+
+.about__section.is-feature {
+	font-size: 1.6em;
+	font-weight: 600;
+	text-align: center;
+}
+
+@media screen and (max-width: 480px) {
+	.about__section.is-feature {
+		font-size: 1.4em;
+		font-weight: 500;
+	}
+}
+
+/* 1.3 - Header */
+
+.about__header {
+	padding-top: 8em;
+	margin-bottom: 32px;
+	background-color: #ebcd3d;
+	background-color: var(--accent-1);
+	color: #322d2b;
+	color: var(--text);
+}
+
+.about__header-title {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	height: 20vh;
+	max-height: 16em;
+	padding: 32px;
+	margin-bottom: 4em;
+	text-align: center;
+}
+
+.about__header-title p {
+	margin: 0;
+	padding: 0;
+	font-size: 4em;
+	line-height: 1;
+	font-weight: 500;
+}
+
+.about__header-title p span {
+	display: block;
+	font-size: 2em;
+}
+
+.about__header-text {
+	display: inline-block;
+	margin-left: -16px;
+	padding: 16px 48px;
+	font-size: 1.5em;
+	line-height: 1.4;
+	background: #b04329;
+	background: var(--accent-3);
+	color: #f2edd4;
+	color: var(--text-light);
+}
+
+.about__header-text p {
+	margin: 0;
+}
+
+.about__header-navigation {
+	clear: both;
+	padding-top: 0;
+	background: #f2edd4;
+	background: var(--nav-background);
+	color: #b04329;
+	color: var(--nav-color);
+	border-bottom: 3px solid #ebcd3d;
+	border-bottom: 3px solid var(--nav-border);
+}
+
+.about__header-navigation .nav-tab {
+	margin-left: 0;
+	padding: 24px 32px;
+	font-size: 1.4em;
+	line-height: 1;
+	border-width: 0 0 3px;
+	border-style: solid;
+	border-color: transparent;
+	background: transparent;
+	color: inherit;
+}
+
+.about__header-navigation .nav-tab:hover,
+.about__header-navigation .nav-tab:active {
+	background-color: #322d2b;
+	background-color: var(--text);
+	color: #f2edd4;
+	color: var(--text-light);
+}
+
+.about__header-navigation .nav-tab-active {
+	margin-bottom: -3px;
+	border-width: 0 0 6px;
+	border-color: #b04329;
+	border-color: var(--nav-current);
+}
+
+.about__header-navigation .nav-tab-active:hover,
+.about__header-navigation .nav-tab-active:active {
+	background-color: #322d2b;
+	background-color: var(--text);
+	color: #f2edd4;
+	color: var(--text-light);
+	border-color: #b04329;
+	border-color: var(--nav-current);
+}
+
+@media screen and (max-width: 782px) {
+	.about__container .about__header-text {
+		font-size: 1.4em;
+	}
+
+	.about__header-title {
+		min-height: 0;
+		max-height: none;
+		height: auto;
+	}
+
+	.about__header-navigation .nav-tab {
+		margin-top: 0;
+		margin-right: 0;
+		padding: 24px 16px;
+	}
+}
+
+@media screen and (max-width: 480px) {
+	.about__header-title p {
+		font-size: 3.2em;
+	}
+
+	.about__header-navigation .nav-tab {
+		float: none;
+		display: block;
+		margin-bottom: 0;
+		padding: 16px 16px;
+		border-left-width: 6px;
+		border-bottom: none;
+	}
+
+	.about__header-navigation .nav-tab-active {
+		border-bottom: none;
+		border-left-width: 6px;
+	}
+}
+
+
 /*------------------------------------------------------------------------------
-  1.0 - Global: About, Credits, Freedoms
+  2.0 - Credits Page
+------------------------------------------------------------------------------*/
+
+.about__section .wp-people-group {
+	margin: 0;
+}
+
+.about__section .wp-person {
+	display: inline-block;
+	vertical-align: top;
+	box-sizing: border-box;
+	padding: 0 1em 1em 0;
+	height: 6em;
+	width: calc( 33% - 4px );
+	min-width: 280px;
+}
+
+.about__section .compact .wp-person {
+	height: auto;
+	width: calc( 25% - 4px );
+	min-width: 220px;
+	padding-bottom: 0.5em;
+}
+
+.about__section .wp-person .gravatar {
+	float: left;
+	margin: -4px 0.85em 0.85em 0;
+	padding: 1px;
+	width: 80px;
+	height: 80px;
+	border-radius: 100%;
+}
+
+.about__section .compact .wp-person .gravatar {
+	width: 40px;
+	height: 40px;
+}
+
+.about__section .wp-person .web {
+	font-size: 1.4em;
+	font-weight: 600;
+	text-decoration: none;
+	color: #322d2b;
+	color: var(--text);
+}
+
+.about__section .wp-person .web:hover {
+	text-decoration: underline;
+}
+
+.about__section .compact .wp-person .web {
+	font-size: 1.2em;
+}
+
+.about__section .wp-person .title {
+	display: block;
+	margin-top: 0.5em;
+}
+
+@media screen and (max-width: 480px) {
+	.about__section .wp-person {
+		min-width: 100%;
+	}
+
+	.about__section .wp-person .gravatar {
+		width: 60px;
+		height: 60px;
+	}
+
+	.about__section .wp-person .web {
+		font-size: 1em;
+	}
+
+	.about__section .compact .wp-person .web {
+		font-size: 1em;
+	}
+}
+
+
+/*------------------------------------------------------------------------------
+  3.0 - Freedoms Page
+------------------------------------------------------------------------------*/
+
+.about__section .column .freedoms-image {
+	margin-bottom: 1em;
+}
+
+
+/*------------------------------------------------------------------------------
+  x.2.0 - Legacy About Styles: Global
 ------------------------------------------------------------------------------*/
 
 .about-wrap {
@@ -98,7 +759,7 @@
 	line-height: 1.33333333;
 }
 
-/* 1.1 - Typography */
+/* x.2.1 - Typography */
 
 .about-wrap h1 {
 	margin: 0.2em 200px 0 0;
@@ -110,7 +771,7 @@
 }
 
 .about-wrap h2 {
-	margin: 40px 0 .6em;
+	margin: 40px 0 0.6em;
 	font-size: 2.7em;
 	line-height: 1.3;
 	font-weight: 300;
@@ -118,7 +779,7 @@
 }
 
 .about-wrap h3 {
-	margin: 1.25em 0 .6em;
+	margin: 1.25em 0 0.6em;
 	font-size: 1.4em;
 	line-height: 1.5;
 }
@@ -159,7 +820,7 @@
 	color: #555d66;
 }
 
-/* 1.2 - Structure */
+/* x.2.2 - Structure */
 
 .about-wrap .has-1-columns,
 .about-wrap .has-2-columns,
@@ -281,18 +942,21 @@
 }
 
 .about-wrap .is-vertically-aligned-top {
+	-ms-grid-row-align: start;
 	align-self: start;
 }
 
 .about-wrap .is-vertically-aligned-center {
+	-ms-grid-row-align: center;
 	align-self: center;
 }
 
 .about-wrap .is-vertically-aligned-bottom {
+	-ms-grid-row-align: end;
 	align-self: end;
 }
 
-/* 1.3 - Point Releases */
+/* x.2.3 - Point Releases */
 
 .about-wrap .point-releases {
 	margin-top: 5px;
@@ -316,10 +980,10 @@
 }
 
 /*------------------------------------------------------------------------------
-  2.0 - About Page
+  x.3.0 - Legacy About Styles: About Page
 ------------------------------------------------------------------------------*/
 
-/* 2.1 - Typography */
+/* x.3.1 - Typography */
 
 .about-wrap .lead-description {
 	font-size: 1.5em;
@@ -330,7 +994,7 @@
 	margin-top: 0.6em;
 }
 
-/* 2.2 - Structure */
+/* x.3.2 - Structure */
 
 .about-wrap .headline-feature {
 	margin: 0 auto 40px;
@@ -360,7 +1024,7 @@
 }
 
 /*------------------------------------------------------------------------------
-  3.0 - Credits & Freedoms Pages
+  x.4.0 - Legacy About Styles: Credits & Freedoms Pages
 ------------------------------------------------------------------------------*/
 
 /* Credits */
@@ -448,10 +1112,6 @@
 	margin: 0.6em 0;
 }
 
-.freedoms-php .has-4-columns {
-	margin-bottom: 40px;
-}
-
 .freedoms-php .column .freedoms-image {
 	background-image: url('https://s.w.org/wp-content/themes/pub/wporg-main/images/freedoms-2x.png');
 	background-size: 100%;
@@ -471,7 +1131,7 @@
 }
 
 /*------------------------------------------------------------------------------
-  4.0 - Media Queries
+  x.5.0 - Legacy About Styles: Media Queries
 ------------------------------------------------------------------------------*/
 
 @media screen and (max-width: 782px) {