Browse Source

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

* commit '5ee8d275c41e183080ed505e556e15a4c7756d01':
  无JIRA任务 class命名改一下
es6
windy 6 years ago
parent
commit
e323c0c4b1
  1. 26
      dist/2.0/fineui.css
  2. 2
      dist/2.0/fineui.ie.js
  3. 58
      dist/2.0/fineui.ie.min.js
  4. 2
      dist/2.0/fineui.js
  5. 2
      dist/2.0/fineui.min.css
  6. 10
      dist/2.0/fineui.min.js
  7. 26
      dist/base.css
  8. 2
      dist/base.js
  9. 26
      dist/bundle.css
  10. 2
      dist/bundle.ie.js
  11. 58
      dist/bundle.ie.min.js
  12. 2
      dist/bundle.js
  13. 2
      dist/bundle.min.css
  14. 10
      dist/bundle.min.js
  15. 26
      dist/fineui.css
  16. 2
      dist/fineui.ie.js
  17. 58
      dist/fineui.ie.min.js
  18. 2
      dist/fineui.js
  19. 2
      dist/fineui.min.css
  20. 10
      dist/fineui.min.js
  21. 2
      dist/fineui_without_jquery_polyfill.js
  22. 2
      dist/utils.min.js
  23. 2
      src/base/single/input/checkbox/checkbox.js
  24. 20
      src/css/base/single/input/checkbox.css
  25. 10
      src/less/base/single/input/checkbox.less

26
dist/2.0/fineui.css vendored

@ -3540,13 +3540,13 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
margin: auto; margin: auto;
width: 100%; width: 100%;
} }
.bi-checkbox .checkbox-context { .bi-checkbox .checkbox-content {
-webkit-border-radius: 2px; -webkit-border-radius: 2px;
-moz-border-radius: 2px; -moz-border-radius: 2px;
border-radius: 2px; border-radius: 2px;
border: 1px solid #9EA6B2; border: 1px solid #9EA6B2;
} }
.bi-checkbox .checkbox-context:after { .bi-checkbox .checkbox-content:after {
position: absolute; position: absolute;
display: table; display: table;
top: 50%; top: 50%;
@ -3563,26 +3563,26 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
transform: rotate(45deg) scale(1) translate(-50%, -50%); transform: rotate(45deg) scale(1) translate(-50%, -50%);
content: ''; content: '';
} }
.bi-checkbox.active .checkbox-context, .bi-checkbox.active .checkbox-content,
.bi-checkbox:active .checkbox-context { .bi-checkbox:active .checkbox-content {
border-color: #3685f2; border-color: #3685f2;
} }
.bi-checkbox.active .checkbox-context:after, .bi-checkbox.active .checkbox-content:after,
.bi-checkbox:active .checkbox-context:after { .bi-checkbox:active .checkbox-content:after {
border-color: #ffffff; border-color: #ffffff;
opacity: 1; opacity: 1;
} }
.bi-checkbox.disabled .checkbox-context:after { .bi-checkbox.disabled .checkbox-content:after {
opacity: 0; opacity: 0;
} }
.bi-checkbox.disabled.active .checkbox-context { .bi-checkbox.disabled.active .checkbox-content {
border-color: #e8eaed; border-color: #e8eaed;
background-color: #d0d4da; background-color: #d0d4da;
} }
.bi-checkbox.disabled.active .checkbox-context:after { .bi-checkbox.disabled.active .checkbox-content:after {
opacity: 1; opacity: 1;
} }
.bi-theme-dark .bi-checkbox .checkbox-context { .bi-theme-dark .bi-checkbox .checkbox-content {
border-color: #9EA6B2; border-color: #9EA6B2;
} }
.bi-file { .bi-file {
@ -3654,17 +3654,15 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
border-color: #9EA6B2; border-color: #9EA6B2;
} }
.bi-label { .bi-label {
text-overflow: ellipsis; overflow: hidden;
overflow-x: hidden; overflow-x: hidden;
overflow-y: hidden; overflow-y: hidden;
white-space: nowrap;
word-break: break-all; word-break: break-all;
} }
.bi-text { .bi-text {
text-overflow: ellipsis; overflow: hidden;
overflow-x: hidden; overflow-x: hidden;
overflow-y: hidden; overflow-y: hidden;
white-space: nowrap;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
/*Safari3.2+*/ /*Safari3.2+*/
-moz-box-sizing: border-box; -moz-box-sizing: border-box;

2
dist/2.0/fineui.ie.js vendored

@ -44790,7 +44790,7 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
ref: function (_ref) { ref: function (_ref) {
self.checkbox = _ref; self.checkbox = _ref;
}, },
cls: "checkbox-context", cls: "checkbox-content",
width: o.iconWidth - 2, width: o.iconWidth - 2,
height: o.iconHeight - 2 height: o.iconHeight - 2
}] }]

58
dist/2.0/fineui.ie.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/2.0/fineui.js vendored

@ -45194,7 +45194,7 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
ref: function (_ref) { ref: function (_ref) {
self.checkbox = _ref; self.checkbox = _ref;
}, },
cls: "checkbox-context", cls: "checkbox-content",
width: o.iconWidth - 2, width: o.iconWidth - 2,
height: o.iconHeight - 2 height: o.iconHeight - 2
}] }]

2
dist/2.0/fineui.min.css vendored

File diff suppressed because one or more lines are too long

10
dist/2.0/fineui.min.js vendored

File diff suppressed because one or more lines are too long

26
dist/base.css vendored

@ -1384,13 +1384,13 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
margin: auto; margin: auto;
width: 100%; width: 100%;
} }
.bi-checkbox .checkbox-context { .bi-checkbox .checkbox-content {
-webkit-border-radius: 2px; -webkit-border-radius: 2px;
-moz-border-radius: 2px; -moz-border-radius: 2px;
border-radius: 2px; border-radius: 2px;
border: 1px solid #9EA6B2; border: 1px solid #9EA6B2;
} }
.bi-checkbox .checkbox-context:after { .bi-checkbox .checkbox-content:after {
position: absolute; position: absolute;
display: table; display: table;
top: 50%; top: 50%;
@ -1407,26 +1407,26 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
transform: rotate(45deg) scale(1) translate(-50%, -50%); transform: rotate(45deg) scale(1) translate(-50%, -50%);
content: ''; content: '';
} }
.bi-checkbox.active .checkbox-context, .bi-checkbox.active .checkbox-content,
.bi-checkbox:active .checkbox-context { .bi-checkbox:active .checkbox-content {
border-color: #3685f2; border-color: #3685f2;
} }
.bi-checkbox.active .checkbox-context:after, .bi-checkbox.active .checkbox-content:after,
.bi-checkbox:active .checkbox-context:after { .bi-checkbox:active .checkbox-content:after {
border-color: #ffffff; border-color: #ffffff;
opacity: 1; opacity: 1;
} }
.bi-checkbox.disabled .checkbox-context:after { .bi-checkbox.disabled .checkbox-content:after {
opacity: 0; opacity: 0;
} }
.bi-checkbox.disabled.active .checkbox-context { .bi-checkbox.disabled.active .checkbox-content {
border-color: #e8eaed; border-color: #e8eaed;
background-color: #d0d4da; background-color: #d0d4da;
} }
.bi-checkbox.disabled.active .checkbox-context:after { .bi-checkbox.disabled.active .checkbox-content:after {
opacity: 1; opacity: 1;
} }
.bi-theme-dark .bi-checkbox .checkbox-context { .bi-theme-dark .bi-checkbox .checkbox-content {
border-color: #9EA6B2; border-color: #9EA6B2;
} }
.bi-file { .bi-file {
@ -1498,17 +1498,15 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
border-color: #9EA6B2; border-color: #9EA6B2;
} }
.bi-label { .bi-label {
text-overflow: ellipsis; overflow: hidden;
overflow-x: hidden; overflow-x: hidden;
overflow-y: hidden; overflow-y: hidden;
white-space: nowrap;
word-break: break-all; word-break: break-all;
} }
.bi-text { .bi-text {
text-overflow: ellipsis; overflow: hidden;
overflow-x: hidden; overflow-x: hidden;
overflow-y: hidden; overflow-y: hidden;
white-space: nowrap;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
/*Safari3.2+*/ /*Safari3.2+*/
-moz-box-sizing: border-box; -moz-box-sizing: border-box;

2
dist/base.js vendored

@ -9352,7 +9352,7 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
ref: function (_ref) { ref: function (_ref) {
self.checkbox = _ref; self.checkbox = _ref;
}, },
cls: "checkbox-context", cls: "checkbox-content",
width: o.iconWidth - 2, width: o.iconWidth - 2,
height: o.iconHeight - 2 height: o.iconHeight - 2
}] }]

26
dist/bundle.css vendored

@ -3540,13 +3540,13 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
margin: auto; margin: auto;
width: 100%; width: 100%;
} }
.bi-checkbox .checkbox-context { .bi-checkbox .checkbox-content {
-webkit-border-radius: 2px; -webkit-border-radius: 2px;
-moz-border-radius: 2px; -moz-border-radius: 2px;
border-radius: 2px; border-radius: 2px;
border: 1px solid #9EA6B2; border: 1px solid #9EA6B2;
} }
.bi-checkbox .checkbox-context:after { .bi-checkbox .checkbox-content:after {
position: absolute; position: absolute;
display: table; display: table;
top: 50%; top: 50%;
@ -3563,26 +3563,26 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
transform: rotate(45deg) scale(1) translate(-50%, -50%); transform: rotate(45deg) scale(1) translate(-50%, -50%);
content: ''; content: '';
} }
.bi-checkbox.active .checkbox-context, .bi-checkbox.active .checkbox-content,
.bi-checkbox:active .checkbox-context { .bi-checkbox:active .checkbox-content {
border-color: #3685f2; border-color: #3685f2;
} }
.bi-checkbox.active .checkbox-context:after, .bi-checkbox.active .checkbox-content:after,
.bi-checkbox:active .checkbox-context:after { .bi-checkbox:active .checkbox-content:after {
border-color: #ffffff; border-color: #ffffff;
opacity: 1; opacity: 1;
} }
.bi-checkbox.disabled .checkbox-context:after { .bi-checkbox.disabled .checkbox-content:after {
opacity: 0; opacity: 0;
} }
.bi-checkbox.disabled.active .checkbox-context { .bi-checkbox.disabled.active .checkbox-content {
border-color: #e8eaed; border-color: #e8eaed;
background-color: #d0d4da; background-color: #d0d4da;
} }
.bi-checkbox.disabled.active .checkbox-context:after { .bi-checkbox.disabled.active .checkbox-content:after {
opacity: 1; opacity: 1;
} }
.bi-theme-dark .bi-checkbox .checkbox-context { .bi-theme-dark .bi-checkbox .checkbox-content {
border-color: #9EA6B2; border-color: #9EA6B2;
} }
.bi-file { .bi-file {
@ -3654,17 +3654,15 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
border-color: #9EA6B2; border-color: #9EA6B2;
} }
.bi-label { .bi-label {
text-overflow: ellipsis; overflow: hidden;
overflow-x: hidden; overflow-x: hidden;
overflow-y: hidden; overflow-y: hidden;
white-space: nowrap;
word-break: break-all; word-break: break-all;
} }
.bi-text { .bi-text {
text-overflow: ellipsis; overflow: hidden;
overflow-x: hidden; overflow-x: hidden;
overflow-y: hidden; overflow-y: hidden;
white-space: nowrap;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
/*Safari3.2+*/ /*Safari3.2+*/
-moz-box-sizing: border-box; -moz-box-sizing: border-box;

2
dist/bundle.ie.js vendored

@ -44790,7 +44790,7 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
ref: function (_ref) { ref: function (_ref) {
self.checkbox = _ref; self.checkbox = _ref;
}, },
cls: "checkbox-context", cls: "checkbox-content",
width: o.iconWidth - 2, width: o.iconWidth - 2,
height: o.iconHeight - 2 height: o.iconHeight - 2
}] }]

58
dist/bundle.ie.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/bundle.js vendored

@ -45194,7 +45194,7 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
ref: function (_ref) { ref: function (_ref) {
self.checkbox = _ref; self.checkbox = _ref;
}, },
cls: "checkbox-context", cls: "checkbox-content",
width: o.iconWidth - 2, width: o.iconWidth - 2,
height: o.iconHeight - 2 height: o.iconHeight - 2
}] }]

2
dist/bundle.min.css vendored

File diff suppressed because one or more lines are too long

10
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

26
dist/fineui.css vendored

@ -3540,13 +3540,13 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
margin: auto; margin: auto;
width: 100%; width: 100%;
} }
.bi-checkbox .checkbox-context { .bi-checkbox .checkbox-content {
-webkit-border-radius: 2px; -webkit-border-radius: 2px;
-moz-border-radius: 2px; -moz-border-radius: 2px;
border-radius: 2px; border-radius: 2px;
border: 1px solid #9EA6B2; border: 1px solid #9EA6B2;
} }
.bi-checkbox .checkbox-context:after { .bi-checkbox .checkbox-content:after {
position: absolute; position: absolute;
display: table; display: table;
top: 50%; top: 50%;
@ -3563,26 +3563,26 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
transform: rotate(45deg) scale(1) translate(-50%, -50%); transform: rotate(45deg) scale(1) translate(-50%, -50%);
content: ''; content: '';
} }
.bi-checkbox.active .checkbox-context, .bi-checkbox.active .checkbox-content,
.bi-checkbox:active .checkbox-context { .bi-checkbox:active .checkbox-content {
border-color: #3685f2; border-color: #3685f2;
} }
.bi-checkbox.active .checkbox-context:after, .bi-checkbox.active .checkbox-content:after,
.bi-checkbox:active .checkbox-context:after { .bi-checkbox:active .checkbox-content:after {
border-color: #ffffff; border-color: #ffffff;
opacity: 1; opacity: 1;
} }
.bi-checkbox.disabled .checkbox-context:after { .bi-checkbox.disabled .checkbox-content:after {
opacity: 0; opacity: 0;
} }
.bi-checkbox.disabled.active .checkbox-context { .bi-checkbox.disabled.active .checkbox-content {
border-color: #e8eaed; border-color: #e8eaed;
background-color: #d0d4da; background-color: #d0d4da;
} }
.bi-checkbox.disabled.active .checkbox-context:after { .bi-checkbox.disabled.active .checkbox-content:after {
opacity: 1; opacity: 1;
} }
.bi-theme-dark .bi-checkbox .checkbox-context { .bi-theme-dark .bi-checkbox .checkbox-content {
border-color: #9EA6B2; border-color: #9EA6B2;
} }
.bi-file { .bi-file {
@ -3654,17 +3654,15 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
border-color: #9EA6B2; border-color: #9EA6B2;
} }
.bi-label { .bi-label {
text-overflow: ellipsis; overflow: hidden;
overflow-x: hidden; overflow-x: hidden;
overflow-y: hidden; overflow-y: hidden;
white-space: nowrap;
word-break: break-all; word-break: break-all;
} }
.bi-text { .bi-text {
text-overflow: ellipsis; overflow: hidden;
overflow-x: hidden; overflow-x: hidden;
overflow-y: hidden; overflow-y: hidden;
white-space: nowrap;
-webkit-box-sizing: border-box; -webkit-box-sizing: border-box;
/*Safari3.2+*/ /*Safari3.2+*/
-moz-box-sizing: border-box; -moz-box-sizing: border-box;

2
dist/fineui.ie.js vendored

@ -45035,7 +45035,7 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
ref: function (_ref) { ref: function (_ref) {
self.checkbox = _ref; self.checkbox = _ref;
}, },
cls: "checkbox-context", cls: "checkbox-content",
width: o.iconWidth - 2, width: o.iconWidth - 2,
height: o.iconHeight - 2 height: o.iconHeight - 2
}] }]

58
dist/fineui.ie.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/fineui.js vendored

@ -45439,7 +45439,7 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
ref: function (_ref) { ref: function (_ref) {
self.checkbox = _ref; self.checkbox = _ref;
}, },
cls: "checkbox-context", cls: "checkbox-content",
width: o.iconWidth - 2, width: o.iconWidth - 2,
height: o.iconHeight - 2 height: o.iconHeight - 2
}] }]

2
dist/fineui.min.css vendored

File diff suppressed because one or more lines are too long

10
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/fineui_without_jquery_polyfill.js vendored

@ -32970,7 +32970,7 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
ref: function (_ref) { ref: function (_ref) {
self.checkbox = _ref; self.checkbox = _ref;
}, },
cls: "checkbox-context", cls: "checkbox-content",
width: o.iconWidth - 2, width: o.iconWidth - 2,
height: o.iconHeight - 2 height: o.iconHeight - 2
}] }]

2
dist/utils.min.js vendored

File diff suppressed because one or more lines are too long

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

@ -24,7 +24,7 @@ BI.Checkbox = BI.inherit(BI.BasicButton, {
ref: function (_ref) { ref: function (_ref) {
self.checkbox = _ref; self.checkbox = _ref;
}, },
cls: "checkbox-context", cls: "checkbox-content",
width: o.iconWidth - 2, width: o.iconWidth - 2,
height: o.iconHeight - 2 height: o.iconHeight - 2
}] }]

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

@ -1,10 +1,10 @@
.bi-checkbox .checkbox-context { .bi-checkbox .checkbox-content {
-webkit-border-radius: 2px; -webkit-border-radius: 2px;
-moz-border-radius: 2px; -moz-border-radius: 2px;
border-radius: 2px; border-radius: 2px;
border: 1px solid #9EA6B2; border: 1px solid #9EA6B2;
} }
.bi-checkbox .checkbox-context:after { .bi-checkbox .checkbox-content:after {
position: absolute; position: absolute;
display: table; display: table;
top: 50%; top: 50%;
@ -21,25 +21,25 @@
transform: rotate(45deg) scale(1) translate(-50%, -50%); transform: rotate(45deg) scale(1) translate(-50%, -50%);
content: ''; content: '';
} }
.bi-checkbox.active .checkbox-context, .bi-checkbox.active .checkbox-content,
.bi-checkbox:active .checkbox-context { .bi-checkbox:active .checkbox-content {
border-color: #3685f2; border-color: #3685f2;
} }
.bi-checkbox.active .checkbox-context:after, .bi-checkbox.active .checkbox-content:after,
.bi-checkbox:active .checkbox-context:after { .bi-checkbox:active .checkbox-content:after {
border-color: #ffffff; border-color: #ffffff;
opacity: 1; opacity: 1;
} }
.bi-checkbox.disabled .checkbox-context:after { .bi-checkbox.disabled .checkbox-content:after {
opacity: 0; opacity: 0;
} }
.bi-checkbox.disabled.active .checkbox-context { .bi-checkbox.disabled.active .checkbox-content {
border-color: #e8eaed; border-color: #e8eaed;
background-color: #d0d4da; background-color: #d0d4da;
} }
.bi-checkbox.disabled.active .checkbox-context:after { .bi-checkbox.disabled.active .checkbox-content:after {
opacity: 1; opacity: 1;
} }
.bi-theme-dark .bi-checkbox .checkbox-context { .bi-theme-dark .bi-checkbox .checkbox-content {
border-color: #9EA6B2; border-color: #9EA6B2;
} }

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

@ -1,7 +1,7 @@
@import "../../../index"; @import "../../../index";
.bi-checkbox { .bi-checkbox {
& .checkbox-context { & .checkbox-content {
.border-radius(2px); .border-radius(2px);
border: 1px solid @color-bi-border-dark-line; border: 1px solid @color-bi-border-dark-line;
&:after { &:after {
@ -19,7 +19,7 @@
} }
} }
&.active, &:active { &.active, &:active {
& .checkbox-context{ & .checkbox-content{
border-color: @color-bi-border-highlight; border-color: @color-bi-border-highlight;
&:after { &:after {
border-color: @color-bi-border-default; border-color: @color-bi-border-default;
@ -28,11 +28,11 @@
} }
} }
&.disabled { &.disabled {
& .checkbox-context:after { & .checkbox-content:after {
opacity: 0; opacity: 0;
} }
&.active { &.active {
& .checkbox-context { & .checkbox-content {
// 深浅主题下border-color是一样的 // 深浅主题下border-color是一样的
border-color: @color-bi-border-line; border-color: @color-bi-border-line;
background-color: @color-bi-background-dark-gray; background-color: @color-bi-background-dark-gray;
@ -46,7 +46,7 @@
.bi-theme-dark { .bi-theme-dark {
.bi-checkbox { .bi-checkbox {
& .checkbox-context { & .checkbox-content {
border-color: @color-bi-border-dark-line-theme-dark; border-color: @color-bi-border-dark-line-theme-dark;
} }
} }

Loading…
Cancel
Save