WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bundled Themes: Update Twenty Twenty. 

This brings `trunk`’s version of Twenty Twenty in-sync with GitHub.

For a complete list of changes since [46551], see bc89c51...4549fd9.

Reviewed by SergeyBiryukov, desrosj, ianbelanger.
Props anlino, ianbelanger, poena, williampatton, nielslange, acosmin, intimez, itowhid06, decrecementofeliz, aristath, westonruter, mukesh27, jorgefilipecosta, karmatosed.
Fixes #48386.
Built from https://develop.svn.wordpress.org/trunk@46571


git-svn-id: http://core.svn.wordpress.org/trunk@46368 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
desrosj 2019-10-22 18:27:08 +00:00
parent 0609e04266
commit 16e5753b48
32 changed files with 269 additions and 191 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
wp-content/themes/twentytwenty/assets/css/editor-style-block-rtl.css
View File

@ -12,7 +12,6 @@
}
.editor-styles-wrapper > * {
color: #000;
font-family: -apple-system, BlinkMacSystemFont, "Helvetica Neue", Helvetica, sans-serif;
font-size: 18px;
}
@ -26,10 +25,16 @@
}
.block-editor-default-block-appender textarea.block-editor-default-block-appender__content {
color: inherit;
font-family: inherit;
font-size: inherit;
}
.block-editor-block-list__empty-block-inserter .block-editor-inserter__toggle:not(:hover):not(:focus),
.block-editor-default-block-appender .block-editor-inserter .block-editor-inserter__toggle:not(:hover):not(:focus) {
color: inherit;
}
/* Fonts ------------------------------------- */
@ -195,7 +200,7 @@ Inter variable font. Usage:
/* Typography -------------------------------- */
.editor-styles-wrapper a {
.editor-styles-wrapper .editor-block-list__layout a {
color: #cd2653;
text-decoration: underline;
}
@ -212,7 +217,6 @@ Inter variable font. Usage:
.editor-styles-wrapper .wp-block h4,
.editor-styles-wrapper .wp-block h5,
.editor-styles-wrapper .wp-block h6 {
color: #000;
font-feature-settings: "lnum";
font-variant-numeric: lining-nums;
font-weight: 700;
@ -575,7 +579,6 @@ hr.wp-block-separator.is-style-dots::before {
border-color: #cd2653;
border-style: solid;
border-width: 0 2px 0 0;
color: inherit;
margin: 20px 0;
padding: 5px 20px 5px 0;
}
@ -633,6 +636,10 @@ hr.wp-block-separator.is-style-dots::before {
/* Block: Code, Verse and Preformatted ------- */
.editor-styles-wrapper .wp-block-code {
color: inherit;
}
.editor-styles-wrapper .wp-block-code,
.editor-styles-wrapper .wp-block-preformatted pre,
.editor-styles-wrapper .wp-block-verse pre {
@ -641,10 +648,12 @@ hr.wp-block-separator.is-style-dots::before {
padding: 30px;
}
.editor-styles-wrapper .wp-block-freeform.block-library-rich-text__tinymce pre,
.editor-styles-wrapper .wp-block-preformatted pre,
.editor-styles-wrapper .wp-block-code .block-editor-plain-text,
.editor-styles-wrapper .wp-block-verse pre {
background: transparent;
color: inherit;
font-family: monospace;
font-size: 14px;
}
@ -938,6 +947,12 @@ hr.wp-block-separator.is-style-dots::before {
margin-top: 15px;
}
/* Block: Shortcode -------------------------- */
.editor-styles-wrapper .wp-block-shortcode textarea {
color: #191e23;
}
/* Block: Embed ------------------------------ */
.editor-styles-wrapper .wp-block-embed {

23
wp-content/themes/twentytwenty/assets/css/editor-style-block.css
View File

@ -12,7 +12,6 @@
}
.editor-styles-wrapper > * {
color: #000;
font-family: -apple-system, BlinkMacSystemFont, "Helvetica Neue", Helvetica, sans-serif;
font-size: 18px;
}
@ -26,10 +25,16 @@
}
.block-editor-default-block-appender textarea.block-editor-default-block-appender__content {
color: inherit;
font-family: inherit;
font-size: inherit;
}
.block-editor-block-list__empty-block-inserter .block-editor-inserter__toggle:not(:hover):not(:focus),
.block-editor-default-block-appender .block-editor-inserter .block-editor-inserter__toggle:not(:hover):not(:focus) {
color: inherit;
}
/* Fonts ------------------------------------- */
@ -195,7 +200,7 @@ Inter variable font. Usage:
/* Typography -------------------------------- */
.editor-styles-wrapper a {
.editor-styles-wrapper .editor-block-list__layout a {
color: #cd2653;
text-decoration: underline;
}
@ -212,7 +217,6 @@ Inter variable font. Usage:
.editor-styles-wrapper .wp-block h4,
.editor-styles-wrapper .wp-block h5,
.editor-styles-wrapper .wp-block h6 {
color: #000;
font-feature-settings: "lnum";
font-variant-numeric: lining-nums;
font-weight: 700;
@ -575,7 +579,6 @@ hr.wp-block-separator.is-style-dots::before {
border-color: #cd2653;
border-style: solid;
border-width: 0 0 0 2px;
color: inherit;
margin: 20px 0;
padding: 5px 0 5px 20px;
}
@ -633,6 +636,10 @@ hr.wp-block-separator.is-style-dots::before {
/* Block: Code, Verse and Preformatted ------- */
.editor-styles-wrapper .wp-block-code {
color: inherit;
}
.editor-styles-wrapper .wp-block-code,
.editor-styles-wrapper .wp-block-preformatted pre,
.editor-styles-wrapper .wp-block-verse pre {
@ -641,10 +648,12 @@ hr.wp-block-separator.is-style-dots::before {
padding: 30px;
}
.editor-styles-wrapper .wp-block-freeform.block-library-rich-text__tinymce pre,
.editor-styles-wrapper .wp-block-preformatted pre,
.editor-styles-wrapper .wp-block-code .block-editor-plain-text,
.editor-styles-wrapper .wp-block-verse pre {
background: transparent;
color: inherit;
font-family: monospace;
font-size: 14px;
}
@ -938,6 +947,12 @@ hr.wp-block-separator.is-style-dots::before {
margin-top: 15px;
}
/* Block: Shortcode -------------------------- */
.editor-styles-wrapper .wp-block-shortcode textarea {
color: #191e23;
}
/* Block: Embed ------------------------------ */
.editor-styles-wrapper .wp-block-embed {

BIN
wp-content/themes/twentytwenty/assets/fonts/font-awesome/fa-brands-400.woff
View File

Binary file not shown.

BIN
wp-content/themes/twentytwenty/assets/fonts/font-awesome/fa-brands-400.woff2
View File

Binary file not shown.

BIN
wp-content/themes/twentytwenty/assets/fonts/font-awesome/fa-fallback.woff
View File

Binary file not shown.

BIN
wp-content/themes/twentytwenty/assets/fonts/font-awesome/fa-fallback.woff2
View File

Binary file not shown.

0
wp-content/themes/twentytwenty/assets/fonts/inter/Inter-italic.var.woff2 → wp-content/themes/twentytwenty/assets/fonts/inter/Inter-italic-var.woff2
View File

0
wp-content/themes/twentytwenty/assets/fonts/inter/Inter-upright.var.woff2 → wp-content/themes/twentytwenty/assets/fonts/inter/Inter-upright-var.woff2
View File

BIN
wp-content/themes/twentytwenty/assets/images/2020-landscape-1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
wp-content/themes/twentytwenty/assets/images/2020-landscape-2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.1 KiB

BIN
wp-content/themes/twentytwenty/assets/images/2020-square-1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.1 KiB

BIN
wp-content/themes/twentytwenty/assets/images/2020-square-2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
wp-content/themes/twentytwenty/assets/images/2020-three-quarters-1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
wp-content/themes/twentytwenty/assets/images/2020-three-quarters-2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.6 KiB

BIN
wp-content/themes/twentytwenty/assets/images/2020-three-quarters-3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 26 KiB

BIN
wp-content/themes/twentytwenty/assets/images/2020-three-quarters-4.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

32
wp-content/themes/twentytwenty/assets/js/color-calculations.js
View File

@ -35,19 +35,33 @@ function _twentyTwentyColor( backgroundColor, accentHue ) {
*/
_twentyTwentyColor.prototype.setAccentColorsArray = function() {
var self = this,
minSaturation = 55,
maxSaturation = 90,
minLightness = 25,
maxLighness = 75,
stepSaturation = 2.5,
stepLightness = 2.5,
minSaturation = 65,
maxSaturation = 100,
minLightness = 30,
maxLighness = 80,
stepSaturation = 2,
stepLightness = 2,
pushColor = function() {
var colorObj = new Color( {
h: self.accentHue,
s: s,
l: l
} ),
item;
item,
/**
* Get a score for this color in contrast to its background color and surrounding text.
*
* @since 1.0.0
* @param {number} contrastBackground - WCAG contrast with the background color.
* @param {number} contrastSurroundingText - WCAG contrast with surrounding text.
* @return {number} - 0 is best, higher numbers have bigger difference with the desired scores.
*/
getScore = function( contrastBackground, contrastSurroundingText ) {
var diffBackground = ( 7 >= contrastBackground ) ? 0 : 7 - contrastBackground,
diffSurroundingText = ( 3 >= contrastSurroundingText ) ? 0 : 3 - contrastSurroundingText;
return diffBackground + diffSurroundingText;
};
item = {
color: colorObj,
@ -62,7 +76,7 @@ _twentyTwentyColor.prototype.setAccentColorsArray = function() {
// Get a score for this color by multiplying the 2 contrasts.
// We'll use that to sort the array.
item.score = item.contrastBackground * item.contrastText;
item.score = getScore( item.contrastBackground, item.contrastText );
self.accentColorsArray.push( item );
},
@ -89,7 +103,7 @@ _twentyTwentyColor.prototype.setAccentColorsArray = function() {
// Sort colors by contrast.
this.accentColorsArray.sort( function( a, b ) {
return b.score - a.score;
return a.score - b.score;
} );
return this;
};

2
wp-content/themes/twentytwenty/assets/js/customize-preview.js
View File

@ -94,7 +94,7 @@
api( 'header_footer_background_color', function( value ) {
value.bind( function( to ) {
// Add background color to header and footer wrappers.
$( '#site-header,#site-footer' ).css( 'background-color', to );
$( 'body:not(.overlay-header)#site-header, #site-footer' ).css( 'background-color', to );
// Change body classes if this is the same background-color as the content background.
if ( to.toLowerCase() === api( 'background_color' ).get().toLowerCase() ) {

11
wp-content/themes/twentytwenty/assets/js/index.js
View File

@ -231,14 +231,14 @@ twentytwenty.coverModals = {
modal.style.removeProperty( 'top' );
}
_win.scrollTo( 0, Math.abs( _win.twentytwenty.scrolled + getAdminBarHeight() ) );
_win.twentytwenty.scrolled = 0;
if ( clickedEl !== false ) {
clickedEl.focus();
clickedEl = false;
}
_win.scrollTo( 0, Math.abs( _win.twentytwenty.scrolled + getAdminBarHeight() ) );
_win.twentytwenty.scrolled = 0;
}, 500 );
} );
} );
@ -621,9 +621,6 @@ twentytwenty.toggles = {
_doc.querySelector( '*[data-toggle-target="' + targetString + '"]' ).classList.toggle( activeClass );
}
// Toggle aria-expanded on the target
twentytwentyToggleAttribute( target, 'aria-expanded', 'true', 'false' );
// Toggle aria-expanded on the toggle
twentytwentyToggleAttribute( toggle, 'aria-expanded', 'true', 'false' );

6
wp-content/themes/twentytwenty/classes/class-twentytwenty-customize.php
View File

@ -26,12 +26,6 @@ if ( ! class_exists( 'TwentyTwenty_Customize' ) ) {
$wp_customize->get_setting( 'blogname' )->transport = 'postMessage';
$wp_customize->get_setting( 'blogdescription' )->transport = 'postMessage';
/**
* Removes the background image section.
* The theme only supports the background color option.
*/
$wp_customize->remove_section( 'background_image' );
$wp_customize->selective_refresh->add_partial(
'blogname',
array(

2
wp-content/themes/twentytwenty/classes/class-twentytwenty-walker-page.php
View File

@ -131,7 +131,7 @@ if ( ! class_exists( 'TwentyTwenty_Walker_Page' ) ) {
$toggle_duration = twentytwenty_toggle_duration();
// Add the sub menu toggle.
$args['list_item_after'] .= '<button class="toggle sub-menu-toggle fill-children-current-color" data-toggle-target="' . $toggle_target_string . '" data-toggle-type="slidetoggle" data-toggle-duration="' . absint( $toggle_duration ) . '"><span class="screen-reader-text">' . __( 'Show sub menu', 'twentytwenty' ) . '</span>' . twentytwenty_get_theme_svg( 'chevron-down' ) . '</button>';
$args['list_item_after'] .= '<button class="toggle sub-menu-toggle fill-children-current-color" data-toggle-target="' . $toggle_target_string . '" data-toggle-type="slidetoggle" data-toggle-duration="' . absint( $toggle_duration ) . '" aria-expanded="false"><span class="screen-reader-text">' . __( 'Show sub menu', 'twentytwenty' ) . '</span>' . twentytwenty_get_theme_svg( 'chevron-down' ) . '</button>';
}

20
wp-content/themes/twentytwenty/functions.php
View File

@ -602,29 +602,29 @@ function twentytwenty_get_elements_array() {
$elements = array(
'content' => array(
'accent' => array(
'color' => array( '.color-accent', '.color-accent-hover:hover', '.color-accent-hover:focus', '.has-accent-color', '.has-drop-cap:not(:focus):first-letter', '.wp-block-button.is-style-outline', 'a' ),
'color' => array( '.color-accent', '.color-accent-hover:hover', '.color-accent-hover:focus', ':root .has-accent-color', '.has-drop-cap:not(:focus):first-letter', '.wp-block-button.is-style-outline', 'a' ),
'border-color' => array( 'blockquote', '.border-color-accent', '.border-color-accent-hover:hover', '.border-color-accent-hover:focus' ),
'background' => array( 'button:not(.toggle)', '.button', '.faux-button', '.wp-block-button__link', '.wp-block-file .wp-block-file__button', 'input[type="button"]', 'input[type="reset"]', 'input[type="submit"]', '.bg-accent', '.bg-accent-hover:hover', '.bg-accent-hover:focus', '.has-accent-background-color', '.comment-reply-link' ),
'background' => array( 'button:not(.toggle)', '.button', '.faux-button', '.wp-block-button__link', '.wp-block-file .wp-block-file__button', 'input[type="button"]', 'input[type="reset"]', 'input[type="submit"]', '.bg-accent', '.bg-accent-hover:hover', '.bg-accent-hover:focus', ':root .has-accent-background-color', '.comment-reply-link' ),
'fill' => array( '.fill-children-accent', '.fill-children-accent *' ),
),
'background' => array(
'color' => array( 'button', '.button', '.faux-button', '.wp-block-button__link', '.wp-block-button__link:active', '.wp-block-button__link:focus', '.wp-block-button__link:visited', '.wp-block-button__link:hover', '.wp-block-file__button', 'input[type="button"]', 'input[type="reset"]', 'input[type="submit"]', '.comment-reply-link' ),
'background' => array( '.has-background-background-color' ),
'color' => array( ':root .has-background-color', 'button', '.button', '.faux-button', '.wp-block-button__link', '.wp-block-file__button', 'input[type="button"]', 'input[type="reset"]', 'input[type="submit"]', '.wp-block-button', '.comment-reply-link' ),
'background' => array( ':root .has-background-background-color' ),
),
'text' => array(
'color' => array( 'body', '.entry-title a', '.has-primary-color' ),
'background' => array( '.has-primary-background-color' ),
'color' => array( 'body', '.entry-title a', ':root .has-primary-color' ),
'background' => array( ':root .has-primary-background-color' ),
),
'secondary' => array(
'color' => array( 'cite', 'figcaption', '.wp-caption-text', '.post-meta', '.entry-content .wp-block-archives li', '.entry-content .wp-block-categories li', '.entry-content .wp-block-latest-posts li', '.wp-block-latest-comments__comment-date', '.wp-block-latest-posts__post-date', '.wp-block-embed figcaption', '.wp-block-image figcaption', '.wp-block-pullquote cite', '.comment-metadata', '.comment-respond .comment-notes', '.comment-respond .logged-in-as', '.pagination .dots', '.entry-content hr:not(.has-background)', 'hr.styled-separator', '.has-secondary-color' ),
'background' => array( '.has-secondary-background-color' ),
'color' => array( 'cite', 'figcaption', '.wp-caption-text', '.post-meta', '.entry-content .wp-block-archives li', '.entry-content .wp-block-categories li', '.entry-content .wp-block-latest-posts li', '.wp-block-latest-comments__comment-date', '.wp-block-latest-posts__post-date', '.wp-block-embed figcaption', '.wp-block-image figcaption', '.wp-block-pullquote cite', '.comment-metadata', '.comment-respond .comment-notes', '.comment-respond .logged-in-as', '.pagination .dots', '.entry-content hr:not(.has-background)', 'hr.styled-separator', ':root .has-secondary-color' ),
'background' => array( ':root .has-secondary-background-color' ),
),
'borders' => array(
'border-color' => array( 'pre', 'fieldset', 'input', 'textarea', 'table', 'table *', 'hr' ),
'background' => array( 'caption', 'code', 'code', 'kbd', 'samp', '.wp-block-table.is-style-stripes tbody tr:nth-child(odd)', '.has-subtle-background-background-color' ),
'background' => array( 'caption', 'code', 'code', 'kbd', 'samp', '.wp-block-table.is-style-stripes tbody tr:nth-child(odd)', ':root .has-subtle-background-background-color' ),
'border-bottom-color' => array( '.wp-block-table.is-style-stripes' ),
'border-top-color' => array( '.wp-block-latest-posts.is-grid li' ),
'color' => array( '.has-subtle-background-color' ),
'color' => array( ':root .has-subtle-background-color' ),
),
),
'header-footer' => array(

36
wp-content/themes/twentytwenty/inc/custom-css.php
View File

@ -57,8 +57,13 @@ if ( ! function_exists( 'twentytwenty_get_customizer_css' ) ) {
// Get variables.
$body = sanitize_hex_color( twentytwenty_get_color_for_area( 'content', 'text' ) );
$body_default = '#000000';
$secondary = sanitize_hex_color( twentytwenty_get_color_for_area( 'content', 'secondary' ) );
$secondary_default = '#6d6d6d';
$borders = sanitize_hex_color( twentytwenty_get_color_for_area( 'content', 'borders' ) );
$borders_default = '#dcd7ca';
$accent = sanitize_hex_color( twentytwenty_get_color_for_area( 'content', 'accent' ) );
$accent_default = '#cd2653';
/**
* Filters the CSS selectors targeting button component on frontend to apply common css
*
@ -69,8 +74,8 @@ if ( ! function_exists( 'twentytwenty_get_customizer_css' ) ) {
$buttons_targets = apply_filters( 'twentytwenty_buttons_targets_front_end', 'button, .button, .faux-button, .wp-block-button__link, .wp-block-file__button, input[type=\'button\'], input[type=\'reset\'], input[type=\'submit\']' );
// Header.
$header_footer_text = sanitize_hex_color( twentytwenty_get_color_for_area( 'header-footer', 'text' ) );
$header_footer_accent = sanitize_hex_color( twentytwenty_get_color_for_area( 'header-footer', 'accent' ) );
$header_footer_background = sanitize_hex_color( twentytwenty_get_color_for_area( 'header-footer', 'background' ) );
$header_footer_background_default = '#ffffff';
// Cover.
$cover = sanitize_hex_color( get_theme_mod( 'cover_template_overlay_text_color' ) );
@ -126,12 +131,9 @@ if ( ! function_exists( 'twentytwenty_get_customizer_css' ) ) {
// Colors.
// Accent color.
if ( $accent && $accent !== $accent_default ) {
twentytwenty_generate_css( '.editor-styles-wrapper a, .editor-styles-wrapper .has-drop-cap:not(:focus):first-letter', 'color', $accent );
twentytwenty_generate_css( '.editor-styles-wrapper blockquote, .editor-styles-wrapper .wp-block-quote', 'border-color', $accent, '', ' !important' );
twentytwenty_generate_css( '.editor-styles-wrapper .wp-block-file .wp-block-file__textlink', 'color', $accent );
twentytwenty_generate_css( $buttons_targets, 'background', $accent );
twentytwenty_generate_css( '.editor-styles-wrapper .wp-block-button.is-style-outline .wp-block-button__link', 'border-color', $accent );
twentytwenty_generate_css( '.editor-styles-wrapper .wp-block-button.is-style-outline .wp-block-button__link', 'color', $accent );
twentytwenty_generate_css( '.has-accent-color, .editor-styles-wrapper .editor-block-list__layout a, .editor-styles-wrapper .has-drop-cap:not(:focus)::first-letter, .editor-styles-wrapper .wp-block-button.is-style-outline .wp-block-button__link, .editor-styles-wrapper .wp-block-pullquote::before, .editor-styles-wrapper .wp-block-file .wp-block-file__textlink', 'color', $accent );
twentytwenty_generate_css( '.editor-styles-wrapper .wp-block-quote', 'border-color', $accent, '' );
twentytwenty_generate_css( '.has-accent-background-color, .editor-styles-wrapper .wp-block-button__link, .editor-styles-wrapper .wp-block-file__button', 'background-color', $accent );
}
// Background color.
@ -139,9 +141,25 @@ if ( ! function_exists( 'twentytwenty_get_customizer_css' ) ) {
twentytwenty_generate_css( '.editor-styles-wrapper', 'background', '#' . $background );
}
// Borders color.
if ( $borders && $borders !== $borders_default ) {
twentytwenty_generate_css( '.editor-styles-wrapper .wp-block-code, .editor-styles-wrapper pre, .editor-styles-wrapper .wp-block-preformatted pre, .editor-styles-wrapper .wp-block-verse pre, .editor-styles-wrapper fieldset, .editor-styles-wrapper .wp-block-table, .editor-styles-wrapper .wp-block-table *, .editor-styles-wrapper .wp-block-table.is-style-stripes, .editor-styles-wrapper .wp-block-latest-posts.is-grid li', 'border-color', $borders );
twentytwenty_generate_css( '.editor-styles-wrapper .wp-block-table caption, .editor-styles-wrapper .wp-block-table.is-style-stripes tbody tr:nth-child(odd)', 'background-color', $borders );
}
// Text color.
if ( $body && $body !== $body_default ) {
twentytwenty_generate_css( 'body .editor-styles-wrapper, body .editor-post-title__block, body .editor-post-title__input, body textarea, .editor-post-title__block .editor-post-title__input', 'color', $body );
twentytwenty_generate_css( 'body .editor-styles-wrapper, .editor-post-title__block .editor-post-title__input, .editor-post-title__block .editor-post-title__input:focus', 'color', $body );
}
// Secondary color.
if ( $secondary && $secondary !== $secondary_default ) {
twentytwenty_generate_css( '.editor-styles-wrapper figcaption, .editor-styles-wrapper cite, .editor-styles-wrapper .wp-block-quote__citation, .editor-styles-wrapper .wp-block-quote cite, .editor-styles-wrapper .wp-block-quote footer, .editor-styles-wrapper .wp-block-pullquote__citation, .editor-styles-wrapper .wp-block-pullquote cite, .editor-styles-wrapper .wp-block-pullquote footer, .editor-styles-wrapper ul.wp-block-archives li, .editor-styles-wrapper ul.wp-block-categories li, .editor-styles-wrapper ul.wp-block-latest-posts li, .editor-styles-wrapper ul.wp-block-categories__list li, .editor-styles-wrapper .wp-block-latest-comments time, .editor-styles-wrapper .wp-block-latest-posts time', 'color', $secondary );
}
// Header Footer Background Color.
if ( $header_footer_background && $header_footer_background !== $header_footer_background_default ) {
twentytwenty_generate_css( '.editor-styles-wrapper .wp-block-pullquote::before', 'background-color', $header_footer_background );
}
} elseif ( 'classic-editor' === $type ) {

28
wp-content/themes/twentytwenty/inc/starter-content.php
View File

@ -32,11 +32,21 @@ function twentytwenty_get_starter_content() {
),
),
// Create the custom image attachments used as post thumbnails for pages.
'attachments' => array(
'image-opening' => array(
'post_title' => _x( 'The New UMoMA Opens its Doors', 'Theme starter content', 'twentytwenty' ),
'file' => 'assets/images/2020-landscape-1.png', // URL relative to the template directory.
),
),
// Specify the core-defined pages to create and add custom thumbnails to some of them.
'posts' => array(
'front' => array(
'post_type' => 'page',
'post_title' => __( 'The New UMoMA Opens its Doors', 'twentytwenty' ),
// Use the above featured image with the predefined about page.
'thumbnail' => '{{image-opening}}',
'post_content' => join(
'',
array(
@ -49,6 +59,9 @@ function twentytwenty_get_starter_content() {
'<div class="wp-block-columns alignwide"><!-- wp:column -->',
'<div class="wp-block-column"><!-- wp:group -->',
'<div class="wp-block-group"><div class="wp-block-group__inner-container">',
'<!-- wp:image {"align":"full","id":37,"sizeSlug":"full"} -->',
'<figure class="wp-block-image alignfull size-full"><img src="' . get_theme_file_uri() . '/assets/images/2020-three-quarters-1.png" alt="" class="wp-image-37"/></figure>',
'<!-- /wp:image -->',
'<!-- wp:heading {"level":3} -->',
'<h3>' . __( 'Works and Days', 'twentytwenty' ) . '</h3>',
'<!-- /wp:heading -->',
@ -61,6 +74,9 @@ function twentytwenty_get_starter_content() {
'<!-- /wp:group -->',
'<!-- wp:group -->',
'<div class="wp-block-group"><div class="wp-block-group__inner-container">',
'<!-- wp:image {"align":"full","id":37,"sizeSlug":"full"} -->',
'<figure class="wp-block-image alignfull size-full"><img src="' . get_theme_file_uri() . '/assets/images/2020-three-quarters-3.png" alt="" class="wp-image-37"/></figure>',
'<!-- /wp:image -->',
'<!-- wp:heading {"level":3} -->',
'<h3>' . __( 'Theatre of Operations', 'twentytwenty' ) . '</h3>',
'<!-- /wp:heading -->',
@ -75,6 +91,9 @@ function twentytwenty_get_starter_content() {
'<!-- wp:column -->',
'<div class="wp-block-column"><!-- wp:group -->',
'<div class="wp-block-group"><div class="wp-block-group__inner-container">',
'<!-- wp:image {"align":"full","id":37,"sizeSlug":"full"} -->',
'<figure class="wp-block-image alignfull size-full"><img src="' . get_theme_file_uri() . '/assets/images/2020-three-quarters-2.png" alt="" class="wp-image-37"/></figure>',
'<!-- /wp:image -->',
'<!-- wp:heading {"level":3} -->',
'<h3>' . __( 'The Life I Deserve', 'twentytwenty' ) . '</h3>',
'<!-- /wp:heading -->',
@ -87,6 +106,9 @@ function twentytwenty_get_starter_content() {
'<!-- /wp:group -->',
'<!-- wp:group -->',
'<div class="wp-block-group"><div class="wp-block-group__inner-container">',
'<!-- wp:image {"align":"full","id":37,"sizeSlug":"full"} -->',
'<figure class="wp-block-image alignfull size-full"><img src="' . get_theme_file_uri() . '/assets/images/2020-three-quarters-4.png" alt="" class="wp-image-37"/></figure>',
'<!-- /wp:image -->',
'<!-- wp:heading {"level":3} -->',
'<h3>' . __( 'From Signac to Matisse', 'twentytwenty' ) . '</h3>',
'<!-- /wp:heading -->',
@ -99,6 +121,9 @@ function twentytwenty_get_starter_content() {
'<!-- /wp:group --></div>',
'<!-- /wp:column --></div>',
'<!-- /wp:columns -->',
'<!-- wp:image {"align":"full","id":37,"sizeSlug":"full"} -->',
'<figure class="wp-block-image alignfull size-full"><img src="' . get_theme_file_uri() . '/assets/images/2020-landscape-2.png" alt="" class="wp-image-37"/></figure>',
'<!-- /wp:image -->',
'<!-- wp:group {"align":"wide"} -->',
'<div class="wp-block-group alignwide"><div class="wp-block-group__inner-container"><!-- wp:heading {"align":"center","textColor":"accent"} -->',
'<h2 class="has-accent-color has-text-align-center">' . __( '”Cyborgs, as the philosopher Donna Haraway established, are not reverent. They do not remember the cosmos.”', 'twentytwenty' ) . '</h2>',
@ -126,6 +151,9 @@ function twentytwenty_get_starter_content() {
'<!-- /wp:button --></div></div>',
'<!-- /wp:group --></div></div>',
'<!-- /wp:group -->',
'<!-- wp:gallery {"ids":[39,38],"align":"wide"} -->',
'<figure class="wp-block-gallery alignwide columns-2 is-cropped"><ul class="blocks-gallery-grid"><li class="blocks-gallery-item"><figure><img src="' . get_theme_file_uri() . '/assets/images/2020-square-2.png" alt="" data-id="39" data-full-url="' . get_theme_file_uri() . '/assets/images/2020-square-2.png" data-link="assets/images/2020-square-2/" class="wp-image-39"/></figure></li><li class="blocks-gallery-item"><figure><img src="' . get_theme_file_uri() . '/assets/images/2020-square-1.png" alt="" data-id="38" data-full-url="' . get_theme_file_uri() . '/assets/images/2020-square-1.png" data-link="' . get_theme_file_uri() . '/assets/images/2020-square-1/" class="wp-image-38"/></figure></li></ul></figure>',
'<!-- /wp:gallery -->',
)
),
),

7
wp-content/themes/twentytwenty/inc/template-tags.php
View File

@ -190,6 +190,9 @@ function twentytwenty_the_post_meta( $post_id = null, $location = 'single-top' )
* @param string $text Anchor text.
*/
function twentytwenty_edit_post_link( $link, $post_id, $text ) {
if ( is_admin() ) {
return $link;
}
$edit_url = get_edit_post_link( $post_id );
@ -219,7 +222,7 @@ add_filter( 'edit_post_link', 'twentytwenty_edit_post_link', 10, 3 );
/**
* Get the post meta.
*
* @param int $post_id The iD of the post.
* @param int $post_id The ID of the post.
* @param string $location The location where the meta is shown.
*/
function twentytwenty_get_post_meta( $post_id = null, $location = 'single-top' ) {
@ -543,7 +546,7 @@ function twentytwenty_add_sub_toggles_to_main_menu( $args, $item, $depth ) {
$toggle_duration = twentytwenty_toggle_duration();
// Add the sub menu toggle.
$args->after .= '<button class="toggle sub-menu-toggle fill-children-current-color" data-toggle-target="' . $toggle_target_string . '" data-toggle-type="slidetoggle" data-toggle-duration="' . absint( $toggle_duration ) . '"><span class="screen-reader-text">' . __( 'Show sub menu', 'twentytwenty' ) . '</span>' . twentytwenty_get_theme_svg( 'chevron-down' ) . '</button>';
$args->after .= '<button class="toggle sub-menu-toggle fill-children-current-color" data-toggle-target="' . $toggle_target_string . '" data-toggle-type="slidetoggle" data-toggle-duration="' . absint( $toggle_duration ) . '" aria-expanded="false"><span class="screen-reader-text">' . __( 'Show sub menu', 'twentytwenty' ) . '</span>' . twentytwenty_get_theme_svg( 'chevron-down' ) . '</button>';
}

86
wp-content/themes/twentytwenty/style-rtl.css
View File

@ -141,11 +141,6 @@ body {
word-wrap: break-word;
}
::selection {
background: #000;
color: #fff;
}
#site-content {
overflow: hidden;
}
@ -1415,6 +1410,8 @@ body:not(.enable-search-modal) .site-logo img {
}
.toggle-inner {
display: flex;
justify-content: center;
height: 2.3rem;
position: relative;
}
@ -1460,11 +1457,6 @@ body:not(.enable-search-modal) .site-logo img {
width: 2.3rem;
}
.search-toggle .toggle-text {
right: 0;
text-align: right;
}
/* Navigation Toggle ------------------------- */
.nav-toggle {
@ -1485,11 +1477,6 @@ body:not(.enable-search-modal) .site-logo img {
padding-top: 0.8rem;
}
.nav-toggle .toggle-text {
left: 0;
text-align: left;
}
/* Primary Menu ---------------------------- */
.primary-menu-wrapper {
@ -2479,26 +2466,26 @@ h2.entry-title {
.author-bio {
margin-top: 4rem;
display: flex;
flex-wrap: wrap;
align-items: flex-start;
}
.hide-avatars .author-bio {
padding-right: 0;
.author-info {
flex: 1;
}
.author-bio-inner p:last-child {
margin-bottom: 0;
.hide-avatars img.avatar {
display: none;
}
.author-bio .avatar {
margin-left: 1.5rem;
height: 5rem;
width: 5rem;
}
.author-bio .author-title {
align-items: center;
display: flex;
margin: 0 0 1rem 0;
margin: 0;
}
.author-bio .author-link {
@ -2576,43 +2563,43 @@ h2.entry-title {
/* CUSTOM COLORS */
.has-accent-color {
:root .has-accent-color {
color: #cd2653;
}
.has-accent-background-color {
:root .has-accent-background-color {
background-color: #cd2653;
}
.has-primary-color {
:root .has-primary-color {
color: #000;
}
.has-primary-background-color {
:root .has-primary-background-color {
background-color: #000;
}
.has-secondary-color {
:root .has-secondary-color {
color: #6d6d6d;
}
.has-secondary-background-color {
:root .has-secondary-background-color {
background-color: #6d6d6d;
}
.has-subtle-background-color {
:root .has-subtle-background-color {
color: #dcd7ca;
}
.has-subtle-background-background-color {
:root .has-subtle-background-background-color {
background-color: #dcd7ca;
}
.has-background-color {
:root .has-background-color {
color: #f5efe0;
}
.has-background-background-color {
:root .has-background-background-color {
background-color: #f5efe0;
}
@ -2844,14 +2831,22 @@ h2.entry-title {
/* Block: Button ----------------------------- */
.wp-block-button {
margin: 3rem 0;
}
.wp-block-button.is-style-outline {
color: #cd2653;
}
.wp-block-button.is-style-outline .wp-block-button__link {
.is-style-outline .wp-block-button__link:not(.has-text-color) {
color: inherit;
}
.is-style-outline .wp-block-button__link {
padding: calc(1.1em - 0.2rem) calc(1.44em - 0.2rem);
}
/* Block: Columns ---------------------------- */
.wp-block-column {
@ -2993,6 +2988,10 @@ figure.wp-block-gallery.alignfull {
max-width: none;
}
.wp-block-media-text__content > *:first-child {
margin-top: 0;
}
.wp-block-media-text__content > *:last-child {
margin-bottom: 0;
}
@ -4335,25 +4334,25 @@ a.to-the-top > * {
/* BLOCK: COLUMNS */
.alignfull .wp-block-column > p:not(.has-background-color),
.alignfull:not(.has-background) .wp-block-column > p:not(.has-background-color),
.alignfull:not(.has-background) .wp-block-group__inner-container > p:not(.has-background-color) {
max-width: calc(100% - 4rem);
margin: auto;
}
}
@media ( min-width: 600px ) {
@media ( min-width: 600px ) and ( max-width: 781px ) {
/* Blocks -------------------------------- */
/* BLOCK: COLUMNS */
.alignfull .wp-block-column:nth-child(odd) > p:not(.has-background-color),
.alignfull:not(.has-background) .wp-block-column:nth-child(odd) > p:not(.has-background-color),
.alignfull:not(.has-background) .wp-block-group__inner-container > p:not(.has-background-color) {
padding-right: 2rem;
}
.alignfull .wp-block-column:nth-child(even) > p:not(.has-background-color),
.alignfull:not(.has-background) .wp-block-column:nth-child(even) > p:not(.has-background-color),
.alignfull:not(.has-background) .wp-block-group__inner-container > p:not(.has-background-color) {
padding-left: 2rem;
}
@ -4762,15 +4761,10 @@ a.to-the-top > * {
.author-bio {
margin-top: 8rem;
min-height: 8rem;
padding-right: 10rem;
position: relative;
}
.author-bio .avatar {
position: absolute;
right: 0;
top: 0;
height: 8rem;
width: 8rem;
}
@ -5251,12 +5245,16 @@ a.to-the-top > * {
/* BLOCK: COLUMNS */
.wp-block-column {
margin-bottom: 0;
}
.alignfull .wp-block-column:first-child > p,
.alignfull:not(.has-background) .wp-block-group__inner-container > p:not(.has-background-color) {
padding-right: 2rem;
}
.alignfull .wp-block-column:last-child > p,
.alignfull:not(.has-background) .wp-block-column:last-child > p,
.alignfull:not(.has-background) .wp-block-group__inner-container > p:not(.has-background-color) {
padding-left: 2rem;
}

86
wp-content/themes/twentytwenty/style.css
View File

@ -141,11 +141,6 @@ body {
word-wrap: break-word;
}
::selection {
background: #000;
color: #fff;
}
#site-content {
overflow: hidden;
}
@ -1421,6 +1416,8 @@ body:not(.enable-search-modal) .site-logo img {
}
.toggle-inner {
display: flex;
justify-content: center;
height: 2.3rem;
position: relative;
}
@ -1466,11 +1463,6 @@ body:not(.enable-search-modal) .site-logo img {
width: 2.3rem;
}
.search-toggle .toggle-text {
left: 0;
text-align: left;
}
/* Navigation Toggle ------------------------- */
.nav-toggle {
@ -1491,11 +1483,6 @@ body:not(.enable-search-modal) .site-logo img {
padding-top: 0.8rem;
}
.nav-toggle .toggle-text {
right: 0;
text-align: right;
}
/* Primary Menu ---------------------------- */
.primary-menu-wrapper {
@ -2487,26 +2474,26 @@ h2.entry-title {
.author-bio {
margin-top: 4rem;
display: flex;
flex-wrap: wrap;
align-items: flex-start;
}
.hide-avatars .author-bio {
padding-left: 0;
.author-info {
flex: 1;
}
.author-bio-inner p:last-child {
margin-bottom: 0;
.hide-avatars img.avatar {
display: none;
}
.author-bio .avatar {
margin-right: 1.5rem;
height: 5rem;
width: 5rem;
}
.author-bio .author-title {
align-items: center;
display: flex;
margin: 0 0 1rem 0;
margin: 0;
}
.author-bio .author-link {
@ -2584,43 +2571,43 @@ h2.entry-title {
/* CUSTOM COLORS */
.has-accent-color {
:root .has-accent-color {
color: #cd2653;
}
.has-accent-background-color {
:root .has-accent-background-color {
background-color: #cd2653;
}
.has-primary-color {
:root .has-primary-color {
color: #000;
}
.has-primary-background-color {
:root .has-primary-background-color {
background-color: #000;
}
.has-secondary-color {
:root .has-secondary-color {
color: #6d6d6d;
}
.has-secondary-background-color {
:root .has-secondary-background-color {
background-color: #6d6d6d;
}
.has-subtle-background-color {
:root .has-subtle-background-color {
color: #dcd7ca;
}
.has-subtle-background-background-color {
:root .has-subtle-background-background-color {
background-color: #dcd7ca;
}
.has-background-color {
:root .has-background-color {
color: #f5efe0;
}
.has-background-background-color {
:root .has-background-background-color {
background-color: #f5efe0;
}
@ -2854,14 +2841,22 @@ h2.entry-title {
/* Block: Button ----------------------------- */
.wp-block-button {
margin: 3rem 0;
}
.wp-block-button.is-style-outline {
color: #cd2653;
}
.wp-block-button.is-style-outline .wp-block-button__link {
.is-style-outline .wp-block-button__link:not(.has-text-color) {
color: inherit;
}
.is-style-outline .wp-block-button__link {
padding: calc(1.1em - 0.2rem) calc(1.44em - 0.2rem);
}
/* Block: Columns ---------------------------- */
.wp-block-column {
@ -3003,6 +2998,10 @@ figure.wp-block-gallery.alignfull {
max-width: none;
}
.wp-block-media-text__content > *:first-child {
margin-top: 0;
}
.wp-block-media-text__content > *:last-child {
margin-bottom: 0;
}
@ -4353,25 +4352,25 @@ a.to-the-top > * {
/* BLOCK: COLUMNS */
.alignfull .wp-block-column > p:not(.has-background-color),
.alignfull:not(.has-background) .wp-block-column > p:not(.has-background-color),
.alignfull:not(.has-background) .wp-block-group__inner-container > p:not(.has-background-color) {
max-width: calc(100% - 4rem);
margin: auto;
}
}
@media ( min-width: 600px ) {
@media ( min-width: 600px ) and ( max-width: 781px ) {
/* Blocks -------------------------------- */
/* BLOCK: COLUMNS */
.alignfull .wp-block-column:nth-child(odd) > p:not(.has-background-color),
.alignfull:not(.has-background) .wp-block-column:nth-child(odd) > p:not(.has-background-color),
.alignfull:not(.has-background) .wp-block-group__inner-container > p:not(.has-background-color) {
padding-left: 2rem;
}
.alignfull .wp-block-column:nth-child(even) > p:not(.has-background-color),
.alignfull:not(.has-background) .wp-block-column:nth-child(even) > p:not(.has-background-color),
.alignfull:not(.has-background) .wp-block-group__inner-container > p:not(.has-background-color) {
padding-right: 2rem;
}
@ -4788,15 +4787,10 @@ a.to-the-top > * {
.author-bio {
margin-top: 8rem;
min-height: 8rem;
padding-left: 10rem;
position: relative;
}
.author-bio .avatar {
position: absolute;
left: 0;
top: 0;
height: 8rem;
width: 8rem;
}
@ -5277,12 +5271,16 @@ a.to-the-top > * {
/* BLOCK: COLUMNS */
.wp-block-column {
margin-bottom: 0;
}
.alignfull .wp-block-column:first-child > p,
.alignfull:not(.has-background) .wp-block-group__inner-container > p:not(.has-background-color) {
padding-left: 2rem;
}
.alignfull .wp-block-column:last-child > p,
.alignfull:not(.has-background) .wp-block-column:last-child > p,
.alignfull:not(.has-background) .wp-block-group__inner-container > p:not(.has-background-color) {
padding-right: 2rem;
}

8
wp-content/themes/twentytwenty/template-parts/entry-author-bio.php
View File

@ -9,11 +9,9 @@
if ( (bool) get_the_author_meta( 'description' ) ) : ?>
<div class="author-bio">
<h2 class="author-title heading-size-4">
<div class="author-avatar vcard">
<?php echo get_avatar( get_the_author_meta( 'ID' ), 160 ); ?>
</div>
<span class="author-name">
<div class="author-info">
<h2 class="author-title heading-size-4">
<?php
printf(
/* translators: %s: Author name */
@ -21,7 +19,6 @@ if ( (bool) get_the_author_meta( 'description' ) ) : ?>
esc_html( get_the_author() )
);
?>
</span>
</h2>
<p class="author-description">
<?php the_author_meta( 'description' ); ?>
@ -29,5 +26,6 @@ if ( (bool) get_the_author_meta( 'description' ) ) : ?>
<?php _e( 'View Archive &rarr;', 'twentytwenty' ); ?>
</a>
</p><!-- .author-description -->
</div>
</div><!-- .author-bio -->
<?php endif; ?>

2
wp-content/themes/twentytwenty/template-parts/modal-menu.php
View File

@ -9,7 +9,7 @@
?>
<div class="menu-modal cover-modal header-footer-group" data-modal-target-string=".menu-modal" aria-expanded="false">
<div class="menu-modal cover-modal header-footer-group" data-modal-target-string=".menu-modal">
<div class="menu-modal-inner modal-inner">

4
wp-content/themes/twentytwenty/template-parts/modal-search.php
View File

@ -8,7 +8,7 @@
*/
?>
<div class="search-modal cover-modal header-footer-group" data-modal-target-string=".search-modal" aria-expanded="false">
<div class="search-modal cover-modal header-footer-group" data-modal-target-string=".search-modal">
<div class="search-modal-inner modal-inner">
@ -22,7 +22,7 @@
);
?>
<button class="toggle search-untoggle close-search-toggle fill-children-current-color" data-toggle-target=".search-modal" data-toggle-body-class="showing-search-modal" data-set-focus=".search-modal .search-field">
<button class="toggle search-untoggle close-search-toggle fill-children-current-color" data-toggle-target=".search-modal" data-toggle-body-class="showing-search-modal" data-set-focus=".search-modal .search-field" aria-expanded="false">
<span class="screen-reader-text"><?php _e( 'Close search', 'twentytwenty' ); ?></span>
<?php twentytwenty_the_theme_svg( 'cross' ); ?>
</button><!-- .search-toggle -->

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
*
* @global string $wp_version
*/
$wp_version = '5.3-RC1-46570';
$wp_version = '5.3-RC1-46571';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.