diff --git a/src/assets/font/HarmonyOS_Sans_SC_Light.ttf b/src/assets/font/HarmonyOS_Sans_SC_Black.ttf similarity index 52% rename from src/assets/font/HarmonyOS_Sans_SC_Light.ttf rename to src/assets/font/HarmonyOS_Sans_SC_Black.ttf index 8cfbc9d..824b3d4 100644 Binary files a/src/assets/font/HarmonyOS_Sans_SC_Light.ttf and b/src/assets/font/HarmonyOS_Sans_SC_Black.ttf differ diff --git a/src/assets/font/Montserrat-Bold.ttf b/src/assets/font/Montserrat-Bold.ttf new file mode 100644 index 0000000..9a425b9 Binary files /dev/null and b/src/assets/font/Montserrat-Bold.ttf differ diff --git a/src/assets/font/Montserrat-Regular.ttf b/src/assets/font/Montserrat-Regular.ttf new file mode 100644 index 0000000..2a2b2aa Binary files /dev/null and b/src/assets/font/Montserrat-Regular.ttf differ diff --git a/src/assets/scss/base.scss b/src/assets/scss/base.scss index ee381ca..06cef66 100644 --- a/src/assets/scss/base.scss +++ b/src/assets/scss/base.scss @@ -6,5 +6,5 @@ html { user-select: none; -webkit-tap-highlight-color: transparent; touch-action: none; - font-family: 'font_light'; -} \ No newline at end of file + font-family: 'HarmonyOS Sans SC'; +} diff --git a/src/assets/scss/font.scss b/src/assets/scss/font.scss index 7134fce..1d6791d 100644 --- a/src/assets/scss/font.scss +++ b/src/assets/scss/font.scss @@ -1,21 +1,34 @@ @font-face { - font-family: 'font_light'; - src: url('@/assets/font/HarmonyOS_Sans_SC_Light.ttf'); -} - -@font-face { - font-family: 'font_regular'; + font-family: 'HarmonyOS Sans SC'; src: url('@/assets/font/HarmonyOS_Sans_SC_Regular.ttf'); + font-weight: 400; } @font-face { - font-family: 'font_medium'; + font-family: 'HarmonyOS Sans SC'; src: url('@/assets/font/HarmonyOS_Sans_SC_Medium.ttf'); + font-weight: 500; } @font-face { - font-family: 'font_bold'; + font-family: 'HarmonyOS Sans SC'; src: url('@/assets/font/HarmonyOS_Sans_SC_Bold.ttf'); + font-weight: 700; } +@font-face { + font-family: 'HarmonyOS Sans SC'; + src: url('@/assets/font/HarmonyOS_Sans_SC_Black.ttf'); + font-weight: 900; +} +@font-face { + font-family: 'Montserrat'; + src: url('@/assets/font/Montserrat-Regular.ttf'); + font-weight: normal; +} +@font-face { + font-family: 'Montserrat'; + src: url('@/assets/font/Montserrat-Bold.ttf'); + font-weight: bold; +} diff --git a/src/base/Go/Go.vue b/src/base/Go/Go.vue index 52eb3bd..7b8692b 100644 --- a/src/base/Go/Go.vue +++ b/src/base/Go/Go.vue @@ -29,7 +29,7 @@ function go() { .text { font-weight: 700; font-size: 20px; - font-family: 'font_bold'; + text-align: justify; color: #ffffff; } diff --git a/src/base/QRCode/QRCode.vue b/src/base/QRCode/QRCode.vue index 6d56892..00e00d5 100644 --- a/src/base/QRCode/QRCode.vue +++ b/src/base/QRCode/QRCode.vue @@ -43,7 +43,7 @@ function close() { } .text { font-weight: 700; - font-family: 'font_bold'; + font-size: 20px; line-height: 23px; text-align: center; diff --git a/src/base/Temperature/Temperature.vue b/src/base/Temperature/Temperature.vue index d394e89..5556824 100644 --- a/src/base/Temperature/Temperature.vue +++ b/src/base/Temperature/Temperature.vue @@ -31,7 +31,6 @@ const { weather, icon } = useWeather() color: var(--weather-iconColor); font-size: 36px; font-weight: bolder; - font-family: 'font_bold'; } .temperature { font-family: 'Montserrat'; diff --git a/src/views/Nav/children/PassShop.vue b/src/views/Nav/children/PassShop.vue index b0e57f1..8c3c42c 100644 --- a/src/views/Nav/children/PassShop.vue +++ b/src/views/Nav/children/PassShop.vue @@ -146,7 +146,7 @@ defineProps({ } .floor { font-weight: 700; - font-family: 'font_bold'; + font-size: 48px; line-height: 56px; color: rgba(0, 0, 0, 0.6); @@ -166,7 +166,7 @@ defineProps({ font-weight: 700; font-size: 12px; line-height: 14px; - font-family: 'font_bold'; + color: rgba(0, 0, 0, 0.4); } .thumb-arrow { @@ -206,7 +206,7 @@ defineProps({ } .name { font-weight: 700; - font-family: 'font_bold'; + font-size: 12px; line-height: 14px; color: rgba(0, 0, 0, 0.6); @@ -337,7 +337,7 @@ defineProps({ font-weight: 700; font-size: 12px; line-height: 14px; - font-family: 'font_bold'; + color: rgba(0, 0, 0, 0.6); } } diff --git a/src/views/Nav/children/QRCode.vue b/src/views/Nav/children/QRCode.vue index ca7e1b3..c7a0bb9 100644 --- a/src/views/Nav/children/QRCode.vue +++ b/src/views/Nav/children/QRCode.vue @@ -30,7 +30,7 @@ defineProps({ } .tip { font-weight: 700; - font-family: 'font_bold'; + font-size: 14px; line-height: 16px; text-align: center;