Browse Source

Merge branch 'master' of ssh://code.fineres.com:7999/~teller/fineui

es6
iapyang 3 years ago
parent
commit
217d08f703
  1. 2
      package.json
  2. 6
      src/base/single/input/checkbox/checkbox.js
  3. 7
      src/less/base/single/button/button.half.less
  4. 7
      src/less/base/single/input/checkbox.less
  5. 2
      src/less/base/tree/ztree.less

2
package.json

@ -1,6 +1,6 @@
{ {
"name": "fineui", "name": "fineui",
"version": "2.0.20211009135140", "version": "2.0.20211011153425",
"description": "fineui", "description": "fineui",
"main": "dist/fineui.min.js", "main": "dist/fineui.min.js",
"types": "dist/lib/index.d.ts", "types": "dist/lib/index.d.ts",

6
src/base/single/input/checkbox/checkbox.js

@ -25,8 +25,8 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
self.checkbox = _ref; self.checkbox = _ref;
}, },
cls: "checkbox-content", cls: "checkbox-content",
width: o.iconWidth - 2, width: o.iconWidth,
height: o.iconHeight - 2 height: o.iconHeight
}] }]
}; };
}, },
@ -58,4 +58,4 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
}); });
BI.Checkbox.EVENT_CHANGE = "EVENT_CHANGE"; BI.Checkbox.EVENT_CHANGE = "EVENT_CHANGE";
BI.shortcut("bi.checkbox", BI.Checkbox); BI.shortcut("bi.checkbox", BI.Checkbox);

7
src/less/base/single/button/button.half.less

@ -2,13 +2,14 @@
.bi-half-button { .bi-half-button {
.border-radius(2px); .border-radius(2px);
box-sizing: border-box;
&:after { &:after {
position: absolute; position: absolute;
left: 3px; left: 2px;
top: 3px; top: 2px;
width: 8px; width: 8px;
height: 8px; height: 8px;
background-color: @color-bi-background-highlight; background-color: @color-bi-background-highlight;
content: ''; content: '';
} }
} }

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

@ -4,6 +4,7 @@
& .checkbox-content, &.checkbox-content { & .checkbox-content, &.checkbox-content {
.border-radius(2px); .border-radius(2px);
border: 1px solid @color-bi-border-dark-line; border: 1px solid @color-bi-border-dark-line;
box-sizing: border-box;
&:after { &:after {
position: absolute; position: absolute;
display: table; display: table;
@ -12,8 +13,8 @@
border: 2px solid transparent; border: 2px solid transparent;
border-top: 0; border-top: 0;
border-left: 0; border-left: 0;
width: 4px; width: 6px;
height: 8px; height: 9px;
.transform(rotate(45deg) scale(1) translate(-50%, -50%)); .transform(rotate(45deg) scale(1) translate(-50%, -50%));
content: ''; content: '';
} }
@ -74,4 +75,4 @@
} }
} }
} }
} }

2
src/less/base/tree/ztree.less

@ -108,6 +108,7 @@
.ztree li span.button.chk { .ztree li span.button.chk {
&.bi-checkbox { &.bi-checkbox {
border: 1px solid @color-bi-border-dark-line; border: 1px solid @color-bi-border-dark-line;
box-sizing: border-box;
&.active { &.active {
background-color: @color-bi-background-highlight; background-color: @color-bi-background-highlight;
border-color: @color-bi-border-highlight;; border-color: @color-bi-border-highlight;;
@ -115,6 +116,7 @@
} }
&.bi-half-button { &.bi-half-button {
border: 1px solid @color-bi-border-highlight; border: 1px solid @color-bi-border-highlight;
box-sizing: border-box;
} }
} }

Loading…
Cancel
Save