Merge pull request #895 from ONLYOFFICE/feature/hotfix-6-3-1

Feature/hotfix 6 3 1

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

@@ -232,7 +232,7 @@ define([
             },
 
             setAvailable: function (value) {
-                this.locked = value;
+                this.locked = !value;
             },
 
             map: function () {
@@ -261,7 +261,7 @@ define([
 
             setTheme: function (id, force) {
                 if ( (this.currentThemeId() != id || force) && !!themes_map[id] ) {
-                    var classname = document.body.className.replace(/theme-\w+\s?/, '');
+                    var classname = document.body.className.replace(/theme-[\w-]+\s?/, '');
                     document.body.className = classname;
 
                     $('body').addClass(id);

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

@@ -974,6 +974,18 @@
     &.disabled {
         opacity: @component-disabled-opacity;
     }
+
+    &:not(:disabled) {
+        .icon {
+            opacity: 1;
+        }
+
+        &:hover {
+            .icon {
+                .icon();
+            }
+        }
+    }
 }
 
 // Dialog buttons

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

@@ -47,7 +47,7 @@
         --text-contrast-background: #fff;
 
         --icon-normal: #444;
-        --icon-normal-pressed: #fff;
+        --icon-normal-pressed: #444;
         --icon-inverse: #444;
         --icon-toolbar-header: fade(#fff, 80%);
         --icon-notification-badge: #000;

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

@@ -85,10 +85,8 @@
             &.close {
                 position: relative;
                 opacity: 0.7;
-                transition: transform .3s;
 
                 &:hover {
-                    transform: scale(1.1);
                     opacity: 1;
                 }
 

apps/presentationeditor/main/resources/less/app.less

@@ -201,7 +201,7 @@
     left: 0;
     right: 0;
     bottom: 0;
-    background: rgb(226, 226, 226);
+    background: @canvas-background;
 
     .slide-h {
         display: flex;

apps/spreadsheeteditor/main/resources/less/app.less

@@ -157,7 +157,7 @@
 // Skeleton of workbook
 
 .doc-placeholder {
-    background: #fbfbfb;
+    background: @canvas-content-background;
     display: flex;
     width: 100%;
     height: 100%;