Browse Source

Merge pull request #906 in VISUAL/fineui from ~WINDY/fineui:master to master

* commit 'f009d999e49ff9abf57441a6ad1823455801d1f5':
  BI-44188 深色系的checkbox边框色改一下
  BI-44188 边框色深色主题少改了
es6
windy 6 years ago
parent
commit
f731405859
  1. 12
      src/css/base/single/input/checkbox.css
  2. 17
      src/less/base/single/input/checkbox.less
  3. 2
      src/less/lib/colors.less
  4. 1
      src/less/lib/constant.less

12
src/css/base/single/input/checkbox.css

@ -37,7 +37,7 @@
opacity: 0; opacity: 0;
} }
.bi-checkbox.disabled.active .checkbox-content { .bi-checkbox.disabled.active .checkbox-content {
border-color: #e8eaed; border-color: #d0d4da;
} }
.bi-checkbox.disabled.active .checkbox-content:after { .bi-checkbox.disabled.active .checkbox-content:after {
opacity: 1; opacity: 1;
@ -45,3 +45,13 @@
.bi-theme-dark .bi-checkbox .checkbox-content { .bi-theme-dark .bi-checkbox .checkbox-content {
border-color: #9EA6B2; border-color: #9EA6B2;
} }
.bi-theme-dark .bi-checkbox.active .checkbox-content,
.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;
}

17
src/less/base/single/input/checkbox.less

@ -37,7 +37,7 @@
&.active { &.active {
& .checkbox-content { & .checkbox-content {
// 深浅主题下border-color是一样的 // 深浅主题下border-color是一样的
border-color: @color-bi-border-line; border-color: @color-bi-border-disabled;
&:after { &:after {
opacity: 1; opacity: 1;
} }
@ -51,5 +51,20 @@
& .checkbox-content { & .checkbox-content {
border-color: @color-bi-border-dark-line-theme-dark; border-color: @color-bi-border-dark-line-theme-dark;
} }
&.active, &:active {
& .checkbox-content {
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;
}
}
}
} }
} }

2
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-dark-line-theme-dark: @border-color-dark-line-theme-dark;
//灰化边框 //灰化边框
@color-bi-border-disabled: @border-color-disabled; @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; @color-bi-border-success: @border-color-success;
//失败边框色 //失败边框色

1
src/less/lib/constant.less

@ -97,6 +97,7 @@
//split color //split color
@border-color-disabled: #d0d4da; @border-color-disabled: #d0d4da;
@border-color-disabled-theme-dark: #606479;
//scroll color //scroll color
@scroll-color: #3d4d66; @scroll-color: #3d4d66;

Loading…
Cancel
Save