Browse Source

无JIRA任务 color_chooser的trigger不要阴影了

es6
windy 6 years ago
parent
commit
c0bdc0e12d
  1. 3
      dist/base.css
  2. 3
      dist/bundle.css
  3. 8
      dist/bundle.js
  4. 2
      dist/bundle.min.css
  5. 2
      dist/bundle.min.js
  6. 8
      dist/case.js
  7. 3
      dist/fineui.css
  8. 8
      dist/fineui.js
  9. 2
      dist/fineui.min.css
  10. 2
      dist/fineui.min.js
  11. BIN
      dist/images/2x/background/trans_normal.png
  12. 4
      src/case/colorchooser/colorchooser.trigger.js
  13. 4
      src/case/colorchooser/colorchooser.trigger.long.js
  14. 3
      src/css/base/colorchooser/colorchooser.css
  15. 1
      src/less/base/colorchooser/colorchooser.trigger.less

3
dist/base.css vendored

@ -12,9 +12,6 @@
-webkit-border-radius: 2px; -webkit-border-radius: 2px;
-moz-border-radius: 2px; -moz-border-radius: 2px;
border-radius: 2px; border-radius: 2px;
box-shadow: 0px 0px 2px 1px #d0d4da inset;
-webkit-box-shadow: 0px 0px 2px 1px #d0d4da inset;
-moz-box-shadow: 0px 0px 2px 1px #d0d4da inset;
} }
.bi-color-picker-button .color-picker-button-mask { .bi-color-picker-button .color-picker-button-mask {
border: 1px solid #232e40; border: 1px solid #232e40;

3
dist/bundle.css vendored

@ -1948,9 +1948,6 @@ textarea {
-webkit-border-radius: 2px; -webkit-border-radius: 2px;
-moz-border-radius: 2px; -moz-border-radius: 2px;
border-radius: 2px; border-radius: 2px;
box-shadow: 0px 0px 2px 1px #d0d4da inset;
-webkit-box-shadow: 0px 0px 2px 1px #d0d4da inset;
-moz-box-shadow: 0px 0px 2px 1px #d0d4da inset;
} }
.bi-color-picker-button .color-picker-button-mask { .bi-color-picker-button .color-picker-button-mask {
border: 1px solid #232e40; border: 1px solid #232e40;

8
dist/bundle.js vendored

@ -51273,7 +51273,7 @@ BI.ColorChooserTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () { _defaultConfig: function () {
var conf = BI.ColorChooserTrigger.superclass._defaultConfig.apply(this, arguments); var conf = BI.ColorChooserTrigger.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, { return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger", baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger bi-border",
height: 24 height: 24
}); });
}, },
@ -51282,7 +51282,7 @@ BI.ColorChooserTrigger = BI.inherit(BI.Trigger, {
BI.ColorChooserTrigger.superclass._init.apply(this, arguments); BI.ColorChooserTrigger.superclass._init.apply(this, arguments);
this.colorContainer = BI.createWidget({ this.colorContainer = BI.createWidget({
type: "bi.layout", type: "bi.layout",
cls: "bi-card color-chooser-trigger-content" + (BI.isIE9Below() ? " hack" : "") cls: "color-chooser-trigger-content" + (BI.isIE9Below() ? " hack" : "")
}); });
var down = BI.createWidget({ var down = BI.createWidget({
@ -51337,7 +51337,7 @@ BI.LongColorChooserTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () { _defaultConfig: function () {
var conf = BI.LongColorChooserTrigger.superclass._defaultConfig.apply(this, arguments); var conf = BI.LongColorChooserTrigger.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, { return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger", baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger bi-border",
height: 24 height: 24
}); });
}, },
@ -51347,7 +51347,7 @@ BI.LongColorChooserTrigger = BI.inherit(BI.Trigger, {
var self = this, o = this.options; var self = this, o = this.options;
this.colorContainer = BI.createWidget({ this.colorContainer = BI.createWidget({
type: "bi.htape", type: "bi.htape",
cls: "bi-card color-chooser-trigger-content", cls: "color-chooser-trigger-content",
items: [{ items: [{
type: "bi.icon_change_button", type: "bi.icon_change_button",
ref: function (_ref) { ref: function (_ref) {

2
dist/bundle.min.css vendored

File diff suppressed because one or more lines are too long

2
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

8
dist/case.js vendored

@ -2644,7 +2644,7 @@ BI.ColorChooserTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () { _defaultConfig: function () {
var conf = BI.ColorChooserTrigger.superclass._defaultConfig.apply(this, arguments); var conf = BI.ColorChooserTrigger.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, { return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger", baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger bi-border",
height: 24 height: 24
}); });
}, },
@ -2653,7 +2653,7 @@ BI.ColorChooserTrigger = BI.inherit(BI.Trigger, {
BI.ColorChooserTrigger.superclass._init.apply(this, arguments); BI.ColorChooserTrigger.superclass._init.apply(this, arguments);
this.colorContainer = BI.createWidget({ this.colorContainer = BI.createWidget({
type: "bi.layout", type: "bi.layout",
cls: "bi-card color-chooser-trigger-content" + (BI.isIE9Below() ? " hack" : "") cls: "color-chooser-trigger-content" + (BI.isIE9Below() ? " hack" : "")
}); });
var down = BI.createWidget({ var down = BI.createWidget({
@ -2708,7 +2708,7 @@ BI.LongColorChooserTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () { _defaultConfig: function () {
var conf = BI.LongColorChooserTrigger.superclass._defaultConfig.apply(this, arguments); var conf = BI.LongColorChooserTrigger.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, { return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger", baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger bi-border",
height: 24 height: 24
}); });
}, },
@ -2718,7 +2718,7 @@ BI.LongColorChooserTrigger = BI.inherit(BI.Trigger, {
var self = this, o = this.options; var self = this, o = this.options;
this.colorContainer = BI.createWidget({ this.colorContainer = BI.createWidget({
type: "bi.htape", type: "bi.htape",
cls: "bi-card color-chooser-trigger-content", cls: "color-chooser-trigger-content",
items: [{ items: [{
type: "bi.icon_change_button", type: "bi.icon_change_button",
ref: function (_ref) { ref: function (_ref) {

3
dist/fineui.css vendored

@ -1948,9 +1948,6 @@ textarea {
-webkit-border-radius: 2px; -webkit-border-radius: 2px;
-moz-border-radius: 2px; -moz-border-radius: 2px;
border-radius: 2px; border-radius: 2px;
box-shadow: 0px 0px 2px 1px #d0d4da inset;
-webkit-box-shadow: 0px 0px 2px 1px #d0d4da inset;
-moz-box-shadow: 0px 0px 2px 1px #d0d4da inset;
} }
.bi-color-picker-button .color-picker-button-mask { .bi-color-picker-button .color-picker-button-mask {
border: 1px solid #232e40; border: 1px solid #232e40;

8
dist/fineui.js vendored

@ -51494,7 +51494,7 @@ BI.ColorChooserTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () { _defaultConfig: function () {
var conf = BI.ColorChooserTrigger.superclass._defaultConfig.apply(this, arguments); var conf = BI.ColorChooserTrigger.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, { return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger", baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger bi-border",
height: 24 height: 24
}); });
}, },
@ -51503,7 +51503,7 @@ BI.ColorChooserTrigger = BI.inherit(BI.Trigger, {
BI.ColorChooserTrigger.superclass._init.apply(this, arguments); BI.ColorChooserTrigger.superclass._init.apply(this, arguments);
this.colorContainer = BI.createWidget({ this.colorContainer = BI.createWidget({
type: "bi.layout", type: "bi.layout",
cls: "bi-card color-chooser-trigger-content" + (BI.isIE9Below() ? " hack" : "") cls: "color-chooser-trigger-content" + (BI.isIE9Below() ? " hack" : "")
}); });
var down = BI.createWidget({ var down = BI.createWidget({
@ -51558,7 +51558,7 @@ BI.LongColorChooserTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () { _defaultConfig: function () {
var conf = BI.LongColorChooserTrigger.superclass._defaultConfig.apply(this, arguments); var conf = BI.LongColorChooserTrigger.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, { return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger", baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger bi-border",
height: 24 height: 24
}); });
}, },
@ -51568,7 +51568,7 @@ BI.LongColorChooserTrigger = BI.inherit(BI.Trigger, {
var self = this, o = this.options; var self = this, o = this.options;
this.colorContainer = BI.createWidget({ this.colorContainer = BI.createWidget({
type: "bi.htape", type: "bi.htape",
cls: "bi-card color-chooser-trigger-content", cls: "color-chooser-trigger-content",
items: [{ items: [{
type: "bi.icon_change_button", type: "bi.icon_change_button",
ref: function (_ref) { ref: function (_ref) {

2
dist/fineui.min.css vendored

File diff suppressed because one or more lines are too long

2
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

BIN
dist/images/2x/background/trans_normal.png vendored

Binary file not shown.

After

Width:  |  Height:  |  Size: 534 B

4
src/case/colorchooser/colorchooser.trigger.js

@ -10,7 +10,7 @@ BI.ColorChooserTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () { _defaultConfig: function () {
var conf = BI.ColorChooserTrigger.superclass._defaultConfig.apply(this, arguments); var conf = BI.ColorChooserTrigger.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, { return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger", baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger bi-border",
height: 24 height: 24
}); });
}, },
@ -19,7 +19,7 @@ BI.ColorChooserTrigger = BI.inherit(BI.Trigger, {
BI.ColorChooserTrigger.superclass._init.apply(this, arguments); BI.ColorChooserTrigger.superclass._init.apply(this, arguments);
this.colorContainer = BI.createWidget({ this.colorContainer = BI.createWidget({
type: "bi.layout", type: "bi.layout",
cls: "bi-card color-chooser-trigger-content" + (BI.isIE9Below() ? " hack" : "") cls: "color-chooser-trigger-content" + (BI.isIE9Below() ? " hack" : "")
}); });
var down = BI.createWidget({ var down = BI.createWidget({

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

@ -10,7 +10,7 @@ BI.LongColorChooserTrigger = BI.inherit(BI.Trigger, {
_defaultConfig: function () { _defaultConfig: function () {
var conf = BI.LongColorChooserTrigger.superclass._defaultConfig.apply(this, arguments); var conf = BI.LongColorChooserTrigger.superclass._defaultConfig.apply(this, arguments);
return BI.extend(conf, { return BI.extend(conf, {
baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger", baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger bi-border",
height: 24 height: 24
}); });
}, },
@ -20,7 +20,7 @@ BI.LongColorChooserTrigger = BI.inherit(BI.Trigger, {
var self = this, o = this.options; var self = this, o = this.options;
this.colorContainer = BI.createWidget({ this.colorContainer = BI.createWidget({
type: "bi.htape", type: "bi.htape",
cls: "bi-card color-chooser-trigger-content", cls: "color-chooser-trigger-content",
items: [{ items: [{
type: "bi.icon_change_button", type: "bi.icon_change_button",
ref: function (_ref) { ref: function (_ref) {

3
src/css/base/colorchooser/colorchooser.css

@ -8,7 +8,4 @@
-webkit-border-radius: 2px; -webkit-border-radius: 2px;
-moz-border-radius: 2px; -moz-border-radius: 2px;
border-radius: 2px; border-radius: 2px;
box-shadow: 0px 0px 2px 1px #d0d4da inset;
-webkit-box-shadow: 0px 0px 2px 1px #d0d4da inset;
-moz-box-shadow: 0px 0px 2px 1px #d0d4da inset;
} }

1
src/less/base/colorchooser/colorchooser.trigger.less

@ -2,5 +2,4 @@
.bi-color-chooser-trigger { .bi-color-chooser-trigger {
.border-radius(2px); .border-radius(2px);
.box-shadow(0px, 0px, 2px, 1px, @color-bi-background-dark-gray, inset);
} }
Loading…
Cancel
Save