Merge branch 'release/v6.3.0' into develop

apps/common/main/lib/controller/Themes.js

@@ -18,15 +18,24 @@ define([
         }
 
         var refresh_sdk_colors = function () {
-            var style = getComputedStyle(document.body);
-            if ( !!window.DE ) {
-                var color_background_normal = style.getPropertyValue('--background-normal');
-                this.api.asc_setSkin({
-                    "RulerOutline": style.getPropertyValue('--border-toolbar')
-                    , "RulerMarkersFillColor": color_background_normal
-                    , "RulerMarkersFillColorOld": color_background_normal
-                    , "RulerTableColor1": color_background_normal
-                });
+            if ( !(Common.Utils.isIE10 || Common.Utils.isIE11) ) {
+                var style = getComputedStyle(document.body);
+                if ( !!window.DE ) {
+                    var color_background_normal = style.getPropertyValue('--background-normal');
+                    this.api.asc_setSkin({
+                        "RulerOutline": style.getPropertyValue('--border-toolbar'),
+                        "RulerMarkersFillColor": color_background_normal,
+                        "RulerMarkersFillColorOld": color_background_normal,
+                        "RulerTableColor1": color_background_normal,
+                        "RulerLight": style.getPropertyValue("--canvas-ruler-background"),
+                        "RulerDark": style.getPropertyValue("--canvas-ruler-margins-background"),
+                        "RulerTextColor": style.getPropertyValue("--canvas-ruler-mark"),
+                        "RulerTableColor2": style.getPropertyValue("--canvas-ruler-handle-border"),
+                        "RulerTableColor2Old": style.getPropertyValue("--canvas-ruler-handle-border-disabled"),
+                        "RulerTabsColor": style.getPropertyValue("--canvas-high-contrast"),
+                        "RulerTabsColorOld": style.getPropertyValue("--canvas-high-contrast-disabled"),
+                    });
+                }
             }
         }
         return {

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

@@ -13,10 +13,10 @@
         font-size:  @font-size-base;
         line-height: @line-height-base;
 
-        -o-transition: border-color ease-in-out .15s;
-        -webkit-transition: border-color ease-in-out .15s;
-        -moz-transition: border-color ease-in-out .15s;
-        transition: border-color ease-in-out .15s;
+        -o-transition: none;
+        -webkit-transition: none;
+        -moz-transition: none;
+        transition: none;
 
         border-top-right-radius: 2px !important;
         border-bottom-right-radius: 2px !important;
@@ -59,6 +59,7 @@
     }
 
     .btn-default.disabled {
+        padding-right: 5px;
         border-top-color: transparent;
         border-bottom-color: transparent;
 
@@ -154,6 +155,14 @@
         top: auto;
         bottom: 100%;
     }
+
+    .masked & {
+        &.disabled {
+            .form-control, .btn-default {
+                opacity: 1;
+            }
+        }
+    }
 }
 
 .open > .combobox.combo-dataview-menu {

apps/documenteditor/main/app/view/DocumentHolder.js

@@ -2707,7 +2707,7 @@ define([
             }).on('click', _.bind(me.onInsertCaption, me));
 
             var mnuTableMerge = new Common.UI.MenuItem({
-                iconCls: 'menu__icon btn-merge',
+                iconCls: 'menu__icon btn-merge-cells',
                 caption     : me.mergeCellsText
             }).on('click', function(item) {
                 if (me.api)

apps/documenteditor/main/app/view/Toolbar.js

@@ -1171,6 +1171,7 @@ define([
                             if (menu.cmpEl) {
                                 var itemEl = $(cmp.cmpEl.find('.dataview.inner .style').get(0)).parent();
                                 var itemMargin = /*parseInt($(itemEl.get(0)).parent().css('margin-right'))*/-1;
+                                Common.Utils.applicationPixelRatio() > 1 && Common.Utils.applicationPixelRatio() < 2 && (itemMargin = itemMargin + 1/Common.Utils.applicationPixelRatio());
                                 var itemWidth = itemEl.is(':visible') ? parseInt(itemEl.css('width')) :
                                     (cmp.itemWidth + parseInt(itemEl.css('padding-left')) + parseInt(itemEl.css('padding-right')) +
                                     parseInt(itemEl.css('border-left-width')) + parseInt(itemEl.css('border-right-width')));
@@ -1709,6 +1710,7 @@ define([
                             this.mnuMarkerChangeLevel = new Common.UI.MenuItem({
                                 caption: this.textChangeLevel,
                                 style: 'padding-right:20px;',
+                                disabled: (this.mnuMarkersPicker.conf.index || 0)==0,
                                 menu: new Common.UI.Menu({
                                     cls: 'list-settings-level',
                                     menuAlign: 'tl-tr',
@@ -1738,6 +1740,7 @@ define([
                             this.mnuNumberChangeLevel = new Common.UI.MenuItem({
                                 caption: this.textChangeLevel,
                                 style: 'padding-right:20px;',
+                                disabled: (this.mnuNumbersPicker.conf.index || 0)==0,
                                 menu: new Common.UI.Menu({
                                     cls: 'list-settings-level',
                                     menuAlign: 'tl-tr',

apps/presentationeditor/main/app/view/DocumentHolder.js

@@ -2165,7 +2165,7 @@ define([
             });
 
             var mnuTableMerge = new Common.UI.MenuItem({
-                iconCls: 'menu__icon btn-merge',
+                iconCls: 'menu__icon btn-merge-cells',
                 caption     : me.mergeCellsText
             }).on('click', function(item) {
                 if (me.api)

apps/presentationeditor/main/app/view/Toolbar.js

@@ -905,6 +905,7 @@ define([
                             if (menu.cmpEl) {
                                 var itemEl = $(cmp.cmpEl.find('.dataview.inner .style').get(0)).parent();
                                 var itemMargin = /*parseInt($(itemEl.get(0)).parent().css('margin-right'))*/-1;
+                                Common.Utils.applicationPixelRatio() > 1 && Common.Utils.applicationPixelRatio() < 2 && (itemMargin = itemMargin + 1/Common.Utils.applicationPixelRatio());
                                 var itemWidth = itemEl.is(':visible') ? parseInt(itemEl.css('width')) :
                                     (cmp.itemWidth + parseInt(itemEl.css('padding-left')) + parseInt(itemEl.css('padding-right')) +
                                     parseInt(itemEl.css('border-left-width')) + parseInt(itemEl.css('border-right-width')));