Minor fixes

jgabuya · Apr 15, 2017 · 416e2c2 · 416e2c2
1 parent 953ec8b
commit 416e2c2
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/application/views/home.php b/application/views/home.php
@@ -26,8 +26,7 @@
         }
     </style>
 
-    <link rel="stylesheet" href="<?php echo asset_url() . 'bower_components/datatables/media/css/jquery.dataTables.css'; ?>">
-    <link rel="stylesheet" href="<?php echo asset_url() . 'bower_components/datatables/media/css/dataTables.bootstrap.css'; ?>">
+    <link rel="stylesheet" href="<?php echo asset_url() . 'bower_components/datatables/media/css/dataTables.bootstrap.css'; ?>">    
     <link rel="stylesheet" href="<?php echo asset_url() . 'bower_components/toastr/toastr.css'; ?>">
     <link rel="stylesheet" href="<?php echo asset_url() . 'bower_components/bootstrap-switch/dist/css/bootstrap3/bootstrap-switch.css'; ?>">
     <link rel="stylesheet" href="<?php echo asset_url() . 'bower_components/eonasdan-bootstrap-datetimepicker/build/css/bootstrap-datetimepicker.css' ?>">    
@@ -289,7 +288,8 @@ class="glyphicon glyphicon-remove"></span> Dismiss
 </script>
 
 <script src="<?php echo asset_url() . 'bower_components/jquery/dist/jquery.js'; ?>"></script>
-<script src="<?php echo asset_url() . 'bower_components/datatables/media/js/jquery.dataTables.js' ?>"></script>
+<script src="<?php echo asset_url() . 'bower_components/datatables/media/js/jquery.dataTables.js'; ?>"></script>
+<script src="<?php echo asset_url() . 'bower_components/datatables/media/js/dataTables.bootstrap.js'; ?>"></script>
 <script src="<?php echo asset_url() . 'bower_components/jquery-timeago/jquery.timeago.js'; ?>"></script>
 <script src="<?php echo asset_url() . 'bower_components/toastr/toastr.js' ?>"></script>
 <script src="<?php echo asset_url() . 'bower_components/bootstrap/dist/js/bootstrap.js' ?>"></script>

diff --git a/assets/css/bootstrap-theme.css.map b/assets/css/bootstrap-theme.css.map
diff --git a/assets/css/main.css b/assets/css/main.css
@@ -4,6 +4,10 @@
    Author's custom styles
    ========================================================================== */
 
+#flower-pots-table {
+    width: 100%;
+}
+
 .modal.fade .modal-dialog {
    z-index: 1041 !important;
 }

diff --git a/assets/js/app.js b/assets/js/app.js
@@ -442,5 +442,4 @@ $(document).ready(function() {
             })
         }
     });
-});
-
+});