From 9d177228dfcd87d8dd1cd286a436f7ede85589e8 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <Julia.Radzhabova@onlyoffice.com>
Date: Tue, 5 Feb 2019 14:46:26 +0300
Subject: [PATCH] Fix toolbar disable in two-line header mode

---
 apps/common/main/resources/less/toolbar.less  | 19 +++++++++++++++++++
 .../main/app/template/ToolbarView.template    |  2 +-
 .../main/resources/less/toolbar.less          | 11 -----------
 .../main/app/template/ToolbarView.template    |  2 +-
 .../main/resources/less/toolbar.less          | 11 -----------
 .../main/app/template/ToolbarView.template    |  2 +-
 .../main/resources/less/toolbar.less          | 11 -----------
 7 files changed, 22 insertions(+), 36 deletions(-)

diff --git a/apps/common/main/resources/less/toolbar.less b/apps/common/main/resources/less/toolbar.less
index 8ef06f74f..df56fed54 100644
--- a/apps/common/main/resources/less/toolbar.less
+++ b/apps/common/main/resources/less/toolbar.less
@@ -257,6 +257,21 @@
         }
     }
 
+    .toolbar-mask {
+        position: absolute;
+        top: 32px;
+        left: 48px;
+        right: 0;
+        bottom: 0;
+        opacity: 0;
+        background-color: @gray-light;
+        /* z-index: @zindex-tooltip + 1; */
+    }
+
+    &.toolbar-view .toolbar-mask{
+        left: 0;
+    }
+
     .top-title > & {
         &:not(.folded) {
             height: 28 + @height-controls;
@@ -277,6 +292,10 @@
         .box-tabs {
             height: 28px;
         }
+
+        .toolbar-mask {
+            left: 0;
+        }
     }
 
 }
diff --git a/apps/documenteditor/main/app/template/ToolbarView.template b/apps/documenteditor/main/app/template/ToolbarView.template
index e92b7992b..ff388fce3 100644
--- a/apps/documenteditor/main/app/template/ToolbarView.template
+++ b/apps/documenteditor/main/app/template/ToolbarView.template
@@ -1,4 +1,4 @@
-<div class="toolbar">
+<div class="toolbar toolbar-view">
     <div class="box-tabs">
         <div class="extra left"></div>
         <%= tabsmarkup %>
diff --git a/apps/documenteditor/main/resources/less/toolbar.less b/apps/documenteditor/main/resources/less/toolbar.less
index f9fc544f8..c58ed40ee 100644
--- a/apps/documenteditor/main/resources/less/toolbar.less
+++ b/apps/documenteditor/main/resources/less/toolbar.less
@@ -22,17 +22,6 @@
     }
 }
 
-.toolbar-mask {
-    position: absolute;
-    top: 32px;
-    left: 48px;
-    right: 0;
-    bottom: 0;
-    opacity: 0;
-    background-color: @gray-light;
-    /* z-index: @zindex-tooltip + 1; */
-}
-
 .toolbar-group-mask {
     position: absolute;
     top: 0;
diff --git a/apps/presentationeditor/main/app/template/ToolbarView.template b/apps/presentationeditor/main/app/template/ToolbarView.template
index e92b7992b..ff388fce3 100644
--- a/apps/presentationeditor/main/app/template/ToolbarView.template
+++ b/apps/presentationeditor/main/app/template/ToolbarView.template
@@ -1,4 +1,4 @@
-<div class="toolbar">
+<div class="toolbar toolbar-view">
     <div class="box-tabs">
         <div class="extra left"></div>
         <%= tabsmarkup %>
diff --git a/apps/presentationeditor/main/resources/less/toolbar.less b/apps/presentationeditor/main/resources/less/toolbar.less
index 3b92700ab..3995f1dc7 100644
--- a/apps/presentationeditor/main/resources/less/toolbar.less
+++ b/apps/presentationeditor/main/resources/less/toolbar.less
@@ -17,17 +17,6 @@
     }
 }
 
-.toolbar-mask {
-    position: absolute;
-    top: 32px;
-    left: 48px;
-    right: 0;
-    bottom: 0;
-    opacity: 0;
-    background-color: @gray-light;
-    /*z-index: @zindex-tooltip + 1;*/
-}
-
 .menu-layouts {
     .dataview.inner {
         & > div:not(.grouped-data):not([class^=ps-scrollbar]) {
diff --git a/apps/spreadsheeteditor/main/app/template/ToolbarView.template b/apps/spreadsheeteditor/main/app/template/ToolbarView.template
index 95aebaed6..eb41b7874 100644
--- a/apps/spreadsheeteditor/main/app/template/ToolbarView.template
+++ b/apps/spreadsheeteditor/main/app/template/ToolbarView.template
@@ -1,4 +1,4 @@
-<section class="toolbar">
+<section class="toolbar toolbar-view">
     <section class="box-tabs">
         <div class="extra left"></div>
         <%= tabsmarkup %>
diff --git a/apps/spreadsheeteditor/main/resources/less/toolbar.less b/apps/spreadsheeteditor/main/resources/less/toolbar.less
index ea7d7af88..5de0a404f 100644
--- a/apps/spreadsheeteditor/main/resources/less/toolbar.less
+++ b/apps/spreadsheeteditor/main/resources/less/toolbar.less
@@ -39,17 +39,6 @@
     }
 }
 
-.toolbar-mask {
-    position: absolute;
-    top: 32px;
-    left: 48px;
-    right: 0;
-    bottom: 0;
-    opacity: 0;
-    background-color: @gray-light;
-    /*z-index: @zindex-tooltip + 1;*/
-}
-
 .color-schemas-menu {
     span {
         &.colors {