Bläddra i källkod

Merge pull request #4361 from Automattic/skatepark-typography-adjustments

Skatepark: typography adjustments from design feedback
Maggie 4 år sedan
förälder
incheckning
bcbac3028b
3 ändrade filer med 46 tillägg och 29 borttagningar
  1. 3 0
      seedlet-blocks/theme.json
  2. 27 17
      skatepark/child-theme.json
  3. 16 12
      skatepark/theme.json

+ 3 - 0
seedlet-blocks/theme.json

@@ -239,6 +239,9 @@
 					}
 					}
 				}
 				}
 			},
 			},
+			"layout": {
+				"contentSize": "620px"
+			},
 			"list": {
 			"list": {
 				"spacing": {
 				"spacing": {
 					"padding": {
 					"padding": {

+ 27 - 17
skatepark/child-theme.json

@@ -143,24 +143,24 @@
 					"slug": "tiny"
 					"slug": "tiny"
 				},
 				},
 				{
 				{
-					"name": "Extra Small",
+					"name": "Small",
 					"size": "16px",
 					"size": "16px",
 					"slug": "small"
 					"slug": "small"
 				},
 				},
 				{
 				{
-					"name": "Small",
+					"name": "Normal",
 					"size": "20px",
 					"size": "20px",
 					"slug": "normal"
 					"slug": "normal"
 				},
 				},
 				{
 				{
 					"name": "Medium",
 					"name": "Medium",
 					"size": "24px",
 					"size": "24px",
-					"slug": "large"
+					"slug": "medium"
 				},
 				},
 				{
 				{
 					"name": "Large",
 					"name": "Large",
 					"size": "min(max(28px, 5vw), 36px)",
 					"size": "min(max(28px, 5vw), 36px)",
-					"slug": "extra-large"
+					"slug": "large"
 				},
 				},
 				{
 				{
 					"name": "Extra Large",
 					"name": "Extra Large",
@@ -180,7 +180,14 @@
 				"typography": {
 				"typography": {
 					"fontSize": "var(--wp--custom--button--typography--font-size)",
 					"fontSize": "var(--wp--custom--button--typography--font-size)",
 					"fontWeight": "var(--wp--custom--button--typography--font-weight)",
 					"fontWeight": "var(--wp--custom--button--typography--font-weight)",
-					"letterSpacing": "0.1em",
+					"letterSpacing": "0.1em"
+				}
+			},
+			"core/site-title": {
+				"typography": {
+					"fontSize": "var(--wp--preset--font-size--medium)",
+					"fontWeight": 900,
+					"letterSpacing": "0.05em",
 					"textTransform": "uppercase"
 					"textTransform": "uppercase"
 				}
 				}
 			}
 			}
@@ -189,45 +196,48 @@
 			"h1": {
 			"h1": {
 				"typography": {
 				"typography": {
 					"fontSize": "min(max(48px, 7vw), 72px)",
 					"fontSize": "min(max(48px, 7vw), 72px)",
-					"lineHeight": 1.2,
-					"fontWeight": "700"
+					"fontWeight": "700",
+					"lineHeight": 1.2
 				}
 				}
 			},
 			},
 			"h2": {
 			"h2": {
 				"typography": {
 				"typography": {
 					"fontSize": "min(max(36px, 5vw), 64px)",
 					"fontSize": "min(max(36px, 5vw), 64px)",
-					"lineHeight": 1.2,
-					"fontWeight": "900"
+					"fontWeight": "900",
+					"lineHeight": 1.2
 				}
 				}
 			},
 			},
 			"h3": {
 			"h3": {
 				"typography": {
 				"typography": {
 					"fontSize": "min(max(30px, 5vw), 48px)",
 					"fontSize": "min(max(30px, 5vw), 48px)",
-					"lineHeight": 1.4,
-					"fontWeight": "900"
+					"fontWeight": "900",
+					"lineHeight": 1.3
 				}
 				}
 			},
 			},
 			"h4": {
 			"h4": {
 				"typography": {
 				"typography": {
-					"fontSize": "20px",
-					"lineHeight": 1.3,
+					"fontSize": "var(--wp--preset--font-size--small)",
 					"fontWeight": "900",
 					"fontWeight": "900",
+					"letterSpacing": "0.1em",
+					"lineHeight": 1.3,
 					"textTransform": "uppercase"
 					"textTransform": "uppercase"
 				}
 				}
 			},
 			},
 			"h5": {
 			"h5": {
 				"typography": {
 				"typography": {
-					"fontSize": "16px",
-					"lineHeight": 1.3,
+					"fontSize": "var(--wp--preset--font-size--small)",
 					"fontWeight": "900",
 					"fontWeight": "900",
+					"letterSpacing": "0.1em",
+					"lineHeight": 1.3,
 					"textTransform": "uppercase"
 					"textTransform": "uppercase"
 				}
 				}
 			},
 			},
 			"h6": {
 			"h6": {
 				"typography": {
 				"typography": {
-					"fontSize": "14px",
-					"lineHeight": 1.3,
+					"fontSize": "var(--wp--preset--font-size--tiny)",
 					"fontWeight": "900",
 					"fontWeight": "900",
+					"letterSpacing": "0.1em",
+					"lineHeight": 1.3,
 					"textTransform": "uppercase"
 					"textTransform": "uppercase"
 				}
 				}
 			}
 			}

+ 16 - 12
skatepark/theme.json

@@ -317,24 +317,24 @@
 					"slug": "tiny"
 					"slug": "tiny"
 				},
 				},
 				{
 				{
-					"name": "Extra Small",
+					"name": "Small",
 					"size": "16px",
 					"size": "16px",
 					"slug": "small"
 					"slug": "small"
 				},
 				},
 				{
 				{
-					"name": "Small",
+					"name": "Normal",
 					"size": "20px",
 					"size": "20px",
 					"slug": "normal"
 					"slug": "normal"
 				},
 				},
 				{
 				{
 					"name": "Medium",
 					"name": "Medium",
 					"size": "24px",
 					"size": "24px",
-					"slug": "large"
+					"slug": "medium"
 				},
 				},
 				{
 				{
 					"name": "Large",
 					"name": "Large",
 					"size": "min(max(28px, 5vw), 36px)",
 					"size": "min(max(28px, 5vw), 36px)",
-					"slug": "extra-large"
+					"slug": "large"
 				},
 				},
 				{
 				{
 					"name": "Extra Large",
 					"name": "Extra Large",
@@ -359,8 +359,7 @@
 					"fontSize": "var(--wp--custom--button--typography--font-size)",
 					"fontSize": "var(--wp--custom--button--typography--font-size)",
 					"fontWeight": "var(--wp--custom--button--typography--font-weight)",
 					"fontWeight": "var(--wp--custom--button--typography--font-weight)",
 					"lineHeight": "var(--wp--custom--button--typography--line-height)",
 					"lineHeight": "var(--wp--custom--button--typography--line-height)",
-					"letterSpacing": "0.1em",
-					"textTransform": "uppercase"
+					"letterSpacing": "0.1em"
 				}
 				}
 			},
 			},
 			"core/code": {
 			"core/code": {
@@ -430,8 +429,10 @@
 			},
 			},
 			"core/site-title": {
 			"core/site-title": {
 				"typography": {
 				"typography": {
-					"fontSize": "var(--wp--preset--font-size--normal)",
-					"fontWeight": 700
+					"fontSize": "var(--wp--preset--font-size--medium)",
+					"fontWeight": 900,
+					"letterSpacing": "0.05em",
+					"textTransform": "uppercase"
 				}
 				}
 			},
 			},
 			"core/quote": {
 			"core/quote": {
@@ -476,7 +477,7 @@
 				"typography": {
 				"typography": {
 					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
 					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
 					"fontWeight": "900",
 					"fontWeight": "900",
-					"lineHeight": 1.4,
+					"lineHeight": 1.3,
 					"fontSize": "min(max(30px, 5vw), 48px)"
 					"fontSize": "min(max(30px, 5vw), 48px)"
 				}
 				}
 			},
 			},
@@ -485,7 +486,8 @@
 					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
 					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
 					"fontWeight": "900",
 					"fontWeight": "900",
 					"lineHeight": 1.3,
 					"lineHeight": 1.3,
-					"fontSize": "20px",
+					"fontSize": "var(--wp--preset--font-size--small)",
+					"letterSpacing": "0.1em",
 					"textTransform": "uppercase"
 					"textTransform": "uppercase"
 				}
 				}
 			},
 			},
@@ -494,7 +496,8 @@
 					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
 					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
 					"fontWeight": "900",
 					"fontWeight": "900",
 					"lineHeight": 1.3,
 					"lineHeight": 1.3,
-					"fontSize": "16px",
+					"fontSize": "var(--wp--preset--font-size--small)",
+					"letterSpacing": "0.1em",
 					"textTransform": "uppercase"
 					"textTransform": "uppercase"
 				}
 				}
 			},
 			},
@@ -503,7 +506,8 @@
 					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
 					"fontFamily": "var(--wp--custom--heading--typography--font-family)",
 					"fontWeight": "900",
 					"fontWeight": "900",
 					"lineHeight": 1.3,
 					"lineHeight": 1.3,
-					"fontSize": "14px",
+					"fontSize": "var(--wp--preset--font-size--tiny)",
+					"letterSpacing": "0.1em",
 					"textTransform": "uppercase"
 					"textTransform": "uppercase"
 				}
 				}
 			},
 			},