From 1f9595d4a9edbce23004d6a49aa38c6f654e2050 Mon Sep 17 00:00:00 2001 From: Allan Jardine Date: Mon, 6 Jan 2014 10:05:00 +0000 Subject: [PATCH] Fix #37 - Scrolling tables incorrectly had margin between the component tables for Bootstrap and Foundation integration --- integration/bootstrap/2/dataTables.bootstrap.css | 2 ++ integration/bootstrap/3/dataTables.bootstrap.css | 5 ++++- integration/foundation/dataTables.foundation.css | 2 ++ integration/foundation/dataTables.foundation.js | 4 ++-- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/integration/bootstrap/2/dataTables.bootstrap.css b/integration/bootstrap/2/dataTables.bootstrap.css index 1bdfa49..6a95b15 100644 --- a/integration/bootstrap/2/dataTables.bootstrap.css +++ b/integration/bootstrap/2/dataTables.bootstrap.css @@ -61,6 +61,7 @@ div.dataTables_scrollHead table thead tr:last-child td:first-child { div.dataTables_scrollBody table { border-top: none; + margin-top: 0 !important; margin-bottom: 0 !important; } @@ -70,6 +71,7 @@ div.dataTables_scrollBody tbody tr:first-child td { } div.dataTables_scrollFoot table { + margin-top: 0 !important; border-top: none; } diff --git a/integration/bootstrap/3/dataTables.bootstrap.css b/integration/bootstrap/3/dataTables.bootstrap.css index 0a597e6..b4e6472 100644 --- a/integration/bootstrap/3/dataTables.bootstrap.css +++ b/integration/bootstrap/3/dataTables.bootstrap.css @@ -27,7 +27,8 @@ div.dataTables_paginate { } div.dataTables_paginate ul.pagination { - margin: 2px; + margin: 2px 0; + white-space: nowrap; } table.dataTable, @@ -80,6 +81,7 @@ div.dataTables_scrollHead table thead tr:last-child td:first-child { div.dataTables_scrollBody table { border-top: none; + margin-top: 0 !important; margin-bottom: 0 !important; } @@ -89,6 +91,7 @@ div.dataTables_scrollBody tbody tr:first-child td { } div.dataTables_scrollFoot table { + margin-top: 0 !important; border-top: none; } diff --git a/integration/foundation/dataTables.foundation.css b/integration/foundation/dataTables.foundation.css index 413084f..e27e69c 100644 --- a/integration/foundation/dataTables.foundation.css +++ b/integration/foundation/dataTables.foundation.css @@ -74,6 +74,7 @@ div.dataTables_scrollHead table { div.dataTables_scrollBody table { border-top: none; + margin-top: 0 !important; margin-bottom: 0 !important; } @@ -83,6 +84,7 @@ div.dataTables_scrollBody tbody tr:first-child td { } div.dataTables_scrollFoot table { + margin-top: 0 !important; border-top: none; } diff --git a/integration/foundation/dataTables.foundation.js b/integration/foundation/dataTables.foundation.js index b36c9da..92625ae 100644 --- a/integration/foundation/dataTables.foundation.js +++ b/integration/foundation/dataTables.foundation.js @@ -1,9 +1,9 @@ /* Set the defaults for DataTables initialisation */ $.extend( true, $.fn.dataTable.defaults, { "sDom": - "<'row'<'large-6 columns'l><'large-6 columns'f>r>"+ + "<'row'<'small-6 columns'l><'small-6 columns'f>r>"+ "t"+ - "<'row'<'large-6 columns'i><'large-6 columns'p>>", + "<'row'<'small-6 columns'i><'small-6 columns'p>>", "oLanguage": { "sLengthMenu": "_MENU_ records per page" }