Skip to content

Commit 894790c

Browse files
committed
refactor(button): 使用font简写替换font-size和font-family
1 parent 329f7e6 commit 894790c

2 files changed

Lines changed: 6 additions & 9 deletions

File tree

style/mobile/components/button/_index.less

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
@import './_var.less';
44

55
.button-size(@size) {
6-
@fontSize: 'button-@{size}-font-size';
6+
@font: 'button-@{size}-font';
77
@padding: 'button-@{size}-padding-horizontal';
88
@height: 'button-@{size}-height';
99
@iconSize: 'button-@{size}-icon-size';
1010

1111
.@{button}--size-@{size} {
12-
font-size: @@fontSize;
12+
font: @@font;
1313
padding-left: @@padding;
1414
padding-right: @@padding;
1515
height: @@height;
@@ -120,8 +120,6 @@
120120
transition: all 0.3s;
121121
border-radius: @button-border-radius;
122122
outline: none;
123-
font-family: @button-font-family;
124-
font-weight: @button-font-weight;
125123
vertical-align: top;
126124

127125
.cursor-pointer();

style/mobile/components/button/_var.less

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
@button-border-width: var(--td-button-border-width, 2px);
22
@button-border-radius: var(--td-button-border-radius, @radius-default);
33
@button-font-weight: var(--td-button-font-weight, 600);
4-
@button-font-family: var(--td-button-font-family, @font-family);
54

6-
@button-extra-small-font-size: var(--td-button-extra-small-font-size, @font-size-base);
7-
@button-small-font-size: var(--td-button-small-font-size, @font-size-base);
8-
@button-medium-font-size: var(--td-button-medium-font-size, @font-size-m);
9-
@button-large-font-size: var(--td-button-large-font-size, @font-size-m);
5+
@button-extra-small-font: var(--td-button-extra-small-font, @font-body-medium);
6+
@button-small-font: var(--td-button-small-font, @font-body-medium);
7+
@button-medium-font: var(--td-button-medium-font, @font-body-large);
8+
@button-large-font: var(--td-button-large-font, @font-body-large);
109

1110
@button-extra-small-height: var(--td-button-extra-small-height, 28px);
1211
@button-small-height: var(--td-button-small-height, 32px);

0 commit comments

Comments
 (0)