git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change header

Browse Source
This commit is contained in:
Yan
2017-10-12 15:13:25 +06:30
parent 31a7b6750f
commit 6e47e4c41c
7 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/assets/images/SX-logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.5 KiB

0
public/js/Chart.js → app/assets/javascripts/Chart.js vendored
View File

0
public/js/Chart.min.js → app/assets/javascripts/Chart.min.js vendored
View File

1
app/assets/javascripts/application.js
View File

@@ -24,6 +24,7 @@
//= require daterangepicker //= require daterangepicker
//= require select2 //= require select2
//= require jquery.datetimepicker //= require jquery.datetimepicker
//= require Chart
$(document).on('turbolinks:load', function() { $(document).on('turbolinks:load', function() {

2
app/assets/stylesheets/theme.scss
View File

@@ -3666,7 +3666,7 @@ textarea.input-group-sm > .input-group-btn > .btn {
} }
.navbar-brand { .navbar-brand {
float: left; float: left;
padding: 15px 15px; padding: 0px 0px;
font-size: 18px; font-size: 18px;
line-height: 20px; line-height: 20px;
} }

2
app/views/home/dashboard.html.erb
View File

@@ -71,8 +71,6 @@
</div> </div>
</div> </div>
<script src="js/Chart.js"></script>
<script> <script>
$(document).ready(function(){ $(document).ready(function(){
var top_products = JSON.parse('<%= @top_products.to_json.html_safe %>'); var top_products = JSON.parse('<%= @top_products.to_json.html_safe %>');

2
app/views/layouts/_header.html.erb
View File

@@ -5,7 +5,7 @@
<span class="fa fa-bars" ></span> <span class="fa fa-bars" ></span>
</a> </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" /> <img src="<%= asset_path('SX-logo.png') %>" width="40" height="40" alt="Logo" />
<span class="navbar-brand-txt">SX Restaurant</span> <span class="navbar-brand-txt">SX Restaurant</span>
</a> </a>