From 2f2a1a40ec3aa2be35d1a9eb850edfba95446ad7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9s?= <andres.maneiro@automattic.com>
Date: Mon, 6 Apr 2020 18:50:16 +0200
Subject: [PATCH] Add CSS properties and migrate defaults from editor-styles

---
 packages/block-library/src/heading/style.scss | 27 +++++++++++++++++++
 packages/editor/src/editor-styles.scss        | 27 -------------------
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/packages/block-library/src/heading/style.scss b/packages/block-library/src/heading/style.scss
index b9a64de5655ec..6c7efaff19ad0 100644
--- a/packages/block-library/src/heading/style.scss
+++ b/packages/block-library/src/heading/style.scss
@@ -9,8 +9,35 @@
 		color: var(--wp--color--text);
 		line-height: var(--wp--typography--line-height);
 	}
+
+	// These follow a Major Third type scale
+	// https://type-scale.com/?size=16&scale=1.250&text=A%20Visual%20Type%20Scale&font=Noto%20Serif&fontweight=600
+	h1 {
+		font-size: var(--wp--typography--font-size, 2.44em);
+	}
+
+	h2 {
+		font-size: var(--wp--typography--font-size, 1.95em);
+	}
+
+	h3 {
+		font-size: var(--wp--typography--font-size, 1.56em);
+	}
+
+	h4 {
+		font-size: var(--wp--typography--font-size, 1.25em);
+	}
+
+	h5 {
+		font-size: var(--wp--typography--font-size, 1em);
+	}
+
+	h6 {
+		font-size: var(--wp--typography--font-size, 0.8em);
+	}
 }
 
+
 h1,
 h2,
 h3,
diff --git a/packages/editor/src/editor-styles.scss b/packages/editor/src/editor-styles.scss
index 8b77567925269..893446c7344bb 100644
--- a/packages/editor/src/editor-styles.scss
+++ b/packages/editor/src/editor-styles.scss
@@ -15,33 +15,6 @@ body {
 	color: $dark-gray-primary;
 }
 
-/* Headings */
-// These follow a Major Third type scale
-// https://type-scale.com/?size=16&scale=1.250&text=A%20Visual%20Type%20Scale&font=Noto%20Serif&fontweight=600
-h1 {
-	font-size: 2.44em;
-}
-
-h2 {
-	font-size: 1.95em;
-}
-
-h3 {
-	font-size: 1.56em;
-}
-
-h4 {
-	font-size: 1.25em;
-}
-
-h5 {
-	font-size: 1em;
-}
-
-h6 {
-	font-size: 0.8em;
-}
-
 // Default margins.
 h1 {
 	margin-top: 0.67em;