From 06ac7083dfaecce138e23f8a1fa40d7a278dcfee Mon Sep 17 00:00:00 2001 From: bietiaop <1527109126@qq.com> Date: Tue, 23 Jul 2024 11:13:27 +0800 Subject: [PATCH] fix:font --- resources/common/layout/index.css | 2 +- resources/common/layout/index.scss | 5 +++-- resources/common/style/index.css | 18 +++++++++------ resources/common/style/index.scss | 36 +++++++++++------------------- resources/help/index.css | 4 ++-- resources/help/index.scss | 12 +++++----- 6 files changed, 36 insertions(+), 41 deletions(-) diff --git a/resources/common/layout/index.css b/resources/common/layout/index.css index c31151b..74b8190 100644 --- a/resources/common/layout/index.css +++ b/resources/common/layout/index.css @@ -5,7 +5,7 @@ } body { - font-family: "zzz", system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif; + font-family: "zzz", "tttgbnumber", "HYWenHei-55W", system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif; transform-origin: 0 0; font-size: 24px; width: 840px; diff --git a/resources/common/layout/index.scss b/resources/common/layout/index.scss index 201df8c..9442901 100644 --- a/resources/common/layout/index.scss +++ b/resources/common/layout/index.scss @@ -7,8 +7,9 @@ } body { - font-family: 'zzz', system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', - Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif; + font-family: 'zzz', 'tttgbnumber', 'HYWenHei-55W', system-ui, -apple-system, + BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, + 'Open Sans', 'Helvetica Neue', sans-serif; transform-origin: 0 0; font-size: 24px; width: 840px; diff --git a/resources/common/style/index.css b/resources/common/style/index.css index 027be13..1f8dd2e 100644 --- a/resources/common/style/index.css +++ b/resources/common/style/index.css @@ -3,21 +3,25 @@ src: url("../fonts/inpinhongmengti.ttf"); } @font-face { - font-family: "Source Han Serif"; - src: url("../fonts/SourceHanSerifCN-Heavy.otf"); + font-family: "tttgbnumber"; + src: url("../../../../../genshin/resources/font/tttgbnumber.ttf"); + font-weight: normal; + font-style: normal; +} +@font-face { + font-family: "HYWenHei-55W"; + src: url("../../../../../genshin/resources/font/HYWenHei-55W.ttf"); + font-weight: normal; + font-style: normal; } .zzz-font { - font-family: "zzz", system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif; + font-family: "zzz", "tttgbnumber", "HYWenHei-55W", system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif; } .no-zzz-font { font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif; } -.zzz-serif { - font-family: "Source Han Serif", system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif; -} - .rank-icon { aspect-ratio: 1; background-repeat: no-repeat; diff --git a/resources/common/style/index.scss b/resources/common/style/index.scss index 0a09a5d..1df54b9 100644 --- a/resources/common/style/index.scss +++ b/resources/common/style/index.scss @@ -2,25 +2,27 @@ @font-face { font-family: 'zzz'; - // src: url('../fonts/RoGSanSrfStd-Bd.otf'); src: url('../fonts/inpinhongmengti.ttf'); - // font-weight: 400; } -// @font-face { -// font-family: 'zzz'; -// src: url('../fonts/REEJI-CloudChaoCuHeiGBT.ttf'); -// font-weight: 900; -// } +@font-face { + font-family: 'tttgbnumber'; + src: url('../../../../../genshin/resources/font/tttgbnumber.ttf'); + font-weight: normal; + font-style: normal; +} @font-face { - font-family: 'Source Han Serif'; - src: url('../fonts/SourceHanSerifCN-Heavy.otf'); + font-family: 'HYWenHei-55W'; + src: url('../../../../../genshin/resources/font/HYWenHei-55W.ttf'); + font-weight: normal; + font-style: normal; } .zzz-font { - font-family: 'zzz', system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', - Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif; + font-family: 'zzz', 'tttgbnumber', 'HYWenHei-55W', system-ui, -apple-system, + BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, + 'Open Sans', 'Helvetica Neue', sans-serif; } .no-zzz-font { @@ -28,18 +30,6 @@ Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif; } -// .zzz-title { -// font-family: 'zzz', system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', -// Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif; -// font-weight: 900; -// } - -.zzz-serif { - font-family: 'Source Han Serif', system-ui, -apple-system, BlinkMacSystemFont, - 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', - sans-serif; -} - .rank-icon { aspect-ratio: 1; background-repeat: no-repeat; diff --git a/resources/help/index.css b/resources/help/index.css index eef6910..2c27a62 100644 --- a/resources/help/index.css +++ b/resources/help/index.css @@ -90,7 +90,7 @@ display: flex; flex-wrap: wrap; gap: 0.3em; - font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif; + font-family: "tttgbnumber", "HYWenHei-55W", system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif; font-weight: 500; font-size: 0.9em; } @@ -114,7 +114,7 @@ } .card .part .list .item .desc { font-size: 1em; - font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif; + font-family: "tttgbnumber", "HYWenHei-55W", system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Open Sans", "Helvetica Neue", sans-serif; font-size: 0.8em; color: rgb(225, 225, 225); } diff --git a/resources/help/index.scss b/resources/help/index.scss index fe77126..340b983 100644 --- a/resources/help/index.scss +++ b/resources/help/index.scss @@ -91,9 +91,9 @@ display: flex; flex-wrap: wrap; gap: 0.3em; - font-family: system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', - Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', - sans-serif; + font-family: 'tttgbnumber', 'HYWenHei-55W', system-ui, -apple-system, + BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, + 'Open Sans', 'Helvetica Neue', sans-serif; font-weight: 500; font-size: 0.9em; .command { @@ -118,9 +118,9 @@ } .desc { font-size: 1em; - font-family: system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', - Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', - sans-serif; + font-family: 'tttgbnumber', 'HYWenHei-55W', system-ui, -apple-system, + BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, + 'Open Sans', 'Helvetica Neue', sans-serif; font-size: 0.8em; color: rgb(225, 225, 225); }