From 6442423a039314692fbce151cd4a59af29db902d Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <julia.radzhabova@onlyoffice.com>
Date: Fri, 16 Apr 2021 02:16:07 +0300
Subject: [PATCH] [DE] Change table settings

---
 .../main/app/template/TableSettings.template       | 12 ++----------
 apps/documenteditor/main/app/view/TableSettings.js | 14 ++++++++++----
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/apps/documenteditor/main/app/template/TableSettings.template b/apps/documenteditor/main/app/template/TableSettings.template
index 610bbe425..e56df652b 100644
--- a/apps/documenteditor/main/app/template/TableSettings.template
+++ b/apps/documenteditor/main/app/template/TableSettings.template
@@ -113,25 +113,17 @@
     <tr>
         <td class="padding-small" colspan=2>
             <label style="margin-top: 3px;"><%= scope.textHeight %></label>
+            <div id="table-btn-distrub-rows" style="display: inline-block; float:right; margin-left: 4px;"></div>
             <div id="table-spin-cell-height" style="display: inline-block; float:right;"></div>
         </td>
     </tr>
     <tr>
         <td class="padding-small" colspan=2>
             <label style="margin-top: 3px;"><%= scope.textWidth %></label>
+            <div id="table-btn-distrub-cols" style="display: inline-block; float:right; margin-left: 4px;"></div>
             <div id="table-spin-cell-width" style="display: inline-block; float:right;"></div>
         </td>
     </tr>
-    <tr>
-        <td class="padding-small" colspan=2>
-            <button type="button" class="btn btn-text-default" id="table-btn-distrub-rows" style="width:100%;"><%= scope.textDistributeRows %></button>
-        </td>
-    </tr>
-    <tr>
-        <td class="padding-small" colspan=2>
-            <button type="button" class="btn btn-text-default" id="table-btn-distrub-cols" style="width:100%;"><%= scope.textDistributeCols %></button>
-        </td>
-    </tr>
     <tr>
         <td class="padding-small" colspan=2>
             <div class="separator horizontal"></div>
diff --git a/apps/documenteditor/main/app/view/TableSettings.js b/apps/documenteditor/main/app/view/TableSettings.js
index a93e3aae2..a612381dd 100644
--- a/apps/documenteditor/main/app/view/TableSettings.js
+++ b/apps/documenteditor/main/app/view/TableSettings.js
@@ -367,7 +367,7 @@ define([
             this.numHeight = new Common.UI.MetricSpinner({
                 el: $('#table-spin-cell-height'),
                 step: .1,
-                width: 115,
+                width: 90,
                 defaultUnit : "cm",
                 value: '1 cm',
                 maxValue: 55.88,
@@ -385,7 +385,7 @@ define([
             this.numWidth = new Common.UI.MetricSpinner({
                 el: $('#table-spin-cell-width'),
                 step: .1,
-                width: 115,
+                width: 90,
                 defaultUnit : "cm",
                 value: '1 cm',
                 maxValue: 55.88,
@@ -401,7 +401,10 @@ define([
             this.spinners.push(this.numWidth);
 
             this.btnDistributeRows = new Common.UI.Button({
-                el: $('#table-btn-distrub-rows')
+                parentEl: $('#table-btn-distrub-rows', me.$el),
+                cls: 'btn-toolbar',
+                iconCls: 'toolbar__icon btn-distrub-rows',
+                hint: this.textDistributeRows
             });
             this.lockedControls.push(this.btnDistributeRows);
             this.btnDistributeRows.on('click', _.bind(function(btn){
@@ -409,7 +412,10 @@ define([
             }, this));
 
             this.btnDistributeCols = new Common.UI.Button({
-                el: $('#table-btn-distrub-cols')
+                parentEl: $('#table-btn-distrub-cols', me.$el),
+                cls: 'btn-toolbar',
+                iconCls: 'toolbar__icon btn-distrub-cols',
+                hint: this.textDistributeCols
             });
             this.lockedControls.push(this.btnDistributeCols);
             this.btnDistributeCols.on('click', _.bind(function(btn){