Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[DE][PE] Table Settings: Change border color when theme colors are changed.

Browse source
This commit is contained in:
Julia Radzhabova 2016-08-18 10:58:30 +03:00
parent 9c5b6f5ba5
commit 1a02a40dec
4 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/common/main/lib/component/ThemeColorPalette.js
View file

@ -365,6 +365,12 @@ define([
aEffectIdx++; aEffectIdx++;
} }
} }
var selected = $(this.el).find('a.' + this.selectedCls);
if (selected.length && selected.hasClass('palette-color-effect')) {
this.value = selected[0].className.match(this.colorRe)[1].toUpperCase();
}
this.options.updateColorsArr = undefined; this.options.updateColorsArr = undefined;
}, },

2
apps/common/main/resources/less/asc-mixins.less
View file

@ -74,7 +74,7 @@
} }
.options-btn-icon(@icon-class, @index, @icon-size) { .options-btn-icon(@icon-class, @index, @icon-size) {
.@{icon-class} {background-position: -@icon-size -@index*@icon-size;} .@{icon-class} {background-position: 0 -@index*@icon-size;}
button.over > .@{icon-class} {background-position: -1*@icon-size -@index*@icon-size;} button.over > .@{icon-class} {background-position: -1*@icon-size -@index*@icon-size;}
// .btn-group.open > .@{icon-class}, // .btn-group.open > .@{icon-class},
button.active > .@{icon-class}, button.active > .@{icon-class},

4
apps/documenteditor/main/app/view/TableSettings.js
View file

@ -687,8 +687,10 @@ define([
UpdateThemeColors: function() { UpdateThemeColors: function() {
if (this.colorsBack) if (this.colorsBack)
this.colorsBack.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors()); this.colorsBack.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());
if (this.borderColor) if (this.borderColor) {
this.borderColor.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors()); this.borderColor.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());
this.btnBorderColor.setColor(this.borderColor.getColor());
}
}, },
_onInitTemplates: function(Templates){ _onInitTemplates: function(Templates){

4
apps/presentationeditor/main/app/view/TableSettings.js
View file

@ -583,8 +583,10 @@ define([
UpdateThemeColors: function() { UpdateThemeColors: function() {
if (this.colorsBack) if (this.colorsBack)
this.colorsBack.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors()); this.colorsBack.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());
if (this.borderColor) if (this.borderColor) {
this.borderColor.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors()); this.borderColor.updateColors(Common.Utils.ThemeColor.getEffectColors(), Common.Utils.ThemeColor.getStandartColors());
this.btnBorderColor.setColor(this.borderColor.getColor());
}
}, },
_onInitTemplates: function(Templates){ _onInitTemplates: function(Templates){