From 5c5bbaa132525fd22f1f41f7ce54e93738474d21 Mon Sep 17 00:00:00 2001 From: guy Date: Thu, 13 Jan 2022 15:45:11 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20button=E6=A0=B7=E5=BC=8F=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/less/base/single/button/button.less | 19 ++++++++++++------- src/less/lib/theme.less | 4 +++- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/src/less/base/single/button/button.less b/src/less/base/single/button/button.less index 2be6ad0a0..0aac16f0e 100644 --- a/src/less/base/single/button/button.less +++ b/src/less/base/single/button/button.less @@ -43,22 +43,22 @@ body .bi-button, #body .bi-button { &.clear, &.clear .b-font:before { color: @color-bi-text-common-clear-button; } - &.ghost{ - &, & .b-font:before{ + &.ghost { + &, & .b-font:before { color: @color-bi-text-common-ghost-button; } - &:hover{ + &:hover { color: @color-bi-text; background-color: @color-bi-background-hover-common-ghost-button; } - &:active{ + &:active { background-color: @color-bi-background-active-common-ghost-button; } } } &.button-ignore { & { - background-color: transparent; + background-color: @color-bi-background-ignore-button; &:not(.clear, .ghost) { border-color: @color-bi-border-ignore-button; } @@ -342,6 +342,7 @@ body .bi-button, #body .bi-button { } } &.button-ignore { + background-color: @color-bi-background-ignore-button-theme-dark; &:hover{ background-color: @color-bi-background-hover-ignore-button-theme-dark; } @@ -361,13 +362,17 @@ body .bi-button, #body .bi-button { } &.button-success.disabled, &.button-error.disabled, - &.button-warning.disabled, - &.button-ignore.disabled { + &.button-warning.disabled { &, &.base-disabled { background-color: fade(@color-bi-background-disabled-button-theme-dark, 20%) !important; @ieColor: argb(fade(@color-bi-background-disabled-button-theme-dark, 20%)); filter: ~"progid:DXImageTransform.Microsoft.gradient(startColorstr=@{ieColor},endColorstr=@{ieColor})"; } } + &.button-ignore.disabled { + &, &.base-disabled { + background-color: @color-bi-background-ignore-button-theme-dark !important; + } + } } } diff --git a/src/less/lib/theme.less b/src/less/lib/theme.less index e38696969..6aa814374 100644 --- a/src/less/lib/theme.less +++ b/src/less/lib/theme.less @@ -71,6 +71,8 @@ @color-bi-background-active-common-ghost-button-theme-dark: @color-bi-background-default; @color-bi-text-ignore-button: @color-bi-text-highlight; @color-bi-border-ignore-button: @color-bi-border-highlight; +@color-bi-background-ignore-button: @color-bi-background-default; +@color-bi-background-ignore-button-theme-dark: @color-bi-background-default-theme-dark; @color-bi-background-hover-ignore-button-theme-dark: @color-bi-blue-10; @color-bi-background-active-ignore-button-theme-dark: @color-bi-blue-10; @color-bi-text-success-button: @color-bi-text; @@ -220,4 +222,4 @@ @color-bi-text-error-year-month-interval: @color-bi-text-failure; @color-bi-text-error-year-quarter-interval: @color-bi-text-failure; // 表单 -@color-bi-background-error-form: @color-bi-red-5; \ No newline at end of file +@color-bi-background-error-form: @color-bi-red-5;