refactor: 还原

6 years ago · 35a349e1af
34 changed files with 274 additions and 498 deletions
--- a/dist/2.0/fineui.css
+++ b/dist/2.0/fineui.css
@ -455,51 +455,6 @@ textarea {
 .bi-border-left.disabled {
  border-color: #d0d4da !important;
 }
-.bi-dark-border {
-  border: 1px solid #9EA6B2;
-}
-.bi-dark-border.disabled {
-  border-color: #d0d4da !important;
-}
-.bi-dark-border-top {
-  border-top: 1px solid #9EA6B2;
-}
-.bi-dark-border-top.disabled {
-  border-color: #d0d4da !important;
-}
-.bi-dark-border-right {
-  border-right: 1px solid #9EA6B2;
-}
-.bi-dark-border-right.disabled {
-  border-color: #d0d4da !important;
-}
-.bi-dark-border-bottom {
-  border-bottom: 1px solid #9EA6B2;
-}
-.bi-dark-border-bottom.disabled {
-  border-color: #d0d4da !important;
-}
-.bi-dark-border-left {
-  border-left: 1px solid #9EA6B2;
-}
-.bi-dark-border-left.disabled {
-  border-color: #d0d4da !important;
-}
-.bi-theme-dark .bi-dark-border {
-  border: 1px solid #9EA6B2;
-}
-.bi-theme-dark .bi-dark-border-top {
-  border-top: 1px solid #9EA6B2;
-}
-.bi-theme-dark .bi-dark-border-right {
-  border-right: 1px solid #9EA6B2;
-}
-.bi-theme-dark .bi-dark-border-bottom {
-  border-bottom: 1px solid #9EA6B2;
-}
-.bi-theme-dark .bi-dark-border-left {
-  border-left: 1px solid #9EA6B2;
-}
 .bi-theme-dark .bi-border {
  border: 1px solid #3a3c53;
 }
@ -3582,6 +3537,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
  -webkit-border-radius: 2px;
  -moz-border-radius: 2px;
  border-radius: 2px;
+  border: 1px solid #9EA6B2;
 }
 .bi-checkbox .checkbox-context:after {
  position: absolute;
@ -3600,6 +3556,10 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
  transform: rotate(45deg) scale(1) translate(-50%, -50%);
  content: '';
 }
+.bi-checkbox.active .checkbox-context,
+.bi-checkbox:active .checkbox-context {
+  border-color: #3685f2;
+}
 .bi-checkbox.active .checkbox-context:after,
 .bi-checkbox:active .checkbox-context:after {
  border-color: #ffffff;
@ -3614,6 +3574,9 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
 .bi-checkbox.disabled.active .checkbox-context:after {
  opacity: 1;
 }
+.bi-theme-dark .bi-checkbox .checkbox-context {
+  border-color: #9EA6B2;
+}
 .bi-file {
  opacity: 0;
  filter: alpha(opacity=0);
@ -3642,10 +3605,15 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
  -webkit-border-radius: 8px;
  -moz-border-radius: 8px;
  border-radius: 8px;
+  border: 1px solid #9EA6B2;
 }
 .bi-radio .radio-content:after {
  content: "";
 }
+.bi-radio:active .radio-content,
+.bi-radio.active .radio-content {
+  border-color: #3685f2;
+}
 .bi-radio:active .radio-content:after,
 .bi-radio.active .radio-content:after {
  width: 6px;
@ -3673,6 +3641,9 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
 .bi-radio.disabled.active .radio-content:after {
  background-color: #ffffff;
 }
+.bi-theme-dark .bi-radio .radio-content {
+  border-color: #9EA6B2;
+}
 .bi-label {
  text-overflow: ellipsis;
  overflow-x: hidden;
--- a/dist/2.0/fineui.ie.js
+++ b/dist/2.0/fineui.ie.js
@ -44735,7 +44735,7 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
                ref: function (_ref) {
                    self.checkbox = _ref;
                },
-                cls: "checkbox-context bi-dark-border",
+                cls: "checkbox-context",
                width: o.iconWidth - 2,
                height: o.iconHeight - 2
            }]
@ -44761,9 +44761,9 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
    setSelected: function (b) {
        BI.Checkbox.superclass.setSelected.apply(this, arguments);
        if (b) {
-            this.checkbox.element.removeClass("bi-dark-border").addClass("bi-high-light-background bi-high-light-border");
+            this.checkbox.element.addClass("bi-high-light-background");
        } else {
-            this.checkbox.element.removeClass("bi-high-light-background bi-high-light-border").addClass("bi-dark-border");
+            this.checkbox.element.removeClass("bi-high-light-background");
        }
    }
 });
@ -45753,7 +45753,7 @@ BI.Radio = BI.inherit(BI.BasicButton, {
            element: this.element,
            items: [{
                type: "bi.layout",
-                cls: "radio-content bi-border",
+                cls: "radio-content",
                ref: function (_ref) {
                    self.radio = _ref;
                },
@ -45782,9 +45782,9 @@ BI.Radio = BI.inherit(BI.BasicButton, {
    setSelected: function (b) {
        BI.Radio.superclass.setSelected.apply(this, arguments);
        if (b) {
-            this.radio.element.removeClass("bi-border").addClass("bi-high-light-background bi-high-light-border");
+            this.radio.element.addClass("bi-high-light-background");
        } else {
-            this.radio.element.removeClass("bi-high-light-background bi-high-light-border").addClass("bi-border");
+            this.radio.element.removeClass("bi-high-light-background");
        }
    }
 });
@ -49798,7 +49798,7 @@ BI.HalfButton = BI.inherit(BI.BasicButton, {
    _defaultConfig: function () {
        var conf = BI.HalfIconButton.superclass._defaultConfig.apply(this, arguments);
        return BI.extend(conf, {
-            extraCls: "bi-half-button bi-border bi-high-light-border",
+            extraCls: "bi-half-button bi-high-light-border",
            height: 14,
            width: 14,
            selected: false
--- a/dist/2.0/fineui.ie.min.js
+++ b/dist/2.0/fineui.ie.min.js
--- a/dist/2.0/fineui.js
+++ b/dist/2.0/fineui.js
@ -45139,7 +45139,7 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
                ref: function (_ref) {
                    self.checkbox = _ref;
                },
-                cls: "checkbox-context bi-dark-border",
+                cls: "checkbox-context",
                width: o.iconWidth - 2,
                height: o.iconHeight - 2
            }]
@ -45165,9 +45165,9 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
    setSelected: function (b) {
        BI.Checkbox.superclass.setSelected.apply(this, arguments);
        if (b) {
-            this.checkbox.element.removeClass("bi-dark-border").addClass("bi-high-light-background bi-high-light-border");
+            this.checkbox.element.addClass("bi-high-light-background");
        } else {
-            this.checkbox.element.removeClass("bi-high-light-background bi-high-light-border").addClass("bi-dark-border");
+            this.checkbox.element.removeClass("bi-high-light-background");
        }
    }
 });
@ -46157,7 +46157,7 @@ BI.Radio = BI.inherit(BI.BasicButton, {
            element: this.element,
            items: [{
                type: "bi.layout",
-                cls: "radio-content bi-border",
+                cls: "radio-content",
                ref: function (_ref) {
                    self.radio = _ref;
                },
@ -46186,9 +46186,9 @@ BI.Radio = BI.inherit(BI.BasicButton, {
    setSelected: function (b) {
        BI.Radio.superclass.setSelected.apply(this, arguments);
        if (b) {
-            this.radio.element.removeClass("bi-border").addClass("bi-high-light-background bi-high-light-border");
+            this.radio.element.addClass("bi-high-light-background");
        } else {
-            this.radio.element.removeClass("bi-high-light-background bi-high-light-border").addClass("bi-border");
+            this.radio.element.removeClass("bi-high-light-background");
        }
    }
 });
@ -50202,7 +50202,7 @@ BI.HalfButton = BI.inherit(BI.BasicButton, {
    _defaultConfig: function () {
        var conf = BI.HalfIconButton.superclass._defaultConfig.apply(this, arguments);
        return BI.extend(conf, {
-            extraCls: "bi-half-button bi-border bi-high-light-border",
+            extraCls: "bi-half-button bi-high-light-border",
            height: 14,
            width: 14,
            selected: false
--- a/dist/2.0/fineui.min.css
+++ b/dist/2.0/fineui.min.css
--- a/dist/2.0/fineui.min.js
+++ b/dist/2.0/fineui.min.js
--- a/dist/base.css
+++ b/dist/base.css
@ -1381,6 +1381,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
  -webkit-border-radius: 2px;
  -moz-border-radius: 2px;
  border-radius: 2px;
+  border: 1px solid #9EA6B2;
 }
 .bi-checkbox .checkbox-context:after {
  position: absolute;
@ -1399,6 +1400,10 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
  transform: rotate(45deg) scale(1) translate(-50%, -50%);
  content: '';
 }
+.bi-checkbox.active .checkbox-context,
+.bi-checkbox:active .checkbox-context {
+  border-color: #3685f2;
+}
 .bi-checkbox.active .checkbox-context:after,
 .bi-checkbox:active .checkbox-context:after {
  border-color: #ffffff;
@ -1413,6 +1418,9 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
 .bi-checkbox.disabled.active .checkbox-context:after {
  opacity: 1;
 }
+.bi-theme-dark .bi-checkbox .checkbox-context {
+  border-color: #9EA6B2;
+}
 .bi-file {
  opacity: 0;
  filter: alpha(opacity=0);
@ -1441,10 +1449,15 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
  -webkit-border-radius: 8px;
  -moz-border-radius: 8px;
  border-radius: 8px;
+  border: 1px solid #9EA6B2;
 }
 .bi-radio .radio-content:after {
  content: "";
 }
+.bi-radio:active .radio-content,
+.bi-radio.active .radio-content {
+  border-color: #3685f2;
+}
 .bi-radio:active .radio-content:after,
 .bi-radio.active .radio-content:after {
  width: 6px;
@ -1472,6 +1485,9 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
 .bi-radio.disabled.active .radio-content:after {
  background-color: #ffffff;
 }
+.bi-theme-dark .bi-radio .radio-content {
+  border-color: #9EA6B2;
+}
 .bi-label {
  text-overflow: ellipsis;
  overflow-x: hidden;
--- a/dist/base.js
+++ b/dist/base.js
@ -9350,7 +9350,7 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
                ref: function (_ref) {
                    self.checkbox = _ref;
                },
-                cls: "checkbox-context bi-dark-border",
+                cls: "checkbox-context",
                width: o.iconWidth - 2,
                height: o.iconHeight - 2
            }]
@ -9376,9 +9376,9 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
    setSelected: function (b) {
        BI.Checkbox.superclass.setSelected.apply(this, arguments);
        if (b) {
-            this.checkbox.element.removeClass("bi-dark-border").addClass("bi-high-light-background bi-high-light-border");
+            this.checkbox.element.addClass("bi-high-light-background");
        } else {
-            this.checkbox.element.removeClass("bi-high-light-background bi-high-light-border").addClass("bi-dark-border");
+            this.checkbox.element.removeClass("bi-high-light-background");
        }
    }
 });
@ -10368,7 +10368,7 @@ BI.Radio = BI.inherit(BI.BasicButton, {
            element: this.element,
            items: [{
                type: "bi.layout",
-                cls: "radio-content bi-border",
+                cls: "radio-content",
                ref: function (_ref) {
                    self.radio = _ref;
                },
@ -10397,9 +10397,9 @@ BI.Radio = BI.inherit(BI.BasicButton, {
    setSelected: function (b) {
        BI.Radio.superclass.setSelected.apply(this, arguments);
        if (b) {
-            this.radio.element.removeClass("bi-border").addClass("bi-high-light-background bi-high-light-border");
+            this.radio.element.addClass("bi-high-light-background");
        } else {
-            this.radio.element.removeClass("bi-high-light-background bi-high-light-border").addClass("bi-border");
+            this.radio.element.removeClass("bi-high-light-background");
        }
    }
 });
--- a/dist/bundle.css
+++ b/dist/bundle.css
@ -455,51 +455,6 @@ textarea {
 .bi-border-left.disabled {
  border-color: #d0d4da !important;
 }
-.bi-dark-border {
-  border: 1px solid #9EA6B2;
-}
-.bi-dark-border.disabled {
-  border-color: #d0d4da !important;
-}
-.bi-dark-border-top {
-  border-top: 1px solid #9EA6B2;
-}
-.bi-dark-border-top.disabled {
-  border-color: #d0d4da !important;
-}
-.bi-dark-border-right {
-  border-right: 1px solid #9EA6B2;
-}
-.bi-dark-border-right.disabled {
-  border-color: #d0d4da !important;
-}
-.bi-dark-border-bottom {
-  border-bottom: 1px solid #9EA6B2;
-}
-.bi-dark-border-bottom.disabled {
-  border-color: #d0d4da !important;
-}
-.bi-dark-border-left {
-  border-left: 1px solid #9EA6B2;
-}
-.bi-dark-border-left.disabled {
-  border-color: #d0d4da !important;
-}
-.bi-theme-dark .bi-dark-border {
-  border: 1px solid #9EA6B2;
-}
-.bi-theme-dark .bi-dark-border-top {
-  border-top: 1px solid #9EA6B2;
-}
-.bi-theme-dark .bi-dark-border-right {
-  border-right: 1px solid #9EA6B2;
-}
-.bi-theme-dark .bi-dark-border-bottom {
-  border-bottom: 1px solid #9EA6B2;
-}
-.bi-theme-dark .bi-dark-border-left {
-  border-left: 1px solid #9EA6B2;
-}
 .bi-theme-dark .bi-border {
  border: 1px solid #3a3c53;
 }
@ -3582,6 +3537,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
  -webkit-border-radius: 2px;
  -moz-border-radius: 2px;
  border-radius: 2px;
+  border: 1px solid #9EA6B2;
 }
 .bi-checkbox .checkbox-context:after {
  position: absolute;
@ -3600,6 +3556,10 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
  transform: rotate(45deg) scale(1) translate(-50%, -50%);
  content: '';
 }
+.bi-checkbox.active .checkbox-context,
+.bi-checkbox:active .checkbox-context {
+  border-color: #3685f2;
+}
 .bi-checkbox.active .checkbox-context:after,
 .bi-checkbox:active .checkbox-context:after {
  border-color: #ffffff;
@ -3614,6 +3574,9 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
 .bi-checkbox.disabled.active .checkbox-context:after {
  opacity: 1;
 }
+.bi-theme-dark .bi-checkbox .checkbox-context {
+  border-color: #9EA6B2;
+}
 .bi-file {
  opacity: 0;
  filter: alpha(opacity=0);
@ -3642,10 +3605,15 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
  -webkit-border-radius: 8px;
  -moz-border-radius: 8px;
  border-radius: 8px;
+  border: 1px solid #9EA6B2;
 }
 .bi-radio .radio-content:after {
  content: "";
 }
+.bi-radio:active .radio-content,
+.bi-radio.active .radio-content {
+  border-color: #3685f2;
+}
 .bi-radio:active .radio-content:after,
 .bi-radio.active .radio-content:after {
  width: 6px;
@ -3673,6 +3641,9 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
 .bi-radio.disabled.active .radio-content:after {
  background-color: #ffffff;
 }
+.bi-theme-dark .bi-radio .radio-content {
+  border-color: #9EA6B2;
+}
 .bi-label {
  text-overflow: ellipsis;
  overflow-x: hidden;
--- a/dist/bundle.ie.js
+++ b/dist/bundle.ie.js
@ -44735,7 +44735,7 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
                ref: function (_ref) {
                    self.checkbox = _ref;
                },
-                cls: "checkbox-context bi-dark-border",
+                cls: "checkbox-context",
                width: o.iconWidth - 2,
                height: o.iconHeight - 2
            }]
@ -44761,9 +44761,9 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
    setSelected: function (b) {
        BI.Checkbox.superclass.setSelected.apply(this, arguments);
        if (b) {
-            this.checkbox.element.removeClass("bi-dark-border").addClass("bi-high-light-background bi-high-light-border");
+            this.checkbox.element.addClass("bi-high-light-background");
        } else {
-            this.checkbox.element.removeClass("bi-high-light-background bi-high-light-border").addClass("bi-dark-border");
+            this.checkbox.element.removeClass("bi-high-light-background");
        }
    }
 });
@ -45753,7 +45753,7 @@ BI.Radio = BI.inherit(BI.BasicButton, {
            element: this.element,
            items: [{
                type: "bi.layout",
-                cls: "radio-content bi-border",
+                cls: "radio-content",
                ref: function (_ref) {
                    self.radio = _ref;
                },
@ -45782,9 +45782,9 @@ BI.Radio = BI.inherit(BI.BasicButton, {
    setSelected: function (b) {
        BI.Radio.superclass.setSelected.apply(this, arguments);
        if (b) {
-            this.radio.element.removeClass("bi-border").addClass("bi-high-light-background bi-high-light-border");
+            this.radio.element.addClass("bi-high-light-background");
        } else {
-            this.radio.element.removeClass("bi-high-light-background bi-high-light-border").addClass("bi-border");
+            this.radio.element.removeClass("bi-high-light-background");
        }
    }
 });
@ -49798,7 +49798,7 @@ BI.HalfButton = BI.inherit(BI.BasicButton, {
    _defaultConfig: function () {
        var conf = BI.HalfIconButton.superclass._defaultConfig.apply(this, arguments);
        return BI.extend(conf, {
-            extraCls: "bi-half-button bi-border bi-high-light-border",
+            extraCls: "bi-half-button bi-high-light-border",
            height: 14,
            width: 14,
            selected: false
--- a/dist/bundle.ie.min.js
+++ b/dist/bundle.ie.min.js
--- a/dist/bundle.js
+++ b/dist/bundle.js
@ -45139,7 +45139,7 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
                ref: function (_ref) {
                    self.checkbox = _ref;
                },
-                cls: "checkbox-context bi-dark-border",
+                cls: "checkbox-context",
                width: o.iconWidth - 2,
                height: o.iconHeight - 2
            }]
@ -45165,9 +45165,9 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
    setSelected: function (b) {
        BI.Checkbox.superclass.setSelected.apply(this, arguments);
        if (b) {
-            this.checkbox.element.removeClass("bi-dark-border").addClass("bi-high-light-background bi-high-light-border");
+            this.checkbox.element.addClass("bi-high-light-background");
        } else {
-            this.checkbox.element.removeClass("bi-high-light-background bi-high-light-border").addClass("bi-dark-border");
+            this.checkbox.element.removeClass("bi-high-light-background");
        }
    }
 });
@ -46157,7 +46157,7 @@ BI.Radio = BI.inherit(BI.BasicButton, {
            element: this.element,
            items: [{
                type: "bi.layout",
-                cls: "radio-content bi-border",
+                cls: "radio-content",
                ref: function (_ref) {
                    self.radio = _ref;
                },
@ -46186,9 +46186,9 @@ BI.Radio = BI.inherit(BI.BasicButton, {
    setSelected: function (b) {
        BI.Radio.superclass.setSelected.apply(this, arguments);
        if (b) {
-            this.radio.element.removeClass("bi-border").addClass("bi-high-light-background bi-high-light-border");
+            this.radio.element.addClass("bi-high-light-background");
        } else {
-            this.radio.element.removeClass("bi-high-light-background bi-high-light-border").addClass("bi-border");
+            this.radio.element.removeClass("bi-high-light-background");
        }
    }
 });
@ -50202,7 +50202,7 @@ BI.HalfButton = BI.inherit(BI.BasicButton, {
    _defaultConfig: function () {
        var conf = BI.HalfIconButton.superclass._defaultConfig.apply(this, arguments);
        return BI.extend(conf, {
-            extraCls: "bi-half-button bi-border bi-high-light-border",
+            extraCls: "bi-half-button bi-high-light-border",
            height: 14,
            width: 14,
            selected: false
--- a/dist/bundle.min.css
+++ b/dist/bundle.min.css
--- a/dist/bundle.min.js
+++ b/dist/bundle.min.js
--- a/dist/case.js
+++ b/dist/case.js
@ -149,7 +149,7 @@ BI.HalfButton = BI.inherit(BI.BasicButton, {
    _defaultConfig: function () {
        var conf = BI.HalfIconButton.superclass._defaultConfig.apply(this, arguments);
        return BI.extend(conf, {
-            extraCls: "bi-half-button bi-border bi-high-light-border",
+            extraCls: "bi-half-button bi-high-light-border",
            height: 14,
            width: 14,
            selected: false
--- a/dist/core.css
+++ b/dist/core.css
@ -455,51 +455,6 @@ textarea {
 .bi-border-left.disabled {
  border-color: #d0d4da !important;
 }
-.bi-dark-border {
-  border: 1px solid #9EA6B2;
-}
-.bi-dark-border.disabled {
-  border-color: #d0d4da !important;
-}
-.bi-dark-border-top {
-  border-top: 1px solid #9EA6B2;
-}
-.bi-dark-border-top.disabled {
-  border-color: #d0d4da !important;
-}
-.bi-dark-border-right {
-  border-right: 1px solid #9EA6B2;
-}
-.bi-dark-border-right.disabled {
-  border-color: #d0d4da !important;
-}
-.bi-dark-border-bottom {
-  border-bottom: 1px solid #9EA6B2;
-}
-.bi-dark-border-bottom.disabled {
-  border-color: #d0d4da !important;
-}
-.bi-dark-border-left {
-  border-left: 1px solid #9EA6B2;
-}
-.bi-dark-border-left.disabled {
-  border-color: #d0d4da !important;
-}
-.bi-theme-dark .bi-dark-border {
-  border: 1px solid #9EA6B2;
-}
-.bi-theme-dark .bi-dark-border-top {
-  border-top: 1px solid #9EA6B2;
-}
-.bi-theme-dark .bi-dark-border-right {
-  border-right: 1px solid #9EA6B2;
-}
-.bi-theme-dark .bi-dark-border-bottom {
-  border-bottom: 1px solid #9EA6B2;
-}
-.bi-theme-dark .bi-dark-border-left {
-  border-left: 1px solid #9EA6B2;
-}
 .bi-theme-dark .bi-border {
  border: 1px solid #3a3c53;
 }
--- a/dist/core_without_normalize.css
+++ b/dist/core_without_normalize.css
@ -174,51 +174,6 @@ textarea {
 .bi-border-left.disabled {
  border-color: #d0d4da !important;
 }
-.bi-dark-border {
-  border: 1px solid #9EA6B2;
-}
-.bi-dark-border.disabled {
-  border-color: #d0d4da !important;
-}
-.bi-dark-border-top {
-  border-top: 1px solid #9EA6B2;
-}
-.bi-dark-border-top.disabled {
-  border-color: #d0d4da !important;
-}
-.bi-dark-border-right {
-  border-right: 1px solid #9EA6B2;
-}
-.bi-dark-border-right.disabled {
-  border-color: #d0d4da !important;
-}
-.bi-dark-border-bottom {
-  border-bottom: 1px solid #9EA6B2;
-}
-.bi-dark-border-bottom.disabled {
-  border-color: #d0d4da !important;
-}
-.bi-dark-border-left {
-  border-left: 1px solid #9EA6B2;
-}
-.bi-dark-border-left.disabled {
-  border-color: #d0d4da !important;
-}
-.bi-theme-dark .bi-dark-border {
-  border: 1px solid #9EA6B2;
-}
-.bi-theme-dark .bi-dark-border-top {
-  border-top: 1px solid #9EA6B2;
-}
-.bi-theme-dark .bi-dark-border-right {
-  border-right: 1px solid #9EA6B2;
-}
-.bi-theme-dark .bi-dark-border-bottom {
-  border-bottom: 1px solid #9EA6B2;
-}
-.bi-theme-dark .bi-dark-border-left {
-  border-left: 1px solid #9EA6B2;
-}
 .bi-theme-dark .bi-border {
  border: 1px solid #3a3c53;
 }
--- a/dist/fineui.css
+++ b/dist/fineui.css
@ -455,51 +455,6 @@ textarea {
 .bi-border-left.disabled {
  border-color: #d0d4da !important;
 }
-.bi-dark-border {
-  border: 1px solid #9EA6B2;
-}
-.bi-dark-border.disabled {
-  border-color: #d0d4da !important;
-}
-.bi-dark-border-top {
-  border-top: 1px solid #9EA6B2;
-}
-.bi-dark-border-top.disabled {
-  border-color: #d0d4da !important;
-}
-.bi-dark-border-right {
-  border-right: 1px solid #9EA6B2;
-}
-.bi-dark-border-right.disabled {
-  border-color: #d0d4da !important;
-}
-.bi-dark-border-bottom {
-  border-bottom: 1px solid #9EA6B2;
-}
-.bi-dark-border-bottom.disabled {
-  border-color: #d0d4da !important;
-}
-.bi-dark-border-left {
-  border-left: 1px solid #9EA6B2;
-}
-.bi-dark-border-left.disabled {
-  border-color: #d0d4da !important;
-}
-.bi-theme-dark .bi-dark-border {
-  border: 1px solid #9EA6B2;
-}
-.bi-theme-dark .bi-dark-border-top {
-  border-top: 1px solid #9EA6B2;
-}
-.bi-theme-dark .bi-dark-border-right {
-  border-right: 1px solid #9EA6B2;
-}
-.bi-theme-dark .bi-dark-border-bottom {
-  border-bottom: 1px solid #9EA6B2;
-}
-.bi-theme-dark .bi-dark-border-left {
-  border-left: 1px solid #9EA6B2;
-}
 .bi-theme-dark .bi-border {
  border: 1px solid #3a3c53;
 }
@ -3582,6 +3537,7 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
  -webkit-border-radius: 2px;
  -moz-border-radius: 2px;
  border-radius: 2px;
+  border: 1px solid #9EA6B2;
 }
 .bi-checkbox .checkbox-context:after {
  position: absolute;
@ -3600,6 +3556,10 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
  transform: rotate(45deg) scale(1) translate(-50%, -50%);
  content: '';
 }
+.bi-checkbox.active .checkbox-context,
+.bi-checkbox:active .checkbox-context {
+  border-color: #3685f2;
+}
 .bi-checkbox.active .checkbox-context:after,
 .bi-checkbox:active .checkbox-context:after {
  border-color: #ffffff;
@ -3614,6 +3574,9 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
 .bi-checkbox.disabled.active .checkbox-context:after {
  opacity: 1;
 }
+.bi-theme-dark .bi-checkbox .checkbox-context {
+  border-color: #9EA6B2;
+}
 .bi-file {
  opacity: 0;
  filter: alpha(opacity=0);
@ -3642,10 +3605,15 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
  -webkit-border-radius: 8px;
  -moz-border-radius: 8px;
  border-radius: 8px;
+  border: 1px solid #9EA6B2;
 }
 .bi-radio .radio-content:after {
  content: "";
 }
+.bi-radio:active .radio-content,
+.bi-radio.active .radio-content {
+  border-color: #3685f2;
+}
 .bi-radio:active .radio-content:after,
 .bi-radio.active .radio-content:after {
  width: 6px;
@ -3673,6 +3641,9 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
 .bi-radio.disabled.active .radio-content:after {
  background-color: #ffffff;
 }
+.bi-theme-dark .bi-radio .radio-content {
+  border-color: #9EA6B2;
+}
 .bi-label {
  text-overflow: ellipsis;
  overflow-x: hidden;
--- a/dist/fineui.ie.js
+++ b/dist/fineui.ie.js
@ -44980,7 +44980,7 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
                ref: function (_ref) {
                    self.checkbox = _ref;
                },
-                cls: "checkbox-context bi-dark-border",
+                cls: "checkbox-context",
                width: o.iconWidth - 2,
                height: o.iconHeight - 2
            }]
@ -45006,9 +45006,9 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
    setSelected: function (b) {
        BI.Checkbox.superclass.setSelected.apply(this, arguments);
        if (b) {
-            this.checkbox.element.removeClass("bi-dark-border").addClass("bi-high-light-background bi-high-light-border");
+            this.checkbox.element.addClass("bi-high-light-background");
        } else {
-            this.checkbox.element.removeClass("bi-high-light-background bi-high-light-border").addClass("bi-dark-border");
+            this.checkbox.element.removeClass("bi-high-light-background");
        }
    }
 });
@ -45998,7 +45998,7 @@ BI.Radio = BI.inherit(BI.BasicButton, {
            element: this.element,
            items: [{
                type: "bi.layout",
-                cls: "radio-content bi-border",
+                cls: "radio-content",
                ref: function (_ref) {
                    self.radio = _ref;
                },
@ -46027,9 +46027,9 @@ BI.Radio = BI.inherit(BI.BasicButton, {
    setSelected: function (b) {
        BI.Radio.superclass.setSelected.apply(this, arguments);
        if (b) {
-            this.radio.element.removeClass("bi-border").addClass("bi-high-light-background bi-high-light-border");
+            this.radio.element.addClass("bi-high-light-background");
        } else {
-            this.radio.element.removeClass("bi-high-light-background bi-high-light-border").addClass("bi-border");
+            this.radio.element.removeClass("bi-high-light-background");
        }
    }
 });
@ -50043,7 +50043,7 @@ BI.HalfButton = BI.inherit(BI.BasicButton, {
    _defaultConfig: function () {
        var conf = BI.HalfIconButton.superclass._defaultConfig.apply(this, arguments);
        return BI.extend(conf, {
-            extraCls: "bi-half-button bi-border bi-high-light-border",
+            extraCls: "bi-half-button bi-high-light-border",
            height: 14,
            width: 14,
            selected: false
--- a/dist/fineui.ie.min.js
+++ b/dist/fineui.ie.min.js
--- a/dist/fineui.js
+++ b/dist/fineui.js
@ -45384,7 +45384,7 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
                ref: function (_ref) {
                    self.checkbox = _ref;
                },
-                cls: "checkbox-context bi-dark-border",
+                cls: "checkbox-context",
                width: o.iconWidth - 2,
                height: o.iconHeight - 2
            }]
@ -45410,9 +45410,9 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
    setSelected: function (b) {
        BI.Checkbox.superclass.setSelected.apply(this, arguments);
        if (b) {
-            this.checkbox.element.removeClass("bi-dark-border").addClass("bi-high-light-background bi-high-light-border");
+            this.checkbox.element.addClass("bi-high-light-background");
        } else {
-            this.checkbox.element.removeClass("bi-high-light-background bi-high-light-border").addClass("bi-dark-border");
+            this.checkbox.element.removeClass("bi-high-light-background");
        }
    }
 });
@ -46402,7 +46402,7 @@ BI.Radio = BI.inherit(BI.BasicButton, {
            element: this.element,
            items: [{
                type: "bi.layout",
-                cls: "radio-content bi-border",
+                cls: "radio-content",
                ref: function (_ref) {
                    self.radio = _ref;
                },
@ -46431,9 +46431,9 @@ BI.Radio = BI.inherit(BI.BasicButton, {
    setSelected: function (b) {
        BI.Radio.superclass.setSelected.apply(this, arguments);
        if (b) {
-            this.radio.element.removeClass("bi-border").addClass("bi-high-light-background bi-high-light-border");
+            this.radio.element.addClass("bi-high-light-background");
        } else {
-            this.radio.element.removeClass("bi-high-light-background bi-high-light-border").addClass("bi-border");
+            this.radio.element.removeClass("bi-high-light-background");
        }
    }
 });
@ -50447,7 +50447,7 @@ BI.HalfButton = BI.inherit(BI.BasicButton, {
    _defaultConfig: function () {
        var conf = BI.HalfIconButton.superclass._defaultConfig.apply(this, arguments);
        return BI.extend(conf, {
-            extraCls: "bi-half-button bi-border bi-high-light-border",
+            extraCls: "bi-half-button bi-high-light-border",
            height: 14,
            width: 14,
            selected: false
--- a/dist/fineui.min.css
+++ b/dist/fineui.min.css
--- a/dist/fineui.min.js
+++ b/dist/fineui.min.js
--- a/dist/fineui_without_jquery_polyfill.js
+++ b/dist/fineui_without_jquery_polyfill.js
@ -32915,7 +32915,7 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
                ref: function (_ref) {
                    self.checkbox = _ref;
                },
-                cls: "checkbox-context bi-dark-border",
+                cls: "checkbox-context",
                width: o.iconWidth - 2,
                height: o.iconHeight - 2
            }]
@ -32941,9 +32941,9 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
    setSelected: function (b) {
        BI.Checkbox.superclass.setSelected.apply(this, arguments);
        if (b) {
-            this.checkbox.element.removeClass("bi-dark-border").addClass("bi-high-light-background bi-high-light-border");
+            this.checkbox.element.addClass("bi-high-light-background");
        } else {
-            this.checkbox.element.removeClass("bi-high-light-background bi-high-light-border").addClass("bi-dark-border");
+            this.checkbox.element.removeClass("bi-high-light-background");
        }
    }
 });
@ -33312,7 +33312,7 @@ BI.Radio = BI.inherit(BI.BasicButton, {
            element: this.element,
            items: [{
                type: "bi.layout",
-                cls: "radio-content bi-border",
+                cls: "radio-content",
                ref: function (_ref) {
                    self.radio = _ref;
                },
@ -33341,9 +33341,9 @@ BI.Radio = BI.inherit(BI.BasicButton, {
    setSelected: function (b) {
        BI.Radio.superclass.setSelected.apply(this, arguments);
        if (b) {
-            this.radio.element.removeClass("bi-border").addClass("bi-high-light-background bi-high-light-border");
+            this.radio.element.addClass("bi-high-light-background");
        } else {
-            this.radio.element.removeClass("bi-high-light-background bi-high-light-border").addClass("bi-border");
+            this.radio.element.removeClass("bi-high-light-background");
        }
    }
 });
@ -35016,7 +35016,7 @@ BI.HalfButton = BI.inherit(BI.BasicButton, {
    _defaultConfig: function () {
        var conf = BI.HalfIconButton.superclass._defaultConfig.apply(this, arguments);
        return BI.extend(conf, {
-            extraCls: "bi-half-button bi-border bi-high-light-border",
+            extraCls: "bi-half-button bi-high-light-border",
            height: 14,
            width: 14,
            selected: false
--- a/dist/utils.min.js
+++ b/dist/utils.min.js
--- a/src/base/single/input/checkbox/checkbox.js
+++ b/src/base/single/input/checkbox/checkbox.js
@ -24,7 +24,7 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
                ref: function (_ref) {
                    self.checkbox = _ref;
                },
-                cls: "checkbox-context bi-dark-border",
+                cls: "checkbox-context",
                width: o.iconWidth - 2,
                height: o.iconHeight - 2
            }]
@ -50,9 +50,9 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
    setSelected: function (b) {
        BI.Checkbox.superclass.setSelected.apply(this, arguments);
        if (b) {
-            this.checkbox.element.removeClass("bi-dark-border").addClass("bi-high-light-background bi-high-light-border");
+            this.checkbox.element.addClass("bi-high-light-background");
        } else {
-            this.checkbox.element.removeClass("bi-high-light-background bi-high-light-border").addClass("bi-dark-border");
+            this.checkbox.element.removeClass("bi-high-light-background");
        }
    }
 });
--- a/src/base/single/input/radio/radio.js
+++ b/src/base/single/input/radio/radio.js
@ -22,7 +22,7 @@ BI.Radio = BI.inherit(BI.BasicButton, {
            element: this.element,
            items: [{
                type: "bi.layout",
-                cls: "radio-content bi-border",
+                cls: "radio-content",
                ref: function (_ref) {
                    self.radio = _ref;
                },
@ -51,9 +51,9 @@ BI.Radio = BI.inherit(BI.BasicButton, {
    setSelected: function (b) {
        BI.Radio.superclass.setSelected.apply(this, arguments);
        if (b) {
-            this.radio.element.removeClass("bi-border").addClass("bi-high-light-background bi-high-light-border");
+            this.radio.element.addClass("bi-high-light-background");
        } else {
-            this.radio.element.removeClass("bi-high-light-background bi-high-light-border").addClass("bi-border");
+            this.radio.element.removeClass("bi-high-light-background");
        }
    }
 });
--- a/src/case/button/icon/iconhalf/icon.half.js
+++ b/src/case/button/icon/iconhalf/icon.half.js
@ -7,7 +7,7 @@ BI.HalfButton = BI.inherit(BI.BasicButton, {
    _defaultConfig: function () {
        var conf = BI.HalfIconButton.superclass._defaultConfig.apply(this, arguments);
        return BI.extend(conf, {
-            extraCls: "bi-half-button bi-border bi-high-light-border",
+            extraCls: "bi-half-button bi-high-light-border",
            height: 14,
            width: 14,
            selected: false
--- a/src/css/base/single/input/checkbox.css
+++ b/src/css/base/single/input/checkbox.css
@ -2,6 +2,7 @@
  -webkit-border-radius: 2px;
  -moz-border-radius: 2px;
  border-radius: 2px;
+  border: 1px solid #9EA6B2;
 }
 .bi-checkbox .checkbox-context:after {
  position: absolute;
@ -20,6 +21,10 @@
  transform: rotate(45deg) scale(1) translate(-50%, -50%);
  content: '';
 }
+.bi-checkbox.active .checkbox-context,
+.bi-checkbox:active .checkbox-context {
+  border-color: #3685f2;
+}
 .bi-checkbox.active .checkbox-context:after,
 .bi-checkbox:active .checkbox-context:after {
  border-color: #ffffff;
@ -34,3 +39,6 @@
 .bi-checkbox.disabled.active .checkbox-context:after {
  opacity: 1;
 }
+.bi-theme-dark .bi-checkbox .checkbox-context {
+  border-color: #9EA6B2;
+}
--- a/src/css/base/single/input/radio.css
+++ b/src/css/base/single/input/radio.css
@ -2,10 +2,15 @@
  -webkit-border-radius: 8px;
  -moz-border-radius: 8px;
  border-radius: 8px;
+  border: 1px solid #9EA6B2;
 }
 .bi-radio .radio-content:after {
  content: "";
 }
+.bi-radio:active .radio-content,
+.bi-radio.active .radio-content {
+  border-color: #3685f2;
+}
 .bi-radio:active .radio-content:after,
 .bi-radio.active .radio-content:after {
  width: 6px;
@ -33,3 +38,6 @@
 .bi-radio.disabled.active .radio-content:after {
  background-color: #ffffff;
 }
+.bi-theme-dark .bi-radio .radio-content {
+  border-color: #9EA6B2;
+}
--- a/src/css/core/utils/common.css
+++ b/src/css/core/utils/common.css
@ -174,51 +174,6 @@ textarea {
 .bi-border-left.disabled {
  border-color: #d0d4da !important;
 }
-.bi-dark-border {
-  border: 1px solid #9EA6B2;
-}
-.bi-dark-border.disabled {
-  border-color: #d0d4da !important;
-}
-.bi-dark-border-top {
-  border-top: 1px solid #9EA6B2;
-}
-.bi-dark-border-top.disabled {
-  border-color: #d0d4da !important;
-}
-.bi-dark-border-right {
-  border-right: 1px solid #9EA6B2;
-}
-.bi-dark-border-right.disabled {
-  border-color: #d0d4da !important;
-}
-.bi-dark-border-bottom {
-  border-bottom: 1px solid #9EA6B2;
-}
-.bi-dark-border-bottom.disabled {
-  border-color: #d0d4da !important;
-}
-.bi-dark-border-left {
-  border-left: 1px solid #9EA6B2;
-}
-.bi-dark-border-left.disabled {
-  border-color: #d0d4da !important;
-}
-.bi-theme-dark .bi-dark-border {
-  border: 1px solid #9EA6B2;
-}
-.bi-theme-dark .bi-dark-border-top {
-  border-top: 1px solid #9EA6B2;
-}
-.bi-theme-dark .bi-dark-border-right {
-  border-right: 1px solid #9EA6B2;
-}
-.bi-theme-dark .bi-dark-border-bottom {
-  border-bottom: 1px solid #9EA6B2;
-}
-.bi-theme-dark .bi-dark-border-left {
-  border-left: 1px solid #9EA6B2;
-}
 .bi-theme-dark .bi-border {
  border: 1px solid #3a3c53;
 }
--- a/src/less/base/single/input/checkbox.less
+++ b/src/less/base/single/input/checkbox.less
@ -3,6 +3,7 @@
 .bi-checkbox {
  & .checkbox-context {
    .border-radius(2px);
+    border: 1px solid @color-bi-border-dark-line;
    &:after {
      position: absolute;
      display: table;
@ -18,9 +19,12 @@
    }
  }
  &.active, &:active {
-    & .checkbox-context:after {
-      border-color: @color-bi-border-default;
-      opacity: 1;
+    & .checkbox-context{
+      border-color: @color-bi-border-highlight;
+      &:after {
+        border-color: @color-bi-border-default;
+        opacity: 1;
+      }
    }
  }
  &.disabled {
@ -36,4 +40,12 @@
      }
    }
  }
+}
+
+.bi-theme-dark {
+  .bi-checkbox {
+    & .checkbox-context {
+      border-color: @color-bi-border-dark-line-theme-dark;
+    }
+  }
 }
--- a/src/less/base/single/input/radio.less
+++ b/src/less/base/single/input/radio.less
@ -3,21 +3,25 @@
 .bi-radio {
  & .radio-content {
    .border-radius(8px);
+    border: 1px solid @color-bi-border-dark-line;
    &:after {
      content: "";
    }
  }
  &:active, &.active {
-    & .radio-content:after {
-      width: 6px;
-      height: 6px;
-      display: table;
-      position: absolute;
-      top: 50%;
-      left: 50%;
-      .border-radius(3px);
-      background-color: @color-bi-background-default;
-      .transform(translate(-50%, -50%));
+    & .radio-content {
+      border-color:  @color-bi-border-highlight;
+      &:after {
+        width: 6px;
+        height: 6px;
+        display: table;
+        position: absolute;
+        top: 50%;
+        left: 50%;
+        .border-radius(3px);
+        background-color: @color-bi-background-default;
+        .transform(translate(-50%, -50%));
+      }
    }
  }
  &.disabled {
@ -33,4 +37,12 @@
      }
    }
  }
+}
+
+.bi-theme-dark {
+  .bi-radio {
+    & .radio-content {
+      border-color: @color-bi-border-dark-line-theme-dark;
+    }
+  }
 }
--- a/src/less/core/utils/common.less
+++ b/src/less/core/utils/common.less
@ -213,64 +213,6 @@ textarea {
  }
 }

-//深色边框
-.bi-dark-border {
-  border: 1px solid @color-bi-border-dark-line;
-  &.disabled {
-    border-color: @color-bi-border-disabled !important;
-  }
-}
-
-.bi-dark-border-top {
-  border-top: 1px solid @color-bi-border-dark-line;
-  &.disabled {
-    border-color: @color-bi-border-disabled !important;
-  }
-}
-
-.bi-dark-border-right {
-  border-right: 1px solid @color-bi-border-dark-line;
-  &.disabled {
-    border-color: @color-bi-border-disabled !important;
-  }
-}
-
-.bi-dark-border-bottom {
-  border-bottom: 1px solid @color-bi-border-dark-line;
-  &.disabled {
-    border-color: @color-bi-border-disabled !important;
-  }
-}
-
-.bi-dark-border-left {
-  border-left: 1px solid @color-bi-border-dark-line;
-  &.disabled {
-    border-color: @color-bi-border-disabled !important;
-  }
-}
-
-.bi-theme-dark {
-  .bi-dark-border {
-    border: 1px solid @color-bi-border-dark-line-theme-dark;
-  }
-
-  .bi-dark-border-top {
-    border-top: 1px solid @color-bi-border-dark-line-theme-dark;
-  }
-
-  .bi-dark-border-right {
-    border-right: 1px solid @color-bi-border-dark-line-theme-dark;
-  }
-
-  .bi-dark-border-bottom {
-    border-bottom: 1px solid @color-bi-border-dark-line-theme-dark;
-  }
-
-  .bi-dark-border-left {
-    border-left: 1px solid @color-bi-border-dark-line-theme-dark;
-  }
-}
-
 .bi-theme-dark {
  .bi-border {
    border: 1px solid @color-bi-border-line-theme-dark;