From 6c96b00713587da6891e3fa162a946d3c4dc5d46 Mon Sep 17 00:00:00 2001
From: Deven Bansod <devenbansod@users.noreply.github.com>
Date: Mon, 23 Feb 2015 11:36:33 +0530
Subject: [PATCH 1/2] Fix bug #4753 | Added a 6px margin to Textarea fields

Signed-off-by: Deven Bansod <devenbansod.bits@gmail.com>
---
 themes/pmahomme/css/common.css.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/themes/pmahomme/css/common.css.php b/themes/pmahomme/css/common.css.php
index 19f6664fa8..37923990c0 100644
--- a/themes/pmahomme/css/common.css.php
+++ b/themes/pmahomme/css/common.css.php
@@ -324,10 +324,12 @@ input.button:disabled {
 
 textarea {
     overflow: visible;
+    margin: 6px;
     height: <?php echo ceil($GLOBALS['cfg']['TextareaRows'] * 1.2); ?>em;
 }
 
 textarea.char {
+    margin: 6px;
     height: <?php echo ceil($GLOBALS['cfg']['CharTextareaRows'] * 1.2); ?>em;
 }
 
@@ -3414,4 +3416,4 @@ th.headerSortUp .sorticon, th.headerSortDown:hover .sorticon {
 th.headerSortDown .sorticon, th.headerSortUp:hover .sorticon {
     background-image: url(<?php echo $_SESSION['PMA_Theme']->getImgPath('s_asc.png');?>);
 }
-/* end of styles of sortable tables */
\ No newline at end of file
+/* end of styles of sortable tables */

From f2170d3bc6bbd2b49de5324900b90e3d2299ef5a Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Mon, 23 Feb 2015 08:00:44 -0500
Subject: [PATCH 2/2] ChangeLog entry

Signed-off-by: Marc Delisle <marc@infomarc.info>
---
 ChangeLog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ChangeLog b/ChangeLog
index 0389662ac7..f3248c4833 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@ phpMyAdmin - ChangeLog
 - bug #4768 MariaDB: version mismatch
 - bug #4777 Some images are missing in Designer for original theme
 - bug #4767 Drizzle: undefined index in mysql_charsets.inc.php
+- bug #4753 Normal field and multi-line field have different margins
 
 4.3.10.0 (2015-02-20)
 - bug       Undefined index navwork