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

Merge pull request #874 from ONLYOFFICE/fix/bugfix

Browse source 
Fix/bugfix
This commit is contained in:
Julia Radzhabova 2021-05-11 15:44:04 +03:00 committed by GitHub
parent 71ce073bed be4a444adb
commit cd21ce2283
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
apps/common/main/resources/less/buttons.less
View file

@ -906,10 +906,6 @@
&.template-table { &.template-table {
width: 92px; width: 92px;
} }
&.sheet-template-table {
width: 83px;
height: 54px;
}
.icon-template-slicer.icon { .icon-template-slicer.icon {
min-width: 36px; min-width: 36px;
@ -930,6 +926,17 @@
position: relative; position: relative;
} }
&.sheet-template-table {
width: 83px;
height: 54px;
.icon {
border: none;
.box-shadow(0 0 0 @scaled-one-px-value-ie @border-regular-control-ie);
.box-shadow(0 0 0 @scaled-one-px-value @border-regular-control);
}
}
svg.icon { svg.icon {
vertical-align: middle; vertical-align: middle;
width: 52px; width: 52px;

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

@ -1537,7 +1537,7 @@ define([
this.toolbar.fireEvent('insertimage', this.toolbar); this.toolbar.fireEvent('insertimage', this.toolbar);
if (this.api) if (this.api)
this.api.asc_addImage(); setTimeout(function() {me.api.asc_addImage();}, 1);
Common.NotificationCenter.trigger('edit:complete', me.toolbar); Common.NotificationCenter.trigger('edit:complete', me.toolbar);
Common.component.Analytics.trackEvent('ToolBar', 'Image'); Common.component.Analytics.trackEvent('ToolBar', 'Image');

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

@ -1556,7 +1556,7 @@ define([
if (opts === 'file') { if (opts === 'file') {
me.toolbar.fireEvent('insertimage', this.toolbar); me.toolbar.fireEvent('insertimage', this.toolbar);
me.api.asc_addImage(); setTimeout(function() {me.api.asc_addImage();}, 1);
Common.NotificationCenter.trigger('edit:complete', this.toolbar); Common.NotificationCenter.trigger('edit:complete', this.toolbar);
Common.component.Analytics.trackEvent('ToolBar', 'Image'); Common.component.Analytics.trackEvent('ToolBar', 'Image');

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

@ -858,7 +858,7 @@ define([
this.toolbar.fireEvent('insertimage', this.toolbar); this.toolbar.fireEvent('insertimage', this.toolbar);
if (this.api) if (this.api)
this.api.asc_addImage(); setTimeout(function() {me.api.asc_addImage();}, 1);
Common.NotificationCenter.trigger('edit:complete', this.toolbar); Common.NotificationCenter.trigger('edit:complete', this.toolbar);
Common.component.Analytics.trackEvent('ToolBar', 'Image'); Common.component.Analytics.trackEvent('ToolBar', 'Image');

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

@ -452,7 +452,7 @@ define([
this.mnuTableTemplatePicker.selectRecord(rec, true); this.mnuTableTemplatePicker.selectRecord(rec, true);
this.btnTableTemplate.resumeEvents(); this.btnTableTemplate.resumeEvents();
this.$el.find('.icon-template-table').css({'background-image': 'url(' + rec.get("imageUrl") + ')', 'height': '48px', 'width': '63px', 'background-position': 'center', 'background-size': 'auto 50px'}); this.$el.find('.icon-template-table').css({'background-image': 'url(' + rec.get("imageUrl") + ')', 'height': '46px', 'width': '61px', 'background-position': 'center', 'background-size': 'cover'});
this._state.TemplateName=value; this._state.TemplateName=value;
} }