diff --git a/wp-content/themes/twentytwenty/assets/css/editor-style-block-rtl.css b/wp-content/themes/twentytwenty/assets/css/editor-style-block-rtl.css index 8dc320fa60..4a6768f83b 100644 --- a/wp-content/themes/twentytwenty/assets/css/editor-style-block-rtl.css +++ b/wp-content/themes/twentytwenty/assets/css/editor-style-block-rtl.css @@ -319,6 +319,7 @@ Inter variable font. Usage: font-size: 0.842em; } +.editor-styles-wrapper p.has-normal-font-size, .editor-styles-wrapper p.has-regular-font-size { font-size: 1em; } diff --git a/wp-content/themes/twentytwenty/assets/css/editor-style-block.css b/wp-content/themes/twentytwenty/assets/css/editor-style-block.css index 7371be7cbb..609f642084 100644 --- a/wp-content/themes/twentytwenty/assets/css/editor-style-block.css +++ b/wp-content/themes/twentytwenty/assets/css/editor-style-block.css @@ -319,6 +319,7 @@ Inter variable font. Usage: font-size: 0.842em; } +.editor-styles-wrapper p.has-normal-font-size, .editor-styles-wrapper p.has-regular-font-size { font-size: 1em; } diff --git a/wp-content/themes/twentytwenty/assets/js/customize-controls.js b/wp-content/themes/twentytwenty/assets/js/customize-controls.js index f5e8af9dfa..f3d94a4597 100644 --- a/wp-content/themes/twentytwenty/assets/js/customize-controls.js +++ b/wp-content/themes/twentytwenty/assets/js/customize-controls.js @@ -1,4 +1,4 @@ -/* global twentyTwentyBgColors, twentyTwentyColor, Color, jQuery, wp, _ */ +/* global twentyTwentyBgColors, twentyTwentyColor, jQuery, wp, _ */ /** * Customizer enhancements for a better user experience. * @@ -74,11 +74,11 @@ .toCSS(); // Get secondary color. - value[ context ].secondary = Color( { - h: colors.bgColorObj.h(), - s: colors.bgColorObj.s() / 2, - l: ( colors.textColorObj.l() * 0.57 ) + ( colors.bgColorObj.l() * 0.43 ) - } ).toCSS(); + value[ context ].secondary = colors.bgColorObj + .clone() + .getReadableContrastingColor( colors.bgColorObj ) + .s( colors.bgColorObj.s() / 2 ) + .toCSS(); } // Change the value. diff --git a/wp-content/themes/twentytwenty/assets/js/index.js b/wp-content/themes/twentytwenty/assets/js/index.js index f0597e2c79..60b007ccef 100644 --- a/wp-content/themes/twentytwenty/assets/js/index.js +++ b/wp-content/themes/twentytwenty/assets/js/index.js @@ -30,10 +30,11 @@ if ( ! Element.prototype.closest ) { if ( window.NodeList && ! NodeList.prototype.forEach ) { NodeList.prototype.forEach = function( callback, thisArg ) { var i; + var len = this.length; thisArg = thisArg || window; - for ( i = 0; i < this.length; i++ ) { + for ( i = 0; i < len; i++ ) { callback.call( thisArg, this[ i ], i, this ); } }; @@ -68,6 +69,21 @@ if ( ! Element.prototype.matches ) { }; } +// Add a class to the body for when touch is enabled for browsers that don't support media queries +// for interaction media features. Adapted from +( function() { + var matchMedia = function() { + // Include the 'heartz' as a way to have a non matching MQ to help terminate the join. See . + var prefixes = [ '-webkit-', '-moz-', '-o-', '-ms-' ]; + var query = [ '(', prefixes.join( 'touch-enabled),(' ), 'heartz', ')' ].join( '' ); + return window.matchMedia && window.matchMedia( query ).matches; + }; + + if ( ( 'ontouchstart' in window ) || ( window.DocumentTouch && document instanceof window.DocumentTouch ) || matchMedia() ) { + document.body.classList.add( 'touch-enabled' ); + } +}() ); + /* ----------------------------------------------------------------------------------------------- Cover Modals --------------------------------------------------------------------------------------------------- */ @@ -523,37 +539,6 @@ twentytwenty.primaryMenu = { self = self.parentElement; } } - - /** - * Toggles `focus` class to allow submenu access on tablets. - */ - ( function( menuObj ) { - var touchStartFn, j, - parentLink = menuObj.querySelectorAll( '.primary-menu .menu-item-has-children > a' ); - - if ( 'ontouchstart' in window ) { - touchStartFn = function( e ) { - var menuItem = this.parentNode; - - if ( ! menuItem.classList.contains( 'focus' ) ) { - e.preventDefault(); - for ( j = 0; j < menuItem.parentNode.children.length; ++j ) { - if ( menuItem === menuItem.parentNode.children[j] ) { - continue; - } - menuItem.parentNode.children[i].classList.remove( 'focus' ); - } - menuItem.classList.add( 'focus' ); - } else { - menuItem.classList.remove( 'focus' ); - } - }; - - for ( j = 0; j < parentLink.length; ++j ) { - parentLink[j].addEventListener( 'touchstart', touchStartFn, false ); - } - } - }( menu ) ); } }; // twentytwenty.primaryMenu diff --git a/wp-content/themes/twentytwenty/classes/class-twentytwenty-non-latin-languages.php b/wp-content/themes/twentytwenty/classes/class-twentytwenty-non-latin-languages.php index 406a60511a..b178bcb454 100644 --- a/wp-content/themes/twentytwenty/classes/class-twentytwenty-non-latin-languages.php +++ b/wp-content/themes/twentytwenty/classes/class-twentytwenty-non-latin-languages.php @@ -19,7 +19,7 @@ if ( ! class_exists( 'TwentyTwenty_Non_Latin_Languages' ) ) { * Get custom CSS. * * Return CSS for non-latin language, if available, or null - * + * * @param string $type Whether to return CSS for the "front-end", "block-editor" or "classic-editor". * * @return void diff --git a/wp-content/themes/twentytwenty/footer.php b/wp-content/themes/twentytwenty/footer.php index eb00a1fd30..5db6505819 100644 --- a/wp-content/themes/twentytwenty/footer.php +++ b/wp-content/themes/twentytwenty/footer.php @@ -26,7 +26,7 @@ ); ?> -

+

diff --git a/wp-content/themes/twentytwenty/functions.php b/wp-content/themes/twentytwenty/functions.php index ad1a3f614c..70a5c0202a 100644 --- a/wp-content/themes/twentytwenty/functions.php +++ b/wp-content/themes/twentytwenty/functions.php @@ -19,9 +19,9 @@ * Custom Logo * WP Body Open * Register Sidebars - * Enqueue block editor assets - * Enqueue classic editor styles - * Block editor settings + * Enqueue Block Editor Assets + * Enqueue Classic Editor Styles + * Block Editor Settings */ /** @@ -119,8 +119,15 @@ function twentytwenty_theme_support() { // Add support for full and wide align images. add_theme_support( 'align-wide' ); - // Adds starter content to highlight the theme on fresh sites. - add_theme_support( 'starter-content', twentytwenty_get_starter_content() ); + /* + * Adds starter content to highlight the theme on fresh sites. + * This is done conditionally to avoid loading the starter content on every + * page load, as it is a one-off operation only needed once in the customizer. + */ + if ( is_customize_preview() ) { + require get_template_directory() . '/inc/starter-content.php'; + add_theme_support( 'starter-content', twentytwenty_get_starter_content() ); + } // Add theme support for selective refresh for widgets. add_theme_support( 'customize-selective-refresh-widgets' ); @@ -167,9 +174,6 @@ require get_template_directory() . '/classes/class-twentytwenty-non-latin-langua // Custom CSS. require get_template_directory() . '/inc/custom-css.php'; -// Custom starter content to highlight the theme on fresh sites. -require get_template_directory() . '/inc/starter-content.php'; - /** * Register and Enqueue Styles. */ @@ -531,7 +535,7 @@ function twentytwenty_block_editor_settings() { 'name' => _x( 'Regular', 'Name of the regular font size in the block editor', 'twentytwenty' ), 'shortName' => _x( 'M', 'Short name of the regular font size in the block editor.', 'twentytwenty' ), 'size' => 21, - 'slug' => 'regular', + 'slug' => 'normal', ), array( 'name' => _x( 'Large', 'Name of the large font size in the block editor', 'twentytwenty' ), @@ -692,26 +696,26 @@ function twentytwenty_get_elements_array() { $elements = array( 'content' => array( 'accent' => array( - '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', ':root .has-accent-background-color', '.comment-reply-link' ), - 'fill' => array( '.fill-children-accent', '.fill-children-accent *' ), + '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-color' => 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( ':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' ), + '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', '.has-background.has-primary-background-color:not(.has-text-color)', '.has-background.has-primary-background-color *:not(.has-text-color)', '.has-background.has-accent-background-color:not(.has-text-color)', '.has-background.has-accent-background-color *:not(.has-text-color)' ), + 'background-color' => array( ':root .has-background-background-color' ), ), 'text' => array( - 'color' => array( 'body', '.entry-title a', ':root .has-primary-color' ), - 'background' => array( ':root .has-primary-background-color' ), + 'color' => array( 'body', '.entry-title a', ':root .has-primary-color' ), + 'background-color' => 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', ':root .has-secondary-color' ), - 'background' => array( ':root .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-color' => 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)', ':root .has-subtle-background-background-color' ), + 'background-color' => 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( ':root .has-subtle-background-color' ), @@ -719,16 +723,16 @@ function twentytwenty_get_elements_array() { ), 'header-footer' => array( 'accent' => array( - 'color' => array( 'body:not(.overlay-header) .primary-menu > li > a', 'body:not(.overlay-header) .primary-menu > li > .icon', '.modal-menu a', '.footer-menu a, .footer-widgets a', '#site-footer .wp-block-button.is-style-outline', '.wp-block-pullquote:before', '.singular:not(.overlay-header) .entry-header a', '.archive-header a', '.header-footer-group .color-accent', '.header-footer-group .color-accent-hover:hover' ), - 'background' => array( '.social-icons a', '#site-footer button:not(.toggle)', '#site-footer .button', '#site-footer .faux-button', '#site-footer .wp-block-button__link', '#site-footer .wp-block-file__button', '#site-footer input[type="button"]', '#site-footer input[type="reset"]', '#site-footer input[type="submit"]' ), + 'color' => array( 'body:not(.overlay-header) .primary-menu > li > a', 'body:not(.overlay-header) .primary-menu > li > .icon', '.modal-menu a', '.footer-menu a, .footer-widgets a', '#site-footer .wp-block-button.is-style-outline', '.wp-block-pullquote:before', '.singular:not(.overlay-header) .entry-header a', '.archive-header a', '.header-footer-group .color-accent', '.header-footer-group .color-accent-hover:hover' ), + 'background-color' => array( '.social-icons a', '#site-footer button:not(.toggle)', '#site-footer .button', '#site-footer .faux-button', '#site-footer .wp-block-button__link', '#site-footer .wp-block-file__button', '#site-footer input[type="button"]', '#site-footer input[type="reset"]', '#site-footer input[type="submit"]' ), ), 'background' => array( - 'color' => array( '.social-icons a', 'body:not(.overlay-header) .primary-menu ul', '.header-footer-group button', '.header-footer-group .button', '.header-footer-group .faux-button', '.header-footer-group .wp-block-button:not(.is-style-outline) .wp-block-button__link', '.header-footer-group .wp-block-file__button', '.header-footer-group input[type="button"]', '.header-footer-group input[type="reset"]', '.header-footer-group input[type="submit"]' ), - 'background' => array( '#site-header', '.footer-nav-widgets-wrapper', '#site-footer', '.menu-modal', '.menu-modal-inner', '.search-modal-inner', '.archive-header', '.singular .entry-header', '.singular .featured-media:before', '.wp-block-pullquote:before' ), + 'color' => array( '.social-icons a', 'body:not(.overlay-header) .primary-menu ul', '.header-footer-group button', '.header-footer-group .button', '.header-footer-group .faux-button', '.header-footer-group .wp-block-button:not(.is-style-outline) .wp-block-button__link', '.header-footer-group .wp-block-file__button', '.header-footer-group input[type="button"]', '.header-footer-group input[type="reset"]', '.header-footer-group input[type="submit"]' ), + 'background-color' => array( '#site-header', '.footer-nav-widgets-wrapper', '#site-footer', '.menu-modal', '.menu-modal-inner', '.search-modal-inner', '.archive-header', '.singular .entry-header', '.singular .featured-media:before', '.wp-block-pullquote:before' ), ), 'text' => array( 'color' => array( '.header-footer-group', 'body:not(.overlay-header) #site-header .toggle', '.menu-modal .toggle' ), - 'background' => array( 'body:not(.overlay-header) .primary-menu ul' ), + 'background-color' => array( 'body:not(.overlay-header) .primary-menu ul' ), 'border-bottom-color' => array( 'body:not(.overlay-header) .primary-menu > li > ul:after' ), 'border-left-color' => array( 'body:not(.overlay-header) .primary-menu ul ul:after' ), ), @@ -736,8 +740,8 @@ function twentytwenty_get_elements_array() { 'color' => array( '.site-description', 'body:not(.overlay-header) .toggle-inner .toggle-text', '.widget .post-date', '.widget .rss-date', '.widget_archive li', '.widget_categories li', '.widget cite', '.widget_pages li', '.widget_meta li', '.widget_nav_menu li', '.powered-by-wordpress', '.to-the-top', '.singular .entry-header .post-meta', '.singular:not(.overlay-header) .entry-header .post-meta a' ), ), 'borders' => array( - 'border-color' => array( '.header-footer-group pre', '.header-footer-group fieldset', '.header-footer-group input', '.header-footer-group textarea', '.header-footer-group table', '.header-footer-group table *', '.footer-nav-widgets-wrapper', '#site-footer', '.menu-modal nav *', '.footer-widgets-outer-wrapper', '.footer-top' ), - 'background' => array( '.header-footer-group table caption', 'body:not(.overlay-header) .header-inner .toggle-wrapper::before' ), + 'border-color' => array( '.header-footer-group pre', '.header-footer-group fieldset', '.header-footer-group input', '.header-footer-group textarea', '.header-footer-group table', '.header-footer-group table *', '.footer-nav-widgets-wrapper', '#site-footer', '.menu-modal nav *', '.footer-widgets-outer-wrapper', '.footer-top' ), + 'background-color' => array( '.header-footer-group table caption', 'body:not(.overlay-header) .header-inner .toggle-wrapper::before' ), ), ), ); diff --git a/wp-content/themes/twentytwenty/inc/custom-css.php b/wp-content/themes/twentytwenty/inc/custom-css.php index d9ce6f9596..a1c560dea4 100644 --- a/wp-content/themes/twentytwenty/inc/custom-css.php +++ b/wp-content/themes/twentytwenty/inc/custom-css.php @@ -129,7 +129,8 @@ if ( ! function_exists( 'twentytwenty_get_customizer_css' ) ) { // Background color. if ( $background && $background !== $background_default ) { - twentytwenty_generate_css( '.editor-styles-wrapper', 'background', '#' . $background ); + twentytwenty_generate_css( '.editor-styles-wrapper', 'background-color', '#' . $background ); + twentytwenty_generate_css( '.has-background.has-primary-background-color:not(.has-text-color),.has-background.has-primary-background-color *:not(.has-text-color),.has-background.has-accent-background-color:not(.has-text-color),.has-background.has-accent-background-color *:not(.has-text-color)', 'color', '#' . $background ); } // Borders color. @@ -164,7 +165,7 @@ if ( ! function_exists( 'twentytwenty_get_customizer_css' ) ) { // Background color. if ( $background && $background !== $background_default ) { - twentytwenty_generate_css( 'body#tinymce.wp-editor.content', 'background', '#' . $background ); + twentytwenty_generate_css( 'body#tinymce.wp-editor.content', 'background-color', '#' . $background ); } // Text color. diff --git a/wp-content/themes/twentytwenty/inc/starter-content.php b/wp-content/themes/twentytwenty/inc/starter-content.php index e7ace1b200..ad1f8c5838 100644 --- a/wp-content/themes/twentytwenty/inc/starter-content.php +++ b/wp-content/themes/twentytwenty/inc/starter-content.php @@ -175,16 +175,20 @@ function twentytwenty_get_starter_content() { 'primary' => array( 'name' => __( 'Primary', 'twentytwenty' ), 'items' => array( + 'link_home', // Note that the core "home" page is actually a link in case a static front page is not used. + 'page_about', + 'page_blog', 'page_contact', ), ), - // Assign a menu to the "expanded" (modal) menu location. + // This replicates primary just to demonstrate the expanded menu. 'expanded' => array( 'name' => __( 'Primary', 'twentytwenty' ), 'items' => array( 'link_home', // Note that the core "home" page is actually a link in case a static front page is not used. 'page_about', 'page_blog', + 'page_contact', ), ), // Assign a menu to the "social" location. diff --git a/wp-content/themes/twentytwenty/print.css b/wp-content/themes/twentytwenty/print.css index 9fd3ebe015..0ab0ce9fb8 100644 --- a/wp-content/themes/twentytwenty/print.css +++ b/wp-content/themes/twentytwenty/print.css @@ -66,6 +66,7 @@ Andreas Hecht in https://www.jotform.com/blog/css-perfect-print-stylesheet-98272 h2.entry-title, h3, h4, + .has-normal-font-size, .has-regular-font-size, .has-large-font-size, .comments-header { diff --git a/wp-content/themes/twentytwenty/style-rtl.css b/wp-content/themes/twentytwenty/style-rtl.css index 28a56b04bf..a4dc8c9e65 100644 --- a/wp-content/themes/twentytwenty/style-rtl.css +++ b/wp-content/themes/twentytwenty/style-rtl.css @@ -180,6 +180,7 @@ path { position: absolute !important; width: 1px; word-wrap: normal !important; + word-break: normal; } .screen-reader-text:focus { @@ -826,6 +827,29 @@ input[type="submit"]:hover { text-decoration: underline; } +input[type="text"]:focus, +input[type="email"]:focus, +input[type="url"]:focus, +input[type="password"]:focus, +input[type="number"]:focus, +input[type="tel"]:focus, +input[type="range"]:focus, +input[type="date"]:focus, +input[type="month"]:focus, +input[type="week"]:focus, +input[type="time"]:focus, +input[type="datetime"]:focus, +input[type="datetime-local"]:focus, +input[type="color"]:focus, +textarea:focus { + border-color: currentColor; +} + +input[type="search"]:focus { + outline: thin dotted; + outline-offset: -4px; +} + /* Tables ------------------------------------ */ table { @@ -1679,6 +1703,38 @@ ul.primary-menu { transform: rotate(-180deg); } +/* + * Enable nav submenu expansion with tapping on arrows on large-viewport + * touch interfaces (e.g. tablets or laptops with touch screens). + * These rules are supported by all browsers (>IE11) and when JS is disabled. + */ +@media (any-pointer: coarse) { + + .primary-menu > li.menu-item-has-children > a { + padding-left: 0; + margin-left: 2rem; + } + + .primary-menu ul li.menu-item-has-children > a { + margin-left: 4.5rem; + padding-left: 0; + width: unset; + } + +} + +/* Repeat previous rules for IE11 (when JS enabled for polyfill). */ +body.touch-enabled .primary-menu > li.menu-item-has-children > a { + padding-left: 0; + margin-left: 2rem; +} + +body.touch-enabled .primary-menu ul li.menu-item-has-children > a { + margin-left: 4.5rem; + padding-left: 0; + width: unset; +} + /* -------------------------------------------------------------------------- */ /* 5. Menu Modal @@ -2685,6 +2741,7 @@ h2.entry-title { font-size: 0.842em; } +.entry-content .has-normal-font-size, .entry-content .has-regular-font-size { font-size: 1em; } @@ -2864,6 +2921,12 @@ h2.entry-title { /* Block: Columns ---------------------------- */ +.wp-block-columns.alignfull, +.alignfull:not(.has-background) .wp-block-columns { + padding-right: 2rem; + padding-left: 2rem; +} + .wp-block-column { margin-bottom: 3.2rem; } @@ -2991,6 +3054,11 @@ figure.wp-block-gallery.alignfull { max-width: 100%; } +.alignfull:not(.has-background) > .wp-block-group__inner-container > p:not(.has-background-color) { + padding-right: 2rem; + padding-left: 2rem; +} + /* Block: Image ------------------------------ */ /* Block: Media And Text --------------------- */ @@ -3175,10 +3243,14 @@ hr.wp-block-separator { background: #dcd7ca; } -.wp-block-table.is-style-stripes { +figure.wp-block-table.is-style-stripes { border-bottom: none; } +.wp-block-table.is-style-stripes table { + border-collapse: inherit; +} + /* Block: Quote ------------------------------ */ .wp-block-quote p, @@ -4349,36 +4421,6 @@ a.to-the-top > * { } -@media ( max-width: 599px ) { - - /* Blocks -------------------------------- */ - - /* BLOCK: COLUMNS */ - - .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 ) and ( max-width: 781px ) { - - /* Blocks -------------------------------- */ - - /* BLOCK: COLUMNS */ - - .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: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; - } -} - @media ( min-width: 660px ) { /* Blocks -------------------------------- */ @@ -5279,14 +5321,9 @@ a.to-the-top > * { 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: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; + .wp-block-columns.alignwide + .wp-block-columns.alignwide, + .wp-block-columns.alignfull + .wp-block-columns.alignfull { + margin-top: -2.8rem; } } @@ -5512,7 +5549,7 @@ a.to-the-top > * { .wp-block-columns.alignwide + .wp-block-columns.alignwide, .wp-block-columns.alignfull + .wp-block-columns.alignfull { - margin-top: -5.2rem; + margin-top: -4.8rem; } /* BLOCK: GALLERY */ diff --git a/wp-content/themes/twentytwenty/style.css b/wp-content/themes/twentytwenty/style.css index 094a2d8d0d..350bf1a80a 100644 --- a/wp-content/themes/twentytwenty/style.css +++ b/wp-content/themes/twentytwenty/style.css @@ -180,6 +180,7 @@ path { position: absolute !important; width: 1px; word-wrap: normal !important; + word-break: normal; } .screen-reader-text:focus { @@ -832,6 +833,29 @@ input[type="submit"]:hover { text-decoration: underline; } +input[type="text"]:focus, +input[type="email"]:focus, +input[type="url"]:focus, +input[type="password"]:focus, +input[type="number"]:focus, +input[type="tel"]:focus, +input[type="range"]:focus, +input[type="date"]:focus, +input[type="month"]:focus, +input[type="week"]:focus, +input[type="time"]:focus, +input[type="datetime"]:focus, +input[type="datetime-local"]:focus, +input[type="color"]:focus, +textarea:focus { + border-color: currentColor; +} + +input[type="search"]:focus { + outline: thin dotted; + outline-offset: -4px; +} + /* Tables ------------------------------------ */ table { @@ -1687,6 +1711,38 @@ ul.primary-menu { transform: rotate(180deg); } +/* + * Enable nav submenu expansion with tapping on arrows on large-viewport + * touch interfaces (e.g. tablets or laptops with touch screens). + * These rules are supported by all browsers (>IE11) and when JS is disabled. + */ +@media (any-pointer: coarse) { + + .primary-menu > li.menu-item-has-children > a { + padding-right: 0; + margin-right: 2rem; + } + + .primary-menu ul li.menu-item-has-children > a { + margin-right: 4.5rem; + padding-right: 0; + width: unset; + } + +} + +/* Repeat previous rules for IE11 (when JS enabled for polyfill). */ +body.touch-enabled .primary-menu > li.menu-item-has-children > a { + padding-right: 0; + margin-right: 2rem; +} + +body.touch-enabled .primary-menu ul li.menu-item-has-children > a { + margin-right: 4.5rem; + padding-right: 0; + width: unset; +} + /* -------------------------------------------------------------------------- */ /* 5. Menu Modal @@ -2699,6 +2755,7 @@ h2.entry-title { font-size: 0.842em; } +.entry-content .has-normal-font-size, .entry-content .has-regular-font-size { font-size: 1em; } @@ -2878,6 +2935,12 @@ h2.entry-title { /* Block: Columns ---------------------------- */ +.wp-block-columns.alignfull, +.alignfull:not(.has-background) .wp-block-columns { + padding-left: 2rem; + padding-right: 2rem; +} + .wp-block-column { margin-bottom: 3.2rem; } @@ -3005,6 +3068,11 @@ figure.wp-block-gallery.alignfull { max-width: 100%; } +.alignfull:not(.has-background) > .wp-block-group__inner-container > p:not(.has-background-color) { + padding-left: 2rem; + padding-right: 2rem; +} + /* Block: Image ------------------------------ */ /* Block: Media And Text --------------------- */ @@ -3189,10 +3257,14 @@ hr.wp-block-separator { background: #dcd7ca; } -.wp-block-table.is-style-stripes { +figure.wp-block-table.is-style-stripes { border-bottom: none; } +.wp-block-table.is-style-stripes table { + border-collapse: inherit; +} + /* Block: Quote ------------------------------ */ .wp-block-quote p, @@ -4371,36 +4443,6 @@ a.to-the-top > * { } -@media ( max-width: 599px ) { - - /* Blocks -------------------------------- */ - - /* BLOCK: COLUMNS */ - - .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 ) and ( max-width: 781px ) { - - /* Blocks -------------------------------- */ - - /* BLOCK: COLUMNS */ - - .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: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; - } -} - @media ( min-width: 660px ) { /* Blocks -------------------------------- */ @@ -5313,14 +5355,9 @@ a.to-the-top > * { 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: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; + .wp-block-columns.alignwide + .wp-block-columns.alignwide, + .wp-block-columns.alignfull + .wp-block-columns.alignfull { + margin-top: -2.8rem; } } @@ -5546,7 +5583,7 @@ a.to-the-top > * { .wp-block-columns.alignwide + .wp-block-columns.alignwide, .wp-block-columns.alignfull + .wp-block-columns.alignfull { - margin-top: -5.2rem; + margin-top: -4.8rem; } /* BLOCK: GALLERY */ diff --git a/wp-includes/version.php b/wp-includes/version.php index 2909e68fcd..c26baa46bf 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.4-alpha-46700'; +$wp_version = '5.4-alpha-46701'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.