Skip to content

Commit 89601b5

Browse files
committed
update style
1 parent 18005cc commit 89601b5

File tree

8 files changed

+44
-57
lines changed

8 files changed

+44
-57
lines changed

components/button/style/mixin.less

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
&:focus,
1717
&:active,
1818
&.active {
19-
.button-color(@color; @background; @border);
19+
.button-color(@btn-disable-color; @btn-disable-bg; @btn-disable-border);
2020
text-shadow: none;
2121
box-shadow: none;
2222
}
@@ -89,21 +89,11 @@
8989
text-shadow: none;
9090
&:hover,
9191
&:focus {
92-
& when (@border = transparent) {
93-
.button-color(~`colorPalette('@{color}', 5) `; transparent; transparent);
94-
}
95-
& when not(@border = transparent) {
96-
.button-color(~`colorPalette('@{color}', 5) `; transparent; ~`colorPalette('@{color}', 5) `);
97-
}
92+
.button-color(~`colorPalette('@{color}', 5) `; transparent; ~`colorPalette('@{color}', 5) `);
9893
}
9994
&:active,
10095
&.active {
101-
& when (@border = transparent) {
102-
.button-color(~`colorPalette('@{color}', 7) `; transparent; transparent);
103-
}
104-
& when not(@border = transparent) {
105-
.button-color(~`colorPalette('@{color}', 7) `; transparent; ~`colorPalette('@{color}', 7) `);
106-
}
96+
.button-color(~`colorPalette('@{color}', 7) `; transparent; ~`colorPalette('@{color}', 7) `);
10797
}
10898
.button-disabled();
10999
}

components/drawer/style/index.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
import '../../style/index.less';
22
import './index.less';
3+
4+
// style dependencies
5+
import '../../button/style';

components/input/style/index.less

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -32,33 +32,11 @@
3232
}
3333

3434
.@{ant-prefix}-input-password-icon {
35-
color: @text-color-secondary;
3635
cursor: pointer;
3736
transition: all 0.3s;
38-
3937
&:hover {
4038
color: #333;
4139
}
4240
}
4341

44-
.@{ant-prefix}-input-clear-icon {
45-
color: @disabled-color;
46-
font-size: @font-size-sm;
47-
vertical-align: top;
48-
cursor: pointer;
49-
transition: color 0.3s;
50-
51-
&:hover {
52-
color: @text-color-secondary;
53-
}
54-
55-
&:active {
56-
color: @text-color;
57-
}
58-
59-
+ i {
60-
margin-left: 6px;
61-
}
62-
}
63-
6442
@import './search-input';

components/modal/style/confirm.less

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@
77
display: none;
88
}
99

10+
.@{ant-prefix}-modal-close {
11+
display: none;
12+
}
13+
1014
.@{ant-prefix}-modal-body {
1115
padding: 32px 32px 24px;
1216
}

components/select/style/index.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,7 @@
556556
font-size: 12px;
557557
text-shadow: 0 0.1px 0, 0.1px 0 0, 0 -0.1px 0, -0.1px 0;
558558
transform: translateY(-50%);
559-
transition: all 0.2s;
559+
transition: all .2s;
560560
}
561561

562562
&:hover .@{select-prefix-cls}-selected-icon {

components/statistic/style/index.less

Lines changed: 28 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,34 @@
55

66
.@{statistic-prefix-cls} {
77
.reset-component;
8-
display: inline-block;
9-
white-space: nowrap;
10-
overflow: hidden;
11-
vertical-align: middle;
12-
13-
&-content-value,
14-
&-content-prefix {
15-
font-size: 1.7em;
16-
}
17-
&-content-value-decimal {
18-
font-size: 0.7em;
8+
9+
&-title {
10+
margin-bottom: 4px;
11+
font-size: @statistic-title-font-size;
1912
}
20-
&-content-suffix {
21-
font-size: 1.1em;
13+
14+
&-content {
15+
font-size: @statistic-content-font-size;
16+
font-family: @statistic-font-family;
17+
18+
&-value {
19+
&-decimal {
20+
font-size: @statistic-unit-font-size;
21+
}
22+
}
23+
24+
&-prefix,
25+
&-suffix {
26+
display: inline-block;
27+
}
28+
29+
&-prefix {
30+
margin-right: 4px;
31+
}
32+
33+
&-suffix {
34+
margin-left: 4px;
35+
font-size: @statistic-unit-font-size;
36+
}
2237
}
2338
}

components/style/themes/default.less

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@
3838
@body-background: #fff;
3939
// Base background color for most components
4040
@component-background: #fff;
41-
@font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'PingFang SC', 'Hiragino Sans GB',
42-
'Microsoft YaHei', 'Helvetica Neue', Helvetica, Arial, sans-serif, 'Apple Color Emoji',
43-
'Segoe UI Emoji', 'Segoe UI Symbol';
41+
@font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'PingFang SC',
42+
'Hiragino Sans GB', 'Microsoft YaHei', 'Helvetica Neue', Helvetica, Arial, sans-serif,
43+
'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';
4444
@code-family: 'SFMono-Regular', Consolas, 'Liberation Mono', Menlo, Courier, monospace;
4545
@heading-color: fade(@black, 85%);
4646
@text-color: fade(@black, 65%);

components/tree/style/index.less

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -164,11 +164,7 @@
164164
}
165165
}
166166
}
167-
ul > li {
168-
&:first-child {
169-
padding-top: 4px;
170-
}
171-
}
167+
172168
> li {
173169
&:first-child {
174170
padding-top: 7px;
@@ -182,6 +178,7 @@
182178
&-open {
183179
display: block;
184180
}
181+
185182
// https://github.com/ant-design/ant-design/issues/14958
186183
> li {
187184
// Provide additional padding between top child node and parent node

0 commit comments

Comments
 (0)