Make 2024: Update typography styles

See #363 git-svn-id: https://meta.svn.wordpress.org/sites/trunk@14026 74240141-8908-4e6f-9713-ba540dce6ec7
WordPress · Sep 6, 2024 · 01ab52b · 01ab52b
1 parent 096ae02
commit 01ab52b
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 53 deletions.
diff --git a/wordpress.org/public_html/wp-content/themes/pub/wporg-breathe-2024/style.css b/wordpress.org/public_html/wp-content/themes/pub/wporg-breathe-2024/style.css
@@ -35,9 +35,13 @@ ol,
 
 p,
 ul,
-ol {
-	margin-top: var(--wp--style--block-gap);
-	margin-bottom: 0;
+ol,
+h1,
+h2,
+h3,
+h4 {
+	margin-top: 0;
+	margin-bottom: var(--wp--style--block-gap);
 }
 
 ul ul,
@@ -62,8 +66,23 @@ h4 {
 
 h2,
 h3,
+h4,
+.content-area h1,
+.content-area h2 {
+	font-weight: 600;
+}
+
+h1,
+h2 {
+	font-size: var(--wp--preset--font-size--heading-3);
+}
+
+h3 {
+	font-size: var(--wp--preset--font-size--heading-5);
+}
+
 h4 {
-	margin: var(--wp--preset--spacing--30) 0 0;
+	fontSize: var(--wp--preset--font-size--heading-6);
 }
 
 .entry-content .reports.ticket-reports {
@@ -459,8 +478,8 @@ input[type="submit"]:hover {
 }
 
 .widget-title {
-	line-height: 1.2;
-	font-size: 1.4em;
+	line-height: inherit;
+	font-size: inherit;
 }
 
 .post-type-archive-handbook aside[id^="handbook"] .widget-title,
@@ -877,8 +896,8 @@ nav.o2-post-footer-actions div.jetpack-likes-widget-wrapper {
 .make-welcome .entry-content {
 	width: 100%;
 	max-width: var(--wp--style--global--wide-size);
-	margin: 1.5rem auto;
-	padding: 40px var(--wp--preset--spacing--edge-space);
+	margin: 0 auto;
+	padding: 40px var(--wp--preset--spacing--edge-space) 30px;
 }
 
 .make-welcome .entry-content h4,
@@ -888,10 +907,6 @@ nav.o2-post-footer-actions div.jetpack-likes-widget-wrapper {
 	font-weight: 600;
 }
 
-.make-welcome .entry-content p {
-	display: inline;
-}
-
 .make-welcome .entry-content .column {
 	vertical-align: top;
 	display: inline-block;

diff --git a/wordpress.org/public_html/wp-content/themes/pub/wporg-breathe-2024/theme.json b/wordpress.org/public_html/wp-content/themes/pub/wporg-breathe-2024/theme.json
@@ -159,46 +159,5 @@
 				}
 			]
 		}
-	},
-	"styles": {
-		"elements": {
-			"h1": {
-				"spacing": {
-					"margin": {
-						"top": "0",
-						"bottom": "var(--wp--style--block-gap)"
-					}
-				}
-			},
-			"h2": {
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--heading-4)",
-					"fontWeight": "600"
-				},
-				"spacing": {
-					"margin": {
-						"top": "0",
-						"bottom": "var(--wp--style--block-gap)"
-					}
-				}
-			},
-			"h3": {
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--heading-5)",
-					"fontWeight": "600"
-				}
-			},
-			"h4": {
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--heading-6)",
-					"fontWeight": "600"
-				}
-			},
-			"h5": {
-				"typography": {
-					"fontSize": "var(--wp--preset--font-size--heading-6)"
-				}
-			}
-		}
 	}
 }