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

Fix bug #52287

Browse source
This commit is contained in:
AlexeyMatveev686 2021-11-15 18:51:04 +03:00
parent e95b5fc0e7
commit 1e9ec5bb17
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/documenteditor/main/app/view/ControlSettingsDialog.js
View file

@ -135,7 +135,7 @@ define([ 'text!documenteditor/main/app/template/ControlSettingsDialog.template',
color: Common.Utils.ThemeColor.getHexColor(220, 220, 220) color: Common.Utils.ThemeColor.getHexColor(220, 220, 220)
}, },
additionalAlign: this.menuAddAlign, additionalAlign: this.menuAddAlign,
color: 'auto', color: (this.props.Color === undefined) ? 'auto' : Common.Utils.ThemeColor.getHexColor(this.props.Color.r, this.props.Color.g, this.props.Color.b),
colors: ['000000', '993300', '333300', '003300', '003366', '000080', '333399', '333333', '800000', 'FF6600', colors: ['000000', '993300', '333300', '003300', '003366', '000080', '333399', '333333', '800000', 'FF6600',
'808000', '00FF00', '008080', '0000FF', '666699', '808080', 'FF0000', 'FF9900', '99CC00', '339966', '808000', '00FF00', '008080', '0000FF', '666699', '808080', 'FF0000', 'FF9900', '99CC00', '339966',
'33CCCC', '3366FF', '800080', '999999', 'FF00FF', 'FFCC00', 'FFFF00', '00FF00', '00FFFF', '00CCFF', '33CCCC', '3366FF', '800080', '999999', 'FF00FF', 'FFCC00', 'FFFF00', '00FF00', '00FFFF', '00CCFF',