Skip to content

Commit 2d47f95

Browse files
authored
refactor(time-spinner): [date-picker] roll back some styles for time-spinner (#2383)
* refactor(time-spinner): [date-picker] roll back some styles for time-spinner * feat(time-spinner): [date-picker] adapt to xdesign theme * refactor(time-panel): [date-picker,time-select] fallback style
1 parent 9712fec commit 2d47f95

File tree

4 files changed

+21
-20
lines changed

4 files changed

+21
-20
lines changed

packages/theme/src/time-panel/index.less

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,24 +38,20 @@
3838

3939
&__header-input {
4040
margin: var(--tv-TimePanel-header-margin);
41-
42-
input {
43-
height: 28px;
44-
}
4541
}
4642

4743
&__header-title {
4844
display: flex;
4945
justify-content: space-around;
5046
color: var(--tv-TimePanel-header-text-color);
51-
margin-top: 8px;
5247
align-items: center;
5348
}
5449

5550
&__content {
5651
font-size: 0;
5752
position: relative;
5853
overflow: hidden;
54+
padding-bottom: var(--tv-TimePanel-content-padding-bottom);
5955

6056
&:after,
6157
&:before {

packages/theme/src/time-panel/vars.less

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
// 面板外间距
1919
--tv-TimePanel-margin: var(--tv-space-sm, 4px) 0;
2020
// 面板内间距
21-
--tv-TimePanel-padding: 0 var(--tv-space-xl, 16px);
21+
--tv-TimePanel-padding: 0 14px;
2222
// 面板背景色
2323
--tv-TimePanel-bg-color: var(--tv-color-bg-secondary, #ffffff);
2424
// 面板圆角
@@ -29,9 +29,11 @@
2929
--tv-TimePanel-border-color-divider: var(--tv-color-border-divider, #f0f0f0);
3030

3131
// 头部外间距
32-
--tv-TimePanel-header-margin: var(--tv-space-lg, 12px) 0;
32+
--tv-TimePanel-header-margin: var(--tv-space-xl, 16px) 2px 24px 2px;
3333
// 头部文本色
3434
--tv-TimePanel-header-text-color: var(--tv-color-text-weaken, #808080);
35+
// 内容区底部内间距
36+
--tv-TimePanel-content-padding-bottom: var(--tv-space-lg, 12px);
3537

3638
// 按钮高度
3739
--tv-TimePanel-btn-height: var(--tv-size-height-sm, 28px);

packages/theme/src/time-spinner/index.less

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
}
3232

3333
.@{scrollbar-prefix-cls}__wrap:not(.@{scrollbar-prefix-cls}__wrap--hidden-default) {
34-
padding-bottom: 12px;
34+
padding-bottom: 15px;
3535
}
3636

3737
&.is-arrow {
@@ -43,10 +43,7 @@
4343
.@{time-spinner-prefix-cls}__list {
4444
&::after,
4545
&::before {
46-
content: '';
47-
display: block;
48-
width: 100%;
49-
height: 52px;
46+
transform: translateY(-32px);
5047
}
5148
}
5249

@@ -56,6 +53,11 @@
5653
}
5754
}
5855

56+
.@{time-spinner-prefix-cls}__list {
57+
transform: translateY(-6px);
58+
margin: var(--tv-TimeSpinner-list-margin);
59+
}
60+
5961
&:last-child {
6062
.@{time-spinner-prefix-cls}__list {
6163
border-right: 0;
@@ -64,7 +66,8 @@
6466
}
6567

6668
&__arrow {
67-
padding: var(--tv-TimeSpinner-arrow-padding);
69+
height: 30px;
70+
line-height: 30px;
6871
position: absolute;
6972
left: 0;
7073
width: 100%;
@@ -82,11 +85,11 @@
8285
}
8386

8487
&.@{css-prefix}icon-arrow-up {
85-
top: 12px;
88+
top: 10px;
8689
}
8790

8891
&.@{css-prefix}icon-arrow-down {
89-
bottom: 12px;
92+
bottom: 10px;
9093
}
9194

9295
&.@{input-prefix-cls} {
@@ -110,7 +113,7 @@
110113
content: '';
111114
display: block;
112115
width: 100%;
113-
height: 4px;
116+
height: 80px;
114117
}
115118
}
116119

@@ -122,6 +125,7 @@
122125
line-height: var(--tv-TimeSpinner-line-height);
123126
color: var(--tv-TimeSpinner-text-color);
124127
border-radius: var(--tv-TimeSpinner-item-border-radius);
128+
width: 52px;
125129

126130
&:hover:not(.disabled):not(.active) {
127131
background: var(--tv-TimeSpinner-item-bg-color-hover);

packages/theme/src/time-spinner/vars.less

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,10 @@
2929
// 图标尺寸
3030
--tv-TimeSpinner-icon-size: var(--tv-icon-size, 16px);
3131

32+
// 列表外间距
33+
--tv-TimeSpinner-list-margin: 10px 0 30px 0;
3234
// 时间项外间距
33-
--tv-TimeSpinner-item-margin: var(--tv-space-lg, 12px) var(--tv-space-md, 8px) 0 var(--tv-space-md, 8px);
35+
--tv-TimeSpinner-item-margin: var(--tv-space-lg, 12px) 10px 0 10px;
3436
// 时间项内间距
3537
--tv-TimeSpinner-item-padding: 3.5px 0;
3638
// 时间项圆角
@@ -41,7 +43,4 @@
4143
--tv-TimeSpinner-item-bg-color-active: var(--tv-color-bg-active-emphasize, #deecff);
4244
// 时间项背景色(禁用)
4345
--tv-TimeSpinner-item-bg-color-disabled: var(--tv-color-bg-disabled, #f0f0f0);
44-
45-
// 箭头内间距
46-
--tv-TimeSpinner-arrow-padding: calc((var(--tv-size-height-sm) - var(--tv-TimeSpinner-icon-size)) / 2) 0;
4746
}

0 commit comments

Comments
 (0)