From 0069f46e5586bb3ae984386e0a67791394bf4db6 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <Julia.Radzhabova@onlyoffice.com>
Date: Fri, 15 Jun 2018 16:26:46 +0300
Subject: [PATCH] [DE] Update layout for mail merge dialog

---
 .../main/app/template/MailMergeEmailDlg.template   | 14 +++++++-------
 .../main/app/view/MailMergeEmailDlg.js             |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/documenteditor/main/app/template/MailMergeEmailDlg.template b/apps/documenteditor/main/app/template/MailMergeEmailDlg.template
index e807dd5c1..17be775a6 100644
--- a/apps/documenteditor/main/app/template/MailMergeEmailDlg.template
+++ b/apps/documenteditor/main/app/template/MailMergeEmailDlg.template
@@ -3,35 +3,35 @@
         <table cols="2" style="width: 100%;" cellpadding="10">
             <tr>
                 <td class="padding-small">
-                    <label class="input-label"><%= scope.textFrom %></label>
-                    <div id="merge-email-dlg-from"></div>
+                    <label class="input-label header"><%= scope.textFrom %></label>
+                    <div id="merge-email-dlg-from" style="margin-right: 5px;"></div>
                 </td>
                 <td class="padding-small">
-                    <label class="input-label"><%= scope.textTo %></label>
+                    <label class="input-label header"><%= scope.textTo %></label>
                     <div id="merge-email-dlg-to"></div>
                 </td>
             </tr>
             <tr>
                 <td colspan="2" class="padding-small">
-                    <label class="input-label"><%= scope.textSubject %></label>
+                    <label class="input-label header"><%= scope.textSubject %></label>
                     <div id="merge-email-dlg-subject" style="width: 100%;"></div>
                 </td>
             </tr>
             <tr>
                 <td colspan="2" class="padding-small">
-                    <label class="input-label"><%= scope.textFormat %></label>
+                    <label class="input-label header"><%= scope.textFormat %></label>
                     <div id="merge-email-dlg-format" style="width: 170px;"></div>
                 </td>
             </tr>
             <tr>
                 <td colspan="2" class="padding-small">
-                    <label id="merge-email-dlg-lbl-filename"  class="input-label disabled"><%= scope.textFileName %></label>
+                    <label id="merge-email-dlg-lbl-filename"  class="input-label disabled header"><%= scope.textFileName %></label>
                     <div id="merge-email-dlg-filename" style="width: 100%;"></div>
                 </td>
             </tr>
             <tr>
                 <td colspan="2" class="padding-small">
-                    <label id="merge-email-dlg-lbl-message" class="input-label disabled"><%= scope.textMessage %></label>
+                    <label id="merge-email-dlg-lbl-message" class="input-label disabled header"><%= scope.textMessage %></label>
                      <textarea id="merge-email-dlg-message" class="disabled form-control" disabled="disabled" style="width: 100%;height: 70px;margin-bottom: 0;"></textarea>
                 </td>
             </tr>
diff --git a/apps/documenteditor/main/app/view/MailMergeEmailDlg.js b/apps/documenteditor/main/app/view/MailMergeEmailDlg.js
index 0fe526355..639aab015 100644
--- a/apps/documenteditor/main/app/view/MailMergeEmailDlg.js
+++ b/apps/documenteditor/main/app/view/MailMergeEmailDlg.js
@@ -47,7 +47,7 @@ define([    'text!documenteditor/main/app/template/MailMergeEmailDlg.template',
         options: {
             alias: 'MailMergeEmail',
             contentWidth: 500,
-            height: 460
+            height: 435
         },
 
         initialize : function(options) {