From 0aeb5b9b14437418ec2780c998bd21aefa4aa4ae Mon Sep 17 00:00:00 2001 From: Julian Dehm Date: Mon, 19 Feb 2024 12:50:12 +0100 Subject: [PATCH 1/2] assets/scss: add font-display:swap to fonts --- adhocracy-plus/assets/scss/_fonts.scss | 6 ++++++ changelog/_9998.md | 3 +++ 2 files changed, 9 insertions(+) create mode 100644 changelog/_9998.md diff --git a/adhocracy-plus/assets/scss/_fonts.scss b/adhocracy-plus/assets/scss/_fonts.scss index f97d1f9ff..aa855f149 100644 --- a/adhocracy-plus/assets/scss/_fonts.scss +++ b/adhocracy-plus/assets/scss/_fonts.scss @@ -3,6 +3,7 @@ src: url("../fonts/SourceSerifPro-Regular.otf"); font-style: normal; font-weight: normal; + font-display: swap; } @font-face { @@ -10,6 +11,7 @@ src: url("../fonts/SourceSerifPro-It.otf"); font-style: italic; font-weight: normal; + font-display: swap; } @font-face { @@ -17,6 +19,7 @@ src: url("../fonts/SourceSansPro-Regular.otf"); font-style: normal; font-weight: normal; + font-display: swap; } @font-face { @@ -24,6 +27,7 @@ src: url("../fonts/SourceSansPro-It.otf"); font-style: italic; font-weight: normal; + font-display: swap; } @font-face { @@ -31,6 +35,7 @@ src: url("../fonts/SourceSansPro-Semibold.otf"); font-style: normal; font-weight: 600; + font-display: swap; } @font-face { @@ -38,4 +43,5 @@ src: url("../fonts/SourceSansPro-Bold.otf"); font-style: bold; font-weight: 900; + font-display: swap; } diff --git a/changelog/_9998.md b/changelog/_9998.md new file mode 100644 index 000000000..0b597cba3 --- /dev/null +++ b/changelog/_9998.md @@ -0,0 +1,3 @@ +### Added + +- add font-display: swap to fonts From 91c842782e621df1116781dacebb51d94ad4f5da Mon Sep 17 00:00:00 2001 From: Julian Dehm Date: Mon, 19 Feb 2024 14:09:15 +0100 Subject: [PATCH 2/2] scss/fonts: change font-weight to be all numbers, fix incorrect font-style bold --- adhocracy-plus/assets/scss/_fonts.scss | 10 +++++----- changelog/_9998.md | 9 +++++++++ 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/adhocracy-plus/assets/scss/_fonts.scss b/adhocracy-plus/assets/scss/_fonts.scss index aa855f149..a97af90da 100644 --- a/adhocracy-plus/assets/scss/_fonts.scss +++ b/adhocracy-plus/assets/scss/_fonts.scss @@ -2,7 +2,7 @@ font-family: "SourceSerifPro"; src: url("../fonts/SourceSerifPro-Regular.otf"); font-style: normal; - font-weight: normal; + font-weight: 400; font-display: swap; } @@ -10,7 +10,7 @@ font-family: "SourceSerifPro"; src: url("../fonts/SourceSerifPro-It.otf"); font-style: italic; - font-weight: normal; + font-weight: 400; font-display: swap; } @@ -18,7 +18,7 @@ font-family: "SourceSansPro"; src: url("../fonts/SourceSansPro-Regular.otf"); font-style: normal; - font-weight: normal; + font-weight: 400; font-display: swap; } @@ -26,7 +26,7 @@ font-family: "SourceSansPro"; src: url("../fonts/SourceSansPro-It.otf"); font-style: italic; - font-weight: normal; + font-weight: 400; font-display: swap; } @@ -41,7 +41,7 @@ @font-face { font-family: "SourceSansPro"; src: url("../fonts/SourceSansPro-Bold.otf"); - font-style: bold; + font-style: normal; font-weight: 900; font-display: swap; } diff --git a/changelog/_9998.md b/changelog/_9998.md index 0b597cba3..05ab72221 100644 --- a/changelog/_9998.md +++ b/changelog/_9998.md @@ -1,3 +1,12 @@ ### Added - add font-display: swap to fonts + +### Fixed + +- fixed incorrect font-style: bold + + +### Changed + +- changed font-weight: normal to 400 to consistenly use numbers