diff --git a/app/assets/images/SX-logo.png b/app/assets/images/SX-logo.png new file mode 100644 index 00000000..6c1a1437 Binary files /dev/null and b/app/assets/images/SX-logo.png differ diff --git a/public/js/Chart.js b/app/assets/javascripts/Chart.js similarity index 100% rename from public/js/Chart.js rename to app/assets/javascripts/Chart.js diff --git a/public/js/Chart.min.js b/app/assets/javascripts/Chart.min.js similarity index 100% rename from public/js/Chart.min.js rename to app/assets/javascripts/Chart.min.js diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 518265d3..17fbea7a 100644 --- 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() { diff --git a/app/assets/stylesheets/theme.scss b/app/assets/stylesheets/theme.scss index b633b55e..5ad2cb5b 100644 --- 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; } diff --git a/app/views/home/dashboard.html.erb b/app/views/home/dashboard.html.erb index f63b00ad..cb52c88c 100644 --- a/app/views/home/dashboard.html.erb +++ b/app/views/home/dashboard.html.erb @@ -71,8 +71,6 @@ - -