Browse Source

Archeo: fixed font files and styles (#5452)

* fixed font files and styles

* added bold font

* preloaded 400 weight too

* adjustments after rebase

* undo site title change

* Removing unused custom property

Co-authored-by: Ben Dwyer <ben@scruffian.com>
Maggie 3 years ago
parent
commit
aa50023b48

BIN
archeo/assets/fonts/Chivo-Bold.woff2


BIN
archeo/assets/fonts/Chivo-BoldItalic.woff2


BIN
archeo/assets/fonts/Chivo-Italic.woff2


BIN
archeo/assets/fonts/Chivo-Light.woff2


BIN
archeo/assets/fonts/Chivo-LightItalic.woff2


BIN
archeo/assets/fonts/Chivo-Regular.woff2


+ 49 - 3
archeo/functions.php

@@ -99,11 +99,51 @@ if ( ! function_exists( 'archeo_get_font_face_styles' ) ) :
 		return "
 		@font-face{
 			font-family: 'Chivo';
-			font-weight: 300 400 700 900;
+			font-weight: 300;
 			font-style: normal;
 			font-stretch: normal;
 			font-display: swap;
-			src: url('" . get_theme_file_uri( 'assets/fonts/Chivo.woff2' ) . "') format('woff2');
+			src: url('" . get_theme_file_uri( 'assets/fonts/Chivo-Light.woff2' ) . "') format('woff2');
+		}
+		@font-face{
+			font-family: 'Chivo';
+			font-weight: 400;
+			font-style: normal;
+			font-stretch: normal;
+			font-display: swap;
+			src: url('" . get_theme_file_uri( 'assets/fonts/Chivo-Regular.woff2' ) . "') format('woff2');
+		}
+		@font-face{
+			font-family: 'Chivo';
+			font-weight: 700;
+			font-style: normal;
+			font-stretch: normal;
+			font-display: swap;
+			src: url('" . get_theme_file_uri( 'assets/fonts/Chivo-Bold.woff2' ) . "') format('woff2');
+		}
+		@font-face{
+			font-family: 'Chivo';
+			font-weight: 300;
+			font-style: italic;
+			font-stretch: normal;
+			font-display: swap;
+			src: url('" . get_theme_file_uri( 'assets/fonts/Chivo-LightItalic.woff2' ) . "') format('woff2');
+		}
+		@font-face{
+			font-family: 'Chivo';
+			font-weight: 400;
+			font-style: italic;
+			font-stretch: normal;
+			font-display: swap;
+			src: url('" . get_theme_file_uri( 'assets/fonts/Chivo-Italic.woff2' ) . "') format('woff2');
+		}
+		@font-face{
+			font-family: 'Chivo';
+			font-weight: 700;
+			font-style: italic;
+			font-stretch: normal;
+			font-display: swap;
+			src: url('" . get_theme_file_uri( 'assets/fonts/Chivo-BoldItalic.woff2' ) . "') format('woff2');
 		}
 		";
 
@@ -116,13 +156,19 @@ if ( ! function_exists( 'archeo_preload_webfonts' ) ) :
 	/**
 	 * Preloads the main web font to improve performance.
 	 *
+	 * Only the main web font (font-weight: 300,400, font-style: normal) is preloaded here since that font is always relevant. 
+	 * The other fonts are only needed if the user changed style or weight of the fonts,
+	 * and therefore preloading it would in most cases regress performance when that font would otherwise not be loaded
+	 * at all.
+	 *
 	 * @since Archeo 1.0
 	 *
 	 * @return void
 	 */
 	function archeo_preload_webfonts() {
 		?>
-		<link rel="preload" href="<?php echo esc_url( get_theme_file_uri( 'assets/fonts/Chivo.woff2' ) ); ?>" as="font" type="font/woff2" crossorigin>
+		<link rel="preload" href="<?php echo esc_url( get_theme_file_uri( 'assets/fonts/Chivo-Light.woff2' ) ); ?>" as="font" type="font/woff2" crossorigin>
+		<link rel="preload" href="<?php echo esc_url( get_theme_file_uri( 'assets/fonts/Chivo-Regular.woff2' ) ); ?>" as="font" type="font/woff2" crossorigin>
 		<?php
 	}
 

+ 4 - 3
archeo/theme.json

@@ -103,7 +103,7 @@
 			},
 			"core/heading": {
 				"typography": {
-					"fontWeight": "400",
+					"fontWeight": "300",
 					"lineHeight": "1.1"
 				}
 			},
@@ -156,8 +156,9 @@
 		},
 		"typography": {
 			"fontFamily": "var(--wp--preset--font-family--chivo)",
-			"lineHeight": "1.5",
-			"fontSize": "var(--wp--preset--font-size--normal)"
+			"fontSize": "var(--wp--preset--font-size--normal)",
+			"fontWeight": "400",
+ 			"lineHeight": "1.6"
 		}
 	},
 	"templateParts": [