diff --git a/components/alert/style/index.less b/components/alert/style/index.less index e80e77dcba..4a45547d71 100644 --- a/components/alert/style/index.less +++ b/components/alert/style/index.less @@ -71,7 +71,7 @@ cursor: pointer; .@{iconfont-css-prefix}-cross { - color: @legend-color; + color: @text-color-secondary; transition: color .3s ease; &:hover { color: #404040; diff --git a/components/breadcrumb/style/index.less b/components/breadcrumb/style/index.less index f28f4bff97..e244bca535 100644 --- a/components/breadcrumb/style/index.less +++ b/components/breadcrumb/style/index.less @@ -3,7 +3,7 @@ @breadcrumb-prefix-cls: ~"@{ant-prefix}-breadcrumb"; .@{breadcrumb-prefix-cls} { - color: #999; + color: @text-color-secondary; font-size: @font-size-base; a { diff --git a/components/button/style/mixin.less b/components/button/style/mixin.less index 8bc2b0c922..e364b14cf6 100644 --- a/components/button/style/mixin.less +++ b/components/button/style/mixin.less @@ -137,7 +137,7 @@ &.disabled, &[disabled] { - cursor: @cursor-disabled; + cursor: not-allowed; > * { pointer-events: none; } diff --git a/components/calendar/style/index.less b/components/calendar/style/index.less index 643e0267ad..e8f48ff8c8 100644 --- a/components/calendar/style/index.less +++ b/components/calendar/style/index.less @@ -4,7 +4,9 @@ .@{full-calendar-prefix-cls} { font-size: @font-size-base; - line-height: 1.5; + line-height: @line-height-base; + outline: none; + border-top: 1px solid @border-color-base; &-month-select { margin-left: 5px; @@ -30,8 +32,6 @@ } } - outline: none; - border-top: 1px solid @legend-border-color; &-date-panel { position: relative; outline: none; diff --git a/components/cascader/style/index.less b/components/cascader/style/index.less index bff22de83d..bca070e913 100644 --- a/components/cascader/style/index.less +++ b/components/cascader/style/index.less @@ -63,7 +63,7 @@ cursor: pointer; transition: color 0.3s ease, opacity 0.15s ease; &:hover { - color: #999; + color: @text-color-secondary; } } @@ -81,7 +81,7 @@ height: 12px; margin-top: -6px; line-height: 12px; - color: #999; + color: @text-color-secondary; .iconfont-size-under-12px(9px); &:before { transition: transform 0.2s ease; @@ -173,7 +173,7 @@ &:after { .iconfont-font("\e61f"); .iconfont-size-under-12px(8px); - color: #999; + color: @text-color-secondary; position: absolute; right: 15px; } diff --git a/components/checkbox/style/mixin.less b/components/checkbox/style/mixin.less index 43b7c9b008..d063cd2b35 100644 --- a/components/checkbox/style/mixin.less +++ b/components/checkbox/style/mixin.less @@ -122,7 +122,7 @@ & + span { color: #ccc; - cursor: @cursor-disabled; + cursor: not-allowed; } } diff --git a/components/date-picker/style/Calendar.less b/components/date-picker/style/Calendar.less index c0ac6d5e67..49ef7a5472 100644 --- a/components/date-picker/style/Calendar.less +++ b/components/date-picker/style/Calendar.less @@ -37,7 +37,7 @@ .@{calendar-prefix-cls}-next-year-btn { position: absolute; top: 0; - color: #999; + color: @text-color-secondary; font-family: Arial, "Hiragino Sans GB", "Microsoft Yahei", "Microsoft Sans Serif", sans-serif; padding: 0 5px; font-size: 16px; @@ -291,7 +291,7 @@ } .@{calendar-prefix-cls}-clear-btn:hover:after { - color: #999; + color: @text-color-secondary; } .@{calendar-prefix-cls}-ok-btn { diff --git a/components/date-picker/style/Picker.less b/components/date-picker/style/Picker.less index 8d38a0dbf1..091083d51b 100644 --- a/components/date-picker/style/Picker.less +++ b/components/date-picker/style/Picker.less @@ -53,7 +53,7 @@ cursor: pointer; transition: color 0.3s ease, opacity 0.15s ease; &:hover { - color: #999; + color: @text-color-secondary; } } @@ -69,14 +69,14 @@ height: 12px; line-height: 12px; right: 8px; - color: #999; + color: @text-color-secondary; top: 50%; margin-top: -6px; &:after { content: "\e6bb"; font-family: "anticon"; font-size: 12px; - color: #999; + color: @text-color-secondary; display: inline-block; line-height: 1; vertical-align: bottom; diff --git a/components/date-picker/style/RangePicker.less b/components/date-picker/style/RangePicker.less index 13b606254d..e866236d6f 100644 --- a/components/date-picker/style/RangePicker.less +++ b/components/date-picker/style/RangePicker.less @@ -19,7 +19,7 @@ } .@{calendar-prefix-cls}-range-picker-separator { - color: #999; + color: @text-color-secondary; } .@{calendar-prefix-cls}-range { @@ -67,7 +67,7 @@ text-align: center; height: @input-box-height; line-height: @input-box-height; - color: #999; + color: @text-color-secondary; } &-right .@{calendar-prefix-cls}-date-input-wrap { diff --git a/components/date-picker/style/TimePicker.less b/components/date-picker/style/TimePicker.less index e9933cd1d5..2d717907e5 100644 --- a/components/date-picker/style/TimePicker.less +++ b/components/date-picker/style/TimePicker.less @@ -108,7 +108,7 @@ color: @btn-disable-color; &:hover { background: transparent; - cursor: @cursor-disabled; + cursor: not-allowed; } } } diff --git a/components/dropdown/style/index.less b/components/dropdown/style/index.less index c235189ab1..129a5f5f5d 100644 --- a/components/dropdown/style/index.less +++ b/components/dropdown/style/index.less @@ -108,7 +108,7 @@ position: absolute; content: "\e61f"; right: 16px; - color: #999; + color: @text-color-secondary; .iconfont-size-under-12px(9px); } diff --git a/components/form/style/index.less b/components/form/style/index.less index ddd97911bf..9b2ff8d963 100644 --- a/components/form/style/index.less +++ b/components/form/style/index.less @@ -32,7 +32,7 @@ input[type="radio"], input[type="checkbox"] { &[disabled], &.disabled { - cursor: @cursor-disabled; + cursor: not-allowed; } } @@ -42,7 +42,7 @@ input[type="checkbox"] { .@{ant-prefix}-checkbox-inline, .@{ant-prefix}-checkbox-vertical { &.disabled { - cursor: @cursor-disabled; + cursor: not-allowed; } } @@ -51,7 +51,7 @@ input[type="checkbox"] { .@{ant-prefix}-checkbox { &.disabled { label { - cursor: @cursor-disabled; + cursor: not-allowed; } } } @@ -116,7 +116,7 @@ input[type="checkbox"] { .@{form-prefix-cls}-explain, .@{form-prefix-cls}-extra { - color: #999; + color: @text-color-secondary; } .@{form-prefix-cls}-text { @@ -426,7 +426,7 @@ form { display: inline-block; animation: loadingCircle 1s infinite linear; content: "\e6ae"; - color: #999; + color: @text-color-secondary; } } diff --git a/components/form/style/mixin.less b/components/form/style/mixin.less index 7635111ca9..801cdae8a5 100644 --- a/components/form/style/mixin.less +++ b/components/form/style/mixin.less @@ -52,9 +52,9 @@ margin-bottom: 20px; font-size: 14px; line-height: inherit; - color: @legend-color; + color: @text-color-secondary; border: 0; - border-bottom: 1px solid @legend-border-color; + border-bottom: 1px solid @border-color-base; } label { diff --git a/components/input-number/style/index.less b/components/input-number/style/index.less index 5720efcb77..64dc9d2eb3 100644 --- a/components/input-number/style/index.less +++ b/components/input-number/style/index.less @@ -29,7 +29,7 @@ line-height: 0; height: 14px; overflow: hidden; - color: #999; + color: @text-color-secondary; position: relative; transition: all 0.1s linear; display: block; @@ -55,7 +55,7 @@ transition: all 0.1s linear; .iconfont-size-under-12px(7px); right: 4px; - color: #999; + color: @text-color-secondary; } &:hover { diff --git a/components/input/style/mixin.less b/components/input/style/mixin.less index 336342893a..cc681262e8 100644 --- a/components/input/style/mixin.less +++ b/components/input/style/mixin.less @@ -29,7 +29,7 @@ .disabled() { background-color: @input-disabled-bg; opacity: 1; - cursor: @cursor-disabled; + cursor: not-allowed; color: #ccc; &:hover { .hover(@input-border-color); diff --git a/components/menu/style/index.less b/components/menu/style/index.less index 8ddb50f2c2..976d1c5bce 100644 --- a/components/menu/style/index.less +++ b/components/menu/style/index.less @@ -25,7 +25,7 @@ } &-item-group-title { - color: #999; + color: @text-color-secondary; font-size: 12px; line-height: 1.5; padding: 8px 16px; @@ -155,11 +155,11 @@ // Disabled state sets text to gray and nukes hover/tab effects &.@{menu-prefix-cls}-item-disabled, &.@{menu-prefix-cls}-submenu-disabled { - color: #999 !important; + color: @text-color-secondary !important; cursor: not-allowed; background: none; > a { - color: #999 !important; + color: @text-color-secondary !important; pointer-events: none; } } @@ -319,7 +319,7 @@ .@{menu-prefix-cls} { &-dark, &-dark &-sub { - color: #999; + color: @text-color-secondary; background: #404040; } @@ -340,7 +340,7 @@ &-dark &-item, &-dark &-item > a { - color: #999; + color: @text-color-secondary; } &-dark&-inline, diff --git a/components/modal/style/modal.less b/components/modal/style/modal.less index 84e6686671..73813ce69d 100644 --- a/components/modal/style/modal.less +++ b/components/modal/style/modal.less @@ -47,7 +47,7 @@ line-height: 1; text-decoration: none; transition: color .3s ease; - color: #999; + color: @text-color-secondary; outline: 0; &-x { diff --git a/components/notification/style/index.less b/components/notification/style/index.less index 36050fba37..c61d9aa23f 100644 --- a/components/notification/style/index.less +++ b/components/notification/style/index.less @@ -83,7 +83,7 @@ position: absolute; right: 16px; top: 10px; - color: @legend-color; + color: @text-color-secondary; outline: none; &:hover { color: #404040; diff --git a/components/radio/style/index.less b/components/radio/style/index.less index 4417cb10fe..bbf493d141 100644 --- a/components/radio/style/index.less +++ b/components/radio/style/index.less @@ -104,7 +104,7 @@ & + span { color: #ccc; - cursor: @cursor-disabled; + cursor: not-allowed; } } diff --git a/components/select/style/index.less b/components/select/style/index.less index ae89868d39..3817e1b46f 100644 --- a/components/select/style/index.less +++ b/components/select/style/index.less @@ -30,7 +30,7 @@ .iconfont-font("\e62e"); } &:hover { - color: #999; + color: @text-color-secondary; } } @@ -318,7 +318,7 @@ .@{select-prefix-cls}-selection__choice__remove { .iconfont-mixin(); - color: #999; + color: @text-color-secondary; line-height: inherit; cursor: pointer; display: inline-block; @@ -437,7 +437,7 @@ } &-item-group-title { - color: #999; + color: @text-color-secondary; line-height: 1.5; padding: 8px 16px; } diff --git a/components/slider/style/index.less b/components/slider/style/index.less index 5ff45bd08c..eaffafc914 100644 --- a/components/slider/style/index.less +++ b/components/slider/style/index.less @@ -82,7 +82,7 @@ vertical-align: middle; text-align: center; cursor: pointer; - color: #999; + color: @text-color-secondary; &-active { color: #666; diff --git a/components/spin/style/index.less b/components/spin/style/index.less index 85ad715998..81d25a7a12 100644 --- a/components/spin/style/index.less +++ b/components/spin/style/index.less @@ -2,7 +2,7 @@ @import "../../style/mixins/index"; @spin-prefix-cls: ~"@{ant-prefix}-spin"; -@spin-dot-default: #999; +@spin-dot-default: @text-color-secondary; @spin-dot-size-sm: 14px; @spin-dot-size: 20px; @spin-dot-size-lg: 30px; diff --git a/components/steps/style/index.less b/components/steps/style/index.less index 4aa4e8d470..8134f5db13 100644 --- a/components/steps/style/index.less +++ b/components/steps/style/index.less @@ -7,7 +7,7 @@ @process-description-color: @process-title-color; @process-tail-color: @border-color-split; @wait-icon-color: #ccc; -@wait-title-color: #999; +@wait-title-color: @text-color-secondary; @wait-description-color: @wait-title-color; @wait-tail-color: @process-tail-color; @finish-icon-color: @process-icon-color; @@ -191,7 +191,7 @@ } .@{steps-prefix-cls}-description { font-size: 12px; - color: #999; + color: @text-color-secondary; } .@{steps-prefix-cls}-tail { position: absolute; @@ -245,7 +245,7 @@ } .@{steps-prefix-cls}-description { font-size: 12px; - color: #999; + color: @text-color-secondary; } .@{steps-prefix-cls}-tail { top: 8px; diff --git a/components/style/core/base.less b/components/style/core/base.less index 90b96922cc..180f0ea9ff 100644 --- a/components/style/core/base.less +++ b/components/style/core/base.less @@ -84,7 +84,7 @@ a { .@{ant-prefix}-divider { margin: 0 4px; - color: #999; + color: @text-color-secondary; display: inline-block; height: 8px; width: 1px; diff --git a/components/style/themes/default.less b/components/style/themes/default.less index 4452eef3ae..a4314996e8 100644 --- a/components/style/themes/default.less +++ b/components/style/themes/default.less @@ -15,6 +15,7 @@ @code-family : Consolas,Menlo,Courier,monospace; @text-color : #666; @heading-color : #404040; +@text-color-secondary : #999; @font-size-base : 12px; @line-height-base : 1.5; @line-height-computed : floor((@font-size-base * @line-height-base)); @@ -31,9 +32,6 @@ @link-active-color : shade(@link-color, 5%); @link-hover-decoration : none; -// Disabled cursor for form controls and buttons. -@cursor-disabled : not-allowed; - // Animation @ease-out : cubic-bezier(0.215, 0.61, 0.355, 1); @ease-in : cubic-bezier(0.55, 0.055, 0.675, 0.19); @@ -91,10 +89,8 @@ @btn-disable-border : @border-color-base; @btn-padding-base : 4px 15px; - @btn-font-size-lg : 14px; @btn-padding-lg : 4px 15px 5px 15px; - @btn-padding-sm : 1px 7px; @btn-circle-size : 28px; @@ -126,11 +122,6 @@ @grid-columns : 24; @grid-gutter-width : 0; -// Container sizes -@container-sm : (720px + @grid-gutter-width); -@container-md : (940px + @grid-gutter-width); -@container-lg : (1140px + @grid-gutter-width); - // z-index list @zindex-affix : 11; @zindex-back-top : 10; @@ -150,8 +141,6 @@ // Form // --- -@legend-color : #999; -@legend-border-color : @border-color-base; @label-required-color : #f50; @label-color : @text-color; @form-item-margin-bottom : 24px; diff --git a/components/table/style/index.less b/components/table/style/index.less index db738684ad..b8c925682c 100644 --- a/components/table/style/index.less +++ b/components/table/style/index.less @@ -293,7 +293,7 @@ position: relative; z-index: 2; font-size: 12px; - color: #999; + color: @text-color-secondary; .@{iconfont-css-prefix} { margin-right: 4px; } diff --git a/components/tabs/style/index.less b/components/tabs/style/index.less index e8881f0c58..82d6b21c7d 100644 --- a/components/tabs/style/index.less +++ b/components/tabs/style/index.less @@ -61,7 +61,7 @@ background-color: transparent; position: absolute; text-align: center; - color: #999; + color: @text-color-secondary; transition: color 0.3s ease; &:hover { @@ -339,7 +339,7 @@ } &&-card > &-bar &-tab .@{iconfont-css-prefix}-close { margin-right: 0; - color: #999; + color: @text-color-secondary; transition: all 0.3s @ease-in-out; .iconfont-size-under-12px(9px); transform-origin: 100% 50%; @@ -378,7 +378,7 @@ border: 1px solid @border-color-base; font-size: 12px; .iconfont-size-under-12px(10px); - color: #999; + color: @text-color-secondary; transition: color 0.3s ease; &:hover { color: #404040; diff --git a/components/time-picker/style/index.less b/components/time-picker/style/index.less index 0f6481a882..e38699a30b 100644 --- a/components/time-picker/style/index.less +++ b/components/time-picker/style/index.less @@ -70,7 +70,7 @@ } &-clear-btn:hover:after { - color: #999; + color: @text-color-secondary; } &-narrow &-input-wrap { @@ -141,7 +141,7 @@ color: @btn-disable-color; &:hover { background: transparent; - cursor: @cursor-disabled; + cursor: not-allowed; } } } @@ -212,14 +212,14 @@ height: 12px; line-height: 12px; right: 8px; - color: #999; + color: @text-color-secondary; top: 50%; margin-top: -6px; &:after { content: "\e641"; font-family: "anticon"; font-size: 12px; - color: #999; + color: @text-color-secondary; display: inline-block; line-height: 1; vertical-align: bottom; diff --git a/components/transfer/style/index.less b/components/transfer/style/index.less index c1d20d8cf4..83f18df763 100644 --- a/components/transfer/style/index.less +++ b/components/transfer/style/index.less @@ -40,7 +40,7 @@ font-size: 12px; color: #ccc; &:hover { - color: #999; + color: @text-color-secondary; } } } diff --git a/components/upload/style/index.less b/components/upload/style/index.less index 8e6bf2f0e9..292c2a3def 100644 --- a/components/upload/style/index.less +++ b/components/upload/style/index.less @@ -95,18 +95,18 @@ } p.@{upload-prefix-cls}-hint { font-size: 12px; - color: #999; + color: @text-color-secondary; } .@{iconfont-css-prefix}-plus { font-size: 30px; transition: all 0.3s ease; color: #ccc; &:hover { - color: #999; + color: @text-color-secondary; } } &:hover .@{iconfont-css-prefix}-plus { - color: #999; + color: @text-color-secondary; } } } @@ -127,7 +127,7 @@ .@{iconfont-css-prefix}-paper-clip { margin-right: 4px; font-size: 12px; - color: #999; + color: @text-color-secondary; } .@{iconfont-css-prefix}-cross { .iconfont-size-under-12px(10px); @@ -135,7 +135,7 @@ opacity: 0; cursor: pointer; float: right; - color: #999; + color: @text-color-secondary; line-height: 22px; &:hover { color: #666; @@ -213,7 +213,7 @@ .@{upload-item}-thumbnail.@{iconfont-css-prefix}:before { line-height: 48px; font-size: 24px; - color: #999; + color: @text-color-secondary; } .@{upload-item}-name { @@ -338,7 +338,7 @@ &-text { margin-top: 18px; - color: #999; + color: @text-color-secondary; } }