From 2e50e8753e613f69ebbc7356afc4312a01d27b10 Mon Sep 17 00:00:00 2001 From: Jonathan Desrosiers Date: Tue, 18 Dec 2018 22:08:33 +0000 Subject: [PATCH] Twenty Nineteen: Code Quality Improvements. This change adds general code quality and documentation improvements. More info here: https://github.com/WordPress/twentynineteen/pull/546 Props grapplerulrich, iCaleb, allancole. Merges [44187] to trunk. See #45424. git-svn-id: https://develop.svn.wordpress.org/trunk@44298 602fd350-edb4-49c9-b593-d223f7449a82 --- .../themes/twentynineteen/archive.php | 2 - .../themes/twentynineteen/functions.php | 9 ++- .../themes/twentynineteen/header.php | 15 +++-- .../themes/twentynineteen/image.php | 2 +- .../twentynineteen/inc/color-patterns.php | 60 +++++++++++++------ .../themes/twentynineteen/inc/customizer.php | 4 +- .../twentynineteen/inc/template-functions.php | 10 +--- .../twentynineteen/inc/template-tags.php | 18 +++--- .../themes/twentynineteen/index.php | 2 +- .../navigation/_menu-social-navigation.scss | 3 + .../themes/twentynineteen/style-rtl.css | 1 + .../themes/twentynineteen/style.css | 1 + 12 files changed, 80 insertions(+), 47 deletions(-) diff --git a/src/wp-content/themes/twentynineteen/archive.php b/src/wp-content/themes/twentynineteen/archive.php index 3d2273e43e..88703de75a 100644 --- a/src/wp-content/themes/twentynineteen/archive.php +++ b/src/wp-content/themes/twentynineteen/archive.php @@ -20,8 +20,6 @@ get_header();
', '' ); - // Remove for now @TODO - // the_archive_description( '
', '
' ); ?>
diff --git a/src/wp-content/themes/twentynineteen/functions.php b/src/wp-content/themes/twentynineteen/functions.php index 424e72bb38..1498ee2c52 100644 --- a/src/wp-content/themes/twentynineteen/functions.php +++ b/src/wp-content/themes/twentynineteen/functions.php @@ -263,14 +263,13 @@ function twentynineteen_colors_css_wrap() { require_once get_parent_theme_file_path( '/inc/color-patterns.php' ); - if ( 'default' === get_theme_mod( 'primary_color', 'default' ) ) { - $primary_color = 199; - } else { - $primary_color = absint( get_theme_mod( 'primary_color_hue', 199 ) ); + $primary_color = 199; + if ( 'default' !== get_theme_mod( 'primary_color', 'default' ) ) { + $primary_color = get_theme_mod( 'primary_color_hue', 199 ); } ?> -
- - - -
+ responses ) > 0 ) { + $classes = 'entry-header has-discussion'; + } + ?> +
diff --git a/src/wp-content/themes/twentynineteen/image.php b/src/wp-content/themes/twentynineteen/image.php index 757d32c108..c27e26f6bb 100644 --- a/src/wp-content/themes/twentynineteen/image.php +++ b/src/wp-content/themes/twentynineteen/image.php @@ -41,7 +41,7 @@ get_header(); echo wp_get_attachment_image( get_the_ID(), $image_size ); ?> -
+
diff --git a/src/wp-content/themes/twentynineteen/inc/color-patterns.php b/src/wp-content/themes/twentynineteen/inc/color-patterns.php index f2eff854f5..6e6004a328 100644 --- a/src/wp-content/themes/twentynineteen/inc/color-patterns.php +++ b/src/wp-content/themes/twentynineteen/inc/color-patterns.php @@ -12,10 +12,9 @@ */ function twentynineteen_custom_colors_css() { - if ( 'default' === get_theme_mod( 'primary_color', 'default' ) ) { - $primary_color = 199; - } else { - $primary_color = absint( get_theme_mod( 'primary_color_hue', 199 ) ); + $primary_color = 199; + if ( 'default' !== get_theme_mod( 'primary_color', 'default' ) ) { + $primary_color = absint( get_theme_mod( 'primary_color', 199 ) ); } /** @@ -25,21 +24,48 @@ function twentynineteen_custom_colors_css() { * * @param int $saturation Color saturation level. */ + $saturation = apply_filters( 'twentynineteen_custom_colors_saturation', 100 ); + $saturation = absint( $saturation ) . '%'; - $saturation = absint( apply_filters( 'twentynineteen_custom_colors_saturation', 100 ) ); - $saturation = $saturation . '%'; - + /** + * Filter Twenty Nineteen default selection saturation level. + * + * @since Twenty Nineteen 1.0 + * + * @param int $saturation_selection Selection color saturation level. + */ $saturation_selection = absint( apply_filters( 'twentynineteen_custom_colors_saturation_selection', 50 ) ); $saturation_selection = $saturation_selection . '%'; - $lightness = absint( apply_filters( 'twentynineteen_custom_colors_lightness', 33 ) ); - $lightness = $lightness . '%'; + /** + * Filter Twenty Nineteen default lightness level. + * + * @since Twenty Nineteen 1.0 + * + * @param int $lightness Color lightness level. + */ + $lightness = apply_filters( 'twentynineteen_custom_colors_lightness', 33 ); + $lightness = absint( $lightness ) . '%'; - $lightness_hover = absint( apply_filters( 'twentynineteen_custom_colors_lightness_hover', 23 ) ); - $lightness_hover = $lightness_hover . '%'; + /** + * Filter Twenty Nineteen default hover lightness level. + * + * @since Twenty Nineteen 1.0 + * + * @param int $lightness_hover Hover color lightness level. + */ + $lightness_hover = apply_filters( 'twentynineteen_custom_colors_lightness_hover', 23 ); + $lightness_hover = absint( $lightness_hover ) . '%'; - $lightness_selection = absint( apply_filters( 'twentynineteen_custom_colors_lightness_selection', 90 ) ); - $lightness_selection = $lightness_selection . '%'; + /** + * Filter Twenty Nineteen default selection lightness level. + * + * @since Twenty Nineteen 1.0 + * + * @param int $lightness_selection Selection color lightness level. + */ + $lightness_selection = apply_filters( 'twentynineteen_custom_colors_lightness_selection', 90 ); + $lightness_selection = absint( $lightness_selection ) . '%'; $theme_css = ' /* @@ -233,11 +259,9 @@ function twentynineteen_custom_colors_css() { color: inherit; } '; - $css = ''; + if ( function_exists( 'register_block_type' ) && is_admin() ) { - $css .= $editor_css; - } elseif ( ! is_admin() ) { - $css = $theme_css; + $theme_css = $editor_css; } /** @@ -249,5 +273,5 @@ function twentynineteen_custom_colors_css() { * @param int $primary_color The user's selected color hue. * @param string $saturation Filtered theme color saturation level. */ - return apply_filters( 'twentynineteen_custom_colors_css', $css, $primary_color, $saturation ); + return apply_filters( 'twentynineteen_custom_colors_css', $theme_css, $primary_color, $saturation ); } diff --git a/src/wp-content/themes/twentynineteen/inc/customizer.php b/src/wp-content/themes/twentynineteen/inc/customizer.php index 2ce309c91a..ced7e9b490 100644 --- a/src/wp-content/themes/twentynineteen/inc/customizer.php +++ b/src/wp-content/themes/twentynineteen/inc/customizer.php @@ -125,7 +125,7 @@ function twentynineteen_customize_partial_blogdescription() { * Bind JS handlers to instantly live-preview changes. */ function twentynineteen_customize_preview_js() { - wp_enqueue_script( 'twentynineteen-customize-preview', get_theme_file_uri( '/js/customize-preview.js' ), array( 'customize-preview' ), '20151215', true ); + wp_enqueue_script( 'twentynineteen-customize-preview', get_theme_file_uri( '/js/customize-preview.js' ), array( 'customize-preview' ), '20181108', true ); } add_action( 'customize_preview_init', 'twentynineteen_customize_preview_js' ); @@ -133,7 +133,7 @@ add_action( 'customize_preview_init', 'twentynineteen_customize_preview_js' ); * Load dynamic logic for the customizer controls area. */ function twentynineteen_panels_js() { - wp_enqueue_script( 'twentynineteen-customize-controls', get_theme_file_uri( '/js/customize-controls.js' ), array(), '1.0', true ); + wp_enqueue_script( 'twentynineteen-customize-controls', get_theme_file_uri( '/js/customize-controls.js' ), array(), '20181031', true ); } add_action( 'customize_controls_enqueue_scripts', 'twentynineteen_panels_js' ); diff --git a/src/wp-content/themes/twentynineteen/inc/template-functions.php b/src/wp-content/themes/twentynineteen/inc/template-functions.php index 947b3d77d5..170232c126 100644 --- a/src/wp-content/themes/twentynineteen/inc/template-functions.php +++ b/src/wp-content/themes/twentynineteen/inc/template-functions.php @@ -106,10 +106,7 @@ function twentynineteen_can_show_post_thumbnail() { * Returns true if image filters are enabled on the theme options. */ function twentynineteen_image_filters_enabled() { - if ( get_theme_mod( 'image_filter', 1 ) ) { - return true; - } - return false; + return 'inactive' !== get_theme_mod( 'image_filter', 1 ); } /** @@ -418,8 +415,7 @@ function twentynineteen_hsl_hex( $h, $s, $l, $to_hex = true ) { return "#$r$g$b"; - } else { - - return "rgb($r, $g, $b)"; } + + return "rgb($r, $g, $b)"; } diff --git a/src/wp-content/themes/twentynineteen/inc/template-tags.php b/src/wp-content/themes/twentynineteen/inc/template-tags.php index b435a35027..c23e859932 100644 --- a/src/wp-content/themes/twentynineteen/inc/template-tags.php +++ b/src/wp-content/themes/twentynineteen/inc/template-tags.php @@ -157,9 +157,7 @@ if ( ! function_exists( 'twentynineteen_post_thumbnail' ) ) :
@@ -223,13 +221,19 @@ if ( ! function_exists( 'twentynineteen_the_posts_navigation' ) ) : * Documentation for function. */ function twentynineteen_the_posts_navigation() { - $prev_icon = twentynineteen_get_icon_svg( 'chevron_left', 22 ); - $next_icon = twentynineteen_get_icon_svg( 'chevron_right', 22 ); the_posts_pagination( array( 'mid_size' => 2, - 'prev_text' => sprintf( '%s %s', $prev_icon, __( 'Newer posts', 'twentynineteen' ) ), - 'next_text' => sprintf( '%s %s', __( 'Older posts', 'twentynineteen' ), $next_icon ), + 'prev_text' => sprintf( + '%s %s', + twentynineteen_get_icon_svg( 'chevron_left', 22 ), + __( 'Newer posts', 'twentynineteen' ) + ), + 'next_text' => sprintf( + '%s %s', + __( 'Older posts', 'twentynineteen' ), + twentynineteen_get_icon_svg( 'chevron_right', 22 ) + ), ) ); } diff --git a/src/wp-content/themes/twentynineteen/index.php b/src/wp-content/themes/twentynineteen/index.php index d7d984c00f..480be7ef15 100644 --- a/src/wp-content/themes/twentynineteen/index.php +++ b/src/wp-content/themes/twentynineteen/index.php @@ -39,7 +39,7 @@ get_header(); } ?> - + diff --git a/src/wp-content/themes/twentynineteen/sass/navigation/_menu-social-navigation.scss b/src/wp-content/themes/twentynineteen/sass/navigation/_menu-social-navigation.scss index 4a3cfe84e7..00724b5eca 100644 --- a/src/wp-content/themes/twentynineteen/sass/navigation/_menu-social-navigation.scss +++ b/src/wp-content/themes/twentynineteen/sass/navigation/_menu-social-navigation.scss @@ -45,6 +45,9 @@ width: 32px; height: 32px; + // Prevent icons from jumping in Safari using hardware acceleration. + transform: translateZ(0); + &#ui-icon-link { transform: rotate(-45deg); } diff --git a/src/wp-content/themes/twentynineteen/style-rtl.css b/src/wp-content/themes/twentynineteen/style-rtl.css index 268e2f7a0a..bda04ec07f 100644 --- a/src/wp-content/themes/twentynineteen/style-rtl.css +++ b/src/wp-content/themes/twentynineteen/style-rtl.css @@ -1604,6 +1604,7 @@ body.page .main-navigation { display: block; width: 32px; height: 32px; + transform: translateZ(0); } .social-navigation ul.social-links-menu li a svg#ui-icon-link { diff --git a/src/wp-content/themes/twentynineteen/style.css b/src/wp-content/themes/twentynineteen/style.css index 1ddc74fb67..0a52b64bf1 100644 --- a/src/wp-content/themes/twentynineteen/style.css +++ b/src/wp-content/themes/twentynineteen/style.css @@ -1604,6 +1604,7 @@ body.page .main-navigation { display: block; width: 32px; height: 32px; + transform: translateZ(0); } .social-navigation ul.social-links-menu li a svg#ui-icon-link {