From 4084696900dc194c04f092b911dbe9903ac8e1fa Mon Sep 17 00:00:00 2001
From: JuliaSvinareva <Julia.Svinaryova@onlyoffice.com>
Date: Tue, 28 Dec 2021 18:18:18 +0300
Subject: [PATCH] [DE PE SSE] Make two line captions for buttons in toolbar

---
 apps/common/main/lib/component/Button.js     | 2 ++
 apps/common/main/resources/less/buttons.less | 6 +++++-
 apps/common/main/resources/less/toolbar.less | 9 +++++++--
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/apps/common/main/lib/component/Button.js b/apps/common/main/lib/component/Button.js
index 7b4e30aa5..495912c4e 100644
--- a/apps/common/main/lib/component/Button.js
+++ b/apps/common/main/lib/component/Button.js
@@ -213,6 +213,7 @@ define([
                     '<span class="caption"><%= caption %>' +
                         '<i class="caret"></i>' +
                     '</span>' +
+                    '<i class="caret compact-caret"></i>' +
                 '</div>' +
             '</button>' +
         '</div>';
@@ -229,6 +230,7 @@ define([
                     '<span class="caption"><%= caption %>' +
                         '<i class="caret"></i>' +
                     '</span>' +
+                    '<i class="caret compact-caret"></i>' +
                 '</span>' +
             '</button>' +
         '</div>';
diff --git a/apps/common/main/resources/less/buttons.less b/apps/common/main/resources/less/buttons.less
index 6e0b6b994..4d199f372 100644
--- a/apps/common/main/resources/less/buttons.less
+++ b/apps/common/main/resources/less/buttons.less
@@ -70,6 +70,9 @@
 
         transition: transform 0.2s ease;
         transform: rotate(-135deg) translate(1px,1px);
+        &.compact-caret {
+            display: none;
+        }
     }
 
     //&:active,
@@ -229,7 +232,7 @@
 
         .inner-box-caption {
             line-height: 18px;
-            padding: 0 2px;
+            padding: 0 3px;
             display: flex;
             //align-items: center;
             align-items: start;
@@ -238,6 +241,7 @@
                 max-width: 85px;
                 max-height: 22px;
                 text-overflow: ellipsis;
+                overflow: hidden;
 
                 white-space: pre-line;
                 line-height: 10px;
diff --git a/apps/common/main/resources/less/toolbar.less b/apps/common/main/resources/less/toolbar.less
index 8872a4f69..942276aa7 100644
--- a/apps/common/main/resources/less/toolbar.less
+++ b/apps/common/main/resources/less/toolbar.less
@@ -192,6 +192,11 @@
 
                     .inner-box-caption {
                         justify-content: center;
+                        align-items: center;
+                    }
+
+                    .compact-caret {
+                        display: block;
                     }
                 }
             }
@@ -237,7 +242,7 @@
         font-size: 0;
 
         &:not(:first-child) {
-            margin-top: 6px;
+            margin-top: 8px;
         }
 
         &.font-normal {
@@ -253,7 +258,7 @@
         }
 
         &.long {
-            height: 46px;
+            height: 48px;
         }
 
         &.short {