Changeset 46614 for branches/5.3/src/wp-content/themes/twentytwenty/functions.php

Timestamp:

10/29/2019 04:40:34 PM (5 years ago)

Author:

desrosj

Message:

Bundled Themes: Update Twenty Twenty.

This brings Twenty Twenty in-sync with GitHub.

For a complete list of changes since [46571], see ​https://github.com/WordPress/twentytwenty/compare/4549fd9...dea9290.

Reviewed by ianbelanger, SergeyBiryukov, desrosj.
Props anlino, ianbelanger, poena, williampatton, collet, erikkroes, torres126, intimez, byalextran, mehidi258, swapnild, nielslange.
Merges [46613] to the 5.3 branch.
Fixes #48450.

Location:

branches/5.3

Files:

• . (modified) (1 prop)
• src/wp-content/themes/twentytwenty/functions.php (modified) (8 diffs)

branches/5.3/src/wp-content/themes/twentytwenty/functions.php

@@ -65 +65 @@
 
     // Custom logo.
-    $logo_id     = get_theme_mod( 'custom_logo' );
     $logo_width  = 120;
     $logo_height = 90;
 
     // If the retina setting is active, double the recommended width and height.
-    if ( get_theme_mod( 'twentytwenty_retina_logo', false ) ) {
+    if ( get_theme_mod( 'retina_logo', false ) ) {
         $logo_width  = floor( $logo_width * 2 );
         $logo_height = floor( $logo_height * 2 );
@@ -82 +81 @@
             'flex-height' => true,
             'flex-width'  => true,
-            'header-text' => array( 'site-title', 'site-description' ),
         )
     );
@@ -164 +162 @@
 require get_template_directory() . '/classes/class-twentytwenty-script-loader.php';
 
+// Non-latin language handling.
+require get_template_directory() . '/classes/class-twentytwenty-non-latin-languages.php';
+
 // Custom CSS.
 require get_template_directory() . '/inc/custom-css.php';
@@ -207 +208 @@
 
 add_action( 'wp_enqueue_scripts', 'twentytwenty_register_scripts' );
+
+/**
+ * Fix skip link focus in IE11.
+ *
+ * This does not enqueue the script because it is tiny and because it is only for IE11,
+ * thus it does not warrant having an entire dedicated blocking script being loaded.
+ *
+ * @link https://git.io/vWdr2
+ */
+function twentytwenty_skip_link_focus_fix() {
+    // The following is minified via `terser --compress --mangle -- assets/js/skip-link-focus-fix.js`.
+    ?>
+    <script>
+    /(trident|msie)/i.test(navigator.userAgent)&&document.getElementById&&window.addEventListener&&window.addEventListener("hashchange",function(){var t,e=location.hash.substring(1);/^[A-z0-9_-]+$/.test(e)&&(t=document.getElementById(e))&&(/^(?:a|select|input|button|textarea)$/i.test(t.tagName)||(t.tabIndex=-1),t.focus())},!1);
+    </script>
+    <?php
+}
+add_action( 'wp_print_footer_scripts', 'twentytwenty_skip_link_focus_fix' );
+
+/** Enqueue non-latin language styles
+ *
+ * @since 1.0.0
+ *
+ * @return void
+ */
+function twentytwenty_non_latin_languages() {
+    $custom_css = TwentyTwenty_Non_Latin_Languages::get_non_latin_css( 'front-end' );
+
+    if ( $custom_css ) {
+        wp_add_inline_style( 'twentytwenty-style', $custom_css );
+    }
+}
+
+add_action( 'wp_enqueue_scripts', 'twentytwenty_non_latin_languages' );
 
 /**
@@ -263 +298 @@
             );
 
+            // Add a style attribute with the height, or append the height to the style attribute if the style attribute already exists.
+            if ( strpos( $html, ' style=' ) === false ) {
+                $search[]  = '/(src=)/';
+                $replace[] = "style=\"height: {$logo_height}px;\" src=";
+            } else {
+                $search[]  = '/(style="[^"]*)/';
+                $replace[] = "$1 height: {$logo_height}px;";
+            }
+
             $html = preg_replace( $search, $replace, $html );
+
         }
     }
@@ -349 +394 @@
     wp_add_inline_style( 'twentytwenty-block-editor-styles', twentytwenty_get_customizer_css( 'block-editor' ) );
 
+    // Add inline style for non-latin fonts.
+    wp_add_inline_style( 'twentytwenty-block-editor-styles', TwentyTwenty_Non_Latin_Languages::get_non_latin_css( 'block-editor' ) );
+
     // Enqueue the editor script.
     wp_enqueue_script( 'twentytwenty-block-editor-script', get_theme_file_uri( '/assets/js/editor-script-block.js' ), array( 'wp-blocks', 'wp-dom' ), wp_get_theme()->get( 'Version' ), true );
@@ -393 +441 @@
 
 add_filter( 'tiny_mce_before_init', 'twentytwenty_add_classic_editor_customizer_styles' );
+
+/**
+ * Output non-latin font styles in the classic editor.
+ * Adds styles to the head of the TinyMCE iframe. Kudos to @Otto42 for the original solution.
+ *
+ * @param array $mce_init TinyMCE styles.
+ *
+ * @return array $mce_init TinyMCE styles.
+ */
+function twentytwenty_add_classic_editor_non_latin_styles( $mce_init ) {
+
+    $styles = TwentyTwenty_Non_Latin_Languages::get_non_latin_css( 'classic-editor' );
+
+    // Return if there are no styles to add.
+    if ( ! $styles ) {
+        return $mce_init;
+    }
+
+    if ( ! isset( $mce_init['content_style'] ) ) {
+        $mce_init['content_style'] = $styles . ' ';
+    } else {
+        $mce_init['content_style'] .= ' ' . $styles . ' ';
+    }
+
+    return $mce_init;
+
+}
+
+add_filter( 'tiny_mce_before_init', 'twentytwenty_add_classic_editor_non_latin_styles' );
 
 /**
@@ -481 +558 @@
 
 add_action( 'after_setup_theme', 'twentytwenty_block_editor_settings' );
+
+/**
+ * Overwrite default more tag with styling and screen reader markup.
+ *
+ * @param string $html The default output HTML for the more tag.
+ *
+ * @return string $html
+ */
+function twentytwenty_read_more_tag( $html ) {
+    return preg_replace( '/<a.*>(.*)<\/a>/iU', sprintf( '<span class="faux-button">$1</span> <span class="screen-reader-text">"%1$s"</span>', get_the_title( get_the_ID() ) ), $html );
+}
+
+add_filter( 'the_content_more_link', 'twentytwenty_read_more_tag' );
 
 /**