diff --git a/assets/css/editor-style.css b/assets/css/editor-style.css
index f7e2d903..812bb7ee 100644
--- a/assets/css/editor-style.css
+++ b/assets/css/editor-style.css
@@ -1,29 +1,50 @@
@font-face {
font-family: GrueneType;
- src: url("../fonts/GrueneType-BlackCondensedItalic.eot");
- src: url("../fonts/GrueneType-BlackCondensedItalic.eot?#iefix") format("embedded-opentype"), url("../fonts/GrueneType-BlackCondensedItalic.woff2") format("woff2"), url("../fonts/GrueneType-BlackCondensedItalic.woff") format("woff"), url("../fonts/GrueneType-BlackCondensedItalic.ttf") format("truetype"), url("../fonts/GrueneType-BlackCondensedItalic.svg#GrueneType-BlackCondensedItalic") format("svg");
+ src: url("assets/fonts/GrueneType-BlackCondensedItalic.woff2") format("woff2"), url("assets/fonts/GrueneType-BlackCondensedItalic.ttf") format("truetype");
font-weight: 900;
font-style: normal;
- font-display: swap; }
+ font-display: swap;
+}
@font-face {
- font-family: PTSans;
- src: url("../fonts/PTSans-Regular.eot");
- src: url("../fonts/PTSans-Regular.eot?#iefix") format("embedded-opentype"), url("../fonts/PTSans-Regular.woff2") format("woff2"), url("../fonts/PTSans-Regular.woff") format("woff"), url("../fonts/PTSans-Regular.ttf") format("truetype"), url("../fonts/PTSans-Regular.svg#PTSans-Regular") format("svg");
+ font-family: "PT Sans";
+ font-style: normal;
font-weight: 400;
+ font-display: fallback;
+ src: url('../fonts/pt-sans-v17-latin_latin-ext-regular.woff2') format('woff2'), url('../fonts/pt-sans-v17-latin_latin-ext-regular.ttf') format('truetype');
+ font-stretch: normal;
+}
+
+@font-face {
+ font-family: "PT Sans";
+ font-style: italic;
+ font-weight: 400;
+ font-display: fallback;
+ src: url('../fonts/pt-sans-v17-latin_latin-ext-italic.woff2') format('woff2'), url('../fonts/pt-sans-v17-latin_latin-ext-italic.ttf') format('truetype');
+ font-stretch: normal;
+}
+
+@font-face {
+ font-family: "PT Sans";
font-style: normal;
- font-display: swap; }
+ font-weight: 700;
+ font-display: fallback;
+ src: url('../fonts/pt-sans-v17-latin_latin-ext-700.woff2') format('woff2'), url('../fonts/pt-sans-v17-latin_latin-ext-700.ttf') format('truetype');
+ font-stretch: normal;
+}
@font-face {
- font-family: PTSans;
- src: url("../fonts/PTSans-Bold.eot");
- src: url("../fonts/PTSans-Bold.eot?#iefix") format("embedded-opentype"), url("../fonts/PTSans-Bold.woff2") format("woff2"), url("../fonts/PTSans-Bold.woff") format("woff"), url("../fonts/PTSans-Bold.ttf") format("truetype"), url("../fonts/PTSans-Bold.svg#PTSans-Bold") format("svg");
+ font-family: "PT Sans";
+ font-style: italic;
font-weight: 700;
- font-style: normal;
- font-display: swap; }
+ font-display: fallback;
+ src: url('../fonts/pt-sans-v17-latin_latin-ext-700italic.woff2') format('woff2'), url('../fonts/pt-sans-v17-latin_latin-ext-700italic.ttf') format('truetype');
+ font-stretch: normal;
+}
+
.editor-styles-wrapper {
- font-family: "PTSans";
+ font-family: "PT Sans", sans-serif;
font-size: 1.1875rem;
line-height: 1.5;
}
@@ -118,7 +139,7 @@
}
.wp-block-button__link {
- font-family: "PTSans";
+ font-family: "PT Sans", sans-serif;
background-color: #008939;
color: #fff;
text-transform: uppercase;
@@ -126,12 +147,13 @@
border-radius: 3px;
}
-.wp-block-pullquote{
+.wp-block-pullquote {
border-top: 0;
border-bottom: 0;
}
-.wp-block-media-text.person .wp-block-media-text__media img, .wp-block-media-text.person .wp-block-image img {
+.wp-block-media-text.person .wp-block-media-text__media img,
+.wp-block-media-text.person .wp-block-image img {
border-top-left-radius: 3px;
border-top-right-radius: 3px;
border-bottom-left-radius: 0;
@@ -183,15 +205,17 @@
font-size: 25px;
}
-.editor-styles-wrapper .has-white-background-color .h1, .h2, .h3 {
+.editor-styles-wrapper .has-white-background-color .h1,
+.h2,
+.h3 {
color: #005437;
}
@media (min-width: 768px) {
+
.wrap h1,
- h1
- .h1,
+ h1 .h1,
.has-huge-font-size {
font-size: 45px;
line-height: 1.3em;
@@ -233,8 +257,8 @@
}
.styled-layout .wp-block-group {
- padding-top: 100px;
- padding-bottom: 100px;
+ padding-top: 100px;
+ padding-bottom: 100px;
}
/* Main column width */
@@ -260,10 +284,12 @@
.same-height .wp-block-column .wp-block-image img {
max-height: 230px;
}
+
.wp-block-column {
margin-bottom: 0;
}
}
+
.wp-block-column img {
width: 100%;
object-fit: cover;
@@ -310,11 +336,11 @@ p a {
}
.theme--default .wp-block-rss .wp-block-rss__item-title {
- font-family: PTSans;
+ font-family: "PT Sans", sans-serif;
}
.theme--contrast .wp-block-rss .wp-block-rss__item-title {
- font-family: PTSans;
+ font-family: "PT Sans", sans-serif;
}
@media (min-width: 768px) {
@@ -372,7 +398,7 @@ p a {
text-transform: uppercase;
}
-.editor-styles-wrapper .has-background.textbalken {
+.editor-styles-wrapper .has-background.textbalken {
font-family: "GrueneType";
}
@@ -413,7 +439,8 @@ p a {
gap: 0;
}
-.wp-block-columns .wp-block-column p.textbalken, .wp-block-columns .wp-block-column ul.textbalken {
+.wp-block-columns .wp-block-column p.textbalken,
+.wp-block-columns .wp-block-column ul.textbalken {
padding: 0 0.5em;
}
@@ -471,9 +498,10 @@ p a {
}
}
-.styled-layout .wp-block-group.wp-block-group-is-layout-flow > h2, .styled-layout .wp-block-group.wp-block-group-is-layout-flow > .h2,
-.styled-layout .wp-block-group .wp-block-group__inner-container > h2,
-.styled-layout .wp-block-group .wp-block-group__inner-container > .h2 {
+.styled-layout .wp-block-group.wp-block-group-is-layout-flow>h2,
+.styled-layout .wp-block-group.wp-block-group-is-layout-flow>.h2,
+.styled-layout .wp-block-group .wp-block-group__inner-container>h2,
+.styled-layout .wp-block-group .wp-block-group__inner-container>.h2 {
margin-bottom: 70px;
}
@@ -485,6 +513,7 @@ p a {
.wp-block-group {
position: relative;
}
+
.wp-block-group__inner-container {
max-width: 1200px;
position: relative;
@@ -495,7 +524,8 @@ p a {
background-size: cover;
background-position: top;
}
-.sunflower-has-background-dim > * {
+
+.sunflower-has-background-dim>* {
z-index: 30;
}
@@ -510,6 +540,7 @@ p a {
opacity: 0.3;
background-color: #000;
}
+
.wp-block-group.alignfull.has-background {
width: 100vw;
display: flex;
@@ -521,6 +552,7 @@ p a {
padding-left: 5vw;
padding-right: 5vw;
}
+
.bg-white {
- background-color: #fff;
+ background-color: #fff;
}
diff --git a/assets/fonts/GrueneType-BlackCondensedItalic.eot b/assets/fonts/GrueneType-BlackCondensedItalic.eot
deleted file mode 100644
index c6ee0416..00000000
Binary files a/assets/fonts/GrueneType-BlackCondensedItalic.eot and /dev/null differ
diff --git a/assets/fonts/GrueneType-BlackCondensedItalic.svg b/assets/fonts/GrueneType-BlackCondensedItalic.svg
deleted file mode 100644
index 167df3cf..00000000
--- a/assets/fonts/GrueneType-BlackCondensedItalic.svg
+++ /dev/null
@@ -1,19551 +0,0 @@
-
-
-
diff --git a/assets/fonts/GrueneType-BlackCondensedItalic.woff b/assets/fonts/GrueneType-BlackCondensedItalic.woff
deleted file mode 100644
index 0022e60f..00000000
Binary files a/assets/fonts/GrueneType-BlackCondensedItalic.woff and /dev/null differ
diff --git a/assets/fonts/PTSans-Bold.eot b/assets/fonts/PTSans-Bold.eot
deleted file mode 100644
index d80d7937..00000000
Binary files a/assets/fonts/PTSans-Bold.eot and /dev/null differ
diff --git a/assets/fonts/PTSans-Bold.svg b/assets/fonts/PTSans-Bold.svg
deleted file mode 100644
index f9c4481e..00000000
--- a/assets/fonts/PTSans-Bold.svg
+++ /dev/null
@@ -1,2148 +0,0 @@
-
-
-
diff --git a/assets/fonts/PTSans-Bold.ttf b/assets/fonts/PTSans-Bold.ttf
deleted file mode 100644
index b73f54e7..00000000
Binary files a/assets/fonts/PTSans-Bold.ttf and /dev/null differ
diff --git a/assets/fonts/PTSans-Bold.woff b/assets/fonts/PTSans-Bold.woff
deleted file mode 100644
index 442a42a1..00000000
Binary files a/assets/fonts/PTSans-Bold.woff and /dev/null differ
diff --git a/assets/fonts/PTSans-Bold.woff2 b/assets/fonts/PTSans-Bold.woff2
deleted file mode 100644
index 256981de..00000000
Binary files a/assets/fonts/PTSans-Bold.woff2 and /dev/null differ
diff --git a/assets/fonts/PTSans-BoldItalic.eot b/assets/fonts/PTSans-BoldItalic.eot
deleted file mode 100644
index b439c3f4..00000000
Binary files a/assets/fonts/PTSans-BoldItalic.eot and /dev/null differ
diff --git a/assets/fonts/PTSans-BoldItalic.svg b/assets/fonts/PTSans-BoldItalic.svg
deleted file mode 100644
index def5a66e..00000000
--- a/assets/fonts/PTSans-BoldItalic.svg
+++ /dev/null
@@ -1,5438 +0,0 @@
-
-
-
diff --git a/assets/fonts/PTSans-BoldItalic.ttf b/assets/fonts/PTSans-BoldItalic.ttf
deleted file mode 100644
index 8a8a50f0..00000000
Binary files a/assets/fonts/PTSans-BoldItalic.ttf and /dev/null differ
diff --git a/assets/fonts/PTSans-BoldItalic.woff b/assets/fonts/PTSans-BoldItalic.woff
deleted file mode 100644
index 3c79ac95..00000000
Binary files a/assets/fonts/PTSans-BoldItalic.woff and /dev/null differ
diff --git a/assets/fonts/PTSans-BoldItalic.woff2 b/assets/fonts/PTSans-BoldItalic.woff2
deleted file mode 100644
index c251d1d9..00000000
Binary files a/assets/fonts/PTSans-BoldItalic.woff2 and /dev/null differ
diff --git a/assets/fonts/PTSans-Italic.eot b/assets/fonts/PTSans-Italic.eot
deleted file mode 100644
index 1b2f42ef..00000000
Binary files a/assets/fonts/PTSans-Italic.eot and /dev/null differ
diff --git a/assets/fonts/PTSans-Italic.svg b/assets/fonts/PTSans-Italic.svg
deleted file mode 100644
index 4aae9378..00000000
--- a/assets/fonts/PTSans-Italic.svg
+++ /dev/null
@@ -1,5225 +0,0 @@
-
-
-
diff --git a/assets/fonts/PTSans-Italic.ttf b/assets/fonts/PTSans-Italic.ttf
deleted file mode 100644
index 23fb640b..00000000
Binary files a/assets/fonts/PTSans-Italic.ttf and /dev/null differ
diff --git a/assets/fonts/PTSans-Italic.woff b/assets/fonts/PTSans-Italic.woff
deleted file mode 100644
index 456830d3..00000000
Binary files a/assets/fonts/PTSans-Italic.woff and /dev/null differ
diff --git a/assets/fonts/PTSans-Italic.woff2 b/assets/fonts/PTSans-Italic.woff2
deleted file mode 100644
index 5ebecfe9..00000000
Binary files a/assets/fonts/PTSans-Italic.woff2 and /dev/null differ
diff --git a/assets/fonts/PTSans-Regular.eot b/assets/fonts/PTSans-Regular.eot
deleted file mode 100644
index bdcacfd6..00000000
Binary files a/assets/fonts/PTSans-Regular.eot and /dev/null differ
diff --git a/assets/fonts/PTSans-Regular.svg b/assets/fonts/PTSans-Regular.svg
deleted file mode 100644
index 23276c2f..00000000
--- a/assets/fonts/PTSans-Regular.svg
+++ /dev/null
@@ -1,1821 +0,0 @@
-
-
-
diff --git a/assets/fonts/PTSans-Regular.ttf b/assets/fonts/PTSans-Regular.ttf
deleted file mode 100644
index 72cd49db..00000000
Binary files a/assets/fonts/PTSans-Regular.ttf and /dev/null differ
diff --git a/assets/fonts/PTSans-Regular.woff b/assets/fonts/PTSans-Regular.woff
deleted file mode 100644
index 3b3e2835..00000000
Binary files a/assets/fonts/PTSans-Regular.woff and /dev/null differ
diff --git a/assets/fonts/PTSans-Regular.woff2 b/assets/fonts/PTSans-Regular.woff2
deleted file mode 100644
index 0240623b..00000000
Binary files a/assets/fonts/PTSans-Regular.woff2 and /dev/null differ
diff --git a/assets/fonts/pt-sans-v17-latin_latin-ext-700.ttf b/assets/fonts/pt-sans-v17-latin_latin-ext-700.ttf
new file mode 100644
index 00000000..59c72ef3
Binary files /dev/null and b/assets/fonts/pt-sans-v17-latin_latin-ext-700.ttf differ
diff --git a/assets/fonts/pt-sans-v17-latin_latin-ext-700.woff2 b/assets/fonts/pt-sans-v17-latin_latin-ext-700.woff2
new file mode 100644
index 00000000..3d7ae076
Binary files /dev/null and b/assets/fonts/pt-sans-v17-latin_latin-ext-700.woff2 differ
diff --git a/assets/fonts/pt-sans-v17-latin_latin-ext-700italic.ttf b/assets/fonts/pt-sans-v17-latin_latin-ext-700italic.ttf
new file mode 100644
index 00000000..e85ec6b7
Binary files /dev/null and b/assets/fonts/pt-sans-v17-latin_latin-ext-700italic.ttf differ
diff --git a/assets/fonts/pt-sans-v17-latin_latin-ext-700italic.woff2 b/assets/fonts/pt-sans-v17-latin_latin-ext-700italic.woff2
new file mode 100644
index 00000000..46b576b6
Binary files /dev/null and b/assets/fonts/pt-sans-v17-latin_latin-ext-700italic.woff2 differ
diff --git a/assets/fonts/pt-sans-v17-latin_latin-ext-italic.ttf b/assets/fonts/pt-sans-v17-latin_latin-ext-italic.ttf
new file mode 100644
index 00000000..b50d8e93
Binary files /dev/null and b/assets/fonts/pt-sans-v17-latin_latin-ext-italic.ttf differ
diff --git a/assets/fonts/pt-sans-v17-latin_latin-ext-italic.woff2 b/assets/fonts/pt-sans-v17-latin_latin-ext-italic.woff2
new file mode 100644
index 00000000..15d84d3b
Binary files /dev/null and b/assets/fonts/pt-sans-v17-latin_latin-ext-italic.woff2 differ
diff --git a/assets/fonts/pt-sans-v17-latin_latin-ext-regular.ttf b/assets/fonts/pt-sans-v17-latin_latin-ext-regular.ttf
new file mode 100644
index 00000000..aaac1455
Binary files /dev/null and b/assets/fonts/pt-sans-v17-latin_latin-ext-regular.ttf differ
diff --git a/assets/fonts/pt-sans-v17-latin_latin-ext-regular.woff2 b/assets/fonts/pt-sans-v17-latin_latin-ext-regular.woff2
new file mode 100644
index 00000000..7cc34eef
Binary files /dev/null and b/assets/fonts/pt-sans-v17-latin_latin-ext-regular.woff2 differ
diff --git a/sass/_accordion.scss b/sass/_accordion.scss
index de874a46..c7030189 100644
--- a/sass/_accordion.scss
+++ b/sass/_accordion.scss
@@ -4,7 +4,10 @@
&__title {
font-size: 1.1875rem;
- font-family: PTSans !important;
+
+ @include themed() {
+ font-family: t(standardFont);
+ }
color: var(--wp--preset--color--white);
padding: var(--wp--preset--spacing--40) var(--wp--preset--spacing--40);
diff --git a/sass/_fonts.scss b/sass/_fonts.scss
index 87c5b617..73f62192 100755
--- a/sass/_fonts.scss
+++ b/sass/_fonts.scss
@@ -1,12 +1,8 @@
@font-face {
font-family: GrueneType;
- src: url("assets/fonts/GrueneType-BlackCondensedItalic.eot");
src:
- url("assets/fonts/GrueneType-BlackCondensedItalic.eot?#iefix") format("embedded-opentype"),
url("assets/fonts/GrueneType-BlackCondensedItalic.woff2") format("woff2"),
- url("assets/fonts/GrueneType-BlackCondensedItalic.woff") format("woff"),
- url("assets/fonts/GrueneType-BlackCondensedItalic.ttf") format("truetype"),
- url("assets/fonts/GrueneType-BlackCondensedItalic.svg#GrueneType-BlackCondensedItalic") format("svg");
+ url("assets/fonts/GrueneType-BlackCondensedItalic.ttf") format("truetype");
font-weight: 900;
font-style: normal;
font-display: swap;
@@ -41,9 +37,5 @@
}
.ptsans {
- font-family: PTSans !important;
-}
-
-.ptsans {
- font-family: PTSans !important;
+ font-family: "PT Sans" !important;
}
diff --git a/sass/_themes.scss b/sass/_themes.scss
index de7a5ea8..96de8891 100644
--- a/sass/_themes.scss
+++ b/sass/_themes.scss
@@ -1,6 +1,6 @@
$themes: (
- default: ("headingFont": "GrueneType", "headingFontBold": "GrueneType", "standardFont": "PTSans, \"PT Sans\", sans-serif"),
- contrast: ("headingFont": "GrueneType", "headingFontBold": "GrueneType", "standardFont": "PTSans \"PT Sans\", sans-serif")
+ default: ("headingFont": "GrueneType", "headingFontBold": "GrueneType", "standardFont": "\"PT Sans\", sans-serif"),
+ contrast: ("headingFont": "GrueneType", "headingFontBold": "GrueneType", "standardFont": "\"PT Sans\", sans-serif")
);
@mixin themed() {
diff --git a/theme.json b/theme.json
index 5a18d121..d3a3a14b 100755
--- a/theme.json
+++ b/theme.json
@@ -75,7 +75,8 @@
"fontStyle": "normal",
"fontWeight": "400",
"src": [
- "file:./assets/fonts/PTSans-Regular.woff2"
+ "file:./assets/fonts/pt-sans-v17-latin_latin-ext-regular.woff2",
+ "file:./assets/fonts/pt-sans-v17-latin_latin-ext-regular.ttf"
]
},
{
@@ -84,7 +85,8 @@
"fontStyle": "italic",
"fontWeight": "400",
"src": [
- "file:./assets/fonts/PTSans-Italic.woff2"
+ "file:./assets/fonts/pt-sans-v17-latin_latin-ext-italic.woff2",
+ "file:./assets/fonts/pt-sans-v17-latin_latin-ext-italic.ttf"
]
},
{
@@ -93,7 +95,8 @@
"fontStyle": "normal",
"fontWeight": "700",
"src": [
- "file:./assets/fonts/PTSans-Bold.woff2"
+ "file:./assets/fonts/pt-sans-v17-latin_latin-ext-700.woff2",
+ "file:./assets/fonts/pt-sans-v17-latin_latin-ext-700.ttf"
]
},
{
@@ -102,12 +105,13 @@
"fontStyle": "italic",
"fontWeight": "700",
"src": [
- "file:./assets/fonts/PTSans-BoldItalic.woff2"
+ "file:./assets/fonts/pt-sans-v17-latin_latin-ext-700italic.woff2",
+ "file:./assets/fonts/pt-sans-v17-latin_latin-ext-700italic.ttf"
]
}
],
- "fontFamily": "PTSans, \"PT Sans\", sans-serif",
- "name": "PTSans",
+ "fontFamily": "\"PT Sans\", sans-serif",
+ "name": "PT Sans",
"slug": "pt-sans"
},
{
@@ -119,7 +123,8 @@
"fontStyle": "bold",
"fontWeight": "900",
"src": [
- "file:./assets/fonts/GrueneType-BlackCondensedItalic.woff2"
+ "file:./assets/fonts/GrueneType-BlackCondensedItalic.woff2",
+ "file:./assets/fonts/GrueneType-BlackCondensedItalic.ttf"
]
}
],