From 2bfebe0c768f7dab3a899961fb4549bfea625ee0 Mon Sep 17 00:00:00 2001 From: chenhaodong Date: Thu, 18 Apr 2019 14:31:25 +0800 Subject: [PATCH] fix --- src/components/button/button.vue | 1 + src/styles/components/button.less | 4 ++++ src/styles/components/input.less | 1 + src/styles/components/switch.less | 6 ++++++ src/styles/components/tabs.less | 3 +++ src/styles/custom.less | 2 ++ 6 files changed, 17 insertions(+), 0 deletions(-) diff --git a/src/components/button/button.vue b/src/components/button/button.vue index 54169b0..4eb5414 100644 --- a/src/components/button/button.vue +++ b/src/components/button/button.vue @@ -19,6 +19,7 @@ props: { type: { validator (value) { + /*wynn*/ return oneOf(value, ['default', 'primary', 'dashed', 'text', 'info', 'success', 'warning', 'error', 'search', 'confirm', 'cancel', 'reset']); }, default: 'default' diff --git a/src/styles/components/button.less b/src/styles/components/button.less index 3f00c88..9851c0e 100644 --- a/src/styles/components/button.less +++ b/src/styles/components/button.less @@ -93,6 +93,7 @@ .btn-circle(@btn-prefix-cls); } + /*wynn*/ &-search { .btn-color(@search-color); } @@ -109,6 +110,7 @@ .btn-color(@reset-color); } + &:before { position: absolute; top: -1px; @@ -194,6 +196,7 @@ } } + /*wynn*/ &-search { color: #fff; &:hover{ @@ -228,6 +231,7 @@ } } + &-ghost&-default[disabled], &-ghost&-dashed[disabled], &-ghost&-primary[disabled], &-ghost&-info[disabled], &-ghost&-success[disabled], &-ghost&-warning[disabled], &-ghost&-error[disabled], &-ghost&-search[disabled], &-ghost&-confirm[disabled], &-ghost&-cancel[disabled], &-ghost&-reset[disabled]{ background: transparent; color: fade(#000, 25%); diff --git a/src/styles/components/input.less b/src/styles/components/input.less index 08c306a..9102fee 100644 --- a/src/styles/components/input.less +++ b/src/styles/components/input.less @@ -160,6 +160,7 @@ &-with-search{ &:hover{ .@{input-prefix-cls} { + /*wynn*/ border-color: #000; } } diff --git a/src/styles/components/switch.less b/src/styles/components/switch.less index 3c0dda0..3efe6d7 100644 --- a/src/styles/components/switch.less +++ b/src/styles/components/switch.less @@ -7,6 +7,7 @@ line-height: 20px; border-radius: 22px; vertical-align: middle; + /*wynn*/ border: 1px solid @mew-common-color; background-color: #efefef; position: relative; @@ -33,6 +34,7 @@ } } + /*wynn*/ &:after { content: ''; width: 18px; @@ -50,6 +52,7 @@ width: 26px; } + /*wynn*/ &:before{ content: ''; display: none; @@ -70,6 +73,7 @@ display: block; } + /*wynn*/ &:focus { box-shadow: 0 0 0 2px fade(@mew-common-color, 20%); outline: 0; @@ -131,6 +135,7 @@ left: 23px; } + /*wynn*/ &-checked { border-color: @mew-common-color; background-color: #e8e8e8; @@ -165,6 +170,7 @@ } } + /*wynn*/ &-disabled&-checked{ border-color: @mew-common-color; background-color: #e8e8e8; diff --git a/src/styles/components/tabs.less b/src/styles/components/tabs.less index 9b06148..884c90b 100644 --- a/src/styles/components/tabs.less +++ b/src/styles/components/tabs.less @@ -11,6 +11,7 @@ outline: none; } + /*wynn*/ &-ink-bar { height: 2px; box-sizing: border-box; @@ -124,6 +125,7 @@ position: relative; transition: color .3s @ease-in-out; + /*wynn*/ &:hover { color: @mew-common-color; } @@ -138,6 +140,7 @@ } } + /*wynn*/ .@{tabs-prefix-cls}-tab-active { color: @mew-common-color; } diff --git a/src/styles/custom.less b/src/styles/custom.less index 278291c..8a2c215 100644 --- a/src/styles/custom.less +++ b/src/styles/custom.less @@ -15,11 +15,13 @@ @link-color : #2D8cF0; @link-hover-color : tint(@link-color, 20%); @link-active-color : shade(@link-color, 5%); +/*wynn*/ @selected-color : fade(#ff9a4c, 90%); @tooltip-color : #fff; @subsidiary-color : #808695; @rate-star-color : #f5a623; +/*wynn*/ // 自定义theme @mew-common-color : #3fcdc0; @mew-white-color : #fff; -- libgit2 0.21.4