From f009d999e49ff9abf57441a6ad1823455801d1f5 Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Fri, 26 Apr 2019 17:31:52 +0800 Subject: [PATCH] =?UTF-8?q?BI-44188=20=E6=B7=B1=E8=89=B2=E7=B3=BB=E7=9A=84?= =?UTF-8?q?checkbox=E8=BE=B9=E6=A1=86=E8=89=B2=E6=94=B9=E4=B8=80=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/css/base/single/input/checkbox.css | 8 +++++++- src/less/base/single/input/checkbox.less | 12 +++++++++++- src/less/lib/colors.less | 2 ++ src/less/lib/constant.less | 1 + 4 files changed, 21 insertions(+), 2 deletions(-) diff --git a/src/css/base/single/input/checkbox.css b/src/css/base/single/input/checkbox.css index b4c4b296e..2a86e0f7c 100644 --- a/src/css/base/single/input/checkbox.css +++ b/src/css/base/single/input/checkbox.css @@ -37,7 +37,7 @@ opacity: 0; } .bi-checkbox.disabled.active .checkbox-content { - border-color: #e8eaed; + border-color: #d0d4da; } .bi-checkbox.disabled.active .checkbox-content:after { opacity: 1; @@ -49,3 +49,9 @@ .bi-theme-dark .bi-checkbox:active .checkbox-content { border-color: #3685f2; } +.bi-theme-dark .bi-checkbox.disabled .checkbox-content { + background-color: #606479; +} +.bi-theme-dark .bi-checkbox.disabled.active .checkbox-content { + border-color: #606479; +} diff --git a/src/less/base/single/input/checkbox.less b/src/less/base/single/input/checkbox.less index da4ab2414..b032e3663 100644 --- a/src/less/base/single/input/checkbox.less +++ b/src/less/base/single/input/checkbox.less @@ -37,7 +37,7 @@ &.active { & .checkbox-content { // 深浅主题下border-color是一样的 - border-color: @color-bi-border-line; + border-color: @color-bi-border-disabled; &:after { opacity: 1; } @@ -56,5 +56,15 @@ border-color: @color-bi-border-highlight; } } + &.disabled { + & .checkbox-content { + background-color: @color-bi-background-dark-gray-theme-dark; + } + &.active { + & .checkbox-content { + border-color: @color-bi-border-disabled-theme-dark; + } + } + } } } \ No newline at end of file diff --git a/src/less/lib/colors.less b/src/less/lib/colors.less index 1b49e843a..8dcd6281f 100644 --- a/src/less/lib/colors.less +++ b/src/less/lib/colors.less @@ -95,6 +95,8 @@ @color-bi-border-dark-line-theme-dark: @border-color-dark-line-theme-dark; //灰化边框 @color-bi-border-disabled: @border-color-disabled; +//深色系灰化边框 +@color-bi-border-disabled-theme-dark: @border-color-disabled-theme-dark; //成功边框色 @color-bi-border-success: @border-color-success; //失败边框色 diff --git a/src/less/lib/constant.less b/src/less/lib/constant.less index f7ab4547c..05e75bd0a 100644 --- a/src/less/lib/constant.less +++ b/src/less/lib/constant.less @@ -97,6 +97,7 @@ //split color @border-color-disabled: #d0d4da; +@border-color-disabled-theme-dark: #606479; //scroll color @scroll-color: #3d4d66;