update header

This commit is contained in:
Yan
2017-10-11 10:02:47 +06:30
parent 7df01dd0a2
commit e1204d84d9
4 changed files with 14 additions and 17 deletions

View File

@@ -9,9 +9,9 @@
}
});
initRealTimeChart();
initDonutChart();
initSparkline();
// initRealTimeChart();
// initDonutChart();
// initSparkline();
});
var realtime = 'on';

View File

@@ -19,27 +19,20 @@
//= require turbolinks
//= require cable
//= require settings/processing_items
//= require momentjs/moment
//= require bootstrap-material-datetimepicker/js/bootstrap-material-datetimepicker
//= require bootstrap-select/js/bootstrap-select
//= require jquery-slimscroll/jquery.slimscroll.js
//= require node-waves/waves.js
//= require autosize/autosize.js
//= require jquery-countto/jquery.countTo.js
//= require raphael/raphael.min
//= require morrisjs/morris
//= require chartjs/Chart.bundle.js
//= require flot-charts/jquery.flot
//= require flot-charts/jquery.flot.resize
//= require flot-charts/jquery.flot.pie
//= require flot-charts/jquery.flot.categories
//= require flot-charts/jquery.flot.time
//= require jquery-sparkline/jquery.sparkline
//= require BSBMaterial/admin.js
//= require BSBMaterial/pages/index.js
//= require BSBMaterial/demo.js
//= require BSBMaterial/pages/forms/basic-form-elements
/*$(document).on('turbolinks:load', function() {
$('.datepicker').datepicker({
format : 'dd-mm-yyyy',

View File

@@ -14,6 +14,10 @@
padding-right: 10px;
}
.navbar {
padding: 0.1rem 1rem;
}
.navbar-header {
padding: 0px;
}
@@ -52,18 +56,18 @@ section.content {
.sidebar {
width: 210px;
height: calc(100vh - 55px);
height: calc(100vh - 50px);
position: fixed;
top: 55px;
top: 50px;
right: 250px;
}
.right-sidebar {
width: 240px;
height: calc(100vh - 55px);
height: calc(100vh - 50px);
position: fixed;
right: -260px;
top: 55px;
top: 50px;
}
.nav-tabs li a.active {