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

Fix Bug 52205

Browse source
This commit is contained in:
Julia Radzhabova 2021-08-26 17:33:13 +03:00
parent 686a648051
commit 563291b195
5 changed files with 4 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -265,7 +265,7 @@ define([
{ {
id: 'id-toolbar-menu-auto-fontcolor', id: 'id-toolbar-menu-auto-fontcolor',
caption: this.textAutoColor, caption: this.textAutoColor,
template: _.template('<a tabindex="-1" type="menuitem"><span class="menu-item-icon" style="background-image: none; width: 12px; height: 12px; margin: 1px 7px 0 1px; background-color: #000;"></span><%= caption %></a>') template: _.template('<a tabindex="-1" type="menuitem"><span class="menu-item-icon color-auto" style="background-image: none; width: 12px; height: 12px; margin: 1px 7px 0 1px; background-color: #000;"></span><%= caption %></a>')
}, },
{caption: '--'}, {caption: '--'},
{template: _.template('<div id="id-toolbar-menu-fontcolor" style="width: 169px; height: 216px; margin: 10px;"></div>')}, {template: _.template('<div id="id-toolbar-menu-fontcolor" style="width: 169px; height: 216px; margin: 10px;"></div>')},

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

@ -340,7 +340,7 @@ define(['text!documenteditor/main/app/template/WatermarkSettings.template',
{ {
id: 'watermark-auto-color', id: 'watermark-auto-color',
caption: this.textAuto, caption: this.textAuto,
template: _.template('<a tabindex="-1" type="menuitem"><span class="menu-item-icon" style="background-image: none; width: 12px; height: 12px; margin: 1px 7px 0 1px; background-color: #000;"></span><%= caption %></a>') template: _.template('<a tabindex="-1" type="menuitem"><span class="menu-item-icon color-auto" style="background-image: none; width: 12px; height: 12px; margin: 1px 7px 0 1px; background-color: #000;"></span><%= caption %></a>')
}, },
{caption: '--'}, {caption: '--'},
{ template: _.template('<div id="watermark-menu-textcolor" style="width: 169px; height: 216px; margin: 10px;"></div>') }, { template: _.template('<div id="watermark-menu-textcolor" style="width: 169px; height: 216px; margin: 10px;"></div>') },

12
apps/documenteditor/main/resources/less/toolbar.less
View file

@ -139,18 +139,6 @@
text-overflow: ellipsis; text-overflow: ellipsis;
} }
#id-toolbar-menu-auto-fontcolor > a.selected,
#id-toolbar-menu-auto-fontcolor > a:hover,
#watermark-auto-color > a.selected,
#watermark-auto-color > a:hover {
span {
outline: @scaled-one-px-value-ie solid @icon-normal-ie;
outline: @scaled-one-px-value solid @icon-normal;
border: @scaled-one-px-value-ie solid @background-normal-ie;
border: @scaled-one-px-value solid @background-normal;
}
}
.save-style-container { .save-style-container {
cursor: default; cursor: default;
position: relative; position: relative;

4
apps/spreadsheeteditor/main/app/view/Toolbar.js
View file

@ -493,7 +493,7 @@ define([
{ {
id: 'id-toolbar-menu-auto-fontcolor', id: 'id-toolbar-menu-auto-fontcolor',
caption: this.textAutoColor, caption: this.textAutoColor,
template: _.template('<a tabindex="-1" type="menuitem"><span class="menu-item-icon" style="background-image: none; width: 12px; height: 12px; margin: 1px 7px 0 1px; background-color: #000;"></span><%= caption %></a>') template: _.template('<a tabindex="-1" type="menuitem"><span class="menu-item-icon color-auto" style="background-image: none; width: 12px; height: 12px; margin: 1px 7px 0 1px; background-color: #000;"></span><%= caption %></a>')
}, },
{caption: '--'}, {caption: '--'},
{ template: _.template('<div id="id-toolbar-menu-fontcolor" style="width: 169px; height: 216px; margin: 10px;"></div>') }, { template: _.template('<div id="id-toolbar-menu-fontcolor" style="width: 169px; height: 216px; margin: 10px;"></div>') },
@ -1891,7 +1891,7 @@ define([
{ {
id: 'id-toolbar-menu-auto-bordercolor', id: 'id-toolbar-menu-auto-bordercolor',
caption: this.textAutoColor, caption: this.textAutoColor,
template: _.template('<a tabindex="-1" type="menuitem"><span class="menu-item-icon" style="background-image: none; width: 12px; height: 12px; margin: 1px 7px 0 1px; background-color: #000;"></span><%= caption %></a>'), template: _.template('<a tabindex="-1" type="menuitem"><span class="menu-item-icon color-auto" style="background-image: none; width: 12px; height: 12px; margin: 1px 7px 0 1px; background-color: #000;"></span><%= caption %></a>'),
stopPropagation: true stopPropagation: true
}, },
{caption: '--'}, {caption: '--'},

12
apps/spreadsheeteditor/main/resources/less/toolbar.less
View file

@ -103,18 +103,6 @@
} }
} }
#id-toolbar-menu-auto-bordercolor > a.selected,
#id-toolbar-menu-auto-bordercolor > a:hover,
#id-toolbar-menu-auto-fontcolor > a.selected,
#id-toolbar-menu-auto-fontcolor > a:hover {
span {
outline: @scaled-one-px-value-ie solid @border-regular-control-ie;
outline: @scaled-one-px-value solid @border-regular-control;
border: @scaled-one-px-value-ie solid @background-normal-ie;
border: @scaled-one-px-value solid @background-normal;
}
}
#special-paste-container, #special-paste-container,
#autocorrect-paste-container { #autocorrect-paste-container {
position: absolute; position: absolute;