update style

pull/1150/head
tangjinzhou 2019-08-26 21:11:46 +08:00
parent 18005cc97c
commit 89601b5b8c
8 changed files with 43 additions and 56 deletions

View File

@ -16,7 +16,7 @@
&:focus, &:focus,
&:active, &:active,
&.active { &.active {
.button-color(@color; @background; @border); .button-color(@btn-disable-color; @btn-disable-bg; @btn-disable-border);
text-shadow: none; text-shadow: none;
box-shadow: none; box-shadow: none;
} }
@ -89,22 +89,12 @@
text-shadow: none; text-shadow: none;
&:hover, &:hover,
&:focus { &:focus {
& when (@border = transparent) {
.button-color(~`colorPalette('@{color}', 5) `; transparent; transparent);
}
& when not(@border = transparent) {
.button-color(~`colorPalette('@{color}', 5) `; transparent; ~`colorPalette('@{color}', 5) `); .button-color(~`colorPalette('@{color}', 5) `; transparent; ~`colorPalette('@{color}', 5) `);
} }
}
&:active, &:active,
&.active { &.active {
& when (@border = transparent) {
.button-color(~`colorPalette('@{color}', 7) `; transparent; transparent);
}
& when not(@border = transparent) {
.button-color(~`colorPalette('@{color}', 7) `; transparent; ~`colorPalette('@{color}', 7) `); .button-color(~`colorPalette('@{color}', 7) `; transparent; ~`colorPalette('@{color}', 7) `);
} }
}
.button-disabled(); .button-disabled();
} }
.button-color(@color; @background; @border) { .button-color(@color; @background; @border) {

View File

@ -1,2 +1,5 @@
import '../../style/index.less'; import '../../style/index.less';
import './index.less'; import './index.less';
// style dependencies
import '../../button/style';

View File

@ -32,33 +32,11 @@
} }
.@{ant-prefix}-input-password-icon { .@{ant-prefix}-input-password-icon {
color: @text-color-secondary;
cursor: pointer; cursor: pointer;
transition: all 0.3s; transition: all 0.3s;
&:hover { &:hover {
color: #333; color: #333;
} }
} }
.@{ant-prefix}-input-clear-icon {
color: @disabled-color;
font-size: @font-size-sm;
vertical-align: top;
cursor: pointer;
transition: color 0.3s;
&:hover {
color: @text-color-secondary;
}
&:active {
color: @text-color;
}
+ i {
margin-left: 6px;
}
}
@import './search-input'; @import './search-input';

View File

@ -7,6 +7,10 @@
display: none; display: none;
} }
.@{ant-prefix}-modal-close {
display: none;
}
.@{ant-prefix}-modal-body { .@{ant-prefix}-modal-body {
padding: 32px 32px 24px; padding: 32px 32px 24px;
} }

View File

@ -556,7 +556,7 @@
font-size: 12px; font-size: 12px;
text-shadow: 0 0.1px 0, 0.1px 0 0, 0 -0.1px 0, -0.1px 0; text-shadow: 0 0.1px 0, 0.1px 0 0, 0 -0.1px 0, -0.1px 0;
transform: translateY(-50%); transform: translateY(-50%);
transition: all 0.2s; transition: all .2s;
} }
&:hover .@{select-prefix-cls}-selected-icon { &:hover .@{select-prefix-cls}-selected-icon {

View File

@ -5,19 +5,34 @@
.@{statistic-prefix-cls} { .@{statistic-prefix-cls} {
.reset-component; .reset-component;
display: inline-block;
white-space: nowrap;
overflow: hidden;
vertical-align: middle;
&-content-value, &-title {
&-content-prefix { margin-bottom: 4px;
font-size: 1.7em; font-size: @statistic-title-font-size;
} }
&-content-value-decimal {
font-size: 0.7em; &-content {
font-size: @statistic-content-font-size;
font-family: @statistic-font-family;
&-value {
&-decimal {
font-size: @statistic-unit-font-size;
}
}
&-prefix,
&-suffix {
display: inline-block;
}
&-prefix {
margin-right: 4px;
}
&-suffix {
margin-left: 4px;
font-size: @statistic-unit-font-size;
} }
&-content-suffix {
font-size: 1.1em;
} }
} }

View File

@ -38,9 +38,9 @@
@body-background: #fff; @body-background: #fff;
// Base background color for most components // Base background color for most components
@component-background: #fff; @component-background: #fff;
@font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'PingFang SC', 'Hiragino Sans GB', @font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'PingFang SC',
'Microsoft YaHei', 'Helvetica Neue', Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Hiragino Sans GB', 'Microsoft YaHei', 'Helvetica Neue', Helvetica, Arial, sans-serif,
'Segoe UI Emoji', 'Segoe UI Symbol'; 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';
@code-family: 'SFMono-Regular', Consolas, 'Liberation Mono', Menlo, Courier, monospace; @code-family: 'SFMono-Regular', Consolas, 'Liberation Mono', Menlo, Courier, monospace;
@heading-color: fade(@black, 85%); @heading-color: fade(@black, 85%);
@text-color: fade(@black, 65%); @text-color: fade(@black, 65%);

View File

@ -164,11 +164,7 @@
} }
} }
} }
ul > li {
&:first-child {
padding-top: 4px;
}
}
> li { > li {
&:first-child { &:first-child {
padding-top: 7px; padding-top: 7px;
@ -182,6 +178,7 @@
&-open { &-open {
display: block; display: block;
} }
// https://github.com/ant-design/ant-design/issues/14958 // https://github.com/ant-design/ant-design/issues/14958
> li { > li {
// Provide additional padding between top child node and parent node // Provide additional padding between top child node and parent node