Skip to content

Commit 7ad2d03

Browse files
committed
feat(calendar-view): [calendar-view] Adapting to the SMB theme
1 parent f3c2250 commit 7ad2d03

File tree

4 files changed

+12
-13
lines changed

4 files changed

+12
-13
lines changed

packages/theme/src/calendar-view/index.less

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -670,23 +670,23 @@
670670
padding: 8px;
671671

672672
.title{
673-
font-size: var(--ti-calendar-view-tooltip-title-font-size);
673+
font-size: var(--ti-tooltip-title-font-size);
674674
padding: 0 6px;
675675
margin-bottom: 6px;
676676
border-left-width: 2px;
677677
border-left-color: #1890ff;
678+
font-weight: var(--ti-tooltip-title-font-weight);
678679
}
679680

680681
.date{
681682
margin-bottom: 6px;
682683
padding: 0 8px;
683-
color: #8d959e;
684-
font-weight: var(--ti-calendar-view-tooltip-title-font-weight);
684+
color: var(--ti-tooltip-date-color, #8d959e);
685685
}
686686

687687
.content{
688688
padding: 0 8px;
689-
color: var(--ti-calendar-view-tooltip-content-color);
689+
color: var(--ti-tooltip-content-color, #8d959e);
690690
}
691691
}
692692
}

packages/theme/src/calendar-view/smb-theme.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ export const tinyCalendarViewSmbTheme = {
1919
'ti-calendar-view-radio-active-inner-hover': 'var(--ti-common-color-bg-white-normal)',
2020
'ti-calendar-view-radio-button-inner': '#ebebeb',
2121
'ti-calendar-view-header-main-text-color': 'var(--ti-common-color-text-weaken)',
22-
'ti-calendar-view-tooltip-title-font-size': 'var(--ti-common-font-size-2)',
23-
'ti-calendar-view-tooltip-title-font-weight': 'var(--ti-common-font-weight-bold)',
24-
'ti-calendar-view-tooltip-content-color': 'var(--ti-common-color-text-primary)',
25-
'ti-calendar-view-tooltip-date-color': 'var(--ti-common-color-text-secondary)',
22+
'ti-tooltip-title-font-size': 'var(--ti-common-font-size-2)',
23+
'ti-tooltip-title-font-weight': 'var(--ti-common-font-weight-bold)',
24+
'ti-tooltip-content-color': 'var(--ti-common-color-text-primary)',
25+
'ti-tooltip-date-color': 'var(--ti-common-color-text-secondary)',
2626
'ti-calendar-view-day-selected-border-radius': 'unset',
2727
'ti-calendar-view-day-selected-svg-right': 'unset',
2828
'ti-calendar-view-day-selected-svg-top': 'unset',

packages/theme/src/calendar-view/vars.less

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@
2727
--ti-calendar-view-day-selected-svg-right: -1px;
2828
--ti-calendar-view-day-selected-svg-top: -6px;
2929
// 提示
30-
--ti-calendar-view-tooltip-title-font-size: var(--ti-common-font-size-base);
31-
--ti-calendar-view-tooltip-title-font-weight: var(--ti-common-font-weight-5);
32-
--ti-calendar-view-tooltip-date-color: #8d959e;
33-
--ti-calendar-view-tooltip-content-color: #8d959e;
30+
--ti-tooltip-title-font-size: var(--ti-common-font-size-base);
31+
--ti-tooltip-title-font-weight: var(--ti-common-font-weight-5);
32+
--ti-tooltip-date-color: #8d959e;
33+
--ti-tooltip-content-color: #8d959e;
3434
// 箭头
3535
--ti-calendar-view-header-left-svg-fill: unset;
3636
--ti-calendar-view-header-right-svg-fill: unset;

packages/vue/src/calendar-view/src/pc.vue

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
<tiny-date-picker
99
v-model="state.currentDate"
1010
class="tiny-calendar-view__picker"
11-
shape="filter"
1211
type="month"
1312
:clearable="false"
1413
@change="currentDateChange"

0 commit comments

Comments
 (0)