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

Merge pull request #1316 from ONLYOFFICE/fix/Bug-53640

Browse source 
Bug 53640
This commit is contained in:
maxkadushkin 2021-11-15 16:07:03 +03:00 committed by GitHub
parent 45538869ea 0c59b54aeb
commit f6b39aff5a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/common/main/lib/view/History.js
View file

@ -86,7 +86,7 @@ define([
'<div class="user-version">' + this.textVer + '<%=version%></div>', '<div class="user-version">' + this.textVer + '<%=version%></div>',
'<% } %>', '<% } %>',
'<% if (isRevision && hasChanges) { %>', '<% if (isRevision && hasChanges) { %>',
'<div class="revision-expand img-commonctrl ' + '<% if (isExpanded) { %>' + 'up' + '<% } %>' + '"></div>', '<div class="revision-expand ' + '<% if (isExpanded) { %>' + 'up' + '<% } %>' + '"></div>',
'<% } %>', '<% } %>',
'<div class="user-name">', '<div class="user-name">',
'<div class="color" style="display: inline-block; background-color:' + '<%=usercolor%>;' + '" >', '<div class="color" style="display: inline-block; background-color:' + '<%=usercolor%>;' + '" >',

21
apps/common/main/resources/less/history.less
View file

@ -84,7 +84,8 @@
} }
.revision-expand { .revision-expand {
background-position: -70px -145px; border-color: @icon-normal-pressed-ie;
border-color: @icon-normal-pressed;
} }
} }
} }
@ -143,16 +144,22 @@
} }
.revision-expand { .revision-expand {
width: 23px; width: 8px;
height: 23px; height: 8px;
background-position: -43px -145px; border: solid 2px @icon-normal-ie;
margin: 10px 10px; border: solid 2px @icon-normal;
border-bottom: none;
border-right: none;
background-image: none;
display: inline-block; display: inline-block;
position: absolute; position: absolute;
right: 0; right: 2px;
margin: 15px;
//transition: transform 0.2s ease;
transform: rotate(-135deg) ;
&.up { &.up {
transform: rotate(180deg); transform: rotate(45deg);
} }
} }