Merge pull request 'fix/update-common-controls-sprite' (#58) from fix…

…/update-common-controls-sprite into release/v8.2.0
ONLYOFFICE · Oct 3, 2024 · e387446 · e387446
2 parents 157a3ca + 077b617
commit e387446
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 18 deletions.
diff --git a/apps/common/main/lib/template/Comments.template b/apps/common/main/lib/template/Comments.template
@@ -101,9 +101,9 @@
                     <% } %>
                 <% } %>
                 <% if (editable && !scope.viewmode) { %>
-                    <div class="btn-resolve <% if (resolved) print('comment-resolved') %>" data-toggle="tooltip"></div>
+                    <div class="btn-resolve <% if (resolved) print('img-commonctrl comment-resolved') %>" data-toggle="tooltip"></div>
                 <% } else if ((!editable || scope.viewmode) && resolved) { %>
-                    <div class="icon-resolve i-comment-resolved" data-toggle="tooltip"></div>
+                    <div class="icon-resolve i-comment-resolved img-commonctrl" data-toggle="tooltip"></div>
                 <% } %>
             </div>
         <% } %>

diff --git a/apps/common/main/lib/template/CommentsPopover.template b/apps/common/main/lib/template/CommentsPopover.template
@@ -100,9 +100,9 @@
                 <% } %>
             <% } %>
             <% if (editable && (fullInfoInHint || !hint) && !scope.viewmode) { %>
-                <div class="btn-resolve <% if (resolved) print('comment-resolved') %>" data-toggle="tooltip"></div>
+                <div class="btn-resolve <% if (resolved) print('img-commonctrl comment-resolved') %>" data-toggle="tooltip"></div>
             <% } else if ((fullInfoInHint || !hint) && (!editable || scope.viewmode) && resolved) { %>
-                <div class="icon-resolve i-comment-resolved" data-toggle="tooltip"></div>
+                <div class="icon-resolve i-comment-resolved img-commonctrl" data-toggle="tooltip"></div>
             <% } %>
         </div>
     <% } %>

diff --git a/apps/common/main/resources/img/controls/common-controls.png b/apps/common/main/resources/img/controls/common-controls.png
diff --git a/apps/common/main/resources/img/controls/[email protected] b/apps/common/main/resources/img/controls/[email protected]
diff --git a/apps/common/main/resources/img/controls/[email protected] b/apps/common/main/resources/img/controls/[email protected]
diff --git a/apps/common/main/resources/img/controls/[email protected] b/apps/common/main/resources/img/controls/[email protected]
diff --git a/apps/common/main/resources/img/controls/[email protected] b/apps/common/main/resources/img/controls/[email protected]
diff --git a/apps/common/main/resources/less/comments.less b/apps/common/main/resources/less/comments.less
@@ -431,7 +431,11 @@
         }
     }
 
-    .btn-resolve, .btn-accept, .icon-resolve {
+    .btn-resolve.comment-resolved, .icon-resolve.i-comment-resolved {
+        background-position: 0px -64px;
+    }
+
+    .btn-resolve:not(.comment-resolved), .btn-accept{
         position: relative;
 
         &:after {
@@ -446,19 +450,6 @@
             left: 6px;
             top: 0px;
         }
-
-        &.comment-resolved, &.i-comment-resolved {
-            &:after {
-                border-color: @icon-success-ie;
-                border-color: @icon-success;
-                width: 5px;
-                height: 9px;
-                top: 3px;
-            }
-            .box-shadow(0 0 0 1px @icon-success-ie);
-            .box-shadow(0 0 0 1px @icon-success);
-            border-radius: 18px;
-        }
     }
 
     .btn-resolve-check {