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

[DE][PE][SSE] Update bootstrap (fixed color style of links)

Browse source
This commit is contained in:
JuliaSvinareva 2020-12-18 20:28:31 +03:00
parent 292831de78
commit 06bc798b1f
6 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/common/main/resources/less/common.less
View file

@ -40,4 +40,8 @@ label {
.dropdown-divider { .dropdown-divider {
margin: 6.5px 0; margin: 6.5px 0;
}
a:not(.dropdown-item), a:not(.dropdown-item):not([href]) {
color: @link-color;
} }

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

@ -208,7 +208,7 @@ define([
}), }),
{caption: '--'}, {caption: '--'},
{template: _.template('<div id="id-toolbar-menu-form-color" style="width: 169px; height: 220px; margin: 10px;"></div>')}, {template: _.template('<div id="id-toolbar-menu-form-color" style="width: 169px; height: 220px; margin: 10px;"></div>')},
{template: _.template('<a id="id-toolbar-menu-new-form-color" style="padding-left:12px;">' + me.textNewColor + '</a>')} {template: _.template('<a id="id-toolbar-menu-new-form-color" class="dropdown-item" style="padding-left:12px;">' + me.textNewColor + '</a>')}
] ]
})); }));
me.mnuFormsColorPicker = new Common.UI.ThemeColorPalette({ me.mnuFormsColorPicker = new Common.UI.ThemeColorPalette({

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

@ -667,7 +667,7 @@ define([
}), }),
{caption: '--'}, {caption: '--'},
{template: _.template('<div id="id-toolbar-menu-controls-color" style="width: 169px; height: 220px; margin: 10px;"></div>')}, {template: _.template('<div id="id-toolbar-menu-controls-color" style="width: 169px; height: 220px; margin: 10px;"></div>')},
{template: _.template('<a id="id-toolbar-menu-new-control-color" style="padding-left:12px;">' + this.textNewColor + '</a>')} {template: _.template('<a id="id-toolbar-menu-new-control-color" class="dropdown-item" style="padding-left:12px;">' + this.textNewColor + '</a>')}
] ]
}) })
} }

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

@ -343,7 +343,7 @@ define([
cls: 'shifted-left', cls: 'shifted-left',
items: [ items: [
{template: _.template('<div id="id-toolbar-menu-fontcolor" style="width: 169px; height: 220px; margin: 10px;"></div>')}, {template: _.template('<div id="id-toolbar-menu-fontcolor" style="width: 169px; height: 220px; margin: 10px;"></div>')},
{template: _.template('<a id="id-toolbar-menu-new-fontcolor" style="padding-left:12px;">' + me.textNewColor + '</a>')} {template: _.template('<a id="id-toolbar-menu-new-fontcolor" class="dropdown-item" style="padding-left:12px;">' + me.textNewColor + '</a>')}
] ]
}) })
}); });

2
apps/spreadsheeteditor/main/app/view/Statusbar.js
View file

@ -309,7 +309,7 @@ define([
cls: 'color-tab', cls: 'color-tab',
items: [ items: [
{ template: _.template('<div id="id-tab-menu-color" style="width: 169px; height: 220px; margin: 10px;"></div>') }, { template: _.template('<div id="id-tab-menu-color" style="width: 169px; height: 220px; margin: 10px;"></div>') },
{ template: _.template('<a id="id-tab-menu-new-color" style="padding-left:12px;">' + me.textNewColor + '</a>') } { template: _.template('<a id="id-tab-menu-new-color" class="dropdown-item" style="padding-left:12px;">' + me.textNewColor + '</a>') }
] ]
}); });

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

@ -481,7 +481,7 @@ define([
menu : new Common.UI.Menu({ menu : new Common.UI.Menu({
items: [ items: [
{ template: _.template('<div id="id-toolbar-menu-fontcolor" style="width: 169px; height: 220px; margin: 10px;"></div>') }, { template: _.template('<div id="id-toolbar-menu-fontcolor" style="width: 169px; height: 220px; margin: 10px;"></div>') },
{ template: _.template('<a id="id-toolbar-menu-new-fontcolor" style="padding-left:12px;">' + me.textNewColor + '</a>') } { template: _.template('<a id="id-toolbar-menu-new-fontcolor" class="dropdown-item" style="padding-left:12px;">' + me.textNewColor + '</a>') }
] ]
}) })
}); });
@ -496,7 +496,7 @@ define([
menu : new Common.UI.Menu({ menu : new Common.UI.Menu({
items: [ items: [
{ template: _.template('<div id="id-toolbar-menu-paracolor" style="width: 169px; height: 220px; margin: 10px;"></div>') }, { template: _.template('<div id="id-toolbar-menu-paracolor" style="width: 169px; height: 220px; margin: 10px;"></div>') },
{ template: _.template('<a id="id-toolbar-menu-new-paracolor" style="padding-left:12px;">' + me.textNewColor + '</a>') } { template: _.template('<a id="id-toolbar-menu-new-paracolor" class="dropdown-item" style="padding-left:12px;">' + me.textNewColor + '</a>') }
] ]
}) })
}); });
@ -1845,7 +1845,7 @@ define([
menuAlign : 'tl-tr', menuAlign : 'tl-tr',
items : [ items : [
{ template: _.template('<div id="id-toolbar-menu-bordercolor" style="width: 169px; height: 220px; margin: 10px;"></div>'), stopPropagation: true }, { template: _.template('<div id="id-toolbar-menu-bordercolor" style="width: 169px; height: 220px; margin: 10px;"></div>'), stopPropagation: true },
{ template: _.template('<a id="id-toolbar-menu-new-bordercolor" style="padding-left:12px;">' + this.textNewColor + '</a>'), stopPropagation: true } { template: _.template('<a id="id-toolbar-menu-new-bordercolor" class="dropdown-item" style="padding-left:12px;">' + this.textNewColor + '</a>'), stopPropagation: true }
] ]
}) })
}) })