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

[DE PE SSE] Fix bug 51488

Browse source
This commit is contained in:
JuliaSvinareva 2021-09-02 15:44:11 +03:00
parent 38def0be24
commit 9d2de2698b
3 changed files with 31 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
apps/common/main/lib/template/Comments.template
View file

@ -70,16 +70,20 @@
<!-- edit buttons --> <!-- edit buttons -->
<% if (!editText && !lock && !scope.viewmode) { %> <% if (!editText && !lock) { %>
<div class="edit-ct"> <div class="edit-ct">
<% if (editable) { %> <% if (!scope.viewmode) { %>
<div class="btn-edit img-commonctrl"></div> <% if (editable) { %>
<div class="btn-edit img-commonctrl"></div>
<% } %>
<% if (removable) { %>
<div class="btn-delete img-commonctrl"></div>
<% } %>
<% } %> <% } %>
<% if (removable) { %> <% if (editable && !scope.viewmode) { %>
<div class="btn-delete img-commonctrl"></div> <div class="btn-resolve <% if (resolved) print('comment-resolved') %>" data-toggle="tooltip"></div>
<% } %> <% } else if ((!editable || scope.viewmode) && resolved) { %>
<% if (editable) { %> <div class="icon-resolve i-comment-resolved"></div>
<div class="btn-resolve <% if (resolved) print('comment-resolved') %>" data-toggle="tooltip"></div>
<% } %> <% } %>
</div> </div>
<% } %> <% } %>

20
apps/common/main/lib/template/CommentsPopover.template
View file

@ -71,16 +71,20 @@
<!-- edit buttons --> <!-- edit buttons -->
<% if (!editTextInPopover && !lock && !hint) { %> <% if (!editTextInPopover && !lock) { %>
<div class="edit-ct"> <div class="edit-ct">
<% if (editable) { %> <% if (!hint) { %>
<div class="btn-edit img-commonctrl"></div> <% if (editable) { %>
<div class="btn-edit img-commonctrl"></div>
<% } %>
<% if (removable) { %>
<div class="btn-delete img-commonctrl"></div>
<% } %>
<% } %> <% } %>
<% if (removable) { %> <% if (editable && !hint) { %>
<div class="btn-delete img-commonctrl"></div> <div class="btn-resolve <% if (resolved) print('comment-resolved') %>" data-toggle="tooltip"></div>
<% } %> <% } else if ((!editable || hint) && resolved) { %>
<% if (editable) { %> <div class="icon-resolve i-comment-resolved"></div>
<div class="btn-resolve <% if (resolved) print('comment-resolved') %>" data-toggle="tooltip"></div>
<% } %> <% } %>
</div> </div>
<% } %> <% } %>

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

@ -277,13 +277,17 @@
cursor: pointer; cursor: pointer;
} }
.btn-edit,.btn-delete, .btn-resolve, .btn-resolve-check, .btn-accept, .btn-reject, .btn-goto { .btn-edit,.btn-delete, .btn-resolve, .icon-resolve, .btn-resolve-check, .btn-accept, .btn-reject, .btn-goto {
width: 16px; width: 16px;
height: 16px; height: 16px;
margin: 0 0 0 5px; margin: 0 0 0 5px;
background-color: transparent; background-color: transparent;
} }
.icon-resolve {
float: left;
}
.btn-edit { .btn-edit {
background-position: -2px -232px; background-position: -2px -232px;
} }
@ -350,7 +354,7 @@
} }
} }
.btn-resolve,.btn-accept { .btn-resolve, .btn-accept, .icon-resolve {
position: relative; position: relative;
&:after { &:after {
@ -366,7 +370,7 @@
top: 0px; top: 0px;
} }
&.comment-resolved { &.comment-resolved, &.i-comment-resolved {
&:after { &:after {
border-color: @icon-success-ie; border-color: @icon-success-ie;
border-color: @icon-success; border-color: @icon-success;