Browse Source

feat: 字体调整

dev
jiannibang 3 years ago
parent
commit
22fefaeb0e
  1. BIN
      src/assets/font/HarmonyOS_Sans_SC_Black.ttf
  2. BIN
      src/assets/font/Montserrat-Bold.ttf
  3. BIN
      src/assets/font/Montserrat-Regular.ttf
  4. 2
      src/assets/scss/base.scss
  5. 29
      src/assets/scss/font.scss
  6. 2
      src/base/Go/Go.vue
  7. 2
      src/base/QRCode/QRCode.vue
  8. 1
      src/base/Temperature/Temperature.vue
  9. 8
      src/views/Nav/children/PassShop.vue
  10. 2
      src/views/Nav/children/QRCode.vue

BIN
src/assets/font/HarmonyOS_Sans_SC_Light.ttf → src/assets/font/HarmonyOS_Sans_SC_Black.ttf

Binary file not shown.

BIN
src/assets/font/Montserrat-Bold.ttf

Binary file not shown.

BIN
src/assets/font/Montserrat-Regular.ttf

Binary file not shown.

2
src/assets/scss/base.scss

@ -6,5 +6,5 @@ html {
user-select: none; user-select: none;
-webkit-tap-highlight-color: transparent; -webkit-tap-highlight-color: transparent;
touch-action: none; touch-action: none;
font-family: 'font_light';
font-family: 'HarmonyOS Sans SC';
} }

29
src/assets/scss/font.scss

@ -1,21 +1,34 @@
@font-face { @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'); src: url('@/assets/font/HarmonyOS_Sans_SC_Regular.ttf');
font-weight: 400;
} }
@font-face { @font-face {
font-family: 'font_medium';
font-family: 'HarmonyOS Sans SC';
src: url('@/assets/font/HarmonyOS_Sans_SC_Medium.ttf'); src: url('@/assets/font/HarmonyOS_Sans_SC_Medium.ttf');
font-weight: 500;
} }
@font-face { @font-face {
font-family: 'font_bold';
font-family: 'HarmonyOS Sans SC';
src: url('@/assets/font/HarmonyOS_Sans_SC_Bold.ttf'); 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;
}

2
src/base/Go/Go.vue

@ -29,7 +29,7 @@ function go() {
.text { .text {
font-weight: 700; font-weight: 700;
font-size: 20px; font-size: 20px;
font-family: 'font_bold';
text-align: justify; text-align: justify;
color: #ffffff; color: #ffffff;
} }

2
src/base/QRCode/QRCode.vue

@ -43,7 +43,7 @@ function close() {
} }
.text { .text {
font-weight: 700; font-weight: 700;
font-family: 'font_bold';
font-size: 20px; font-size: 20px;
line-height: 23px; line-height: 23px;
text-align: center; text-align: center;

1
src/base/Temperature/Temperature.vue

@ -31,7 +31,6 @@ const { weather, icon } = useWeather()
color: var(--weather-iconColor); color: var(--weather-iconColor);
font-size: 36px; font-size: 36px;
font-weight: bolder; font-weight: bolder;
font-family: 'font_bold';
} }
.temperature { .temperature {
font-family: 'Montserrat'; font-family: 'Montserrat';

8
src/views/Nav/children/PassShop.vue

@ -146,7 +146,7 @@ defineProps({
} }
.floor { .floor {
font-weight: 700; font-weight: 700;
font-family: 'font_bold';
font-size: 48px; font-size: 48px;
line-height: 56px; line-height: 56px;
color: rgba(0, 0, 0, 0.6); color: rgba(0, 0, 0, 0.6);
@ -166,7 +166,7 @@ defineProps({
font-weight: 700; font-weight: 700;
font-size: 12px; font-size: 12px;
line-height: 14px; line-height: 14px;
font-family: 'font_bold';
color: rgba(0, 0, 0, 0.4); color: rgba(0, 0, 0, 0.4);
} }
.thumb-arrow { .thumb-arrow {
@ -206,7 +206,7 @@ defineProps({
} }
.name { .name {
font-weight: 700; font-weight: 700;
font-family: 'font_bold';
font-size: 12px; font-size: 12px;
line-height: 14px; line-height: 14px;
color: rgba(0, 0, 0, 0.6); color: rgba(0, 0, 0, 0.6);
@ -337,7 +337,7 @@ defineProps({
font-weight: 700; font-weight: 700;
font-size: 12px; font-size: 12px;
line-height: 14px; line-height: 14px;
font-family: 'font_bold';
color: rgba(0, 0, 0, 0.6); color: rgba(0, 0, 0, 0.6);
} }
} }

2
src/views/Nav/children/QRCode.vue

@ -30,7 +30,7 @@ defineProps({
} }
.tip { .tip {
font-weight: 700; font-weight: 700;
font-family: 'font_bold';
font-size: 14px; font-size: 14px;
line-height: 16px; line-height: 16px;
text-align: center; text-align: center;

Loading…
Cancel
Save