ui review and edited

app/assets/javascripts/application.js

@@ -11,17 +11,16 @@
 // about supported directives.
 //
 //= require jquery
-//= require jquery_nested_form
 //= require tether
 //= require bootstrap/js/popper.min
 //= require bootstrap/js/bootstrap-material-design.min
+//= require jquery_nested_form
 //= require jquery_ujs
 //= require turbolinks
 //= require cable
 //= require settings/processing_items
 //= require momentjs/moment
 //= require bootstrap-material-datetimepicker/js/bootstrap-material-datetimepicker
-//= require bootstrap/js/bootstrap.js
 //= require multi-select/js/jquery.multi-select.js
 //= require jquery-slimscroll/jquery.slimscroll.js
 //= require node-waves/waves.js
@@ -34,33 +33,28 @@
 //= require BSBMaterial/admin.js
 //= require BSBMaterial/pages/index.js
 //= require BSBMaterial/demo.js
-//= require select2
 //= require custom.js
 
 $(document).on('turbolinks:load', function() {
-    
-    $('.datetimepicker').bootstrapMaterialDatePicker({
-        format: 'DD-MM-YYYY - HH:mm',
-        clearButton: true,
-        weekStart: 1
-    });
+  $('.datetimepicker').bootstrapMaterialDatePicker({
+      format: 'DD-MM-YYYY - HH:mm',
+      clearButton: true,
+      weekStart: 1
+  });
 
-    $('.datepicker').bootstrapMaterialDatePicker({
-        format: 'DD-MM-YYYY',
-        clearButton: true,
-        weekStart: 1,
-        time: false
-    });
-
-    $('.timepicker').bootstrapMaterialDatePicker({
-        format: 'HH:mm',
-        clearButton: true,
-        date: false
-    });
-   
-});
-$(document).on('turbolinks:load', function() {
+  $('.datepicker').bootstrapMaterialDatePicker({
+      format: 'DD-MM-YYYY',
+      clearButton: true,
+      weekStart: 1,
+      time: false
+  });
 
+  $('.timepicker').bootstrapMaterialDatePicker({
+      format: 'HH:mm',
+      clearButton: true,
+      date: false
+  });
+  
   // Image Upload
   $("#simple_menu_item_image_path").fileinput({
       previewFileType: "image",
@@ -104,6 +98,10 @@ $(document).on('turbolinks:load', function() {
 
 });
 
+$(document).ready(function() {
+    $('body').bootstrapMaterialDesign();
+});
+
 // $(document).on("focus", "[data-behaviour~='datepicker']", function(e){
 //   $(this).datepicker({"format": "yyyy-M-dd", "weekStart": 1, "autoclose": true});
 //   $('.dropdown-toggle').dropdown();

app/assets/javascripts/custom.js

@@ -1,7 +1,7 @@
 
 $(document).on('turbolinks:load', function() {
 
-  $('body').bootstrapMaterialDesign();
+  
   var height = ($(window).height() - ($('.legal').outerHeight() + $('.user-info').outerHeight() + $('.navbar').innerHeight()));
 
   $('#custom-slimscroll').slimScroll({

app/assets/javascripts/inventory.js

@@ -10,4 +10,3 @@
 //= require BSBMaterial/admin.js
 //= require BSBMaterial/demo.js
 //= require custom.js
-//= require select2

app/assets/stylesheets/BSBMaterial/style.css

@@ -3428,7 +3428,7 @@ section.content {
 
 /* Checkbox & Radio ============================ */
 [type="checkbox"] + label {
-  padding-left: 26px;
+  padding-left: 5px;
   height: 25px;
   line-height: 21px;
   font-size: 13px;

app/assets/stylesheets/CRM.scss

@@ -1,9 +1,4 @@
-//@import "bootstrap";
-//@import "font-awesome";
-//@import "theme";
-//@import "jquery-ui";
-//@import "bootstrap-datepicker3";
-//@import "bootstrap/modal";
+@import "material_icons";
 @import "tether";
 @import "bootstrap/css/bootstrap-material-design.min";
 @import "node-waves/waves";

app/assets/stylesheets/OQS.scss

@@ -1,3 +1,4 @@
+@import "material_icons";
 @import "tether";
 @import "bootstrap/css/bootstrap-material-design.min";
 @import "node-waves/waves";

app/assets/stylesheets/application.scss

@@ -1,3 +1,4 @@
+@import "material_icons";
 @import "tether";
 @import "bootstrap/css/bootstrap-material-design.min";
 @import "node-waves/waves";

app/assets/stylesheets/inventory_definitions.scss

@@ -1,3 +1,4 @@
+@import "material_icons";
 @import "tether";
 @import "bootstrap/css/bootstrap-material-design.min";
 @import "node-waves/waves";
@@ -9,8 +10,6 @@
 @import "BSBMaterial/style";
 @import "BSBMaterial/themes/all-themes";
 @import "reset";
-@import "select2";
-
 
 /* Show it is fixed to the top */
 // body {

app/assets/stylesheets/origami.scss

@@ -1,12 +1,4 @@
-/*
-@import "bootstrap";
-@import "font-awesome";
-@import "theme";
-@import "jquery-ui";
-@import "bootstrap-datepicker3";
-@import "jquery.datetimepicker";
-*/
-
+@import "material_icons";
 @import "tether";
 @import "bootstrap/css/bootstrap-material-design.min";
 @import "node-waves/waves";

app/assets/stylesheets/reset.css

@@ -1,3 +1,28 @@
+.material-icons {
+  font-family: 'Material Icons';
+  font-weight: normal;
+  font-style: normal;
+  font-size: 24px;  /* Preferred icon size */
+  display: inline-block;
+  line-height: 1;
+  text-transform: none;
+  letter-spacing: normal;
+  word-wrap: normal;
+  white-space: nowrap;
+  direction: ltr;
+
+  /* Support for all WebKit browsers. */
+  -webkit-font-smoothing: antialiased;
+  /* Support for Safari and Chrome. */
+  text-rendering: optimizeLegibility;
+
+  /* Support for Firefox. */
+  -moz-osx-font-smoothing: grayscale;
+
+  /* Support for IE. */
+  font-feature-settings: 'liga';
+}
+
 /* Start Reset Theme */
 .col, .col-1, .col-2, .col-3, .col-4, .col-5, .col-6, .col-7, .col-8, .col-9, .col-10, .col-11, .col-12, .col-auto, .col-lg, .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12, .col-lg-auto, .col-md, .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12, .col-md-auto, .col-sm, .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12, .col-sm-auto, .col-xl, .col-xl-1, .col-xl-2, .col-xl-3, .col-xl-4, .col-xl-5, .col-xl-6, .col-xl-7, .col-xl-8, .col-xl-9, .col-xl-10, .col-xl-11, .col-xl-12, .col-xl-auto {
   padding-left: 10px;
@@ -32,7 +57,7 @@
 
 .navbar-right a.dropdown-toggle {
   position: relative;
-  top: -5px;
+  top: 0px;
 }
 
 .dropdown-menu {

app/assets/stylesheets/settings.scss

@@ -1,7 +1,3 @@
-@import "bootstrap";
-@import "font-awesome";
-@import "theme";
-
 /* Show it is fixed to the top */
 // body {
 //   min-height: 75rem;