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

[SSE] Changes for Bug 34141.

Browse source
This commit is contained in:
Julia Radzhabova 2017-03-10 14:17:14 +03:00
parent 6e553f5cd0
commit b165941332
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/spreadsheeteditor/mobile/app/controller/edit/EditText.js
View file

@ -151,8 +151,7 @@ define([
var color = _fontInfo.asc_getColor(), var color = _fontInfo.asc_getColor(),
clr = me._sdkToThemeColor(color); clr = me._sdkToThemeColor(color);
$('#text-color .color-preview').css('background-color', '#' + (_.isObject(clr) ? clr.color : clr)); $('#font-color .color-preview').css('background-color', '#' + (_.isObject(clr) ? clr.color : clr));
// Align // Align
$('#edit-text-align-block').css('display', (_textIn == TextType.inShape) ? 'block' : 'none'); $('#edit-text-align-block').css('display', (_textIn == TextType.inShape) ? 'block' : 'none');
@ -279,7 +278,7 @@ define([
onTextColor:function (palette, color) { onTextColor:function (palette, color) {
this.api.asc_setCellTextColor(Common.Utils.ThemeColor.getRgbColor(color)); this.api.asc_setCellTextColor(Common.Utils.ThemeColor.getRgbColor(color));
$('#text-color .color-preview').css('background-color', '#' + (_.isObject(color) ? color.color : color)); $('#font-color .color-preview').css('background-color', '#' + (_.isObject(color) ? color.color : color));
}, },
onHAlignChange: function (e) { onHAlignChange: function (e) {

2
apps/spreadsheeteditor/mobile/app/template/EditText.template
View file

@ -24,7 +24,7 @@
</div> </div>
</li> </li>
<li> <li>
<a id="text-color" class="item-link" data-page="#edit-text-color"> <a id="font-color" class="item-link" data-page="#edit-text-color">
<div class="item-content"> <div class="item-content">
<% if (!android) { %><div class="item-media" style="padding-top: 0;"><i class="icon icon-text-color"><span class="color-preview"></span></i></div><% } %> <% if (!android) { %><div class="item-media" style="padding-top: 0;"><i class="icon icon-text-color"><span class="color-preview"></span></i></div><% } %>
<div class="item-inner"> <div class="item-inner">