merge with origin

app/assets/javascripts/application.js

@@ -21,7 +21,8 @@
 //= require settings/processing_items
 //= require momentjs/moment
 //= require bootstrap-material-datetimepicker/js/bootstrap-material-datetimepicker
-//= require bootstrap-select/js/bootstrap-select
+//= require bootstrap/js/bootstrap.js
+//= require multi-select/js/jquery.multi-select.js
 //= require jquery-slimscroll/jquery.slimscroll.js
 //= require node-waves/waves.js
 //= require sweetalert/sweetalert.min.js
@@ -36,7 +37,7 @@
 
 
 $(document).on('turbolinks:load', function() {
-
+    
     $('.datetimepicker').bootstrapMaterialDatePicker({
         format: 'DD-MM YYYY - HH:mm',
         clearButton: true,
@@ -58,20 +59,6 @@ $(document).on('turbolinks:load', function() {
    
 });
 
-function showConfirmMessage() {
-    swal({
-        title: "Information",
-        text: "You will not be able to recover this imaginary file!",
-        type: "warning",
-        showCancelButton: true,
-        confirmButtonColor: "#DD6B55",
-        confirmButtonText: "OK",
-        closeOnConfirm: true
-    }, function () {
-        swal("Deleted!", "Your imaginary file has been deleted.", "success");
-    });
-}
-
 $(function(){
 
   $('body').bootstrapMaterialDesign();
@@ -137,13 +124,12 @@ $(function(){
   });
 
   $('.delete').click(function(){
-    var method = $(this).attr('data-method');
-    var url = $(this).attr('data-ref');
-    var html = $( this ).siblings( "#delete_text" ).html();
-    console.log(html);
+    var method    = $(this).attr('data-method');
+    var url       = $(this).attr('data-ref');
+    var html_text = $( this ).siblings( "#delete_text" ).html();
     swal({
         title: "Confirmation",
-        text: html,
+        text: html_text,
         type: "warning",
         showCancelButton: true,
         confirmButtonColor: "#DD6B55",

app/assets/stylesheets/application.scss

@@ -3,9 +3,8 @@
 @import "node-waves/waves";
 @import "animate-css/animate";
 @import "sweetalert/sweetalert.css";
-@import "multi-select/css/multi-select";
+@import "multi-select/css/multi-select.css";
 @import "bootstrap-material-datetimepicker/css/bootstrap-material-datetimepicker";
-@import "bootstrap-select/css/bootstrap-select";
 @import "morrisjs/morris";
 @import "fileinput.min";
 @import "BSBMaterial/style";
@@ -62,7 +61,7 @@
 }
 
 section.content {
-  margin: 50px 15px 0 225px;
+  margin: 60px 15px 0 225px;
 }
 
 .sidebar {
@@ -81,10 +80,6 @@ section.content {
   top: 50px;
 }
 
-.nav-tabs li a.active {
-  color: #000 !important; 
-}
-
 .info-box {
   margin-bottom: 20px;
 }
@@ -106,8 +101,8 @@ section.content {
 }
 
 .btn {
-      padding: .46875rem 0.25rem;
-      color : #fff !important;
+  padding: .46875rem 0.25rem;
+  color : #fff !important;
 }
 .btn-default, .bg-default{
   color : #111 !important;
@@ -148,7 +143,43 @@ section.content {
   top: 0px; 
   margin-left: 0px; 
 }
+.nav {
+    padding-left: 0;
+    margin-bottom: 0;
+    list-style: none;
+}
 
+.nav > li > a {
+    position: relative;
+    display: block;
+    padding: 10px 15px;
+}
+
+.nav-tabs > li {
+    float: left;
+    margin-bottom: -1px;
+}
+
+.nav-tabs li a.active {
+  color: #000 !important; 
+   border-bottom: 2px solid #2196F3 !important;
+}
+
+.nav-tabs > li.active > a, .nav-tabs > li.active > a:hover, .nav-tabs > li.active > a:focus {
+    color: #555;
+    cursor: default;
+    background-color: #fff;
+    border: 1px solid #ddd;
+    border-bottom-color: transparent;
+}
+.nav-tabs > li > a {
+    margin-right: 2px;
+    line-height: 1.42857143;
+    text-decoration:none;
+}
+.nav-tabs .nav-link {
+    padding: 0.7286em .8575em;
+}
 /* End Reset Theme */
 /* *************************************************** */