From 1167d1381445c4cd53991ae3802f0e86ea712eb8 Mon Sep 17 00:00:00 2001
From: Maxim Kadushkin <maxim.kadushkin@onlyoffice.com>
Date: Tue, 4 Jul 2017 17:24:15 +0300
Subject: [PATCH] styles: adjusted distance between buttons

---
 apps/common/main/resources/less/toolbar.less  |  4 ++++
 .../main/app/template/Toolbar.template        | 20 ++++++----------
 .../main/resources/less/toolbar.less          | 10 +++++---
 .../main/app/template/Toolbar.template        | 14 ++++-------
 .../main/app/template/Toolbar.template        | 24 +++++++++----------
 .../main/resources/less/toolbar.less          |  2 +-
 6 files changed, 35 insertions(+), 39 deletions(-)

diff --git a/apps/common/main/resources/less/toolbar.less b/apps/common/main/resources/less/toolbar.less
index 8d679c6a6..f8dc9b805 100644
--- a/apps/common/main/resources/less/toolbar.less
+++ b/apps/common/main/resources/less/toolbar.less
@@ -225,6 +225,10 @@
             width: 22px;
             height: 22px;
         }
+
+        &.adding {
+            margin-right: 5px;
+        }
     }
 }
 
diff --git a/apps/documenteditor/main/app/template/Toolbar.template b/apps/documenteditor/main/app/template/Toolbar.template
index 01d818c01..43ac7fd15 100644
--- a/apps/documenteditor/main/app/template/Toolbar.template
+++ b/apps/documenteditor/main/app/template/Toolbar.template
@@ -33,11 +33,11 @@
             <div class="separator long"></div>
             <div class="group">
                 <div class="elset">
-                    <span class="btn-slot split" id="slot-btn-copy"></span>
+                    <span class="btn-slot adding" id="slot-btn-copy"></span>
                     <span class="btn-slot" id="slot-btn-paste"></span>
                 </div>
                 <div class="elset">
-                    <span class="btn-slot split" id="slot-btn-undo"></span>
+                    <span class="btn-slot adding" id="slot-btn-undo"></span>
                     <span class="btn-slot" id="slot-btn-redo"></span>
                 </div>
             </div>
@@ -59,9 +59,9 @@
                         <span class="btn-slot" id="slot-btn-strikeout"></span>
                         <span class="btn-slot" id="slot-btn-superscript"></span>
                         <span class="btn-slot" id="slot-btn-subscript"></span>
-                        <span class="btn-slot" id="slot-btn-highlight"></span>
-                        <span class="btn-slot" id="slot-btn-fontcolor"></span>
-                        <span class="btn-slot" id="slot-btn-paracolor"></span>
+                        <span class="btn-slot split" id="slot-btn-highlight"></span>
+                        <span class="btn-slot split" id="slot-btn-fontcolor"></span>
+                        <span class="btn-slot split" id="slot-btn-paracolor"></span>
                     </div>
                 </div>
                 <div class="separator long" style="margin-left: 5px;"></div>
@@ -84,18 +84,12 @@
                 </div>
                 <div class="separator long" style="margin-left: 5px;"></div>
                 <div class="group">
-                    <div class=elset">
-                        <span class="btn-slot" id="slot-btn-clearstyle"></span>
-                    </div>
                     <div class="elset">
-                        <span class="btn-slot" id="slot-btn-copystyle"></span>
-                    </div>
-                </div>
-                <div class="group">
-                    <div class="toolbar-elset">
+                        <span class="btn-slot adding" id="slot-btn-clearstyle"></span>
                         <span class="btn-slot split" id="slot-btn-colorschemas"></span>
                     </div>
                     <div class="elset">
+                        <span class="btn-slot adding" id="slot-btn-copystyle"></span>
                         <span class="btn-slot" id="slot-btn-mailrecepients"></span>
                     </div>
                 </div>
diff --git a/apps/documenteditor/main/resources/less/toolbar.less b/apps/documenteditor/main/resources/less/toolbar.less
index 5f356d938..16e60bbaf 100644
--- a/apps/documenteditor/main/resources/less/toolbar.less
+++ b/apps/documenteditor/main/resources/less/toolbar.less
@@ -20,8 +20,12 @@
     }
 
     .font-attr {
-        > .btn-slot:not(:last-child) {
-            margin-right: 8px;
+        > .btn-slot:not(:last-child):not(.split) {
+            margin-right: 6px;
+        }
+
+        > .btn-slot:not(:last-child).split {
+            margin-right: 2px;
         }
     }
 }
@@ -400,7 +404,7 @@
 
 #slot-field-fontname {
     float: left;
-    width: 165px;
+    width: 166px;
 }
 
 #slot-field-fontsize {
diff --git a/apps/presentationeditor/main/app/template/Toolbar.template b/apps/presentationeditor/main/app/template/Toolbar.template
index 480097a00..4594d9b51 100644
--- a/apps/presentationeditor/main/app/template/Toolbar.template
+++ b/apps/presentationeditor/main/app/template/Toolbar.template
@@ -32,11 +32,11 @@
             <div class="separator long"></div>
             <div class="group">
                 <div class="elset">
-                    <span class="btn-slot split" id="slot-btn-copy"></span>
+                    <span class="btn-slot adding" id="slot-btn-copy"></span>
                     <span class="btn-slot" id="slot-btn-paste"></span>
                 </div>
                 <div class="elset">
-                    <span class="btn-slot split" id="slot-btn-undo"></span>
+                    <span class="btn-slot adding" id="slot-btn-undo"></span>
                     <span class="btn-slot" id="slot-btn-redo"></span>
                 </div>
             </div>
@@ -103,17 +103,11 @@
                 <div class="separator long"></div>
                 <div class="group">
                     <div class="elset">
-                        <span class="btn-slot" id="slot-btn-clearstyle"></span>
-                    </div>
-                    <div class="elset">
-                        <span class="btn-slot" id="slot-btn-copystyle"></span>
-                    </div>
-                </div>
-                <div class="group">
-                    <div class="elset">
+                        <span class="btn-slot adding" id="slot-btn-clearstyle"></span>
                         <span class="btn-slot split" id="slot-btn-colorschemas"></span>
                     </div>
                     <div class="elset">
+                        <span class="btn-slot adding" id="slot-btn-copystyle"></span>
                         <span class="btn-slot split" id="slot-btn-slidesize"></span>
                     </div>
                 </div>
diff --git a/apps/spreadsheeteditor/main/app/template/Toolbar.template b/apps/spreadsheeteditor/main/app/template/Toolbar.template
index 3ac6b9e23..6cfbb24e4 100644
--- a/apps/spreadsheeteditor/main/app/template/Toolbar.template
+++ b/apps/spreadsheeteditor/main/app/template/Toolbar.template
@@ -33,11 +33,11 @@
             <div class="separator long"></div>
             <div class="group">
                 <div class="elset">
-                    <span class="btn-slot split" id="slot-btn-copy"></span>
+                    <span class="btn-slot adding" id="slot-btn-copy"></span>
                     <span class="btn-slot" id="slot-btn-paste"></span>
                 </div>
                 <div class="elset">
-                    <span class="btn-slot split" id="slot-btn-undo"></span>
+                    <span class="btn-slot adding" id="slot-btn-undo"></span>
                     <span class="btn-slot" id="slot-btn-redo"></span>
                 </div>
             </div>
@@ -64,17 +64,17 @@
                 <div class="separator long"></div>
                 <div class="group">
                     <div class="elset">
-                        <span class="btn-slot split" id="slot-btn-top"></span>
-                        <span class="btn-slot split" id="slot-btn-middle"></span>
-                        <span class="btn-slot split" id="slot-btn-bottom"></span>
-                        <span class="btn-slot split" id="slot-btn-wrap"></span>
+                        <span class="btn-slot adding" id="slot-btn-top"></span>
+                        <span class="btn-slot adding" id="slot-btn-middle"></span>
+                        <span class="btn-slot adding" id="slot-btn-bottom"></span>
+                        <span class="btn-slot adding" id="slot-btn-wrap"></span>
                         <span class="btn-slot split" id="slot-btn-text-orient"></span>
                     </div>
                     <div class="elset">
-                        <span class="btn-slot split" id="slot-btn-align-left"></span>
-                        <span class="btn-slot split" id="slot-btn-align-center"></span>
-                        <span class="btn-slot split" id="slot-btn-align-right"></span>
-                        <span class="btn-slot split" id="slot-btn-align-just"></span>
+                        <span class="btn-slot adding" id="slot-btn-align-left"></span>
+                        <span class="btn-slot adding" id="slot-btn-align-center"></span>
+                        <span class="btn-slot adding" id="slot-btn-align-right"></span>
+                        <span class="btn-slot adding" id="slot-btn-align-just"></span>
                         <span class="btn-slot split" id="slot-btn-merge"></span>
                     </div>
                 </div>
@@ -90,11 +90,11 @@
                 <div class="separator long"></div>
                 <div class="group">
                     <div class="elset">
-                        <span class="btn-slot split" id="slot-btn-sortdesc"></span>
+                        <span class="btn-slot adding" id="slot-btn-sortdesc"></span>
                         <span class="btn-slot" id="slot-btn-sortasc"></span>
                     </div>
                     <div class="elset">
-                        <span class="btn-slot split" id="slot-btn-setfilter"></span>
+                        <span class="btn-slot adding" id="slot-btn-setfilter"></span>
                         <span class="btn-slot" id="slot-btn-clear-filter"></span>
                     </div>
                 </div>
diff --git a/apps/spreadsheeteditor/main/resources/less/toolbar.less b/apps/spreadsheeteditor/main/resources/less/toolbar.less
index f24c03c53..be7c34c43 100644
--- a/apps/spreadsheeteditor/main/resources/less/toolbar.less
+++ b/apps/spreadsheeteditor/main/resources/less/toolbar.less
@@ -21,7 +21,7 @@
 
     .font-attr {
         > .btn-slot:not(:last-child):not(.split) {
-            margin-right: 8px;
+            margin-right: 6px;
         }
 
         > .btn-slot.split:not(:last-child) {