diff --git a/apps/common/main/resources/less/common.less b/apps/common/main/resources/less/common.less index 16ff08719..e603db5e3 100644 --- a/apps/common/main/resources/less/common.less +++ b/apps/common/main/resources/less/common.less @@ -40,4 +40,8 @@ label { .dropdown-divider { margin: 6.5px 0; +} + +a:not(.dropdown-item), a:not(.dropdown-item):not([href]) { + color: @link-color; } \ No newline at end of file diff --git a/apps/documenteditor/main/app/view/FormsTab.js b/apps/documenteditor/main/app/view/FormsTab.js index e49706509..9e22eaeab 100644 --- a/apps/documenteditor/main/app/view/FormsTab.js +++ b/apps/documenteditor/main/app/view/FormsTab.js @@ -208,7 +208,7 @@ define([ }), {caption: '--'}, {template: _.template('
')}, - {template: _.template('' + me.textNewColor + '')} + {template: _.template('' + me.textNewColor + '')} ] })); me.mnuFormsColorPicker = new Common.UI.ThemeColorPalette({ diff --git a/apps/documenteditor/main/app/view/Toolbar.js b/apps/documenteditor/main/app/view/Toolbar.js index c3c6fde98..b3ea0f2f0 100644 --- a/apps/documenteditor/main/app/view/Toolbar.js +++ b/apps/documenteditor/main/app/view/Toolbar.js @@ -667,7 +667,7 @@ define([ }), {caption: '--'}, {template: _.template('
')}, - {template: _.template('' + this.textNewColor + '')} + {template: _.template('' + this.textNewColor + '')} ] }) } diff --git a/apps/presentationeditor/main/app/view/Toolbar.js b/apps/presentationeditor/main/app/view/Toolbar.js index 9fcd70c63..fb93c121c 100644 --- a/apps/presentationeditor/main/app/view/Toolbar.js +++ b/apps/presentationeditor/main/app/view/Toolbar.js @@ -343,7 +343,7 @@ define([ cls: 'shifted-left', items: [ {template: _.template('
')}, - {template: _.template('' + me.textNewColor + '')} + {template: _.template('' + me.textNewColor + '')} ] }) }); diff --git a/apps/spreadsheeteditor/main/app/view/Statusbar.js b/apps/spreadsheeteditor/main/app/view/Statusbar.js index 8af47c062..653ba99e6 100644 --- a/apps/spreadsheeteditor/main/app/view/Statusbar.js +++ b/apps/spreadsheeteditor/main/app/view/Statusbar.js @@ -309,7 +309,7 @@ define([ cls: 'color-tab', items: [ { template: _.template('
') }, - { template: _.template('' + me.textNewColor + '') } + { template: _.template('' + me.textNewColor + '') } ] }); diff --git a/apps/spreadsheeteditor/main/app/view/Toolbar.js b/apps/spreadsheeteditor/main/app/view/Toolbar.js index b224d5e1a..b6f6b8ad9 100644 --- a/apps/spreadsheeteditor/main/app/view/Toolbar.js +++ b/apps/spreadsheeteditor/main/app/view/Toolbar.js @@ -481,7 +481,7 @@ define([ menu : new Common.UI.Menu({ items: [ { template: _.template('
') }, - { template: _.template('' + me.textNewColor + '') } + { template: _.template('' + me.textNewColor + '') } ] }) }); @@ -496,7 +496,7 @@ define([ menu : new Common.UI.Menu({ items: [ { template: _.template('
') }, - { template: _.template('' + me.textNewColor + '') } + { template: _.template('' + me.textNewColor + '') } ] }) }); @@ -1845,7 +1845,7 @@ define([ menuAlign : 'tl-tr', items : [ { template: _.template('
'), stopPropagation: true }, - { template: _.template('' + this.textNewColor + ''), stopPropagation: true } + { template: _.template('' + this.textNewColor + ''), stopPropagation: true } ] }) })