From 8b053c1e3c3dc50a73e471e4edcd2171fc24a7ec Mon Sep 17 00:00:00 2001 From: minusf Date: Wed, 24 May 2023 10:26:25 +0200 Subject: [PATCH] Fixed #34592 -- Removed Safari/Chrome workaround for system fonts. --- django/contrib/admin/static/admin/css/base.css | 2 -- django/views/templates/default_urlconf.html | 2 +- tests/admin_views/tests.py | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/django/contrib/admin/static/admin/css/base.css b/django/contrib/admin/static/admin/css/base.css index 2a2d6f8f5d..ec2c8e34d0 100644 --- a/django/contrib/admin/static/admin/css/base.css +++ b/django/contrib/admin/static/admin/css/base.css @@ -56,8 +56,6 @@ html[data-theme="light"], --object-tools-hover-bg: var(--close-button-hover-bg); --font-family-primary: - -apple-system, - BlinkMacSystemFont, "Segoe UI", system-ui, Roboto, diff --git a/django/views/templates/default_urlconf.html b/django/views/templates/default_urlconf.html index c54ce842d1..6bb170cc67 100644 --- a/django/views/templates/default_urlconf.html +++ b/django/views/templates/default_urlconf.html @@ -19,7 +19,7 @@ body { max-width: 960px; color: #525252; - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", ui-system, sans-serif; + font-family: "Segoe UI", system-ui, sans-serif; margin: 0 auto; } main { diff --git a/tests/admin_views/tests.py b/tests/admin_views/tests.py index 903a8996d4..0a252bac4f 100644 --- a/tests/admin_views/tests.py +++ b/tests/admin_views/tests.py @@ -6209,8 +6209,6 @@ class SeleniumTests(AdminSeleniumTestCase): self.assertEqual( fonts, [ - "-apple-system", - "BlinkMacSystemFont", "Segoe UI", "system-ui", "Roboto",