From e8fd5abb260ef1ed1d78c81f77a7166c90250f08 Mon Sep 17 00:00:00 2001 From: allancole Date: Sat, 15 Dec 2018 11:07:38 +0000 Subject: [PATCH] Updating Twenty Nineteen, the new default theme for 2019. This update changes the following: - Add proper frontend styles for center aligned archive and category blocks. More info here: https://github.com/WordPress/twentynineteen/pull/684 - Fix image_filter theme option conditional function. More info here: https://github.com/WordPress/twentynineteen/pull/680 - Remove duplicate rule-line when a separator block is followed by H1/H2 in the editor. Props richtabor. More info here: https://github.com/WordPress/twentynineteen/pull/686 Props richtabor, kjellr. See #45424. Built from https://develop.svn.wordpress.org/branches/5.0@44193 git-svn-id: http://core.svn.wordpress.org/branches/5.0@44023 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- .../twentynineteen/inc/template-functions.php | 2 +- .../themes/twentynineteen/sass/blocks/_blocks.scss | 14 +++++++++++--- wp-content/themes/twentynineteen/style-editor.css | 7 +++++++ wp-content/themes/twentynineteen/style-editor.scss | 7 +++++++ wp-content/themes/twentynineteen/style-rtl.css | 5 +++++ wp-content/themes/twentynineteen/style.css | 5 +++++ wp-includes/version.php | 2 +- 7 files changed, 37 insertions(+), 5 deletions(-) diff --git a/wp-content/themes/twentynineteen/inc/template-functions.php b/wp-content/themes/twentynineteen/inc/template-functions.php index 3ab2b68c19..9b860aa9ed 100644 --- a/wp-content/themes/twentynineteen/inc/template-functions.php +++ b/wp-content/themes/twentynineteen/inc/template-functions.php @@ -106,7 +106,7 @@ function twentynineteen_can_show_post_thumbnail() { * Returns true if image filters are enabled on the theme options. */ function twentynineteen_image_filters_enabled() { - return 'inactive' !== get_theme_mod( 'image_filter', 1 ); + return 0 !== get_theme_mod( 'image_filter', 1 ); } /** diff --git a/wp-content/themes/twentynineteen/sass/blocks/_blocks.scss b/wp-content/themes/twentynineteen/sass/blocks/_blocks.scss index 58bc3867d0..7bb4963351 100644 --- a/wp-content/themes/twentynineteen/sass/blocks/_blocks.scss +++ b/wp-content/themes/twentynineteen/sass/blocks/_blocks.scss @@ -198,9 +198,9 @@ &.is-style-outline .wp-block-button__link, &.is-style-outline .wp-block-button__link:focus, &.is-style-outline .wp-block-button__link:active { - @include button-all-transition; + @include button-all-transition; border-width: 2px; - border-style: solid; + border-style: solid; &:not(.has-background) { background: transparent; @@ -244,6 +244,14 @@ } } + .wp-block-archives, + .wp-block-categories { + + &.aligncenter { + text-align: center; + } + } + //! Latest categories .wp-block-categories { @@ -788,7 +796,7 @@ .has-secondary-background-color, .has-dark-gray-background-color, .has-light-gray-background-color { - + // Use white text against these backgrounds by default. color: $color__background-body; diff --git a/wp-content/themes/twentynineteen/style-editor.css b/wp-content/themes/twentynineteen/style-editor.css index 5bc0ae4549..67bcc4a17c 100644 --- a/wp-content/themes/twentynineteen/style-editor.css +++ b/wp-content/themes/twentynineteen/style-editor.css @@ -614,6 +614,13 @@ figcaption, padding-left: calc(2 * 1rem); } +/* Remove duplicate rule-line when a separator + * is followed by an H1, or H2 */ +.wp-block[data-type="core/separator"] + .wp-block[data-type="core/heading"] h1:before, +.wp-block[data-type="core/separator"] + .wp-block[data-type="core/heading"] h2:before { + display: none; +} + /** === Latest Posts, Archives, Categories === */ ul.wp-block-archives, .wp-block-categories, diff --git a/wp-content/themes/twentynineteen/style-editor.scss b/wp-content/themes/twentynineteen/style-editor.scss index 713c519fae..f19be4b03e 100644 --- a/wp-content/themes/twentynineteen/style-editor.scss +++ b/wp-content/themes/twentynineteen/style-editor.scss @@ -600,6 +600,13 @@ figcaption, } } +/* Remove duplicate rule-line when a separator + * is followed by an H1, or H2 */ +.wp-block[data-type="core/separator"] + .wp-block[data-type="core/heading"] h1:before, +.wp-block[data-type="core/separator"] + .wp-block[data-type="core/heading"] h2:before { + display: none; +} + /** === Latest Posts, Archives, Categories === */ ul.wp-block-archives, diff --git a/wp-content/themes/twentynineteen/style-rtl.css b/wp-content/themes/twentynineteen/style-rtl.css index 5d329773f6..bb5e4592b5 100644 --- a/wp-content/themes/twentynineteen/style-rtl.css +++ b/wp-content/themes/twentynineteen/style-rtl.css @@ -3690,6 +3690,11 @@ body.page .main-navigation { text-decoration: none; } +.entry .entry-content .wp-block-archives.aligncenter, +.entry .entry-content .wp-block-categories.aligncenter { + text-align: center; +} + .entry .entry-content .wp-block-categories ul { padding-top: 0.75rem; } diff --git a/wp-content/themes/twentynineteen/style.css b/wp-content/themes/twentynineteen/style.css index 6eb328ce94..20d5d725a8 100644 --- a/wp-content/themes/twentynineteen/style.css +++ b/wp-content/themes/twentynineteen/style.css @@ -3702,6 +3702,11 @@ body.page .main-navigation { text-decoration: none; } +.entry .entry-content .wp-block-archives.aligncenter, +.entry .entry-content .wp-block-categories.aligncenter { + text-align: center; +} + .entry .entry-content .wp-block-categories ul { padding-top: 0.75rem; } diff --git a/wp-includes/version.php b/wp-includes/version.php index f1a25ce1d5..48d8fd24ac 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '5.0.2-alpha-44192'; +$wp_version = '5.0.2-alpha-44193'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.