From 594ca3520cebffe24ce8de5641de61d77bb22270 Mon Sep 17 00:00:00 2001 From: tophf Date: Wed, 19 Jan 2022 00:25:11 +0300 Subject: [PATCH] actually use the global font everywhere (#1384) --- edit/edit.css | 1 - global.css | 10 +++++----- install-usercss/install-usercss.css | 2 -- manage/manage.css | 2 +- popup/popup.css | 2 -- 5 files changed, 6 insertions(+), 11 deletions(-) diff --git a/edit/edit.css b/edit/edit.css index 3dd8ac15..11697142 100644 --- a/edit/edit.css +++ b/edit/edit.css @@ -5,7 +5,6 @@ body { margin: 0; height: 100vh; - font: 12px arial,sans-serif; } a { diff --git a/global.css b/global.css index 6fd13082..95440557 100644 --- a/global.css +++ b/global.css @@ -4,18 +4,18 @@ html#stylus #header *:not(#\1transition-suppressor) { * Using \1 to simplify js code because \0 is converted to \xFFFD per spec. */ transition: none !important; } -body { - font: normal 12px Arial, system-ui, sans-serif; +:root { + --family: Arial, "Helvetica Neue", Helvetica, system-ui, sans-serif; +} +body { + font: normal 12px var(--family); } - body:lang(ja) { font-family: Arial, 'Meiryo UI', 'MS Gothic', system-ui, sans-serif; } - body:lang(zh-CN) { font-family: Arial, 'Microsoft YaHei UI', 'Microsoft YaHei', system-ui, sans-serif; } - body:lang(zh-TW), body:lang(zh-HK) { font-family: Arial, 'Microsoft JhengHei UI', 'Microsoft JhengHei', system-ui, sans-serif; diff --git a/install-usercss/install-usercss.css b/install-usercss/install-usercss.css index 2054de0f..b9c09576 100644 --- a/install-usercss/install-usercss.css +++ b/install-usercss/install-usercss.css @@ -119,8 +119,6 @@ h1 { } .install { - font-family: Arial, "DejaVu Sans", Verdana, Geneva, sans-serif; - font-size: 14px; background-color: hsl(0, 0%, 33%); color: #eee; border-radius: 4px; diff --git a/manage/manage.css b/manage/manage.css index f2e5a6f9..035ef169 100644 --- a/manage/manage.css +++ b/manage/manage.css @@ -962,7 +962,7 @@ a:hover { } #manage\.newUI\.sort { - font-family: 'sorticon', Arial; + font-family: 'sorticon', var(--family); -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; } diff --git a/popup/popup.css b/popup/popup.css index 9ae12e80..715c70b4 100644 --- a/popup/popup.css +++ b/popup/popup.css @@ -11,8 +11,6 @@ html, body { body { width: 252px; - font-size: 12px; - font-family: Arial, "Helvetica Neue", Helvetica, sans-serif; margin: 0; }