Update WordPress to latest trunk.

parent 5454ae2a
This diff is collapsed.
......@@ -32,14 +32,14 @@ if ( empty( $current_screen ) ) {
}
get_admin_page_title();
$title = esc_html( strip_tags( $title ) );
$title = strip_tags( $title );
if ( is_network_admin() ) {
/* translators: Network admin screen title. %s: Network title. */
$admin_title = sprintf( __( 'Network Admin: %s' ), esc_html( get_network()->site_name ) );
$admin_title = sprintf( __( 'Network Admin: %s' ), get_network()->site_name );
} elseif ( is_user_admin() ) {
/* translators: User dashboard screen title. %s: Network title. */
$admin_title = sprintf( __( 'User Dashboard: %s' ), esc_html( get_network()->site_name ) );
$admin_title = sprintf( __( 'User Dashboard: %s' ), get_network()->site_name );
} else {
$admin_title = get_bloginfo( 'name' );
}
......@@ -71,7 +71,7 @@ wp_user_settings();
_wp_admin_html_begin();
?>
<title><?php echo $admin_title; ?></title>
<title><?php echo esc_html( $admin_title ); ?></title>
<?php
wp_enqueue_style( 'colors' );
......
......@@ -22,14 +22,12 @@ $credits = wp_credits();
<div class="about__header">
<div class="about__header-title">
<h1>
<span><?php echo $display_version; ?></span>
<p>
<?php _e( 'WordPress' ); ?>
</h1>
<span><?php echo $display_version; ?></span>
</p>
</div>
<div class="about__header-badge"></div>
<div class="about__header-text">
<p>
<?php _e( 'Building more with blocks, faster and easier.' ); ?>
......@@ -44,32 +42,43 @@ $credits = wp_credits();
</nav>
</div>
<div class="about__section">
<div class="about__section is-feature">
<div class="column">
<h2><?php _e( 'WordPress is created by a worldwide team of passionate individuals.' ); ?></h2>
<h1><?php _e( 'Credits' ); ?></h1>
<?php if ( ! $credits ) : ?>
<p>
<?php
printf(
/* translators: 1: https://wordpress.org/about/, 2: https://make.wordpress.org/ */
__( 'WordPress is created by a <a href="%1$s">worldwide team</a> of passionate individuals. <a href="%2$s">Get involved in WordPress</a>.' ),
__( 'https://wordpress.org/about/' ),
__( 'https://make.wordpress.org/' )
);
?>
</p>
<?php else : ?>
<p>
<?php _e( 'WordPress is created by a worldwide team of passionate individuals.' ); ?>
</p>
<p>
<?php
if ( ! $credits ) {
printf(
/* translators: 1: https://wordpress.org/about/, 2: https://make.wordpress.org/ */
__( 'WordPress is created by a <a href="%1$s">worldwide team</a> of passionate individuals. <a href="%2$s">Get involved in WordPress</a>.' ),
__( 'https://wordpress.org/about/' ),
__( 'https://make.wordpress.org/' )
);
} else {
printf(
/* translators: %s: https://make.wordpress.org/ */
__( 'Want to see your name in lights on this page? <a href="%s">Get involved in WordPress</a>.' ),
__( 'https://make.wordpress.org/' )
);
}
printf(
/* translators: %s: https://make.wordpress.org/ */
__( 'Want to see your name in lights on this page? <a href="%s">Get involved in WordPress</a>.' ),
__( 'https://make.wordpress.org/' )
);
?>
</p>
<?php endif; ?>
</div>
<div class="about__image aligncenter">
<img src="data:image/svg+xml;charset=utf8,%3Csvg width='1320' height='350' viewbox='0 0 1320 350' xmlns='http://www.w3.org/2000/svg'%3E%3Crect width='72' height='220' transform='matrix(1 0 0 -1 61 220)' fill='%23321017'/%3E%3Crect width='72' height='250' transform='matrix(1 0 0 -1 166 300)' fill='%23BD3854'/%3E%3Crect width='72' height='220' transform='matrix(1 0 0 -1 272 220)' fill='%23321017'/%3E%3Crect width='71' height='220' transform='matrix(1 0 0 -1 378 220)' fill='%235F1B29'/%3E%3Crect width='71' height='220' transform='matrix(1 0 0 -1 483 220)' fill='%23321017'/%3E%3Crect width='71' height='220' transform='matrix(1 0 0 -1 587 220)' fill='%235F1B29'/%3E%3Crect width='71.28' height='250' transform='matrix(1 0 0 -1 689 300)' fill='%23BD3854'/%3E%3Crect width='72' height='220' transform='matrix(1 0 0 -1 884 220)' fill='%235F1B29'/%3E%3Crect width='72' height='220' transform='matrix(1 0 0 -1 789 220)' fill='%23321017'/%3E%3Crect width='71' height='220' transform='matrix(1 0 0 -1 985 220)' fill='%23321017'/%3E%3Crect width='72' height='220' transform='matrix(1 0 0 -1 1084 220)' fill='%235F1B29'/%3E%3Crect width='72' height='220' transform='matrix(1 0 0 -1 1179 220)' fill='%233D0F19'/%3E%3C/svg%3E%0A" alt="" />
<img src="data:image/svg+xml;charset=utf8,%3Csvg width='1000' height='300' viewbox='0 0 1000 300' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath fill='%23F3F4F5' d='M0 0h1000v300H0z'/%3E%3Cpath style='mix-blend-mode:multiply' d='M39.6 140.22l931.1 3.36.8 76.5-929.5 6.6-2.4-86.46z' fill='%23216DD2'/%3E%3Cpath style='mix-blend-mode:multiply' d='M963.7 275.14s-.9-59.58-1-64.14c-.1-4.2-932.3 1.74-932.3 1.74L29 268.48v8.4' fill='%237FCDE6'/%3E%3Cpath style='mix-blend-mode:multiply' d='M958 73.32L47.8 70.26l1.2 78.66 907.3 4.26 1.7-79.86z' fill='%23072CF0'/%3E%3Cpath style='mix-blend-mode:multiply' d='M34 91.32l910.4-2.16L939.2 21 33.3 23.82l.7 67.5z' fill='%230188D9'/%3E%3C/svg%3E" alt="" />
</div>
</div>
......
......@@ -21,17 +21,19 @@
.about__container {
/* Section backgrounds */
--background: #f4efe1;
--subtle-background: #d7d2c5;
--background: #f3f4f5;
--subtle-background: #bde7f0;
/* Main text color */
--text: #413e38;
--text: #32373c;
--text-light: #f3f4f5;
/* Navigation colors. */
--nav-background: #fefcf7;
--nav-color: #716d64;
--nav-background: #216bce;
--nav-border: #1730e5;
--nav-color: #f3f4f5;
/* Reds, used as accents & in header. */
--accent-1: #bd3854;
--accent-2: #5f1b29;
--accent-3: #321017;
--accent-1: #1730e5;
--accent-2: #216bce;
--accent-3: #bde7f0;
}
/*------------------------------------------------------------------------------
......@@ -96,17 +98,20 @@
}
.about__section {
background: #F4EFE1;
background: #f3f4f5;
background: var(--background);
clear: both;
}
.about__container .has-accent-background-color {
background-color: #BD3854;
color: #f3f4f5;
color: var(--text-light);
background-color: #1730e5;
background-color: var(--accent-1);
}
.about__container .has-subtle-background-color {
background-color: #D7D2C5;
background-color: #bde7f0;
background-color: var(--subtle-background);
}
......@@ -124,6 +129,10 @@
padding: 0;
}
.about__section .column p:first-of-type {
margin-top: 0;
}
.about__section .column p:last-of-type {
margin-bottom: 0;
}
......@@ -133,6 +142,11 @@
padding: 32px 32px 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;
}
......@@ -141,6 +155,10 @@
margin: 0;
}
.about__section.is-feature p + p {
margin-top: 1rem;
}
.about__section.has-2-columns,
.about__section.has-3-columns,
.about__section.has-4-columns {
......@@ -287,13 +305,17 @@
}
.about__container h1 {
font-size: 5em;
line-height: 1;
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 {
......@@ -307,7 +329,8 @@
}
.about__section a {
color: #5f1b29;
color: #1730e5;
color: var(--accent-1);
text-decoration: underline;
}
......@@ -343,6 +366,7 @@
align-items: center;
justify-content: center;
height: 100%;
overflow: hidden;
}
.about__container .about__image img {
......@@ -357,6 +381,10 @@
border: none;
}
.about__container hr.is-small {
height: 8px;
}
.about__container div.updated,
.about__container div.error,
.about__container .notice {
......@@ -370,19 +398,10 @@
.about__section.is-feature {
font-size: 1.6em;
font-weight: 600;
}
@media screen and (max-width: 782px) {
.about__container h1 {
font-size: 4em;
}
text-align: center;
}
@media screen and (max-width: 480px) {
.about__container h1 {
font-size: 3.2em;
}
.about__section.is-feature {
font-size: 1.4em;
font-weight: 500;
......@@ -392,16 +411,17 @@
/* 1.3 - Header */
.about__header {
display: -ms-grid;
display: grid;
-ms-grid-columns: 1fr 1fr;
grid-template-columns: 1fr 1fr;
-ms-grid-rows: 1fr 1fr;
grid-template-rows: 1fr 1fr;
min-height: 28em;
max-height: 36em;
height: 90vh;
margin-bottom: 32px;
background-color: #f3f4f5;
background-color: var(--background);
background-repeat: no-repeat;
background-position: top left;
background-size: contain;
background-image: url('https://s.w.org/images/core/5.4/header-diagonal.svg');
}
.rtl .about__header {
background-image: url('https://s.w.org/images/core/5.4/header-diagonal-rtl.svg');
}
.about__header > div {
......@@ -413,56 +433,30 @@
}
.about__header-title {
-ms-grid-column: 1;
grid-column: 1;
-ms-grid-row: 1;
-ms-grid-row-span: 2;
grid-row: 1/span 2;
padding: 32px;
background-color: #BD3854;
background-color: var(--accent-1);
color: white;
padding: 32px;
min-height: 24em;
max-height: 32em;
height: 80vh;
padding: 0 32px;
}
.about__header-title h1 {
.about__header-title p {
margin: 0;
padding: 0;
color: inherit;
}
.about__header-title h1 span {
display: block;
font-weight: 600;
font-size: 1.2em;
font-size: 4em;
line-height: 1;
font-weight: 500;
color: #1730e5;
color: var(--accent-1);
}
.about__header-badge {
-ms-grid-column: 2;
grid-column: 2;
-ms-grid-row: 1;
grid-row: 1;
background-color: #5f1b29;
background-color: var(--accent-2);
margin: 0;
padding: 32px;
justify-content: flex-end;
}
.about__header-badge img {
align-self: flex-start;
max-width: 100%;
.about__header-title p span {
display: inline-block;
color: #216bce;
color: var(--accent-2);
}
.about__header-text {
-ms-grid-column: 2;
grid-column: 2;
-ms-grid-row: 2;
grid-row: 2;
padding: 32px;
background-color: #321017;
background-color: var(--accent-3);
color: white;
padding: 16px 32px 32px;
font-size: 1.5em;
line-height: 1.4;
}
......@@ -472,17 +466,13 @@
}
.about__header-navigation {
-ms-grid-column: 1;
-ms-grid-column-span: 2;
grid-column: 1/span 2;
-ms-grid-row: 3;
grid-row: 3;
padding-top: 0;
background: #FEFCF7;
background: #216bce;
background: var(--nav-background);
color: #716d64;
color: #f3f4f5;
color: var(--nav-color);
border-bottom: 3px solid currentColor;
border-bottom: 3px solid #1730e5;
border-bottom: 3px solid var(--nav-border);
}
.about__header-navigation .nav-tab {
......@@ -499,40 +489,39 @@
.about__header-navigation .nav-tab:hover,
.about__header-navigation .nav-tab:active {
background-color: #F4EFE1;
background-color: var(--background);
background-color: #1730e5;
background-color: var(--accent-1);
}
.about__header-navigation .nav-tab-active {
margin-bottom: -3px;
border-width: 0 0 6px;
color: #BD3854;
color: var(--accent-1);
border-color: currentColor;
border-color: #bde7f0;
border-color: var(--accent-3);
}
.about__header-navigation .nav-tab-active:hover,
.about__header-navigation .nav-tab-active:active {
background-color: transparent;
border-color: currentColor;
background-color: #1730e5;
background-color: var(--accent-1);
border-color: #bde7f0;
border-color: var(--accent-3);
}
@media screen and (max-width: 782px) {
.about__container .about__header-text {
font-size: 1.4em;
}
}
@media screen and (max-width: 600px) {
.about__header {
display: block;
min-height: unset;
max-height: unset;
.about__header-title {
min-height: 0;
max-height: none;
height: auto;
}
.about__header-badge {
justify-content: flex-start;
/*
* 60% is a "magic" number to create a top offset approx-equal to the height of the background image,
* which scales to match the container width.
*/
padding-top: 60%;
}
.about__header-navigation .nav-tab {
......@@ -543,20 +532,22 @@
}
@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-right-width: 3px;
border-right-width: 6px;
border-bottom: none;
}
.about__header-navigation .nav-tab-active {
border-bottom: none;
border-right-width: 3px;
background: #F4EFE1;
background: var(--background);
border-right-width: 6px;
}
}
......@@ -604,7 +595,7 @@
font-size: 1.4em;
font-weight: 600;
text-decoration: none;
color: #413E38;
color: #32373c;
color: var(--text);
}
......@@ -1090,10 +1081,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%;
......
This diff is collapsed.
......@@ -20,17 +20,19 @@
.about__container {
/* Section backgrounds */
--background: #f4efe1;
--subtle-background: #d7d2c5;
--background: #f3f4f5;
--subtle-background: #bde7f0;
/* Main text color */
--text: #413e38;
--text: #32373c;
--text-light: #f3f4f5;
/* Navigation colors. */
--nav-background: #fefcf7;
--nav-color: #716d64;
--nav-background: #216bce;
--nav-border: #1730e5;
--nav-color: #f3f4f5;
/* Reds, used as accents & in header. */
--accent-1: #bd3854;
--accent-2: #5f1b29;
--accent-3: #321017;
--accent-1: #1730e5;
--accent-2: #216bce;
--accent-3: #bde7f0;
}
/*------------------------------------------------------------------------------
......@@ -95,17 +97,20 @@
}
.about__section {
background: #F4EFE1;
background: #f3f4f5;
background: var(--background);
clear: both;
}
.about__container .has-accent-background-color {
background-color: #BD3854;
color: #f3f4f5;
color: var(--text-light);
background-color: #1730e5;
background-color: var(--accent-1);
}
.about__container .has-subtle-background-color {
background-color: #D7D2C5;
background-color: #bde7f0;
background-color: var(--subtle-background);
}
......@@ -123,6 +128,10 @@
padding: 0;
}
.about__section .column p:first-of-type {
margin-top: 0;
}
.about__section .column p:last-of-type {
margin-bottom: 0;
}
......@@ -132,6 +141,11 @@
padding: 32px 32px 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;
}
......@@ -140,6 +154,10 @@
margin: 0;
}
.about__section.is-feature p + p {
margin-top: 1rem;
}
.about__section.has-2-columns,
.about__section.has-3-columns,
.about__section.has-4-columns {
......@@ -286,13 +304,17 @@
}
.about__container h1 {
font-size: 5em;
line-height: 1;
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 {
......@@ -306,7 +328,8 @@
}
.about__section a {
color: #5f1b29;
color: #1730e5;
color: var(--accent-1);
text-decoration: underline;
}
......@@ -342,6 +365,7 @@
align-items: center;
justify-content: center;
height: 100%;
overflow: hidden;
}
.about__container .about__image img {
......@@ -356,6 +380,10 @@
border: none;
}
.about__container hr.is-small {
height: 8px;
}
.about__container div.updated,
.about__container div.error,
.about__container .notice {
......@@ -369,19 +397,10 @@
.about__section.is-feature {
font-size: 1.6em;
font-weight: 600;
}
@media screen and (max-width: 782px) {
.about__container h1 {
font-size: 4em;
}
text-align: center;
}
@media screen and (max-width: 480px) {
.about__container h1 {
font-size: 3.2em;
}
.about__section.is-feature {
font-size: 1.4em;
font-weight: 500;
......@@ -391,16 +410,17 @@
/* 1.3 - Header */
.about__header {