From cf501ac19ee2e25ec1573a1e694c190f62aa8edb Mon Sep 17 00:00:00 2001 From: lyswhut Date: Tue, 22 Feb 2022 08:56:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AD=97=E4=BD=93=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E4=B8=8D=E7=94=9F=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/renderer-lyric/assets/styles/reset.less | 5 +++-- src/renderer/assets/styles/reset.less | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/renderer-lyric/assets/styles/reset.less b/src/renderer-lyric/assets/styles/reset.less index e7ce98bd..7a1ea2bc 100644 --- a/src/renderer-lyric/assets/styles/reset.less +++ b/src/renderer-lyric/assets/styles/reset.less @@ -16,7 +16,6 @@ time, mark, audio, video { border: 0; font-size: 100%; font: inherit; - font-family: "Microsoft YaHei", "Microsoft Jhenghei", "PingFang SC", -apple-system, BlinkMacSystemFont, Roboto, "Helvetica Neue", Helvetica, Arial, "Hiragino Sans GB", "Source Han Sans", "Noto Sans CJK Sc", sans-serif; vertical-align: baseline; } /* HTML5 display-role reset for older browsers */ @@ -24,6 +23,9 @@ article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section { display: block; } +html { + font-family: "Microsoft YaHei", "Microsoft Jhenghei", "PingFang SC", -apple-system, BlinkMacSystemFont, Roboto, "Helvetica Neue", Helvetica, Arial, "Hiragino Sans GB", "Source Han Sans", "Noto Sans CJK Sc", sans-serif; +} body { line-height: 1; } @@ -44,5 +46,4 @@ table { } button { font-family: inherit; - font-family: "Microsoft YaHei", "Microsoft Jhenghei", "PingFang SC", -apple-system, BlinkMacSystemFont, Roboto, "Helvetica Neue", Helvetica, Arial, "Hiragino Sans GB", "Source Han Sans", "Noto Sans CJK Sc", sans-serif; } diff --git a/src/renderer/assets/styles/reset.less b/src/renderer/assets/styles/reset.less index e7ce98bd..7a1ea2bc 100644 --- a/src/renderer/assets/styles/reset.less +++ b/src/renderer/assets/styles/reset.less @@ -16,7 +16,6 @@ time, mark, audio, video { border: 0; font-size: 100%; font: inherit; - font-family: "Microsoft YaHei", "Microsoft Jhenghei", "PingFang SC", -apple-system, BlinkMacSystemFont, Roboto, "Helvetica Neue", Helvetica, Arial, "Hiragino Sans GB", "Source Han Sans", "Noto Sans CJK Sc", sans-serif; vertical-align: baseline; } /* HTML5 display-role reset for older browsers */ @@ -24,6 +23,9 @@ article, aside, details, figcaption, figure, footer, header, hgroup, menu, nav, section { display: block; } +html { + font-family: "Microsoft YaHei", "Microsoft Jhenghei", "PingFang SC", -apple-system, BlinkMacSystemFont, Roboto, "Helvetica Neue", Helvetica, Arial, "Hiragino Sans GB", "Source Han Sans", "Noto Sans CJK Sc", sans-serif; +} body { line-height: 1; } @@ -44,5 +46,4 @@ table { } button { font-family: inherit; - font-family: "Microsoft YaHei", "Microsoft Jhenghei", "PingFang SC", -apple-system, BlinkMacSystemFont, Roboto, "Helvetica Neue", Helvetica, Arial, "Hiragino Sans GB", "Source Han Sans", "Noto Sans CJK Sc", sans-serif; }