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

[DE] Fix style for disabled item Add new style

Browse source
This commit is contained in:
Julia Radzhabova 2021-09-20 19:51:32 +03:00
parent 03069417fb
commit 75fa8c5c10
4 changed files with 7 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/common/main/lib/component/MenuItem.js
View file

@ -137,6 +137,7 @@ define([
this.toggleGroup = me.options.toggleGroup; this.toggleGroup = me.options.toggleGroup;
this.template = me.options.template || this.template; this.template = me.options.template || this.template;
this.iconCls = me.options.iconCls; this.iconCls = me.options.iconCls;
this.liCls = me.options.liCls;
this.hint = me.options.hint; this.hint = me.options.hint;
this.rendered = false; this.rendered = false;
@ -216,6 +217,9 @@ define([
}); });
} }
if (this.liCls)
el.addClass(this.liCls);
if (this.disabled) if (this.disabled)
el.toggleClass('disabled', this.disabled); el.toggleClass('disabled', this.disabled);

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

@ -357,8 +357,6 @@ define([
Common.Gateway.on('insertimage', _.bind(this.insertImage, this)); Common.Gateway.on('insertimage', _.bind(this.insertImage, this));
Common.Gateway.on('setmailmergerecipients', _.bind(this.setMailMergeRecipients, this)); Common.Gateway.on('setmailmergerecipients', _.bind(this.setMailMergeRecipients, this));
$('#id-toolbar-menu-new-control-color').on('click', _.bind(this.onNewControlsColor, this)); $('#id-toolbar-menu-new-control-color').on('click', _.bind(this.onNewControlsColor, this));
// $('#id-save-style-plus, #id-save-style-link', toolbar.$el).on('click', this.onMenuSaveStyle.bind(this));
toolbar.listStylesAdditionalMenuItem.on('click', this.onMenuSaveStyle.bind(this)); toolbar.listStylesAdditionalMenuItem.on('click', this.onMenuSaveStyle.bind(this));
this.onSetupCopyStyleButton(); this.onSetupCopyStyleButton();

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

@ -1286,14 +1286,9 @@ define([
this.paragraphControls.push(this.cmbFontName); this.paragraphControls.push(this.cmbFontName);
this.listStylesAdditionalMenuItem = new Common.UI.MenuItem({ this.listStylesAdditionalMenuItem = new Common.UI.MenuItem({
cls: 'save-style-container', liCls: 'save-style-container',
iconCls: 'menu__icon btn-zoomup', iconCls: 'menu__icon btn-zoomup',
caption: me.textStyleMenuNew caption: me.textStyleMenuNew
// template: _.template(
// '<div id="id-save-style-container" class = "save-style-container">' +
// '<span id="id-save-style-plus" class="plus img-commonctrl" ></span>' +
// '<label id="id-save-style-link" class="save-style-link" >' + me.textStyleMenuNew + '</label>' +
// '</div>')
}); });
this.listStyles = new Common.UI.ComboDataView({ this.listStyles = new Common.UI.ComboDataView({

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

@ -152,36 +152,13 @@
} }
.save-style-container { .save-style-container {
//cursor: default;
//position: relative;
//padding: 14px 11px;
padding: 14px 20px !important;
border-left: @scaled-one-px-value-ie solid @border-regular-control-ie; border-left: @scaled-one-px-value-ie solid @border-regular-control-ie;
border-left: @scaled-one-px-value solid @border-regular-control; border-left: @scaled-one-px-value solid @border-regular-control;
border-top: @scaled-one-px-value-ie solid @border-regular-control-ie; border-top: @scaled-one-px-value-ie solid @border-regular-control-ie;
border-top: @scaled-one-px-value solid @border-regular-control; border-top: @scaled-one-px-value solid @border-regular-control;
}
.save-style-link { a {
border-bottom: @scaled-one-px-value-ie dotted @text-secondary-ie; padding: 14px 20px !important;
border-bottom: @scaled-one-px-value dotted @text-secondary;
cursor: pointer;
margin-left: 22px;
}
.plus {
width: 16px;
height: 16px;
cursor: pointer;
position: absolute;
background-position: @plus-offset-x @plus-offset-y;
}
.dropdown-menu > .disabled {
.plus, .save-style-link {
cursor: default;
color: @dropdown-link-disabled-color;
background-position: @plus-offset-x @plus-offset-y - 16;
} }
} }