From 9486f3ea026d121fa2689257dd3c1383f9c55d5f Mon Sep 17 00:00:00 2001 From: Allan Jardine Date: Fri, 31 Jan 2014 13:27:55 +0000 Subject: [PATCH] Update: CSS - remove margin at the bottom ofhte table - it was causing problems with the extensions which clone the table node. Rather the margin is applied to the controls at the bottom of the table. --- .datatables-commit-sync | 2 +- media/css/jquery.dataTables.css | 22 +++++++--------------- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/.datatables-commit-sync b/.datatables-commit-sync index c7b07952..d691aea9 100644 --- a/.datatables-commit-sync +++ b/.datatables-commit-sync @@ -1 +1 @@ -8238b3057f27bff04a3aa2e1e4ef73013b1936a8 +dcfefb9ec6d6d94c9bf758a1d24f76368c2a8340 diff --git a/media/css/jquery.dataTables.css b/media/css/jquery.dataTables.css index 5b707b21..18c87abd 100644 --- a/media/css/jquery.dataTables.css +++ b/media/css/jquery.dataTables.css @@ -15,17 +15,12 @@ table.dataTable { */ } table.dataTable thead th, -table.dataTable thead td, -table.dataTable tfoot th, -table.dataTable tfoot td { - padding: 10px 18px; -} -table.dataTable thead th, table.dataTable tfoot th { font-weight: bold; } table.dataTable thead th, table.dataTable thead td { + padding: 10px 18px; border-bottom: 1px solid #111111; } table.dataTable thead th:active, @@ -34,6 +29,7 @@ table.dataTable thead td:active { } table.dataTable tfoot th, table.dataTable tfoot td { + padding: 10px 18px 6px 18px; border-top: 1px solid #111111; } table.dataTable thead .sorting_asc, @@ -210,7 +206,6 @@ table.dataTable.order-column.hover tbody tr.even:hover.selected > .sorting_3 { } table.dataTable.no-footer { border-bottom: 1px solid #111111; - margin-bottom: 0.5em; } table.dataTable, @@ -243,11 +238,12 @@ table.dataTable td { .dataTables_wrapper .dataTables_info { clear: both; float: left; - padding-top: 0.55em; + padding-top: 0.755em; } .dataTables_wrapper .dataTables_paginate { float: right; text-align: right; + padding-top: 0.25em; } .dataTables_wrapper .dataTables_paginate .paginate_button { box-sizing: border-box; @@ -353,15 +349,11 @@ table.dataTable td { } .dataTables_wrapper .dataTables_scroll { clear: both; + border-bottom: 1px solid #111111; } -.dataTables_wrapper .dataTables_scroll table.no-footer { - margin-bottom: 0; -} -.dataTables_wrapper .dataTables_scroll div.dataTables_scrollHead table.no-footer { - border-bottom: none; -} +.dataTables_wrapper .dataTables_scroll div.dataTables_scrollHead table.no-footer, .dataTables_wrapper .dataTables_scroll div.dataTables_scrollBody table.no-footer { - margin-bottom: 0.5em; + border-bottom: none; } .dataTables_wrapper .dataTables_scrollBody { *margin-top: -1px;