diff --git a/src/design/ant/btn.less b/src/design/ant/btn.less index a1a4d450..b85da514 100644 --- a/src/design/ant/btn.less +++ b/src/design/ant/btn.less @@ -20,23 +20,26 @@ border-color: transparent !important; } - //&-primary { - // color: @white; - // background-color: @button-primary-color; - // border-width: 0; - // - // &:hover, - // &:focus { - // color: @white !important; - // background-color: @button-primary-hover-color; - // } - // - // &[disabled], - // &[disabled]:hover { - // color: @white; - // background-color: fade(@button-primary-color, 40%); - // } - //} + &-primary { + color: @white; + background-color: @button-primary-color; + + &:hover, + &:focus { + color: @white; + background-color: @button-primary-hover-color; + } + + &[disabled], + &[disabled]:hover { + color: fade(@button-cancel-color, 40%); + background-color: fade(@button-cancel-bg-color, 40%); + } + } + + &-primary:not(&-background-ghost) { + border-width: 0; + } &-default { color: @button-cancel-color; @@ -50,12 +53,12 @@ border-color: @button-cancel-hover-border-color; } - //&[disabled], - //&[disabled]:hover { - // color: fade(@button-cancel-color, 40%); - // background: fade(@button-cancel-bg-color, 40%); - // border-color: fade(@button-cancel-border-color, 40%); - //} + &[disabled], + &[disabled]:hover { + color: fade(@button-cancel-color, 40%); + background: fade(@button-cancel-bg-color, 40%); + border-color: fade(@button-cancel-border-color, 40%); + } } [data-theme='light'] &.ant-btn-link.is-disabled { @@ -212,33 +215,31 @@ } } - &-background-ghost.ant-btn-link, - &.ant-btn-dashed:not([disabled='disabled']) { - // color: @text-color-call-out; - - &:hover { - color: @button-primary-color; - } + &-background-ghost { + border-width: 1px; } - &-background-ghost { + &-dashed&-background-ghost, + &-default&-background-ghost { color: @button-ghost-color; background-color: transparent; border-color: @button-ghost-color; - border-width: 1px; &:hover, &:focus { - color: @button-ghost-hover-color !important; - background-color: @button-ghost-hover-bg-color; + color: @button-ghost-hover-color; border-color: @button-ghost-hover-color; } + &:active { + color: @button-ghost-active-color; + border-color: @button-ghost-active-color; + } + &[disabled], &[disabled]:hover { - color: fade(@white, 40%) !important; - background-color: fade(@white, 40%); - border-color: fade(@white, 40%) !important; + color: fade(@white, 40%); + border-color: fade(@white, 40%); } } diff --git a/src/design/color.less b/src/design/color.less index 54fab2e3..9d2138c4 100644 --- a/src/design/color.less +++ b/src/design/color.less @@ -111,9 +111,10 @@ html { @button-primary-hover-color: lighten(@primary-color, 5%); @button-primary-active-color: darken(@primary-color, 5%); -@button-ghost-color: @primary-color; -@button-ghost-hover-color: lighten(@primary-color, 10%); +@button-ghost-color: @white; +@button-ghost-hover-color: lighten(@white, 10%); @button-ghost-hover-bg-color: #e1ebf6; +@button-ghost-active-color: darken(@white, 10%); @button-success-color: @success-color; @button-success-hover-color: lighten(@success-color, 10%); diff --git a/src/views/demo/comp/button/index.vue b/src/views/demo/comp/button/index.vue index 5a0fc4fd..13ecb3c6 100644 --- a/src/views/demo/comp/button/index.vue +++ b/src/views/demo/comp/button/index.vue @@ -43,8 +43,8 @@ 幽灵成功 幽灵警告 幽灵错误 - - 幽灵warn-dashed + 幽灵警告dashed + 幽灵危险

常规幽灵按钮通常用于有色背景下

幽灵主要 @@ -52,8 +52,8 @@ 禁用 loading 幽灵默认 - 幽灵危险
+