From 1d2298591265c412fc7d1bdc1b9168eaeea5669c Mon Sep 17 00:00:00 2001
From: PaarthAgarwal <paarth.agarwal.mec20@itbhu.ac.in>
Date: Sat, 19 Mar 2022 19:51:41 +0530
Subject: [PATCH] Fix issue where normalize.css would introduce font issues
- global font family on some elements set by normalize.css would override the desired font
- font stack was not correctly used across some elements
- fixes #8016
---
CHANGELOG.txt | 2 +-
docs/releases/3.0.md | 2 +-
wagtail/admin/static_src/wagtailadmin/css/normalize.css | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 22b5661f48..5e68a52f20 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -9,7 +9,7 @@ Changelog
* Major updates to frontend tooling; move Node tooling from Gulp to Webpack, upgrade to Node v16 and npm v8, eslint v8, stylelint v14 and others (Thibaud Colas)
* Change comment headers’ date formatting to use browser APIs instead of requiring a library (LB (Ben Johnston))
* Lint with flake8-comprehensions and flake8-assertive, including adding a pre-commit hook for these (Mads Jensen, Dan Braghis)
- * Switch the Wagtail branding font to a system font stack (Steven Steinwand)
+ * Switch the Wagtail branding font to a system font stack (Steven Steinwand, Paarth Agarwal)
* Add black configuration and reformat code using it (Dan Braghis)
* Remove UI code for legacy browser support: polyfills, IE11 workarounds, Modernizr (Thibaud Colas)
* Remove redirect auto-creation recipe from documentation as this feature is now supported in Wagtail core (Andy Babic)
diff --git a/docs/releases/3.0.md b/docs/releases/3.0.md
index a71ff55179..07f62c4ec6 100644
--- a/docs/releases/3.0.md
+++ b/docs/releases/3.0.md
@@ -13,7 +13,7 @@ depth: 1
Here are other changes related to the redesign:
- * Switch the Wagtail branding font to a system font stack (Steven Steinwand)
+ * Switch the Wagtail branding font to a system font stack (Steven Steinwand, Paarth Agarwal)
* Remove most uppercased text styles from admin UI (Paarth Agarwal)
* Convert all UI code to CSS logical properties for Right-to-Left (RTL) language support (Thibaud Colas)
diff --git a/wagtail/admin/static_src/wagtailadmin/css/normalize.css b/wagtail/admin/static_src/wagtailadmin/css/normalize.css
index af91090aa6..fb4bdf4f1e 100644
--- a/wagtail/admin/static_src/wagtailadmin/css/normalize.css
+++ b/wagtail/admin/static_src/wagtailadmin/css/normalize.css
@@ -87,7 +87,7 @@ button,
input,
select,
textarea {
- font-family: sans-serif;
+ font-family: inherit;
}
/**