Skip to content

Commit 12d9cbb

Browse files
authored
Merge pull request #161 from vue-zone/refactor/font-base-16
refactor: set default base font size
2 parents e8bfd0c + 7c75a97 commit 12d9cbb

File tree

12 files changed

+43
-45
lines changed

12 files changed

+43
-45
lines changed

src/pages/[...all].vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ function onBack() {
1414
<van-icon name="warn-o" size="3em" />
1515
<div> Not found </div>
1616

17-
<div class="mt-10">
17+
<div class="mt-2">
1818
<button van-haptics-feedback class="btn" @click="onBack">
1919
Back
2020
</button>

src/pages/counter/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const { counter } = storeToRefs(counterStore)
77
</script>
88

99
<template>
10-
<div class="text-14 space-y-10">
10+
<div class="text-sm space-y-2">
1111
<p> {{ $t('counter.description') }}</p>
1212
<van-stepper v-model="counter" />
1313
</div>

src/pages/forgot-password/index.vue

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,9 @@ async function getCode() {
7373
</script>
7474

7575
<template>
76-
<div class="m-x-a text-center w-7xl">
76+
<div class="mx-auto p-3 text-center w-full">
7777
<van-form :model="postData" :rules="rules" validate-trigger="onSubmit" @submit="reset">
78-
<div class="rounded-3xl overflow-hidden">
78+
<div class="rounded-md overflow-hidden">
7979
<van-field
8080
v-model.trim="postData.email"
8181
:rules="rules.email"
@@ -84,7 +84,7 @@ async function getCode() {
8484
/>
8585
</div>
8686

87-
<div class="mt-16 rounded-3xl overflow-hidden">
87+
<div class="mt-4 rounded-md overflow-hidden">
8888
<van-field
8989
v-model.trim="postData.code"
9090
:rules="rules.code"
@@ -99,7 +99,7 @@ async function getCode() {
9999
</van-field>
100100
</div>
101101

102-
<div class="mt-16 rounded-3xl overflow-hidden">
102+
<div class="mt-4 rounded-md overflow-hidden">
103103
<van-field
104104
v-model.trim="postData.password"
105105
type="password"
@@ -109,7 +109,7 @@ async function getCode() {
109109
/>
110110
</div>
111111

112-
<div class="mt-16 rounded-3xl overflow-hidden">
112+
<div class="mt-4 rounded-md overflow-hidden">
113113
<van-field
114114
v-model.trim="postData.confirmPassword"
115115
type="password"
@@ -119,7 +119,7 @@ async function getCode() {
119119
/>
120120
</div>
121121

122-
<div class="mt-16">
122+
<div class="mt-4">
123123
<van-button
124124
:loading="loading"
125125
type="primary"

src/pages/keepalive/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const value = ref(0)
77
</script>
88

99
<template>
10-
<div class="text-14 space-y-10">
10+
<div class="text-sm space-y-2">
1111
<p>{{ $t('keepAlive.label') }}</p>
1212
<van-stepper v-model="value" />
1313
</div>

src/pages/login/index.vue

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,13 @@ async function login(values: any) {
5454
</script>
5555

5656
<template>
57-
<div class="m-x-a text-center w-7xl">
58-
<div class="mb-32 mt-20">
59-
<van-image :src="dark ? logoDark : logo" class="h-120 w-120" alt="brand logo" />
57+
<div class="mx-auto p-3 text-center w-full">
58+
<div class="mb-8 mt-2">
59+
<van-image :src="dark ? logoDark : logo" class="h-30 w-30" alt="brand logo" />
6060
</div>
6161

6262
<van-form :model="postData" :rules="rules" validate-trigger="onSubmit" @submit="login">
63-
<div class="rounded-3xl overflow-hidden">
63+
<div class="rounded-md overflow-hidden">
6464
<van-field
6565
v-model="postData.email"
6666
:rules="rules.email"
@@ -69,7 +69,7 @@ async function login(values: any) {
6969
/>
7070
</div>
7171

72-
<div class="mt-16 rounded-3xl overflow-hidden">
72+
<div class="mt-4 rounded-md overflow-hidden">
7373
<van-field
7474
v-model="postData.password"
7575
type="password"
@@ -79,7 +79,7 @@ async function login(values: any) {
7979
/>
8080
</div>
8181

82-
<div class="mt-16">
82+
<div class="mt-4">
8383
<van-button
8484
:loading="loading"
8585
type="primary"
@@ -95,7 +95,7 @@ async function login(values: any) {
9595
{{ $t('login.signUp') }}
9696
</GhostButton>
9797

98-
<GhostButton block to="forgot-password">
98+
<GhostButton block to="forgot-password" class="mt-2">
9999
{{ $t('login.forgotPassword') }}
100100
</GhostButton>
101101
</div>

src/pages/mock/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ function pull() {
2323
<VanEmpty v-else :description="$t('mock.noData')" />
2424
</div>
2525

26-
<van-space class="m-10" direction="vertical" fill>
26+
<van-space class="m-2" direction="vertical" fill>
2727
<VanButton type="primary" round block @click="pull">
2828
{{ $t('mock.pull') }}
2929
</VanButton>

src/pages/profile/index.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ function login() {
2020
<VanCellGroup :inset="true">
2121
<van-cell center :is-link="!isLogin" @click="login">
2222
<template #title>
23-
<van-image :src="userInfo.avatar || defaultAvatar" round class="h-56 w-56" />
23+
<van-image :src="userInfo.avatar || defaultAvatar" round class="h-14 w-14" />
2424
</template>
2525

2626
<template #value>
@@ -30,15 +30,15 @@ function login() {
3030
</van-cell>
3131
</VanCellGroup>
3232

33-
<VanCellGroup :inset="true" class="!mt-16">
33+
<VanCellGroup :inset="true" class="!mt-4">
3434
<van-cell :title="$t('profile.settings')" icon="setting-o" is-link to="/settings">
3535
<template #icon>
36-
<div class="i-carbon:settings text-gray-400 mr-5 self-center" />
36+
<div class="i-carbon:settings text-gray-400 mr-2 self-center" />
3737
</template>
3838
</van-cell>
3939
<van-cell :title="$t('profile.docs')" is-link url="https://vue-zone.github.io/docs/vue3-vant-mobile/">
4040
<template #icon>
41-
<div class="i-carbon:doc text-gray-400 mr-5 self-center" />
41+
<div class="i-carbon:doc text-gray-400 mr-2 self-center" />
4242
</template>
4343
</van-cell>
4444
</VanCellGroup>

src/pages/register/index.vue

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,9 @@ async function getCode() {
7777
</script>
7878

7979
<template>
80-
<div class="m-x-a text-center w-7xl">
80+
<div class="mx-auto p-3 text-center w-full">
8181
<van-form :model="postData" :rules="rules" validate-trigger="onSubmit" @submit="register">
82-
<div class="rounded-3xl overflow-hidden">
82+
<div class="rounded-md overflow-hidden">
8383
<van-field
8484
v-model.trim="postData.email"
8585
:rules="rules.email"
@@ -88,7 +88,7 @@ async function getCode() {
8888
/>
8989
</div>
9090

91-
<div class="mt-16 rounded-3xl overflow-hidden">
91+
<div class="mt-4 rounded-md overflow-hidden">
9292
<van-field
9393
v-model.trim="postData.code"
9494
:rules="rules.code"
@@ -103,7 +103,7 @@ async function getCode() {
103103
</van-field>
104104
</div>
105105

106-
<div class="mt-16 rounded-3xl overflow-hidden">
106+
<div class="mt-4 rounded-md overflow-hidden">
107107
<van-field
108108
v-model.trim="postData.nickname"
109109
:rules="rules.nickname"
@@ -112,7 +112,7 @@ async function getCode() {
112112
/>
113113
</div>
114114

115-
<div class="mt-16 rounded-3xl overflow-hidden">
115+
<div class="mt-4 rounded-md overflow-hidden">
116116
<van-field
117117
v-model.trim="postData.password"
118118
type="password"
@@ -122,7 +122,7 @@ async function getCode() {
122122
/>
123123
</div>
124124

125-
<div class="mt-16 rounded-3xl overflow-hidden">
125+
<div class="mt-4 rounded-md overflow-hidden">
126126
<van-field
127127
v-model.trim="postData.confirmPassword"
128128
type="password"
@@ -132,7 +132,7 @@ async function getCode() {
132132
/>
133133
</div>
134134

135-
<div class="mt-16">
135+
<div class="mt-4">
136136
<van-button
137137
:loading="loading"
138138
type="primary"

src/pages/scroll-cache/index.vue

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,24 +43,24 @@ onBeforeRouteLeave(() => {
4343
:loading-text="$t('scrollCache.loading')"
4444
@load="onLoad"
4545
>
46-
<ul class="space-y-10">
47-
<li v-for="item in list" :key="item" class="p-3 flex gap-12">
46+
<ul class="space-y-2">
47+
<li v-for="item in list" :key="item" class="p-1 flex gap-3">
4848
<div class="shrink-0">
49-
<div class="rounded-full bg-gray-500/20 flex h-48 w-48 items-center justify-center overflow-hidden">
50-
<span class="text-[16px] text-zinc-600 tabular-nums dark:text-zinc-400"> {{ item }} </span>
49+
<div class="rounded-full bg-gray-500/20 flex h-12 w-12 items-center justify-center overflow-hidden">
50+
<span class="text-base text-zinc-600 tabular-nums dark:text-zinc-400"> {{ item }} </span>
5151
</div>
5252
</div>
5353

5454
<div class="flex-1 min-w-0">
55-
<div class="mb-2 flex flex-row gap-1 w-full justify-between">
56-
<h3 class="text-[16px] text-zinc-600 tracking-tight font-semibold w-1/2 dark:text-white">
55+
<div class="flex flex-row gap-2 w-full justify-between">
56+
<h3 class="text-base text-zinc-600 tracking-tight font-semibold w-1/2 dark:text-white">
5757
<van-text-ellipsis :content="`${$t('scrollCache.sectionTitle')}`" />
5858
</h3>
5959

60-
<time class="text-[12px] text-zinc-400 tabular-nums">2025-05-16</time>
60+
<time class="text-xs text-zinc-400 tabular-nums">2025-05-16</time>
6161
</div>
6262

63-
<p class="text-[14px] text-zinc-500">
63+
<p class="text-sm text-zinc-500">
6464
<van-text-ellipsis :rows="2" :content="$t('scrollCache.sectionText')" />
6565
</p>
6666
</div>

src/pages/settings/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ function Logout() {
2626
<van-cell v-if="userInfo.uid" :title="$t('settings.logout')" clickable class="van-text-color" @click="Logout" />
2727
</VanCellGroup>
2828

29-
<div class="text-gray mt-10">
29+
<div class="text-gray mt-2">
3030
{{ $t("settings.currentVersion") }}: v{{ version }}
3131
</div>
3232
</div>

0 commit comments

Comments
 (0)