Update Bootstrap integration for Bootstrap 3rc2 and TableTools

pull/28/head
Allan Jardine 11 years ago
parent 3e22e81748
commit 29b203ab9a

@ -29,6 +29,7 @@ div.dataTables_paginate ul.pagination {
table.table { table.table {
clear: both; clear: both;
margin-top: 6px !important;
margin-bottom: 6px !important; margin-bottom: 6px !important;
max-width: none !important; max-width: none !important;
} }

@ -1,6 +1,6 @@
/* Set the defaults for DataTables initialisation */ /* Set the defaults for DataTables initialisation */
$.extend( true, $.fn.dataTable.defaults, { $.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", "sPaginationType": "bootstrap",
"oLanguage": { "oLanguage": {
"sLengthMenu": "_MENU_ records per page" "sLengthMenu": "_MENU_ records per page"
@ -12,7 +12,7 @@ $.extend( true, $.fn.dataTable.defaults, {
/* Default class modification */ /* Default class modification */
$.extend( $.fn.dataTableExt.oStdClasses, { $.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, { $.extend( true, $.fn.DataTable.TableTools.classes, {
"container": "DTTT btn-group", "container": "DTTT btn-group",
"buttons": { "buttons": {
"normal": "btn", "normal": "btn btn-default",
"disabled": "disabled" "disabled": "disabled"
}, },
"collection": { "collection": {

@ -5,7 +5,7 @@
<title>DataTables Bootstrap 2 example</title> <title>DataTables Bootstrap 2 example</title>
<link rel="stylesheet" type="text/css" href="//netdna.bootstrapcdn.com/bootstrap/3.0.0-rc1/css/bootstrap.min.css"> <link rel="stylesheet" type="text/css" href="//netdna.bootstrapcdn.com/bootstrap/3.0.0-rc2/css/bootstrap.min.css">
<link rel="stylesheet" type="text/css" href="dataTables.bootstrap.css"> <link rel="stylesheet" type="text/css" href="dataTables.bootstrap.css">
<script type="text/javascript" language="javascript" src="http://ajax.aspnetcdn.com/ajax/jQuery/jquery-1.8.2.min.js"></script> <script type="text/javascript" language="javascript" src="http://ajax.aspnetcdn.com/ajax/jQuery/jquery-1.8.2.min.js"></script>

Loading…
Cancel
Save