Changeset 55267 for trunk/src/wp-content/themes/twentysixteen/functions.php

Timestamp:

02/07/2023 03:43:01 PM (20 months ago)

Author:

audrasjb

Message:

Twenty Sixteen: Bundle Google Fonts locally.

This changeset bundles the Google Fonts used by Twenty Sixteen locally in the theme folder, instead of loading them from Google servers. Existing font stylesheet handles are maintained for backward compatibilily.

Props garrett-eclipse, kjellr, ocean90, SergeyBiryukov, westonruter, luminuu, audrasjb, jhoffmann, jffng, paapst, cbirdsong, webcommsat, kau-boy, MatthiasReinholz, sabernhardt, hellofromTonya, JeffPaul, davidbaumwald, desrosj, bedas, poena, costdev, mukesh27, azaozz, aristath.
See #55985.

File:

• trunk/src/wp-content/themes/twentysixteen/functions.php (modified) (9 diffs)

trunk/src/wp-content/themes/twentysixteen/functions.php

@@ -135 +135 @@
         /*
          * This theme styles the visual editor to resemble the theme style,
-         * specifically font, colors, icons, and column width.
-         */
-        add_editor_style( array( 'css/editor-style.css', twentysixteen_fonts_url() ) );
+         * specifically font, colors, icons, and column width. When fonts are
+         * self-hosted, the theme directory needs to be removed first.
+         */
+        $font_stylesheet = str_replace(
+            array( get_template_directory_uri() . '/', get_stylesheet_directory_uri() . '/' ),
+            '',
+            twentysixteen_fonts_url()
+        );
+        add_editor_style( array( 'css/editor-style.css', $font_stylesheet ) );
 
         // Load regular editor styles into the new block-based editor.
@@ -242 +248 @@
  *
  * @since Twenty Sixteen 1.6
+ * @deprecated Twenty Sixteen 2.9 Disabled filter because, by default, fonts are self-hosted.
  *
  * @param array  $urls          URLs to print for resource hints.
@@ -257 +264 @@
     return $urls;
 }
-add_filter( 'wp_resource_hints', 'twentysixteen_resource_hints', 10, 2 );
+// add_filter( 'wp_resource_hints', 'twentysixteen_resource_hints', 10, 2 );
 
 /**
@@ -307 +314 @@
 if ( ! function_exists( 'twentysixteen_fonts_url' ) ) :
     /**
-     * Register Google fonts for Twenty Sixteen.
+     * Register fonts for Twenty Sixteen.
      *
      * Create your own twentysixteen_fonts_url() function to override in a child theme.
      *
      * @since Twenty Sixteen 1.0
+     * @since Twenty Sixteen 2.9 Replaced Google URL with self-hosted fonts.
      *
-     * @return string Google fonts URL for the theme.
+     * @return string Fonts URL for the theme.
      */
     function twentysixteen_fonts_url() {
         $fonts_url = '';
         $fonts     = array();
-        $subsets   = 'latin,latin-ext';
 
         /*
@@ -325 +332 @@
          */
         if ( 'off' !== _x( 'on', 'Merriweather font: on or off', 'twentysixteen' ) ) {
-            $fonts[] = 'Merriweather:400,700,900,400italic,700italic,900italic';
+            $fonts[] = 'merriweather';
         }
 
@@ -333 +340 @@
          */
         if ( 'off' !== _x( 'on', 'Montserrat font: on or off', 'twentysixteen' ) ) {
-            $fonts[] = 'Montserrat:400,700';
+            $fonts[] = 'montserrat';
         }
 
@@ -341 +348 @@
          */
         if ( 'off' !== _x( 'on', 'Inconsolata font: on or off', 'twentysixteen' ) ) {
-            $fonts[] = 'Inconsolata:400';
+            $fonts[] = 'inconsolata';
         }
 
         if ( $fonts ) {
-            $fonts_url = add_query_arg(
-                array(
-                    'family'  => urlencode( implode( '|', $fonts ) ),
-                    'subset'  => urlencode( $subsets ),
-                    'display' => urlencode( 'fallback' ),
-                ),
-                'https://fonts.googleapis.com/css'
-            );
+            $fonts_url = get_template_directory_uri() . '/fonts/' . implode( '-plus-', $fonts ) . '.css';
         }
 
@@ -378 +378 @@
 function twentysixteen_scripts() {
     // Add custom fonts, used in the main stylesheet.
-    wp_enqueue_style( 'twentysixteen-fonts', twentysixteen_fonts_url(), array(), null );
+    $font_version = ( 0 === strpos( (string) twentysixteen_fonts_url(), get_template_directory_uri() . '/' ) ) ? '20230328' : null;
+    wp_enqueue_style( 'twentysixteen-fonts', twentysixteen_fonts_url(), array(), $font_version );
 
     // Add Genericons, used in the main stylesheet.
@@ -437 +438 @@
     wp_enqueue_style( 'twentysixteen-block-editor-style', get_template_directory_uri() . '/css/editor-blocks.css', array(), '20221004' );
     // Add custom fonts.
-    wp_enqueue_style( 'twentysixteen-fonts', twentysixteen_fonts_url(), array(), null );
+    $font_version = ( 0 === strpos( (string) twentysixteen_fonts_url(), get_template_directory_uri() . '/' ) ) ? '20230328' : null;
+    wp_enqueue_style( 'twentysixteen-fonts', twentysixteen_fonts_url(), array(), $font_version );
 }
 add_action( 'enqueue_block_editor_assets', 'twentysixteen_block_editor_styles' );