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

Merge pull request #800 from ONLYOFFICE/feature/pr15-fix-bug-49480

Browse source 
Feature/pr15 fix bug 49480
This commit is contained in:
maxkadushkin 2021-04-08 19:17:25 +03:00 committed by GitHub
parent eae2520639 a547dabab6
commit e7933c9c2a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 3 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
apps/common/main/resources/img/controls/common-controls.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.3 KiB

After

Width:  |  Height:  |  Size: 11 KiB

BIN
apps/common/main/resources/img/controls/common-controls@1.5x.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.4 KiB

After

Width:  |  Height:  |  Size: 12 KiB

BIN
apps/common/main/resources/img/controls/common-controls@2x.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.9 KiB

After

Width:  |  Height:  |  Size: 20 KiB

6
apps/common/main/resources/less/comments.less
View file

@ -265,11 +265,11 @@
}
.btn-edit {
background-position: -2px -233px;
background-position: -2px -232px;
}
.btn-delete {
background-position: -22px -233px;
background-position: -22px -232px;
}
.btn-accept {
@ -293,7 +293,7 @@
width: 7px;
height: 12px;
left: 6px;
top: -2px;
top: 0px;
}
&.comment-resolved {

6
apps/documenteditor/main/app/controller/Main.js
View file

@ -1156,12 +1156,6 @@ define([
$('.doc-placeholder').remove();
this.appOptions.user.guest && this.appOptions.canRenameAnonymous && (Common.Utils.InternalSettings.get("guest-username")===null) && this.showRenameUserDialog();
$('#header-logo').children(0).click(function(e) {
e.stopImmediatePropagation();
Common.UI.Themes.toggleTheme();
// getComputedStyle(document.documentElement).getPropertyValue('--background-normal');
})
},
onLicenseChanged: function(params) {

6
apps/presentationeditor/main/app/controller/Main.js
View file

@ -877,12 +877,6 @@ define([
$('.doc-placeholder').remove();
this.appOptions.user.guest && this.appOptions.canRenameAnonymous && (Common.Utils.InternalSettings.get("guest-username")===null) && this.showRenameUserDialog();
$('#header-logo').children(0).click(function(e) {
e.stopImmediatePropagation();
Common.UI.Themes.toggleTheme();
})
},
onLicenseChanged: function(params) {

5
apps/spreadsheeteditor/main/app/controller/Main.js
View file

@ -946,11 +946,6 @@ define([
Common.Gateway.documentReady();
if (this.appOptions.user.guest && this.appOptions.canRenameAnonymous && !this.appOptions.isEditDiagram && !this.appOptions.isEditMailMerge && (Common.Utils.InternalSettings.get("guest-username")===null))
this.showRenameUserDialog();
$('#header-logo').children(0).click(function(e) {
e.stopImmediatePropagation();
Common.UI.Themes.toggleTheme();
})
},
onLicenseChanged: function(params) {