diff --git a/src/case/colorchooser/colorchooser.js b/src/case/colorchooser/colorchooser.js index bed892c7d..c321baf70 100644 --- a/src/case/colorchooser/colorchooser.js +++ b/src/case/colorchooser/colorchooser.js @@ -9,7 +9,7 @@ BI.ColorChooser = BI.inherit(BI.Widget, { _defaultConfig: function () { return BI.extend(BI.ColorChooser.superclass._defaultConfig.apply(this, arguments), { - baseCls: "bi-color-chooser bi-border", + baseCls: "bi-color-chooser", value: "", height: 24, el: {}, @@ -18,8 +18,6 @@ BI.ColorChooser = BI.inherit(BI.Widget, { _init: function () { var self = this, o = this.options; - o.height -= 2; - BI.isNumeric(o.width) && (o.width -= 2); BI.ColorChooser.superclass._init.apply(this, arguments); o.value = o.value || ""; this.combo = BI.createWidget({ @@ -34,8 +32,8 @@ BI.ColorChooser = BI.inherit(BI.Widget, { ref: function (_ref) { self.trigger = _ref; }, - width: o.width, - height: o.height + width: o.width - 2, + height: o.height - 2 }, o.el), popup: { el: BI.extend({ diff --git a/src/case/colorchooser/colorchooser.trigger.js b/src/case/colorchooser/colorchooser.trigger.js index 17dd665da..8efe4fb79 100644 --- a/src/case/colorchooser/colorchooser.trigger.js +++ b/src/case/colorchooser/colorchooser.trigger.js @@ -10,8 +10,8 @@ BI.ColorChooserTrigger = BI.inherit(BI.Trigger, { _defaultConfig: function () { var conf = BI.ColorChooserTrigger.superclass._defaultConfig.apply(this, arguments); return BI.extend(conf, { - baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger", - height: 24 + baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger bi-border bi-focus-shadow", + height: 22 }); }, diff --git a/src/case/colorchooser/colorchooser.trigger.long.js b/src/case/colorchooser/colorchooser.trigger.long.js index 238c13f2c..eb15f7551 100644 --- a/src/case/colorchooser/colorchooser.trigger.long.js +++ b/src/case/colorchooser/colorchooser.trigger.long.js @@ -10,7 +10,7 @@ BI.LongColorChooserTrigger = BI.inherit(BI.Trigger, { _defaultConfig: function () { var conf = BI.LongColorChooserTrigger.superclass._defaultConfig.apply(this, arguments); return BI.extend(conf, { - baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger", + baseCls: (conf.baseCls || "") + " bi-color-chooser-trigger bi-border bi-focus-shadow", height: 24 }); },