Преглед на файлове

Replace Poppins font with DM Sans (#3869)

* Replace Poppins font with DM Sans

* Update child-experimental-theme.json and recompile.

* Update screenshot.png
Kjell Reigstad преди 4 години
родител
ревизия
6b80199bfb
променени са 5 файла, в които са добавени 26 реда и са изтрити 25 реда
  1. 1 1
      quadrat/assets/theme.css
  2. 13 12
      quadrat/child-experimental-theme.json
  3. 11 11
      quadrat/experimental-theme.json
  4. 1 1
      quadrat/sass/blocks/_table.scss
  5. BIN
      quadrat/screenshot.png

+ 1 - 1
quadrat/assets/theme.css

@@ -267,7 +267,7 @@ ul ul {
 }
 }
 
 
 .wp-block-table th {
 .wp-block-table th {
-	font-weight: 500;
+	font-weight: 400;
 }
 }
 
 
 .wp-block-table tbody td {
 .wp-block-table tbody td {

+ 13 - 12
quadrat/child-experimental-theme.json

@@ -46,7 +46,7 @@
 				},
 				},
 				"typography": {
 				"typography": {
 					"fontSize": "20px",
 					"fontSize": "20px",
-					"fontWeight": "600"
+					"fontWeight": "700"
 				}
 				}
 			},
 			},
 			"color": {
 			"color": {
@@ -57,7 +57,7 @@
 				"selection": "var(--wp--preset--color--darker-blue)"
 				"selection": "var(--wp--preset--color--darker-blue)"
 			},
 			},
 			"fontsToLoadFromGoogle": [
 			"fontsToLoadFromGoogle": [
-				"family=Poppins:ital,wght@0,300;0,400;0,500;0,600;1,400"
+				"family=DM+Sans:ital,wght@0,400;0,500;0,700;1,400;1,500;1,700"
 			],
 			],
 			"form": {
 			"form": {
 				"border": {
 				"border": {
@@ -115,7 +115,7 @@
 					"typography": {
 					"typography": {
 						"fontSize": "var(--wp--preset--font-size--tiny)",
 						"fontSize": "var(--wp--preset--font-size--tiny)",
 						"fontStyle": "normal",
 						"fontStyle": "normal",
-						"fontWeight": "300"
+						"fontWeight": "400"
 					}
 					}
 				}
 				}
 			},
 			},
@@ -123,7 +123,7 @@
 				"citation": {
 				"citation": {
 					"typography": {
 					"typography": {
 						"fontStyle": "normal",
 						"fontStyle": "normal",
-						"fontWeight": 300
+						"fontWeight": 400
 					}
 					}
 				}
 				}
 			}
 			}
@@ -147,9 +147,9 @@
 			"customLineHeight": true,
 			"customLineHeight": true,
 			"fontFamilies": [
 			"fontFamilies": [
 				{
 				{
-					"fontFamily": "\"Poppins\", sans-serif",
+					"fontFamily": "\"DM Sans\", sans-serif",
 					"slug": "base",
 					"slug": "base",
-					"name": "Poppins"
+					"name": "DM Sans"
 				},
 				},
 				{
 				{
 					"fontFamily": "-apple-system,BlinkMacSystemFont,\"Segoe UI\",Roboto,Oxygen-Sans,Ubuntu,Cantarell,\"Helvetica Neue\",sans-serif",
 					"fontFamily": "-apple-system,BlinkMacSystemFont,\"Segoe UI\",Roboto,Oxygen-Sans,Ubuntu,Cantarell,\"Helvetica Neue\",sans-serif",
@@ -199,7 +199,8 @@
 					"text": "var(--wp--custom--button--color--text)"
 					"text": "var(--wp--custom--button--color--text)"
 				},
 				},
 				"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)"
 				}
 				}
 			},
 			},
 			"core/code": {
 			"core/code": {
@@ -239,7 +240,7 @@
 				"citation": {
 				"citation": {
 					"typography": {
 					"typography": {
 						"fontSize": "15px",
 						"fontSize": "15px",
-						"fontWeight": "300"
+						"fontWeight": "400"
 					}
 					}
 				},
 				},
 				"spacing": {
 				"spacing": {
@@ -257,7 +258,7 @@
 				"typography": {
 				"typography": {
 					"fontStyle": "normal",
 					"fontStyle": "normal",
 					"fontSize": "var(--wp--preset--font-size--huge)",
 					"fontSize": "var(--wp--preset--font-size--huge)",
-					"fontWeight": "500",
+					"fontWeight": "400",
 					"lineHeight": "1.4"
 					"lineHeight": "1.4"
 				},
 				},
 				"spacing": {
 				"spacing": {
@@ -275,13 +276,13 @@
 					"link": "var(--wp--custom--color--primary)"
 					"link": "var(--wp--custom--color--primary)"
 				},
 				},
 				"typography": {
 				"typography": {
-					"fontSize": "20px",
-					"fontWeight": 800
+					"fontSize": "18px",
+					"fontWeight": 700
 				}
 				}
 			},
 			},
 			"core/navigation": {
 			"core/navigation": {
 				"typography": {
 				"typography": {
-					"fontSize": "20px"
+					"fontSize": "18px"
 				}
 				}
 			}
 			}
 		},
 		},

+ 11 - 11
quadrat/experimental-theme.json

@@ -74,7 +74,7 @@
 				"typography": {
 				"typography": {
 					"fontFamily": "var(--wp--preset--font-family--base)",
 					"fontFamily": "var(--wp--preset--font-family--base)",
 					"fontSize": "20px",
 					"fontSize": "20px",
-					"fontWeight": "600",
+					"fontWeight": "700",
 					"lineHeight": 2
 					"lineHeight": 2
 				}
 				}
 			},
 			},
@@ -212,7 +212,7 @@
 						"fontSize": "var(--wp--preset--font-size--tiny)",
 						"fontSize": "var(--wp--preset--font-size--tiny)",
 						"fontFamily": "inherit",
 						"fontFamily": "inherit",
 						"fontStyle": "normal",
 						"fontStyle": "normal",
-						"fontWeight": 300
+						"fontWeight": 400
 					},
 					},
 					"spacing": {
 					"spacing": {
 						"margin": {
 						"margin": {
@@ -229,7 +229,7 @@
 					"typography": {
 					"typography": {
 						"fontSize": "var(--wp--preset--font-size--tiny)",
 						"fontSize": "var(--wp--preset--font-size--tiny)",
 						"fontStyle": "normal",
 						"fontStyle": "normal",
-						"fontWeight": "300"
+						"fontWeight": "400"
 					}
 					}
 				},
 				},
 				"typography": {
 				"typography": {
@@ -255,7 +255,7 @@
 				}
 				}
 			},
 			},
 			"fontsToLoadFromGoogle": [
 			"fontsToLoadFromGoogle": [
-				"family=Poppins:ital,wght@0,300;0,400;0,500;0,600;1,400"
+				"family=DM+Sans:ital,wght@0,400;0,500;0,700;1,400;1,500;1,700"
 			],
 			],
 			"line-height": {
 			"line-height": {
 				"body": 1.7,
 				"body": 1.7,
@@ -288,9 +288,9 @@
 			"customLineHeight": true,
 			"customLineHeight": true,
 			"fontFamilies": [
 			"fontFamilies": [
 				{
 				{
-					"fontFamily": "\"Poppins\", sans-serif",
+					"fontFamily": "\"DM Sans\", sans-serif",
 					"slug": "base",
 					"slug": "base",
-					"name": "Poppins"
+					"name": "DM Sans"
 				},
 				},
 				{
 				{
 					"fontFamily": "-apple-system,BlinkMacSystemFont,\"Segoe UI\",Roboto,Oxygen-Sans,Ubuntu,Cantarell,\"Helvetica Neue\",sans-serif",
 					"fontFamily": "-apple-system,BlinkMacSystemFont,\"Segoe UI\",Roboto,Oxygen-Sans,Ubuntu,Cantarell,\"Helvetica Neue\",sans-serif",
@@ -385,7 +385,7 @@
 			},
 			},
 			"core/navigation": {
 			"core/navigation": {
 				"typography": {
 				"typography": {
-					"fontSize": "20px"
+					"fontSize": "18px"
 				}
 				}
 			},
 			},
 			"core/post-content": {
 			"core/post-content": {
@@ -420,7 +420,7 @@
 				"typography": {
 				"typography": {
 					"fontStyle": "normal",
 					"fontStyle": "normal",
 					"fontSize": "var(--wp--preset--font-size--huge)",
 					"fontSize": "var(--wp--preset--font-size--huge)",
-					"fontWeight": "500",
+					"fontWeight": "400",
 					"lineHeight": "1.4"
 					"lineHeight": "1.4"
 				},
 				},
 				"spacing": {
 				"spacing": {
@@ -444,8 +444,8 @@
 			},
 			},
 			"core/site-title": {
 			"core/site-title": {
 				"typography": {
 				"typography": {
-					"fontSize": "20px",
-					"fontWeight": 800
+					"fontSize": "18px",
+					"fontWeight": 700
 				},
 				},
 				"color": {
 				"color": {
 					"link": "var(--wp--custom--color--primary)"
 					"link": "var(--wp--custom--color--primary)"
@@ -471,7 +471,7 @@
 				"citation": {
 				"citation": {
 					"typography": {
 					"typography": {
 						"fontSize": "15px",
 						"fontSize": "15px",
-						"fontWeight": "300"
+						"fontWeight": "400"
 					}
 					}
 				}
 				}
 			},
 			},

+ 1 - 1
quadrat/sass/blocks/_table.scss

@@ -1,6 +1,6 @@
 .wp-block-table {
 .wp-block-table {
 	th {
 	th {
-		font-weight: 500;
+		font-weight: 400;
 	}
 	}
 
 
 	tbody td { // tbody adds the specificity needed to override the default Gutenberg styles
 	tbody td { // tbody adds the specificity needed to override the default Gutenberg styles

BIN
quadrat/screenshot.png