Merge pull request #861 from ONLYOFFICE/feature/pr26-fix-bug-50190

Feature/pr26 fix bug 50190

apps/common/main/lib/component/ThemeColorPalette.js

@@ -64,7 +64,7 @@ define([
                 '<% var me = this; %>' +
                 '<% $(colors).each(function(num, item) { %>' +
                     '<% if (me.isBlankSeparator(item)) { %> <div class="palette-color-spacer" style="width:100%;height:8px;float:left;"></div>' +
-                    '<% } else if (me.isSeparator(item)) { %> </div><div class="palette-color-separator" style="width:100%;height:1px;float:left;border-bottom: 1px solid #E0E0E0"></div><div style="padding: 12px;">' +
+                    '<% } else if (me.isSeparator(item)) { %> </div><div class="divider" style="width:100%;float:left;"></div><div style="padding: 12px;">' +
                     '<% } else if (me.isColor(item)) { %> ' +
                         '<a class="palette-color color-<%=item%>" style="background:#<%=item%>" hidefocus="on">' +
                         '<em><span style="background:#<%=item%>;" unselectable="on">&#160;</span></em>' +

apps/common/main/resources/less/buttons.less

@@ -428,8 +428,8 @@
         height: 3px;
         background-color: red;
         &.bordered {
-            border: 1px solid @border-regular-control-ie;
+            border: @scaled-one-px-value-ie solid @border-regular-control-ie;
-            border: 1px solid @border-regular-control;
+            border: @scaled-one-px-value solid @border-regular-control;
         }
 
 
@@ -571,8 +571,8 @@
 
         &.over:not(.disabled),
         &.open {
-            box-shadow: inset 0 0 0 1px @highlight-button-hover-ie;
+            box-shadow: inset 0 0 0 @scaled-one-px-value-ie @highlight-button-hover-ie;
-            box-shadow: inset 0 0 0 1px @highlight-button-hover;
+            box-shadow: inset 0 0 0 @scaled-one-px-value @highlight-button-hover;
 
             button:not(.active):not(.btn-text-split-default) {
                 background-color: transparent;
@@ -973,8 +973,8 @@
     color: @text-normal;
     background-color: @background-normal-ie;
     background-color: @background-normal;
-    border: 1px solid @border-regular-control-ie;
+    border: @scaled-one-px-value-ie solid @border-regular-control-ie;
-    border: 1px solid @border-regular-control;
+    border: @scaled-one-px-value solid @border-regular-control;
 
     &:hover:not(.disabled),
     &.hover:not(.disabled) {

apps/common/main/resources/less/colors-table-classic.less

@@ -111,7 +111,7 @@
         --modal-window-mask-opacity: 0.6;
         --image-border-types-filter: none;
         --image-border-types-filter-selected: invert(100%) brightness(4);
-        --component-normal-icon-filter: invert(100%);
+        --component-normal-icon-filter: none;
 
         --component-normal-icon-opacity: .8;
         --component-hover-icon-opacity: .8;

apps/common/main/resources/less/common.less

@@ -269,4 +269,20 @@ textarea {
 
 .doc-content-color {
     background-color: @canvas-content-background;
+}
+
+a {
+    color: @text-link;
+
+    &:hover {
+        color: @text-link-hover;
+    }
+
+    &:active {
+        color: @text-link-active;
+    }
+
+    &:visited {
+        color: @text-link-visited;
+    }
 }

apps/spreadsheeteditor/main/app/view/HeaderFooterDialog.js

@@ -99,7 +99,7 @@ define([
                             '</td>',
                         '</tr>',
                     '</table>',
-                    '<div class="input-row" style="margin-bottom: 15px; border-bottom: 1px solid #cfcfcf;">',
+                    '<div class="input-row input-row--tabs" style="margin-bottom: 15px;">',
                         '<button type="button" class="btn btn-text-default auto" id="id-dlg-hf-btn-all" style="border-radius: 0;">', this.textAll,'</button>',
                         '<button type="button" class="btn btn-text-default auto hidden" id="id-dlg-hf-btn-odd" style="border-radius: 0;">', this.textOdd,'</button>',
                         '<button type="button" class="btn btn-text-default auto hidden" id="id-dlg-hf-btn-even" style="border-radius: 0; margin-left:-1px;">', this.textEven,'</button>',
@@ -115,17 +115,17 @@ define([
                     '<div id="id-dlg-h-underline" style="display: inline-block;margin-left: 6px;"></div>','<div id="id-dlg-h-strikeout" style="display: inline-block;margin-left: 6px;"></div>',
                     '<div id="id-dlg-h-subscript" style="display: inline-block;margin-left: 6px;"></div>','<div id="id-dlg-h-superscript" style="display: inline-block;margin-left: 6px;"></div>',
                         '<div style="display: inline-block;margin-right: -1px;margin-top: 7px;vertical-align: middle;">',
-                            '<div style="border: 1px solid #cbcbcb;width: 206px; height: 92px; position:relative; overflow:hidden;">',
+                            '<div class="preview-canvas-container" style="width: 206px; height: 92px; position:relative; overflow:hidden;">',
                                 '<div id="header-left-img" style="width: 190px; height: 100%;"></div>',
                             '</div>',
                         '</div>',
                         '<div style="display: inline-block;margin-right: -1px;margin-top: 7px;vertical-align: middle;">',
-                            '<div style="border: 1px solid #cbcbcb;width: 206px; height: 92px; position:relative; overflow:hidden;">',
+                            '<div class="preview-canvas-container" style="width: 206px; height: 92px; position:relative; overflow:hidden;">',
                                 '<div id="header-center-img" style="width: 190px; height: 100%;"></div>',
                             '</div>',
                         '</div>',
                         '<div style="display: inline-block;margin-top: 7px;vertical-align: middle;">',
-                            '<div style="border: 1px solid #cbcbcb;width: 206px; height: 92px; position:relative; overflow:hidden;">',
+                            '<div class="preview-canvas-container" style="width: 206px; height: 92px; position:relative; overflow:hidden;">',
                                 '<div id="header-right-img" style="width: 190px; height: 100%;"></div>',
                             '</div>',
                         '</div>',
@@ -139,17 +139,17 @@ define([
                     '<div id="id-dlg-f-underline" style="display: inline-block;margin-left: 6px;"></div>','<div id="id-dlg-f-strikeout" style="display: inline-block;margin-left: 6px;"></div>',
                     '<div id="id-dlg-f-subscript" style="display: inline-block;margin-left: 6px;"></div>','<div id="id-dlg-f-superscript" style="display: inline-block;margin-left: 6px;"></div>',
                         '<div style="display: inline-block;margin-right: -1px;margin-top: 7px;vertical-align: middle;">',
-                            '<div style="border: 1px solid #cbcbcb;width: 206px; height: 92px; position:relative; overflow:hidden;">',
+                            '<div class="preview-canvas-container" style="width: 206px; height: 92px; position:relative; overflow:hidden;">',
                                 '<div id="footer-left-img" style="width: 190px; height: 100%;"></div>',
                             '</div>',
                         '</div>',
                         '<div style="display: inline-block;margin-right: -1px;margin-top: 7px;vertical-align: middle;">',
-                            '<div style="border: 1px solid #cbcbcb;width: 206px; height: 92px; position:relative; overflow:hidden;">',
+                            '<div class="preview-canvas-container" style="width: 206px; height: 92px; position:relative; overflow:hidden;">',
                                 '<div id="footer-center-img" style="width: 190px; height: 100%;"></div>',
                             '</div>',
                         '</div>',
                         '<div style="display: inline-block;margin-top: 7px;vertical-align: middle;">',
-                            '<div style="border: 1px solid #cbcbcb;width: 206px; height: 92px; position:relative; overflow:hidden;">',
+                            '<div class="preview-canvas-container" style="width: 206px; height: 92px; position:relative; overflow:hidden;">',
                                 '<div id="footer-right-img" style="width: 190px; height: 100%;"></div>',
                             '</div>',
                         '</div>',

apps/spreadsheeteditor/main/resources/less/advanced-settings.less

@@ -98,3 +98,13 @@
     min-width: 100px;
     margin-right: 5px;
 }
+
+.input-row--tabs {
+    border-bottom: @scaled-one-px-value-ie solid @border-divider-ie;
+    border-bottom: @scaled-one-px-value solid @border-divider;
+}
+
+.preview-canvas-container {
+    border: @scaled-one-px-value-ie solid @border-regular-control-ie;
+    border: @scaled-one-px-value solid @border-regular-control;
+}