Skip to content

Commit

Permalink
Merge pull request StartBootstrap#96 from krzysiekpiasecki/gh-pages
Browse files Browse the repository at this point in the history
Fix responsive datatable example and prevent from 404
  • Loading branch information
davidtmiller committed Jan 29, 2016
2 parents f64e47d + 9da00b7 commit 7d43502
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"holderjs": "~2.4.1",
"metisMenu": "~1.1.3",
"morrisjs": "~0.5.1",
"datatables-responsive": "~1.0.3",
"datatables-responsive": "1.0.6",
"bootstrap-social": "~4.8.0",
"flot.tooltip": "~0.8.4"
}
Expand Down
5 changes: 3 additions & 2 deletions pages/tables.html
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ <h1 class="page-header">Tables</h1>
<!-- /.panel-heading -->
<div class="panel-body">
<div class="dataTable_wrapper">
<table class="table table-striped table-bordered table-hover" id="dataTables-example">
<table width="100%" class="table table-striped table-bordered table-hover" id="dataTables-example">
<thead>
<tr>
<th>Rendering engine</th>
Expand Down Expand Up @@ -1127,7 +1127,8 @@ <h4>DataTables Usage Information</h4>
<!-- DataTables JavaScript -->
<script src="../bower_components/datatables/media/js/jquery.dataTables.min.js"></script>
<script src="../bower_components/datatables-plugins/integration/bootstrap/3/dataTables.bootstrap.min.js"></script>

<script src="../bower_components/datatables-responsive/js/dataTables.responsive.js"></script>

<!-- Custom Theme JavaScript -->
<script src="../dist/js/sb-admin-2.js"></script>

Expand Down

0 comments on commit 7d43502

Please sign in to comment.