diff --git a/apps/common/main/lib/template/ReviewChangesPopover.template b/apps/common/main/lib/template/ReviewChangesPopover.template index aa9b75381..ddfe2c417 100644 --- a/apps/common/main/lib/template/ReviewChangesPopover.template +++ b/apps/common/main/lib/template/ReviewChangesPopover.template @@ -14,8 +14,8 @@
<% } %> <% } else if (editable) { %> -
-
+
+
<% } %> <% } %> diff --git a/apps/common/main/resources/less/comments.less b/apps/common/main/resources/less/comments.less index 415f98a0c..2def511a2 100644 --- a/apps/common/main/resources/less/comments.less +++ b/apps/common/main/resources/less/comments.less @@ -273,15 +273,73 @@ background-position: -22px -232px; } - .btn-accept { - background-position: -2px -253px; + + .tool { + float: right; + width: 16px; + height: 16px; + cursor: pointer; + overflow: hidden; + padding: 0px; + margin-right: 2px; + + &.btn-reject { + position: relative; + opacity: 0.7; + + &:hover { + opacity: 1; + } + + &.disabled { + cursor: default; + } + + &:before, &:after { + content: ' '; + position: absolute; + left: 7px; + left: calc(7px/@pixel-ratio-factor); + top: @scaled-one-px-value-ie; + top: @scaled-one-px-value; + height: 14px; + width: @scaled-one-px-value-ie; + width: @scaled-one-px-value; + background-color: @icon-normal-ie; + background-color: @icon-normal; + } + + &:before { + transform: rotate(45deg); + } + + &:after { + transform: rotate(-45deg); + } + } + + &.help { + width: 20px; + margin-right:0; + line-height: 14px; + font-size: 14px; + font-weight: bold; + color: @text-normal-ie; + color: @text-normal; + opacity: 0.7; + + &:hover { + opacity: 1; + } + + &.disabled { + opacity: @component-disabled-opacity; + cursor: default; + } + } } - .btn-reject { - background-position: -22px -253px; - } - - .btn-resolve { + .btn-resolve,.btn-accept { position: relative; &:after { diff --git a/apps/spreadsheeteditor/main/app/view/Spellcheck.js b/apps/spreadsheeteditor/main/app/view/Spellcheck.js index 0abbe625c..0264df328 100644 --- a/apps/spreadsheeteditor/main/app/view/Spellcheck.js +++ b/apps/spreadsheeteditor/main/app/view/Spellcheck.js @@ -64,7 +64,7 @@ define([ '', '
', '', '' diff --git a/apps/spreadsheeteditor/main/resources/less/spellcheck.less b/apps/spreadsheeteditor/main/resources/less/spellcheck.less index 1582d2759..1b217871b 100644 --- a/apps/spreadsheeteditor/main/resources/less/spellcheck.less +++ b/apps/spreadsheeteditor/main/resources/less/spellcheck.less @@ -48,4 +48,23 @@ #spellcheck-complete { display: flex; +} +.btn-resolve + { + position: relative; + + &:after { + content: ''; + position: absolute; + border: solid @text-normal-ie; + border: solid @text-normal; + border-color: @icon-success-ie; + border-color: @icon-success; + border-width: 0 3px 3px 0; + transform: rotate(40deg); + width: 6px; + height: 10px; + } + + } \ No newline at end of file