diff --git a/components/date-picker/style/Picker.less b/components/date-picker/style/Picker.less index 61bb8e71ed..124ec96fd2 100644 --- a/components/date-picker/style/Picker.less +++ b/components/date-picker/style/Picker.less @@ -76,12 +76,12 @@ } &-icon { - color: @text-color-secondary; + color: @disabled-color; &:after { content: "\e6bb"; font-family: "anticon"; font-size: @font-size-base; - color: @text-color-secondary; + color: @disabled-color; display: inline-block; line-height: 1; } diff --git a/components/steps/style/custom-icon.less b/components/steps/style/custom-icon.less index 16100ccb05..55e16ed9ec 100644 --- a/components/steps/style/custom-icon.less +++ b/components/steps/style/custom-icon.less @@ -5,7 +5,8 @@ width: auto; height: auto; > .@{steps-prefix-cls}-icon { - font-size: @steps-icon-size; + font-size: 24px; + line-height: @steps-icon-size; top: 1px; left: 0.5px; width: @steps-icon-size; diff --git a/components/steps/style/index.less b/components/steps/style/index.less index ce851ab162..1f061ec433 100644 --- a/components/steps/style/index.less +++ b/components/steps/style/index.less @@ -13,7 +13,7 @@ @wait-tail-color: @process-tail-color; @finish-icon-color: @process-icon-color; @finish-title-color: @text-color; -@finish-description-color: @finish-title-color; +@finish-description-color: @text-color-secondary; @finish-tail-color: @primary-color; @error-icon-color: @error-color; @error-title-color: @error-color; @@ -95,7 +95,7 @@ font-size: @font-size-lg; color: @text-color; display: inline-block; - padding-right: 10px; + padding-right: 16px; position: relative; line-height: @steps-icon-size; &:after { @@ -134,11 +134,14 @@ .@{steps-prefix-cls}-horizontal:not(.@{steps-prefix-cls}-label-vertical) { .@{steps-prefix-cls}-item { - margin-right: 8px; + margin-right: 16px; white-space: nowrap; &:last-child { margin-right: 0; } + &:last-child .@{steps-prefix-cls}-item-title { + padding-right: 0; + } &-tail { display: none; } diff --git a/components/steps/style/small.less b/components/steps/style/small.less index 0f65685674..4bcb226012 100644 --- a/components/steps/style/small.less +++ b/components/steps/style/small.less @@ -1,4 +1,10 @@ .@{steps-prefix-cls}-small { + &.@{steps-prefix-cls}-horizontal:not(.@{steps-prefix-cls}-label-vertical) .@{steps-prefix-cls}-item { + margin-right: 12px; + &:last-child { + margin-right: 0; + } + } .@{steps-prefix-cls}-item-icon { width: @steps-small-icon-size; height: @steps-small-icon-size; @@ -6,11 +12,11 @@ text-align: center; border-radius: @steps-small-icon-size; font-size: @font-size-sm; - margin-right: 8px; } .@{steps-prefix-cls}-item-title { font-size: @font-size-base; line-height: @steps-small-icon-size; + padding-right: 12px; &:after { top: @steps-small-icon-size / 2; } @@ -31,8 +37,8 @@ border: 0; background: none; > .@{steps-prefix-cls}-icon { - font-size: @steps-icon-size; - top: -2.5px; + font-size: @steps-small-icon-size; + line-height: @steps-small-icon-size; transform: none; } } diff --git a/components/steps/style/vertical.less b/components/steps/style/vertical.less index 0b5b798ce7..a7b92130c2 100644 --- a/components/steps/style/vertical.less +++ b/components/steps/style/vertical.less @@ -5,9 +5,7 @@ overflow: visible; &-icon { float: left; - &-inner { - margin-right: 16px; - } + margin-right: 16px; } &-content { min-height: 48px; diff --git a/components/time-picker/style/index.less b/components/time-picker/style/index.less index a1dbfd0f07..9ae325a541 100644 --- a/components/time-picker/style/index.less +++ b/components/time-picker/style/index.less @@ -208,13 +208,13 @@ height: 14px; line-height: 14px; right: @control-padding-horizontal - 1px; - color: @text-color-secondary; + color: @disabled-color; top: 50%; margin-top: -7px; &:after { content: "\e641"; font-family: "anticon"; - color: @text-color-secondary; + color: @disabled-color; display: block; line-height: 1; }