Skip to content

Commit f78da81

Browse files
committed
feat(DateInput): update calendar icon to use 'calendar-month-outline' and adjust related styles
1 parent 5b39a55 commit f78da81

6 files changed

Lines changed: 20 additions & 11 deletions

File tree

packages/varlet-ui/src/date-input/DateInput.vue

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,9 @@
4848

4949
<template #append-icon>
5050
<slot name="append-icon">
51-
<var-icon :class="n('calendar-icon')" name="calendar" />
51+
<span :class="n('calendar-icon-container')">
52+
<var-icon :class="n('calendar-icon')" name="calendar-month-outline" />
53+
</span>
5254
</slot>
5355
</template>
5456

packages/varlet-ui/src/date-input/__tests__/index.spec.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -398,6 +398,7 @@ describe('test dateInput input behavior', () => {
398398
})
399399

400400
expect(wrapper.find('.var-date-input__calendar-icon').exists()).toBe(false)
401+
expect(wrapper.find('.var-date-input__calendar-icon-container').exists()).toBe(false)
401402
expect(wrapper.find('.custom-append-icon').exists()).toBe(true)
402403

403404
wrapper.unmount()

packages/varlet-ui/src/date-input/date-input.less

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,16 @@
2626
}
2727
}
2828

29-
&__calendar-icon {
29+
&__calendar-icon-container {
30+
display: inline-flex;
31+
align-items: center;
3032
margin-left: 6px;
3133
}
3234

35+
&__calendar-icon {
36+
font-size: var(--field-decorator-icon-size);
37+
}
38+
3339
&__clear-icon-container {
3440
display: inline-flex;
3541
align-items: center;

packages/varlet-ui/src/date-input/docs/en-US.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ const allowedDates = (date) => Number(date.split('-')[2]) % 2 === 1
5555
/>
5656
<var-date-input v-model="standardValue9" placeholder="Display Icon">
5757
<template #prepend-icon>
58-
<var-icon class="prepend-icon" name="calendar" />
58+
<var-icon class="prepend-icon" name="calendar-month-outline" />
5959
</template>
6060
<template #append-icon>
6161
<var-icon class="append-icon" name="heart-outline" />
@@ -157,7 +157,7 @@ const allowedTimes = () => ({
157157
/>
158158
<var-date-input v-model="outlinedValue9" variant="outlined" placeholder="Display Icon">
159159
<template #prepend-icon>
160-
<var-icon class="prepend-icon" name="calendar" />
160+
<var-icon class="prepend-icon" name="calendar-month-outline" />
161161
</template>
162162
<template #append-icon>
163163
<var-icon class="append-icon" name="heart-outline" />
@@ -286,7 +286,7 @@ const allowedDates = (date) => Number(date.split('-')[2]) % 2 === 1
286286
/>
287287
<var-date-input v-model="filledValue9" variant="filled" placeholder="Display Icon">
288288
<template #prepend-icon>
289-
<var-icon class="prepend-icon" name="calendar" />
289+
<var-icon class="prepend-icon" name="calendar-month-outline" />
290290
</template>
291291
<template #append-icon>
292292
<var-icon class="append-icon" name="heart-outline" />

packages/varlet-ui/src/date-input/docs/zh-CN.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ const allowedDates = (date) => Number(date.split('-')[2]) % 2 === 1
5555
/>
5656
<var-date-input v-model="standardValue9" placeholder="显示图标">
5757
<template #prepend-icon>
58-
<var-icon class="prepend-icon" name="calendar" />
58+
<var-icon class="prepend-icon" name="calendar-month-outline" />
5959
</template>
6060
<template #append-icon>
6161
<var-icon class="append-icon" name="heart-outline" />
@@ -157,7 +157,7 @@ const allowedTimes = () => ({
157157
/>
158158
<var-date-input v-model="outlinedValue9" variant="outlined" placeholder="显示图标">
159159
<template #prepend-icon>
160-
<var-icon class="prepend-icon" name="calendar" />
160+
<var-icon class="prepend-icon" name="calendar-month-outline" />
161161
</template>
162162
<template #append-icon>
163163
<var-icon class="append-icon" name="heart-outline" />
@@ -286,7 +286,7 @@ const allowedDates = (date) => Number(date.split('-')[2]) % 2 === 1
286286
/>
287287
<var-date-input v-model="filledValue9" variant="filled" placeholder="显示图标">
288288
<template #prepend-icon>
289-
<var-icon class="prepend-icon" name="calendar" />
289+
<var-icon class="prepend-icon" name="calendar-month-outline" />
290290
</template>
291291
<template #append-icon>
292292
<var-icon class="append-icon" name="heart-outline" />

packages/varlet-ui/src/date-input/example/index.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ onThemeChange()
103103
/>
104104
<var-date-input v-model="standardValue9" :placeholder="t('displayIcon')">
105105
<template #prepend-icon>
106-
<var-icon class="prepend-icon" name="calendar" />
106+
<var-icon class="prepend-icon" name="calendar-month-outline" />
107107
</template>
108108
<template #append-icon>
109109
<var-icon class="append-icon" name="heart-outline" />
@@ -150,7 +150,7 @@ onThemeChange()
150150
/>
151151
<var-date-input v-model="outlinedValue9" variant="outlined" :placeholder="t('displayIcon')">
152152
<template #prepend-icon>
153-
<var-icon class="prepend-icon" name="calendar" />
153+
<var-icon class="prepend-icon" name="calendar-month-outline" />
154154
</template>
155155
<template #append-icon>
156156
<var-icon class="append-icon" name="heart-outline" />
@@ -251,7 +251,7 @@ onThemeChange()
251251
/>
252252
<var-date-input v-model="filledValue9" variant="filled" :placeholder="t('displayIcon')">
253253
<template #prepend-icon>
254-
<var-icon class="prepend-icon" name="calendar" />
254+
<var-icon class="prepend-icon" name="calendar-month-outline" />
255255
</template>
256256
<template #append-icon>
257257
<var-icon class="append-icon" name="heart-outline" />

0 commit comments

Comments
 (0)