diff --git a/apps/common/main/lib/template/Comments.template b/apps/common/main/lib/template/Comments.template index 771ac2190c..c7d8170265 100644 --- 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 index d43b79abf7..e09499a79f 100644 --- 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 index a5c6ea1ec2..a570d9b8b4 100644 Binary files a/apps/common/main/resources/img/controls/common-controls.png and b/apps/common/main/resources/img/controls/common-controls.png differ diff --git a/apps/common/main/resources/img/controls/common-controls@1.25x.png b/apps/common/main/resources/img/controls/common-controls@1.25x.png index 80cff84127..a114ff3fee 100644 Binary files a/apps/common/main/resources/img/controls/common-controls@1.25x.png and b/apps/common/main/resources/img/controls/common-controls@1.25x.png differ diff --git a/apps/common/main/resources/img/controls/common-controls@1.5x.png b/apps/common/main/resources/img/controls/common-controls@1.5x.png index 839945e9ce..55f01fab8c 100644 Binary files a/apps/common/main/resources/img/controls/common-controls@1.5x.png and b/apps/common/main/resources/img/controls/common-controls@1.5x.png differ diff --git a/apps/common/main/resources/img/controls/common-controls@1.75x.png b/apps/common/main/resources/img/controls/common-controls@1.75x.png index 97181e3c22..316f479eea 100644 Binary files a/apps/common/main/resources/img/controls/common-controls@1.75x.png and b/apps/common/main/resources/img/controls/common-controls@1.75x.png differ diff --git a/apps/common/main/resources/img/controls/common-controls@2x.png b/apps/common/main/resources/img/controls/common-controls@2x.png index a1db566bb0..4ea52d0fe0 100644 Binary files a/apps/common/main/resources/img/controls/common-controls@2x.png and b/apps/common/main/resources/img/controls/common-controls@2x.png differ diff --git a/apps/common/main/resources/less/comments.less b/apps/common/main/resources/less/comments.less index ae37d86853..68eff8f413 100644 --- 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 {