From e1204d84d98800f42d8969032fe998413764a12a Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Wed, 11 Oct 2017 10:02:47 +0630
Subject: [PATCH] update header

---
 app/assets/javascripts/BSBMaterial/pages/index.js |  6 +++---
 app/assets/javascripts/application.js             | 11 ++---------
 app/assets/stylesheets/application.scss           | 12 ++++++++----
 app/views/layouts/_header.html.erb                |  2 +-
 4 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/app/assets/javascripts/BSBMaterial/pages/index.js b/app/assets/javascripts/BSBMaterial/pages/index.js
index c9ca25e4..263a34a7 100644
--- a/app/assets/javascripts/BSBMaterial/pages/index.js
+++ b/app/assets/javascripts/BSBMaterial/pages/index.js
@@ -9,9 +9,9 @@
         }
     });
 
-    initRealTimeChart();
-    initDonutChart();
-    initSparkline();
+    // initRealTimeChart();
+    // initDonutChart();
+    // initSparkline();
 });
 
 var realtime = 'on';
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index baf62ca4..b9811d02 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -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',
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index ba52bb08..95a5b511 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -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 {
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index d01aea7a..72c2a24d 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -16,7 +16,7 @@
             <!-- <a href="javascript:void(0);" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse" aria-expanded="false"></a> -->
             <a href="javascript:void(0);" class="bars"></a>
             <a class="navbar-brand" href="index.html">
-                <img src="<%= asset_path('logo.png') %>" width="32" height="32" alt="Logo" />
+                <img src="<%= asset_path('SX-logo.png') %>" width="40" height="40" alt="Logo" />
                 <span class="navbar-brand-txt">SX Restaurant</span>
             </a>           
         </div>