summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorminusf <fholop@ripe.net>2023-05-24 10:26:25 +0200
committerGitHub <noreply@github.com>2023-05-24 10:26:25 +0200
commit8b053c1e3c3dc50a73e471e4edcd2171fc24a7ec (patch)
tree61a6a131a79674a21b63b09e69f2d5f257e0a82e
parenteb9df03a43f34c44131ec3a295643327b8a68bb4 (diff)
Fixed #34592 -- Removed Safari/Chrome workaround for system fonts.
-rw-r--r--django/contrib/admin/static/admin/css/base.css2
-rw-r--r--django/views/templates/default_urlconf.html2
-rw-r--r--tests/admin_views/tests.py2
3 files changed, 1 insertions, 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",