From 532c1eee83ebbff160596c0f0ebab00e7691f256 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?= <mauricio@fauth.dev>
Date: Fri, 27 Nov 2020 16:14:13 -0300
Subject: [PATCH] Use Bootstrap's table for db central columns page
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
---
 templates/database/central_columns/main.twig | 20 ++++++++++----------
 themes/bootstrap/scss/_common.scss           |  6 ------
 themes/original/scss/_common.scss            |  6 ------
 themes/pmahomme/scss/_common.scss            |  6 ------
 4 files changed, 10 insertions(+), 28 deletions(-)

diff --git a/templates/database/central_columns/main.twig b/templates/database/central_columns/main.twig
index cff87c829b..0e738633ae 100644
--- a/templates/database/central_columns/main.twig
+++ b/templates/database/central_columns/main.twig
@@ -7,12 +7,11 @@
         method="post" action="{{ url('/database/central-columns') }}">
         {{ get_hidden_inputs(db) }}
         <input type="hidden" name="add_new_column" value="add_new_column">
-        <div class="responsivetable">
-            <table class="pma-table">
-                <thead>
+        <div class="table-responsive">
+            <table class="table table-light">
+                <thead class="thead-light">
                     <tr>
-                        <th class=""></th>
-                        <th class="hide"></th>
+                        <th></th>
                         <th class="" title="" data-column="name">
                             {% trans 'Name' %}
                             <div class="sorticon"></div>
@@ -45,6 +44,7 @@
                             {% trans 'A_I' %}
                             <div class="sorticon"></div>
                         </th>
+                        <th></th>
                     </tr>
                 </thead>
                 <tbody>
@@ -131,7 +131,7 @@
         {% trans 'The central list of columns for the current database is empty' %}
     </fieldset>
 {% else %}
-    <table style="display:inline-block;max-width:49%" class="pma-table navigation nospacing nopadding">
+    <table class="table table-borderless table-sm w-auto d-inline-block navigation">
         <tr>
             <td class="navigation_separator"></td>
             {% if pos - max_rows >= 0 %}
@@ -172,8 +172,8 @@
         </tr>
     </table>
 {% endif %}
-{# getHtmlForAddColumn #}
-<table class="pma-table central_columns_add_column navigation nospacing nopadding">
+
+<table class="table table-borderless table-sm w-auto d-inline-block navigation">
     <tr>
         <td class="navigation_separator largescreenonly"></td>
         <td class="central_columns_navigation">
@@ -210,10 +210,10 @@
     </form>
     <div id="tableslistcontainer">
         <form name="tableslistcontainer">
-            <table id="table_columns" class="pma-table tablesorter data">
+            <table id="table_columns" class="table table-light table-striped table-hover tablesorter">
                 {% set class = 'column_heading' %}
                 {% set title = 'Click to sort.' | trans %}
-                <thead>
+                <thead class="thead-light">
                     <tr>
                         <th class="{{ class }}"></th>
                         <th class="hide"></th>
diff --git a/themes/bootstrap/scss/_common.scss b/themes/bootstrap/scss/_common.scss
index 3619db15a6..7f7bb72096 100644
--- a/themes/bootstrap/scss/_common.scss
+++ b/themes/bootstrap/scss/_common.scss
@@ -882,12 +882,6 @@ label.col-3.d-flex.align-items-center {
   padding: 1.5% 0 !important;
 }
 
-.central_columns_add_column {
-  display: inline-block;
-  margin-#{$left}: 1%;
-  max-width: 50%;
-}
-
 .message_errors_found {
   margin-top: 20px;
 }
diff --git a/themes/original/scss/_common.scss b/themes/original/scss/_common.scss
index 34f3ee8fc1..fb94599ba1 100644
--- a/themes/original/scss/_common.scss
+++ b/themes/original/scss/_common.scss
@@ -683,12 +683,6 @@ form.login label {
   padding: 1.5% 0 !important;
 }
 
-.central_columns_add_column {
-  display: inline-block;
-  margin-#{$left}: 1%;
-  max-width: 50%;
-}
-
 .message_errors_found {
   margin-top: 20px;
 }
diff --git a/themes/pmahomme/scss/_common.scss b/themes/pmahomme/scss/_common.scss
index e7e8dbd88a..d662872d16 100644
--- a/themes/pmahomme/scss/_common.scss
+++ b/themes/pmahomme/scss/_common.scss
@@ -930,12 +930,6 @@ label.col-3.d-flex.align-items-center {
   padding: 1.5% 0 !important;
 }
 
-.central_columns_add_column {
-  display: inline-block;
-  margin-#{$left}: 1%;
-  max-width: 50%;
-}
-
 .message_errors_found {
   margin-top: 20px;
 }