Selaa lähdekoodia

Cult: Fonts and Weights (#5946)

* fonts and headings settings

* fixed medium css variable for cult and bc

* Reduce font size presets to standard sizes.

Co-authored-by: Jeff Ong <jonger4@gmail.com>
Maggie 3 vuotta sitten
vanhempi
commit
2435e5c0b9

+ 6 - 6
block-canvas/theme.json

@@ -140,7 +140,7 @@
                 },
                 },
                 "typography": {
                 "typography": {
                     "fontFamily": "var(--wp--preset--font-family--body-font)",
                     "fontFamily": "var(--wp--preset--font-family--body-font)",
-                    "fontSize": "var(--wp--preset--font-size-medium)",
+                    "fontSize": "var(--wp--preset--font-size--medium)",
                     "fontWeight": "normal",
                     "fontWeight": "normal",
                     "lineHeight": "2"
                     "lineHeight": "2"
                 }
                 }
@@ -187,7 +187,7 @@
             },
             },
             "core/navigation": {
             "core/navigation": {
                 "typography": {
                 "typography": {
-                    "fontSize": "var(--wp--preset--font-size-medium)"
+                    "fontSize": "var(--wp--preset--font-size--medium)"
                 }
                 }
             },
             },
             "core/post-date": {
             "core/post-date": {
@@ -240,13 +240,13 @@
                     }
                     }
                 },
                 },
                 "typography": {
                 "typography": {
-                    "fontSize": "var(--wp--preset--font-size-medium)",
+                    "fontSize": "var(--wp--preset--font-size--medium)",
                     "fontStyle": "normal"
                     "fontStyle": "normal"
                 }
                 }
             },
             },
             "core/search": {
             "core/search": {
                 "typography": {
                 "typography": {
-                    "fontSize": "var(--wp--preset--font-size-medium)",
+                    "fontSize": "var(--wp--preset--font-size--medium)",
                     "lineHeight": "1.6"
                     "lineHeight": "1.6"
                 }
                 }
             },
             },
@@ -267,7 +267,7 @@
             },
             },
             "core/site-title": {
             "core/site-title": {
                 "typography": {
                 "typography": {
-                    "fontSize": "var(--wp--preset--font-size-medium)",
+                    "fontSize": "var(--wp--preset--font-size--medium)",
                     "fontWeight": "700",
                     "fontWeight": "700",
                     "textDecoration": "none"
                     "textDecoration": "none"
                 }
                 }
@@ -319,7 +319,7 @@
         },
         },
         "typography": {
         "typography": {
             "fontFamily": "var(--wp--preset--font-family--body-font)",
             "fontFamily": "var(--wp--preset--font-family--body-font)",
-            "fontSize": "var(--wp--preset--font-size-medium)",
+            "fontSize": "var(--wp--preset--font-size--medium)",
             "lineHeight": "1.6"
             "lineHeight": "1.6"
         }
         }
     },
     },

BIN
cult/assets/fonts/Petrona-Italic.ttf


BIN
cult/assets/fonts/Petrona.ttf


BIN
cult/assets/fonts/WorkSans-Italic.ttf


BIN
cult/assets/fonts/WorkSans.ttf


+ 76 - 22
cult/theme.json

@@ -61,14 +61,58 @@
 			"customFontSize": true,
 			"customFontSize": true,
 			"fontFamilies": [
 			"fontFamilies": [
 				{
 				{
-					"fontFamily": "-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Ubuntu, Cantarell, 'Helvetica Neue', sans-serif",
+					"fontFamily": "Petrona, serif",
 					"name": "Body (System Font)",
 					"name": "Body (System Font)",
-					"slug": "body-font"
+					"slug": "body-font",
+					"fontFace": [
+						{
+							"fontDisplay": "block",
+							"fontFamily": "Petrona",
+							"fontWeight": "300 700",
+							"fontStyle": "normal",
+							"fontStretch": "normal",
+							"src": [
+								"file:./assets/fonts/Petrona.ttf"
+							]
+						},
+						{
+							"fontDisplay": "block",
+							"fontFamily": "Petrona",
+							"fontWeight": "300 700",
+							"fontStyle": "italic",
+							"fontStretch": "normal",
+							"src": [
+								"file:./assets/fonts/Petrona-Italic.ttf"
+							]
+						}
+					]
 				},
 				},
 				{
 				{
-					"fontFamily": "-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Ubuntu, Cantarell, 'Helvetica Neue', sans-serif",
+					"fontFamily": "'Work Sans', sans-serif",
 					"name": "Headings (System Font)",
 					"name": "Headings (System Font)",
-					"slug": "heading-font"
+					"slug": "heading-font",
+					"fontFace": [
+						{
+							"fontDisplay": "block",
+							"fontFamily": "'Work Sans'",
+							"fontWeight": "900",
+							"fontStyle": "normal",
+							"fontStretch": "normal",
+							"src": [
+								"file:./assets/fonts/WorkSans.ttf"
+							]
+						},
+						{
+							"fontDisplay": "block",
+							"fontFamily": "'Work Sans'",
+							"fontWeight": "900",
+							"fontStyle": "italic",
+							"fontStretch": "normal",
+							"src": [
+								"file:./assets/fonts/WorkSans-Italic.ttf"
+							]
+						}
+					]
 				}
 				}
 			],
 			],
 			"fontSizes": [
 			"fontSizes": [
@@ -79,12 +123,12 @@
 				},
 				},
 				{
 				{
 					"name": "Medium",
 					"name": "Medium",
-					"size": "1.5rem",
+					"size": "1.125rem",
 					"slug": "medium"
 					"slug": "medium"
 				},
 				},
 				{
 				{
 					"name": "Large",
 					"name": "Large",
-					"size": "1.75rem",
+					"size": "1.25rem",
 					"slug": "large"
 					"slug": "large"
 				},
 				},
 				{
 				{
@@ -108,7 +152,7 @@
 				},
 				},
 				"typography": {
 				"typography": {
 					"fontFamily": "var(--wp--preset--font-family--body-font)",
 					"fontFamily": "var(--wp--preset--font-family--body-font)",
-					"fontSize": "var(--wp--preset--font-size-medium)",
+					"fontSize": "var(--wp--preset--font-size--medium)",
 					"fontWeight": "normal",
 					"fontWeight": "normal",
 					"lineHeight": "2"
 					"lineHeight": "2"
 				}
 				}
@@ -141,8 +185,6 @@
 			},
 			},
 			"core/heading": {
 			"core/heading": {
 				"typography": {
 				"typography": {
-					"fontFamily": "var(--wp--preset--font-family--heading-font)",
-					"fontWeight": "400",
 					"lineHeight": "1.125"
 					"lineHeight": "1.125"
 				}
 				}
 			},
 			},
@@ -155,7 +197,7 @@
 			},
 			},
 			"core/navigation": {
 			"core/navigation": {
 				"typography": {
 				"typography": {
-					"fontSize": "var(--wp--preset--font-size-medium)"
+					"fontSize": "var(--wp--preset--font-size--medium)"
 				}
 				}
 			},
 			},
 			"core/post-date": {
 			"core/post-date": {
@@ -174,7 +216,6 @@
 				},
 				},
 				"typography": {
 				"typography": {
 					"fontFamily": "var(--wp--preset--font-family--heading-font)",
 					"fontFamily": "var(--wp--preset--font-family--heading-font)",
-					"fontSize": "var(--wp--preset--font-size--large)",
 					"lineHeight": "1.125"
 					"lineHeight": "1.125"
 				}
 				}
 			},
 			},
@@ -208,13 +249,13 @@
 					}
 					}
 				},
 				},
 				"typography": {
 				"typography": {
-					"fontSize": "var(--wp--preset--font-size-medium)",
+					"fontSize": "var(--wp--preset--font-size--medium)",
 					"fontStyle": "normal"
 					"fontStyle": "normal"
 				}
 				}
 			},
 			},
 			"core/search": {
 			"core/search": {
 				"typography": {
 				"typography": {
-					"fontSize": "var(--wp--preset--font-size-medium)",
+					"fontSize": "var(--wp--preset--font-size--medium)",
 					"lineHeight": "1.6"
 					"lineHeight": "1.6"
 				}
 				}
 			},
 			},
@@ -235,8 +276,8 @@
 			},
 			},
 			"core/site-title": {
 			"core/site-title": {
 				"typography": {
 				"typography": {
-					"fontSize": "var(--wp--preset--font-size-medium)",
-					"fontWeight": "700",
+					"fontSize": "var(--wp--preset--font-size--medium)",
+					"fontWeight": "900",
 					"textDecoration": "none"
 					"textDecoration": "none"
 				}
 				}
 			}
 			}
@@ -248,32 +289,45 @@
 		"elements": {
 		"elements": {
 			"h1": {
 			"h1": {
 				"typography": {
 				"typography": {
-					"fontSize": "3rem"
+					"fontFamily": "var(--wp--preset--font-family--heading-font)",
+					"fontWeight": "900",
+					"fontSize": "clamp(5.875rem, 10vw, 3.375rem)"
 				}
 				}
 			},
 			},
 			"h2": {
 			"h2": {
 				"typography": {
 				"typography": {
-					"fontSize": "var(--wp--preset--font-size--x-large)"
+					"fontFamily": "var(--wp--preset--font-family--heading-font)",
+					"fontWeight": "900",
+					"fontSize": "clamp(2.75rem, 10vw, 2rem)"
 				}
 				}
 			},
 			},
 			"h3": {
 			"h3": {
 				"typography": {
 				"typography": {
-					"fontSize": "var(--wp--preset--font-size--large)"
+					"fontFamily": "var(--wp--preset--font-family--body-font)",
+					"fontWeight": "300",
+					"fontSize": "clamp(2rem, 10vw, 1.5rem)"
 				}
 				}
 			},
 			},
 			"h4": {
 			"h4": {
 				"typography": {
 				"typography": {
-					"fontSize": "var(--wp--preset--font-size--medium)"
+					"fontFamily": "var(--wp--preset--font-family--body-font)",
+					"fontWeight": "700",
+					"fontSize": "clamp(1.75rem, 10vw, 1.375rem)"
 				}
 				}
 			},
 			},
 			"h5": {
 			"h5": {
 				"typography": {
 				"typography": {
-					"fontSize": "1.125rem"
+					"fontFamily": "var(--wp--preset--font-family--heading-font)",
+					"fontWeight": "900",
+					"fontSize": "1.375rem",
+					"textTransform": "uppercase"
 				}
 				}
 			},
 			},
 			"h6": {
 			"h6": {
 				"typography": {
 				"typography": {
-					"fontSize": "var(--wp--preset--font-size--small)"
+					"fontFamily": "var(--wp--preset--font-family--body-font)",
+					"fontWeight": "700",
+					"fontSize": "var(--wp--preset--font-size--medium)"
 				}
 				}
 			},
 			},
 			"link": {
 			"link": {
@@ -287,7 +341,7 @@
 		},
 		},
 		"typography": {
 		"typography": {
 			"fontFamily": "var(--wp--preset--font-family--body-font)",
 			"fontFamily": "var(--wp--preset--font-family--body-font)",
-			"fontSize": "var(--wp--preset--font-size-medium)",
+			"fontSize": "var(--wp--preset--font-size--medium)",
 			"lineHeight": "1.6"
 			"lineHeight": "1.6"
 		}
 		}
 	},
 	},