ソースを参照

Updates font sizes. (#4699)

Updates font sizes for;
h tags
p tags
site title and tag
navigation scss
Jeffrey Pearce 3 年 前
コミット
44f95610b3

+ 2 - 2
geologist/assets/theme.css

@@ -134,7 +134,7 @@ ul ul {
 
 .wp-block-navigation.is-responsive .wp-block-navigation__responsive-container.is-menu-open.has-modal-open .wp-block-pages-list__item,
 .wp-block-navigation.is-responsive .wp-block-navigation__responsive-container.is-menu-open.has-modal-open .wp-block-navigation-link {
-	font-size: 20px;
+	font-size: var(--wp--preset--font-size--normal);
 	line-height: 50px;
 	margin: 0;
 	align-items: flex-end;
@@ -165,7 +165,7 @@ ul ul {
 .wp-block-navigation.is-responsive .wp-block-navigation__responsive-container.is-menu-open.has-modal-open .wp-block-navigation-link.has-child .wp-block-navigation-link__container .wp-block-pages-list__item__link,
 .wp-block-navigation.is-responsive .wp-block-navigation__responsive-container.is-menu-open.has-modal-open .wp-block-navigation-link.has-child .wp-block-navigation-link__container .wp-block-navigation-link__content {
 	padding: 0;
-	font-size: 15px;
+	font-size: var(--wp--preset--font-size--tiny);
 	line-height: 40px;
 }
 

+ 15 - 15
geologist/child-theme.json

@@ -56,7 +56,7 @@
 					}
 				},
 				"typography": {
-					"fontSize": "20px",
+					"fontSize": "var(--wp--preset--font-size--normal)",
 					"fontWeight": "700"
 				}
 			},
@@ -192,17 +192,17 @@
 			"fontSizes": [
 				{
 					"name": "Tiny",
-					"size": "15px",
+					"size": "16px",
 					"slug": "tiny"
 				},
 				{
 					"name": "Small",
-					"size": "17px",
+					"size": "18px",
 					"slug": "small"
 				},
 				{
 					"name": "Normal",
-					"size": "18px",
+					"size": "20px",
 					"slug": "normal"
 				},
 				{
@@ -212,7 +212,7 @@
 				},
 				{
 					"name": "Extra Large",
-					"size": "min(max(28px, 5vw), 35px)",
+					"size": "min(max(28px, 5vw), 38px)",
 					"slug": "extra-large"
 				},
 				{
@@ -244,14 +244,14 @@
 					"background": "var(--wp--custom--color--tertiary)"
 				},
 				"typography": {
-					"fontSize": "20px",
+					"fontSize": "var(--wp--preset--font-size--normal)",
 					"fontWeight": "400",
 					"lineHeight": "1.6"
 				}
 			},
 			"core/navigation": {
 				"typography": {
-					"fontSize": "18px"
+					"fontSize": "var(--wp--preset--font-size--normal)"
 				}
 			},
 			"core/navigation-link": {
@@ -279,7 +279,7 @@
 				},
 				"citation": {
 					"typography": {
-						"fontSize": "15px",
+						"fontSize": "var(--wp--preset--font-size--tiny)",
 						"fontWeight": "400"
 					}
 				},
@@ -317,14 +317,14 @@
 				"elements": {
 					"h2": {
 						"typography": {
-							"fontSize": "min(max(28px, 5vw), 38px)"
+							"fontSize": "var(--wp--preset--font-size--extra-large)"
 						}
 					}
 				}
 			},
 			"core/query-pagination": {
 				"typography": {
-					"fontSize": "18px",
+					"fontSize": "var(--wp--preset--font-size--normal)",
 					"fontWeight": "500"
 				}
 			},
@@ -333,7 +333,7 @@
 					"link": "var(--wp--custom--color--primary)"
 				},
 				"typography": {
-					"fontSize": "18px",
+					"fontSize": "var(--wp--preset--font-size--normal)",
 					"fontWeight": 700,
 					"textTransform": "uppercase"
 				}
@@ -357,28 +357,28 @@
 			"h3": {
 				"typography": {
 					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
-					"fontSize": "min(max(28px, 5vw), 38px)",
+					"fontSize": "var(--wp--preset--font-size--extra-large)",
 					"lineHeight": 1.2
 				}
 			},
 			"h4": {
 				"typography": {
 					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
-					"fontSize": "20px",
+					"fontSize": "var(--wp--preset--font-size--large)",
 					"lineHeight": 1.4
 				}
 			},
 			"h5": {
 				"typography": {
 					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
-					"fontSize": "18px",
+					"fontSize": "var(--wp--preset--font-size--normal)",
 					"lineHeight": 1.4
 				}
 			},
 			"h6": {
 				"typography": {
 					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
-					"fontSize": "16px",
+					"fontSize": "var(--wp--preset--font-size--small)",
 					"lineHeight": 1.4
 				}
 			},

+ 2 - 2
geologist/sass/blocks/_navigation.scss

@@ -28,7 +28,7 @@
 		&.has-modal-open {
 			.wp-block-pages-list__item,
 			.wp-block-navigation-link {
-				font-size: 20px;
+				font-size: var(--wp--preset--font-size--normal);
 				line-height: 50px;
 				margin: 0;
 				align-items: flex-end;
@@ -45,7 +45,7 @@
 						.wp-block-pages-list__item__link,
 						.wp-block-navigation-link__content {
 							padding: 0;
-							font-size: 15px;
+							font-size: var(--wp--preset--font-size--tiny);
 							line-height: 40px;
 						}
 					}

+ 15 - 15
geologist/theme.json

@@ -101,7 +101,7 @@
 					}
 				},
 				"typography": {
-					"fontSize": "20px",
+					"fontSize": "var(--wp--preset--font-size--normal)",
 					"fontWeight": "700",
 					"lineHeight": 2
 				}
@@ -360,17 +360,17 @@
 			"fontSizes": [
 				{
 					"name": "Tiny",
-					"size": "15px",
+					"size": "16px",
 					"slug": "tiny"
 				},
 				{
 					"name": "Small",
-					"size": "17px",
+					"size": "18px",
 					"slug": "small"
 				},
 				{
 					"name": "Normal",
-					"size": "18px",
+					"size": "20px",
 					"slug": "normal"
 				},
 				{
@@ -380,7 +380,7 @@
 				},
 				{
 					"name": "Extra Large",
-					"size": "min(max(28px, 5vw), 35px)",
+					"size": "min(max(28px, 5vw), 38px)",
 					"slug": "extra-large"
 				},
 				{
@@ -425,7 +425,7 @@
 				},
 				"typography": {
 					"fontFamily": "monospace",
-					"fontSize": "20px",
+					"fontSize": "var(--wp--preset--font-size--normal)",
 					"fontWeight": "400",
 					"lineHeight": "1.6"
 				},
@@ -442,7 +442,7 @@
 			},
 			"core/navigation": {
 				"typography": {
-					"fontSize": "18px"
+					"fontSize": "var(--wp--preset--font-size--normal)"
 				}
 			},
 			"core/post-title": {
@@ -494,7 +494,7 @@
 			},
 			"core/site-title": {
 				"typography": {
-					"fontSize": "18px",
+					"fontSize": "var(--wp--preset--font-size--normal)",
 					"fontWeight": 700,
 					"textTransform": "uppercase"
 				},
@@ -521,7 +521,7 @@
 				},
 				"citation": {
 					"typography": {
-						"fontSize": "15px",
+						"fontSize": "var(--wp--preset--font-size--tiny)",
 						"fontWeight": "400"
 					}
 				}
@@ -541,14 +541,14 @@
 				"elements": {
 					"h2": {
 						"typography": {
-							"fontSize": "min(max(28px, 5vw), 38px)"
+							"fontSize": "var(--wp--preset--font-size--extra-large)"
 						}
 					}
 				}
 			},
 			"core/query-pagination": {
 				"typography": {
-					"fontSize": "18px",
+					"fontSize": "var(--wp--preset--font-size--normal)",
 					"fontWeight": "500"
 				}
 			}
@@ -591,7 +591,7 @@
 					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
 					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
 					"lineHeight": 1.2,
-					"fontSize": "min(max(28px, 5vw), 38px)"
+					"fontSize": "var(--wp--preset--font-size--extra-large)"
 				},
 				"spacing": {
 					"margin": {
@@ -605,7 +605,7 @@
 					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
 					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
 					"lineHeight": 1.4,
-					"fontSize": "20px"
+					"fontSize": "var(--wp--preset--font-size--large)"
 				},
 				"spacing": {
 					"margin": {
@@ -619,7 +619,7 @@
 					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
 					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
 					"lineHeight": 1.4,
-					"fontSize": "18px"
+					"fontSize": "var(--wp--preset--font-size--normal)"
 				},
 				"spacing": {
 					"margin": {
@@ -633,7 +633,7 @@
 					"fontFamily": "var(--wp--preset--font-family--dm-sans)",
 					"fontWeight": "var(--wp--custom--heading--typography--font-weight)",
 					"lineHeight": 1.4,
-					"fontSize": "16px"
+					"fontSize": "var(--wp--preset--font-size--small)"
 				},
 				"spacing": {
 					"margin": {