change header

2017-10-12 15:13:25 +06:30
parent 31a7b6750f
commit 6e47e4c41c
7 changed files with 3 additions and 4 deletions
--- a/app/assets/images/SX-logo.png
+++ b/app/assets/images/SX-logo.png
--- a/app/assets/javascripts/Chart.js
+++ b/app/assets/javascripts/Chart.js
--- a/app/assets/javascripts/Chart.min.js
+++ b/app/assets/javascripts/Chart.min.js
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -24,6 +24,7 @@
 //= require daterangepicker
 //= require select2
 //= require jquery.datetimepicker
+//= require Chart


 $(document).on('turbolinks:load', function() {
--- a/app/assets/stylesheets/theme.scss
+++ b/app/assets/stylesheets/theme.scss
@@ -3666,7 +3666,7 @@ textarea.input-group-sm > .input-group-btn > .btn {
 }
 .navbar-brand {
  float: left;
-  padding: 15px 15px;
+  padding: 0px 0px;
  font-size: 18px;
  line-height: 20px;
 }
--- a/app/views/home/dashboard.html.erb
+++ b/app/views/home/dashboard.html.erb
@@ -71,8 +71,6 @@
      </div>
 </div>

-
-<script src="js/Chart.js"></script>
 <script>
  $(document).ready(function(){
    var top_products = JSON.parse('<%= @top_products.to_json.html_safe %>');
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -5,7 +5,7 @@
      <span class="fa fa-bars" ></span>
  </a>  
  
-   <a class="navbar-brand" href="<%= dashboard_path %>" style="color: rgba(67, 185, 220, 0.9)">
+   <a class="navbar-brand" href="<%= dashboard_path %>" style="color: #fff">
      <img src="<%= asset_path('SX-logo.png') %>" width="40" height="40" alt="Logo" />
      <span class="navbar-brand-txt">SX Restaurant</span>
   </a>