Browse Source

merge conflict

es6
刘荣歆 6 years ago
parent
commit
38e8cb0d72
  1. 9
      dist/base.css
  2. 2
      dist/base.js
  3. 9
      dist/bundle.css
  4. 6
      dist/bundle.ie.js
  5. 6
      dist/bundle.ie.min.js
  6. 6
      dist/bundle.js
  7. 2
      dist/bundle.min.css
  8. 10
      dist/bundle.min.js
  9. 4
      dist/case.js
  10. 9
      dist/fineui.css
  11. 6
      dist/fineui.ie.js
  12. 6
      dist/fineui.ie.min.js
  13. 6
      dist/fineui.js
  14. 2
      dist/fineui.min.css
  15. 10
      dist/fineui.min.js
  16. 2
      dist/fineui_without_jquery_polyfill.js
  17. 2
      dist/utils.min.js
  18. 2
      src/base/single/button/buttons/button.js
  19. 2
      src/case/colorchooser/colorchooser.trigger.js
  20. 2
      src/case/colorchooser/colorchooser.trigger.long.js
  21. 9
      src/css/base/single/button/button.css
  22. 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; top: 0;
pointer-events: none; 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-common:active:after,
.bi-basic-button.button-success:active:after, .bi-basic-button.button-success:active:after,
.bi-basic-button.button-warning: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; top: 0;
pointer-events: none; pointer-events: none;
} }
.bi-basic-button.button-ignore.hack:after {
content: none;
}
.bi-basic-button.button-ignore:active:after { .bi-basic-button.button-ignore:active:after {
transform: scale(0, 1); transform: scale(0, 1);
opacity: 0.1; opacity: 0.1;

2
dist/base.js vendored

@ -7121,7 +7121,7 @@ BI.Button = BI.inherit(BI.BasicButton, {
_defaultConfig: function (props) { _defaultConfig: function (props) {
var conf = BI.Button.superclass._defaultConfig.apply(this, arguments); var conf = BI.Button.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, { 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, minWidth: (props.block === true || props.clear === true) ? 0 : 80,
height: 24, height: 24,
shadow: props.clear !== true, shadow: props.clear !== true,

9
dist/bundle.css vendored

@ -3188,6 +3188,12 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
top: 0; top: 0;
pointer-events: none; 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-common:active:after,
.bi-basic-button.button-success:active:after, .bi-basic-button.button-success:active:after,
.bi-basic-button.button-warning:active:after, .bi-basic-button.button-warning:active:after,
@ -3233,6 +3239,9 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
top: 0; top: 0;
pointer-events: none; pointer-events: none;
} }
.bi-basic-button.button-ignore.hack:after {
content: none;
}
.bi-basic-button.button-ignore:active:after { .bi-basic-button.button-ignore:active:after {
transform: scale(0, 1); transform: scale(0, 1);
opacity: 0.1; opacity: 0.1;

6
dist/bundle.ie.js vendored

@ -42213,7 +42213,7 @@ BI.Button = BI.inherit(BI.BasicButton, {
_defaultConfig: function (props) { _defaultConfig: function (props) {
var conf = BI.Button.superclass._defaultConfig.apply(this, arguments); var conf = BI.Button.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, { 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, minWidth: (props.block === true || props.clear === true) ? 0 : 80,
height: 24, height: 24,
shadow: props.clear !== true, shadow: props.clear !== true,
@ -51870,7 +51870,7 @@ BI.ColorChooserTrigger = BI.inherit(BI.Trigger, {
var down = BI.createWidget({ var down = BI.createWidget({
type: "bi.icon_button", type: "bi.icon_button",
disableSelected: true, disableSelected: true,
cls: "icon-combo-down-icon trigger-triangle-font", cls: "icon-combo-down-icon trigger-triangle-font icon-size-12",
width: 12, width: 12,
height: 8 height: 8
}); });
@ -51956,7 +51956,7 @@ BI.LongColorChooserTrigger = BI.inherit(BI.Trigger, {
var down = BI.createWidget({ var down = BI.createWidget({
type: "bi.icon_button", type: "bi.icon_button",
disableSelected: true, disableSelected: true,
cls: "icon-combo-down-icon trigger-triangle-font", cls: "icon-combo-down-icon trigger-triangle-font icon-size-12",
width: 12, width: 12,
height: 8 height: 8
}); });

6
dist/bundle.ie.min.js vendored

File diff suppressed because one or more lines are too long

6
dist/bundle.js vendored

@ -42617,7 +42617,7 @@ BI.Button = BI.inherit(BI.BasicButton, {
_defaultConfig: function (props) { _defaultConfig: function (props) {
var conf = BI.Button.superclass._defaultConfig.apply(this, arguments); var conf = BI.Button.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, { 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, minWidth: (props.block === true || props.clear === true) ? 0 : 80,
height: 24, height: 24,
shadow: props.clear !== true, shadow: props.clear !== true,
@ -52274,7 +52274,7 @@ BI.ColorChooserTrigger = BI.inherit(BI.Trigger, {
var down = BI.createWidget({ var down = BI.createWidget({
type: "bi.icon_button", type: "bi.icon_button",
disableSelected: true, disableSelected: true,
cls: "icon-combo-down-icon trigger-triangle-font", cls: "icon-combo-down-icon trigger-triangle-font icon-size-12",
width: 12, width: 12,
height: 8 height: 8
}); });
@ -52360,7 +52360,7 @@ BI.LongColorChooserTrigger = BI.inherit(BI.Trigger, {
var down = BI.createWidget({ var down = BI.createWidget({
type: "bi.icon_button", type: "bi.icon_button",
disableSelected: true, disableSelected: true,
cls: "icon-combo-down-icon trigger-triangle-font", cls: "icon-combo-down-icon trigger-triangle-font icon-size-12",
width: 12, width: 12,
height: 8 height: 8
}); });

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

4
dist/case.js vendored

@ -2670,7 +2670,7 @@ BI.ColorChooserTrigger = BI.inherit(BI.Trigger, {
var down = BI.createWidget({ var down = BI.createWidget({
type: "bi.icon_button", type: "bi.icon_button",
disableSelected: true, disableSelected: true,
cls: "icon-combo-down-icon trigger-triangle-font", cls: "icon-combo-down-icon trigger-triangle-font icon-size-12",
width: 12, width: 12,
height: 8 height: 8
}); });
@ -2756,7 +2756,7 @@ BI.LongColorChooserTrigger = BI.inherit(BI.Trigger, {
var down = BI.createWidget({ var down = BI.createWidget({
type: "bi.icon_button", type: "bi.icon_button",
disableSelected: true, disableSelected: true,
cls: "icon-combo-down-icon trigger-triangle-font", cls: "icon-combo-down-icon trigger-triangle-font icon-size-12",
width: 12, width: 12,
height: 8 height: 8
}); });

9
dist/fineui.css vendored

@ -3188,6 +3188,12 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
top: 0; top: 0;
pointer-events: none; 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-common:active:after,
.bi-basic-button.button-success:active:after, .bi-basic-button.button-success:active:after,
.bi-basic-button.button-warning:active:after, .bi-basic-button.button-warning:active:after,
@ -3233,6 +3239,9 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
top: 0; top: 0;
pointer-events: none; pointer-events: none;
} }
.bi-basic-button.button-ignore.hack:after {
content: none;
}
.bi-basic-button.button-ignore:active:after { .bi-basic-button.button-ignore:active:after {
transform: scale(0, 1); transform: scale(0, 1);
opacity: 0.1; opacity: 0.1;

6
dist/fineui.ie.js vendored

@ -42458,7 +42458,7 @@ BI.Button = BI.inherit(BI.BasicButton, {
_defaultConfig: function (props) { _defaultConfig: function (props) {
var conf = BI.Button.superclass._defaultConfig.apply(this, arguments); var conf = BI.Button.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, { 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, minWidth: (props.block === true || props.clear === true) ? 0 : 80,
height: 24, height: 24,
shadow: props.clear !== true, shadow: props.clear !== true,
@ -52115,7 +52115,7 @@ BI.ColorChooserTrigger = BI.inherit(BI.Trigger, {
var down = BI.createWidget({ var down = BI.createWidget({
type: "bi.icon_button", type: "bi.icon_button",
disableSelected: true, disableSelected: true,
cls: "icon-combo-down-icon trigger-triangle-font", cls: "icon-combo-down-icon trigger-triangle-font icon-size-12",
width: 12, width: 12,
height: 8 height: 8
}); });
@ -52201,7 +52201,7 @@ BI.LongColorChooserTrigger = BI.inherit(BI.Trigger, {
var down = BI.createWidget({ var down = BI.createWidget({
type: "bi.icon_button", type: "bi.icon_button",
disableSelected: true, disableSelected: true,
cls: "icon-combo-down-icon trigger-triangle-font", cls: "icon-combo-down-icon trigger-triangle-font icon-size-12",
width: 12, width: 12,
height: 8 height: 8
}); });

6
dist/fineui.ie.min.js vendored

File diff suppressed because one or more lines are too long

6
dist/fineui.js vendored

@ -42862,7 +42862,7 @@ BI.Button = BI.inherit(BI.BasicButton, {
_defaultConfig: function (props) { _defaultConfig: function (props) {
var conf = BI.Button.superclass._defaultConfig.apply(this, arguments); var conf = BI.Button.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, { 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, minWidth: (props.block === true || props.clear === true) ? 0 : 80,
height: 24, height: 24,
shadow: props.clear !== true, shadow: props.clear !== true,
@ -52519,7 +52519,7 @@ BI.ColorChooserTrigger = BI.inherit(BI.Trigger, {
var down = BI.createWidget({ var down = BI.createWidget({
type: "bi.icon_button", type: "bi.icon_button",
disableSelected: true, disableSelected: true,
cls: "icon-combo-down-icon trigger-triangle-font", cls: "icon-combo-down-icon trigger-triangle-font icon-size-12",
width: 12, width: 12,
height: 8 height: 8
}); });
@ -52605,7 +52605,7 @@ BI.LongColorChooserTrigger = BI.inherit(BI.Trigger, {
var down = BI.createWidget({ var down = BI.createWidget({
type: "bi.icon_button", type: "bi.icon_button",
disableSelected: true, disableSelected: true,
cls: "icon-combo-down-icon trigger-triangle-font", cls: "icon-combo-down-icon trigger-triangle-font icon-size-12",
width: 12, width: 12,
height: 8 height: 8
}); });

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

@ -30468,7 +30468,7 @@ BI.Button = BI.inherit(BI.BasicButton, {
_defaultConfig: function (props) { _defaultConfig: function (props) {
var conf = BI.Button.superclass._defaultConfig.apply(this, arguments); var conf = BI.Button.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, { 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, minWidth: (props.block === true || props.clear === true) ? 0 : 80,
height: 24, height: 24,
shadow: props.clear !== true, 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) { _defaultConfig: function (props) {
var conf = BI.Button.superclass._defaultConfig.apply(this, arguments); var conf = BI.Button.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, { 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, minWidth: (props.block === true || props.clear === true) ? 0 : 80,
height: 24, height: 24,
shadow: props.clear !== true, shadow: props.clear !== true,

2
src/case/colorchooser/colorchooser.trigger.js

@ -25,7 +25,7 @@ BI.ColorChooserTrigger = BI.inherit(BI.Trigger, {
var down = BI.createWidget({ var down = BI.createWidget({
type: "bi.icon_button", type: "bi.icon_button",
disableSelected: true, disableSelected: true,
cls: "icon-combo-down-icon trigger-triangle-font", cls: "icon-combo-down-icon trigger-triangle-font icon-size-12",
width: 12, width: 12,
height: 8 height: 8
}); });

2
src/case/colorchooser/colorchooser.trigger.long.js

@ -47,7 +47,7 @@ BI.LongColorChooserTrigger = BI.inherit(BI.Trigger, {
var down = BI.createWidget({ var down = BI.createWidget({
type: "bi.icon_button", type: "bi.icon_button",
disableSelected: true, disableSelected: true,
cls: "icon-combo-down-icon trigger-triangle-font", cls: "icon-combo-down-icon trigger-triangle-font icon-size-12",
width: 12, width: 12,
height: 8 height: 8
}); });

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

@ -352,6 +352,12 @@ body .bi-button.button-ignore.disabled.ghost .b-font:before,
top: 0; top: 0;
pointer-events: none; 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-common:active:after,
.bi-basic-button.button-success:active:after, .bi-basic-button.button-success:active:after,
.bi-basic-button.button-warning: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; top: 0;
pointer-events: none; pointer-events: none;
} }
.bi-basic-button.button-ignore.hack:after {
content: none;
}
.bi-basic-button.button-ignore:active:after { .bi-basic-button.button-ignore:active:after {
transform: scale(0, 1); transform: scale(0, 1);
opacity: 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; top: 0;
pointer-events: none; pointer-events: none;
} }
&.hack:after {
content: none;
}
&:active:after { &:active:after {
transform: scale(0, 1); transform: scale(0, 1);
.opacity(0.1); .opacity(0.1);
@ -208,6 +211,9 @@ body .bi-button, #body .bi-button {
top: 0; top: 0;
pointer-events: none; pointer-events: none;
} }
&.hack:after {
content: none;
}
&:active:after { &:active:after {
transform: scale(0, 1); transform: scale(0, 1);
.opacity(0.1); .opacity(0.1);

Loading…
Cancel
Save