Skip to content

Commit e55672b

Browse files
committed
fix: fix cr
1 parent bbeafde commit e55672b

6 files changed

Lines changed: 21 additions & 25 deletions

File tree

style/mobile/components/calendar/_index.less

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,9 @@
1919
display: flex;
2020
align-items: center;
2121
justify-content: center;
22-
font-size: @calendar-title-font-size;
23-
font-weight: 600;
22+
font: @calendar-title-font;
2423
color: @calendar-title-color;
25-
height: 26px;
26-
padding: 16px;
24+
padding: @spacer-2;
2725

2826
&:focus {
2927
outline: 0;
@@ -32,10 +30,10 @@
3230

3331
&__close-btn {
3432
position: absolute;
35-
top: 16px;
36-
right: 16px;
37-
margin: -12px;
38-
padding: 12px;
33+
top: @spacer-2;
34+
right: @spacer-2;
35+
margin: calc(-1 * @spacer-1);
36+
padding: @spacer-1;
3937
color: @calendar-title-color;
4038
}
4139

@@ -93,9 +91,8 @@
9391
}
9492

9593
&__month {
96-
font-size: 14px;
94+
font: @font-title-small;
9795
color: @calendar-title-color;
98-
font-weight: 600;
9996
padding: 16px 0 0;
10097

10198
&s {

style/mobile/components/calendar/_var.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
@calendar-bg-color: var(--td-calendar-bg-color, @bg-color-container);
33
@calendar-active-color: var(--td-calendar-active-color, @brand-color);
44
@calendar-selected-color: var(--td-calendar-selected-color, @text-color-anti);
5-
@calendar-title-font-size: var(--td-calendar-title-font-size, 18px);
5+
@calendar-title-font: var(--td-calendar-title-font, @font-title-large);
66
@calendar-title-color: var(--td-calendar-title-color, @text-color-primary);
77
@calendar-dates-color: var(--td-calendar-dates-color, @text-color-primary);
88
@calendar-days-color: var(--td-calendar-days-color, @text-color-secondary);

style/mobile/components/color-picker/_index.less

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
outline: none;
2424
width: @color-picker-slider-thumb-size;
2525
height: @color-picker-slider-thumb-size;
26-
border-radius: @color-picker-border-radius-circle;
26+
border-radius: @radius-circle;
2727
box-shadow: @color-picker-thumbs-shadow;
2828
color: @text-color-brand;
2929
box-sizing: border-box;
@@ -32,7 +32,7 @@
3232
&::after {
3333
content: "";
3434
position: absolute;
35-
border-radius: @color-picker-border-radius-circle;
35+
border-radius: @radius-circle;
3636
box-sizing: border-box;
3737
display: block;
3838
border: 1px solid @component-border;
@@ -86,7 +86,7 @@
8686
.@{color-picker}__thumb {
8787
width: @color-picker-saturation-thumb-size;
8888
height: @color-picker-saturation-thumb-size;
89-
border-radius: @color-picker-border-radius-circle;
89+
border-radius: @radius-circle;
9090
transform: translate(-50%, -50%);
9191
}
9292
}

style/mobile/components/color-picker/_var.less

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
@color-picker-swatch-active: var(--td-color-picker-swatch-active, rgba(0, 0, 0, 20%));
2828

2929
@color-picker-thumbs-shadow: @shadow-1;
30-
@color-picker-border-radius-circle: var(--td-color-picker-border-radius-circle, @radius-circle);
3130
@color-picker-format-background-color: var(--td-color-picker-format-background-color, @gray-color-1);
3231

3332
@color-picker: ~"@{prefix}-color-picker";

style/mobile/components/dropdown-menu/_index.less

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@
55
.@{dropdownMenu} {
66
position: relative;
77
display: flex;
8-
height: 48px;
9-
background: @dropdown-menu-bg-color;
8+
background: @dropdown-menu-background;
109
.border(bottom);
1110

1211
&__item {
1312
display: flex;
1413
flex: 1;
1514
align-items: center;
1615
justify-content: center;
17-
padding: 0 @spacer;
16+
padding: @spacer-1 @spacer;
17+
box-sizing: border-box;
1818
position: relative;
1919
overflow: hidden;
2020
color: @dropdown-menu-color;
@@ -45,6 +45,6 @@
4545
overflow: hidden;
4646
text-overflow: ellipsis;
4747
white-space: nowrap;
48-
font-size: @dropdown-menu-font-size;
48+
font: @dropdown-menu-font;
4949
}
5050
}
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
@dropdown-menu-bg-color: var(--td-dropdown-menu-bg-colorm, @bg-color-container);
2-
@dropdown-menu-color: var(--td-dropdown-menu-colorm, @text-color-primary);
3-
@dropdown-menu-active-color: var(--td-dropdown-menu-active-colorm, @brand-color);
4-
@dropdown-menu-disabled-color: var(--td-dropdown-menu-disabled-colorm, @text-color-disabled);
5-
@dropdown-menu-font-size: var(--td-dropdown-menu-font-sizem, 14px);
6-
@dropdown-menu-icon-size: var(--td-dropdown-menu-icon-sizem, 24px);
1+
@dropdown-menu-background: var(--td-dropdown-menu-background, @bg-color-container);
2+
@dropdown-menu-color: var(--td-dropdown-menu-color, @text-color-primary);
3+
@dropdown-menu-active-color: var(--td-dropdown-menu-active-color, @brand-color);
4+
@dropdown-menu-disabled-color: var(--td-dropdown-menu-disabled-color, @text-color-disabled);
5+
@dropdown-menu-font: var(--td-dropdown-menu-font, @font-body-medium);
6+
@dropdown-menu-icon-size: var(--td-dropdown-menu-icon-size, 24px);
77

88
@dropdownMenu: ~"@{prefix}-dropdown-menu";

0 commit comments

Comments
 (0)