From aa74cd29fbf7e7e0fe61fc0bf5d14e01a1887e43 Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Wed, 11 Mar 2015 18:47:33 +0530
Subject: [PATCH] Styles were affecting edit columns as well as edit central
 columns

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
---
 libraries/tbl_columns_definition_form.lib.php |  6 ++++--
 themes/original/css/common.css.php            | 20 +++++++++----------
 themes/pmahomme/css/common.css.php            | 19 +++++++++---------
 3 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/libraries/tbl_columns_definition_form.lib.php b/libraries/tbl_columns_definition_form.lib.php
index ab2b52a302..b249ce333b 100644
--- a/libraries/tbl_columns_definition_form.lib.php
+++ b/libraries/tbl_columns_definition_form.lib.php
@@ -174,7 +174,8 @@ function PMA_getHtmlForFooter()
  */
 function PMA_getHtmlForTableNameAndNoOfColumns()
 {
-    $html = '<table class="menucontainer" id="table_name_col_no">'
+    $html = '<div id="table_name_col_no_outer">'
+        . '<table id="table_name_col_no">'
         . '<tr class="vmiddle floatleft">'
         . '<td>' . __('Table name')
         . ':&nbsp;<input type="text" name="table" size="40" maxlength="80"'
@@ -194,7 +195,8 @@ function PMA_getHtmlForTableNameAndNoOfColumns()
 
     $html .= '</td>'
         . '</tr>'
-        . '</table>';
+        . '</table>'
+        . '</div>';
 
     return $html;
 }
diff --git a/themes/original/css/common.css.php b/themes/original/css/common.css.php
index f9738a212b..57280f3ebc 100644
--- a/themes/original/css/common.css.php
+++ b/themes/original/css/common.css.php
@@ -821,14 +821,6 @@ div#tablestatistics table {
     width: 100%;
 }
 
-.menucontainer#table_name_col_no {
-    position:fixed;
-    top:48px;
-    z-index:500;
-    width:100%;
-    background: <?php echo $GLOBALS['cfg']['MainBackground']; ?>;
-}
-
 #serverinfo {
     background: white;
     font-weight:        bold;
@@ -2026,8 +2018,16 @@ fieldset .disabled-field td {
     padding: 0.5em;
 }
 
-#table_columns.noclick {
-    margin-top:40px;
+#table_name_col_no_outer {
+    margin-top: 30px;
+}
+
+#table_name_col_no {
+    position: fixed;
+    top: 44px;
+    z-index: 500;
+    width: 100%;
+    background: <?php echo $GLOBALS['cfg']['MainBackground']; ?>;
 }
 
 #table_columns input[type="text"],
diff --git a/themes/pmahomme/css/common.css.php b/themes/pmahomme/css/common.css.php
index 3164e7bb62..a55cf40905 100644
--- a/themes/pmahomme/css/common.css.php
+++ b/themes/pmahomme/css/common.css.php
@@ -975,13 +975,6 @@ ul#topmenu2 li {
     border-top: 1px solid #aaa;
 }
 
-.menucontainer#table_name_col_no {
-    position:fixed;
-    top:58px;
-    z-index:500;
-    width:100%;
-}
-
 /* default tab styles */
 .tabactive {
     background: #fff !important;
@@ -2569,8 +2562,16 @@ fieldset .disabled-field td {
     padding: 1.5em;
 }
 
-#table_columns.noclick {
-    margin-top:50px;
+#table_name_col_no_outer {
+    margin-top: 45px;
+}
+
+#table_name_col_no {
+    position: fixed;
+    top: 55px;
+    z-index: 500;
+    width: 100%;
+    background: '#ffffff';
 }
 
 #table_columns input[type="text"],