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

update header

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/BSBMaterial/pages/index.js
View File

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

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

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

12
app/assets/stylesheets/application.scss
View File

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

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

@@ -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="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse" aria-expanded="false"></a> -->
<a href="javascript:void(0);" class="bars"></a> <a href="javascript:void(0);" class="bars"></a>
<a class="navbar-brand" href="index.html"> <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> <span class="navbar-brand-txt">SX Restaurant</span>
</a> </a>
</div> </div>