Skip to content

Commit

Permalink
Merge pull request #378 from puikinsh/Development
Browse files Browse the repository at this point in the history
Updates to close some old pull requests
  • Loading branch information
AndreiCN authored Jan 25, 2017
2 parents 1167c25 + ac6bffa commit 3448fdf
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 2 deletions.
17 changes: 17 additions & 0 deletions build/css/custom.css
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@

html , body{

height:100%;

}

.full-width {

width:100%;

}

.full-height{
height:100%;
}

.daterangepicker .ranges li {
color: #73879C
}
Expand Down
2 changes: 1 addition & 1 deletion build/js/custom.js
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ var setContentHeight = function () {
}
});

// toggle small or large menu
// toggle small or large menu
$MENU_TOGGLE.on('click', function() {
console.log('clicked - menu toggle');

Expand Down
2 changes: 1 addition & 1 deletion production/tables_dynamic.html
Original file line number Diff line number Diff line change
Expand Up @@ -3695,7 +3695,7 @@ <h2>Responsive example<small>Users</small></h2>
<script src="../vendors/datatables.net-keytable/js/dataTables.keyTable.min.js"></script>
<script src="../vendors/datatables.net-responsive/js/dataTables.responsive.min.js"></script>
<script src="../vendors/datatables.net-responsive-bs/js/responsive.bootstrap.js"></script>
<script src="../vendors/datatables.net-scroller/js/datatables.scroller.min.js"></script>
<script src="../vendors/datatables.net-scroller/js/dataTables.scroller.min.js"></script>
<script src="../vendors/jszip/dist/jszip.min.js"></script>
<script src="../vendors/pdfmake/build/pdfmake.min.js"></script>
<script src="../vendors/pdfmake/build/vfs_fonts.js"></script>
Expand Down

0 comments on commit 3448fdf

Please sign in to comment.