diff --git a/apps/common/main/lib/component/ColorButton.js b/apps/common/main/lib/component/ColorButton.js index e33631d3b..b14e4c280 100644 --- a/apps/common/main/lib/component/ColorButton.js +++ b/apps/common/main/lib/component/ColorButton.js @@ -80,7 +80,7 @@ define([ getMenu: function(options) { if (typeof this.menu !== 'object') { options = options || this.options; - var height = options.paletteHeight || 240, + var height = options.paletteHeight ? options.paletteHeight + 'px' : 'auto', id = Common.UI.getId(), auto = []; if (options.auto) { @@ -98,7 +98,8 @@ define([ cls: 'shifted-left', additionalAlign: options.additionalAlign, items: (options.additionalItems ? options.additionalItems : []).concat(auto).concat([ - { template: _.template('
') }, + { template: _.template('') }, + {caption: '--'}, { id: id + '-color-new', template: _.template('' + this.textNewColor + '') diff --git a/apps/common/main/lib/component/ThemeColorPalette.js b/apps/common/main/lib/component/ThemeColorPalette.js index 770dc4231..42f1cf928 100644 --- a/apps/common/main/lib/component/ThemeColorPalette.js +++ b/apps/common/main/lib/component/ThemeColorPalette.js @@ -62,7 +62,7 @@ define([ template : _.template( - '