From 29b203ab9a4cdd2e9bf0bb85511029b7ab6f39a4 Mon Sep 17 00:00:00 2001 From: Allan Jardine Date: Wed, 14 Aug 2013 15:36:05 +0100 Subject: [PATCH] Update Bootstrap integration for Bootstrap 3rc2 and TableTools --- integration/bootstrap/3/dataTables.bootstrap.css | 1 + integration/bootstrap/3/dataTables.bootstrap.js | 6 +++--- integration/bootstrap/3/index.html | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/integration/bootstrap/3/dataTables.bootstrap.css b/integration/bootstrap/3/dataTables.bootstrap.css index 67a126a..59f6e7c 100644 --- a/integration/bootstrap/3/dataTables.bootstrap.css +++ b/integration/bootstrap/3/dataTables.bootstrap.css @@ -29,6 +29,7 @@ div.dataTables_paginate ul.pagination { table.table { clear: both; + margin-top: 6px !important; margin-bottom: 6px !important; max-width: none !important; } diff --git a/integration/bootstrap/3/dataTables.bootstrap.js b/integration/bootstrap/3/dataTables.bootstrap.js index 25d87c0..c25ee59 100644 --- a/integration/bootstrap/3/dataTables.bootstrap.js +++ b/integration/bootstrap/3/dataTables.bootstrap.js @@ -1,6 +1,6 @@ /* Set the defaults for DataTables initialisation */ $.extend( true, $.fn.dataTable.defaults, { - "sDom": "<'row'<'col-6'l><'col-6'f>r>t<'row'<'col-6'i><'col-6'p>>", + "sDom": "<'row'<'col-xs-6'l><'col-xs-6'f>r>t<'row'<'col-xs-6'i><'col-xs-6'p>>", "sPaginationType": "bootstrap", "oLanguage": { "sLengthMenu": "_MENU_ records per page" @@ -12,7 +12,7 @@ $.extend( true, $.fn.dataTable.defaults, { /* Default class modification */ $.extend( $.fn.dataTableExt.oStdClasses, { - "sWrapper": "dataTables_wrapper form-inline input-small" + "sWrapper": "dataTables_wrapper form-inline" } ); @@ -120,7 +120,7 @@ if ( $.fn.DataTable.TableTools ) { $.extend( true, $.fn.DataTable.TableTools.classes, { "container": "DTTT btn-group", "buttons": { - "normal": "btn", + "normal": "btn btn-default", "disabled": "disabled" }, "collection": { diff --git a/integration/bootstrap/3/index.html b/integration/bootstrap/3/index.html index 4f301c2..b4c7b18 100644 --- a/integration/bootstrap/3/index.html +++ b/integration/bootstrap/3/index.html @@ -5,7 +5,7 @@ DataTables Bootstrap 2 example - +