Browse Source

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

* commit '9887f63ce4f248cc30cd25912ba1295307363b5c':
  update
  无JIRA任务 IE8下伪类不支持opacity
es6
windy 6 years ago
parent
commit
324a1fbda9
  1. 9
      dist/base.css
  2. 2
      dist/base.js
  3. 9
      dist/bundle.css
  4. 2
      dist/bundle.ie.js
  5. 4
      dist/bundle.ie.min.js
  6. 2
      dist/bundle.js
  7. 2
      dist/bundle.min.css
  8. 4
      dist/bundle.min.js
  9. 9
      dist/fineui.css
  10. 2
      dist/fineui.ie.js
  11. 4
      dist/fineui.ie.min.js
  12. 2
      dist/fineui.js
  13. 2
      dist/fineui.min.css
  14. 4
      dist/fineui.min.js
  15. 2
      dist/fineui_without_jquery_polyfill.js
  16. 2
      dist/utils.min.js
  17. 2
      src/base/single/button/buttons/button.js
  18. 9
      src/css/base/single/button/button.css
  19. 6
      src/less/base/single/button/button.less

9
dist/base.css vendored

@ -1217,6 +1217,12 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
top: 0;
pointer-events: none;
}
.bi-basic-button.button-common.hack:after,
.bi-basic-button.button-success.hack:after,
.bi-basic-button.button-warning.hack:after,
.bi-basic-button.button-error.hack:after {
content: none;
}
.bi-basic-button.button-common:active:after,
.bi-basic-button.button-success:active:after,
.bi-basic-button.button-warning:active:after,
@ -1262,6 +1268,9 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
top: 0;
pointer-events: none;
}
.bi-basic-button.button-ignore.hack:after {
content: none;
}
.bi-basic-button.button-ignore:active:after {
transform: scale(0, 1);
opacity: 0.1;

2
dist/base.js vendored

@ -7121,7 +7121,7 @@ BI.Button = BI.inherit(BI.BasicButton, {
_defaultConfig: function (props) {
var conf = BI.Button.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-button",
baseCls: (conf.baseCls || "") + " bi-button" + ((BI.isIE() && BI.isIE9Below()) ? " hack" : ""),
minWidth: (props.block === true || props.clear === true) ? 0 : 80,
height: 24,
shadow: props.clear !== true,

9
dist/bundle.css vendored

@ -3189,6 +3189,12 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
top: 0;
pointer-events: none;
}
.bi-basic-button.button-common.hack:after,
.bi-basic-button.button-success.hack:after,
.bi-basic-button.button-warning.hack:after,
.bi-basic-button.button-error.hack:after {
content: none;
}
.bi-basic-button.button-common:active:after,
.bi-basic-button.button-success:active:after,
.bi-basic-button.button-warning:active:after,
@ -3234,6 +3240,9 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
top: 0;
pointer-events: none;
}
.bi-basic-button.button-ignore.hack:after {
content: none;
}
.bi-basic-button.button-ignore:active:after {
transform: scale(0, 1);
opacity: 0.1;

2
dist/bundle.ie.js vendored

@ -42213,7 +42213,7 @@ BI.Button = BI.inherit(BI.BasicButton, {
_defaultConfig: function (props) {
var conf = BI.Button.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-button",
baseCls: (conf.baseCls || "") + " bi-button" + ((BI.isIE() && BI.isIE9Below()) ? " hack" : ""),
minWidth: (props.block === true || props.clear === true) ? 0 : 80,
height: 24,
shadow: props.clear !== true,

4
dist/bundle.ie.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/bundle.js vendored

@ -42617,7 +42617,7 @@ BI.Button = BI.inherit(BI.BasicButton, {
_defaultConfig: function (props) {
var conf = BI.Button.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-button",
baseCls: (conf.baseCls || "") + " bi-button" + ((BI.isIE() && BI.isIE9Below()) ? " hack" : ""),
minWidth: (props.block === true || props.clear === true) ? 0 : 80,
height: 24,
shadow: props.clear !== true,

2
dist/bundle.min.css vendored

File diff suppressed because one or more lines are too long

4
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

9
dist/fineui.css vendored

@ -3189,6 +3189,12 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
top: 0;
pointer-events: none;
}
.bi-basic-button.button-common.hack:after,
.bi-basic-button.button-success.hack:after,
.bi-basic-button.button-warning.hack:after,
.bi-basic-button.button-error.hack:after {
content: none;
}
.bi-basic-button.button-common:active:after,
.bi-basic-button.button-success:active:after,
.bi-basic-button.button-warning:active:after,
@ -3234,6 +3240,9 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
top: 0;
pointer-events: none;
}
.bi-basic-button.button-ignore.hack:after {
content: none;
}
.bi-basic-button.button-ignore:active:after {
transform: scale(0, 1);
opacity: 0.1;

2
dist/fineui.ie.js vendored

@ -42458,7 +42458,7 @@ BI.Button = BI.inherit(BI.BasicButton, {
_defaultConfig: function (props) {
var conf = BI.Button.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-button",
baseCls: (conf.baseCls || "") + " bi-button" + ((BI.isIE() && BI.isIE9Below()) ? " hack" : ""),
minWidth: (props.block === true || props.clear === true) ? 0 : 80,
height: 24,
shadow: props.clear !== true,

4
dist/fineui.ie.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/fineui.js vendored

@ -42862,7 +42862,7 @@ BI.Button = BI.inherit(BI.BasicButton, {
_defaultConfig: function (props) {
var conf = BI.Button.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-button",
baseCls: (conf.baseCls || "") + " bi-button" + ((BI.isIE() && BI.isIE9Below()) ? " hack" : ""),
minWidth: (props.block === true || props.clear === true) ? 0 : 80,
height: 24,
shadow: props.clear !== true,

2
dist/fineui.min.css vendored

File diff suppressed because one or more lines are too long

4
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/fineui_without_jquery_polyfill.js vendored

@ -30468,7 +30468,7 @@ BI.Button = BI.inherit(BI.BasicButton, {
_defaultConfig: function (props) {
var conf = BI.Button.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-button",
baseCls: (conf.baseCls || "") + " bi-button" + ((BI.isIE() && BI.isIE9Below()) ? " hack" : ""),
minWidth: (props.block === true || props.clear === true) ? 0 : 80,
height: 24,
shadow: props.clear !== true,

2
dist/utils.min.js vendored

File diff suppressed because one or more lines are too long

2
src/base/single/button/buttons/button.js

@ -12,7 +12,7 @@ BI.Button = BI.inherit(BI.BasicButton, {
_defaultConfig: function (props) {
var conf = BI.Button.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-button",
baseCls: (conf.baseCls || "") + " bi-button" + ((BI.isIE() && BI.isIE9Below()) ? " hack" : ""),
minWidth: (props.block === true || props.clear === true) ? 0 : 80,
height: 24,
shadow: props.clear !== true,

9
src/css/base/single/button/button.css

@ -352,6 +352,12 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
top: 0;
pointer-events: none;
}
.bi-basic-button.button-common.hack:after,
.bi-basic-button.button-success.hack:after,
.bi-basic-button.button-warning.hack:after,
.bi-basic-button.button-error.hack:after {
content: none;
}
.bi-basic-button.button-common:active:after,
.bi-basic-button.button-success:active:after,
.bi-basic-button.button-warning:active:after,
@ -397,6 +403,9 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
top: 0;
pointer-events: none;
}
.bi-basic-button.button-ignore.hack:after {
content: none;
}
.bi-basic-button.button-ignore:active:after {
transform: scale(0, 1);
opacity: 0.1;

6
src/less/base/single/button/button.less

@ -179,6 +179,9 @@ body .bi-button, #body .bi-button {
top: 0;
pointer-events: none;
}
&.hack:after {
content: none;
}
&:active:after {
transform: scale(0, 1);
.opacity(0.1);
@ -208,6 +211,9 @@ body .bi-button, #body .bi-button {
top: 0;
pointer-events: none;
}
&.hack:after {
content: none;
}
&:active:after {
transform: scale(0, 1);
.opacity(0.1);

Loading…
Cancel
Save