merge with origin

app/assets/stylesheets/application.scss

@@ -2,6 +2,7 @@
 @import "bootstrap/css/bootstrap-material-design.min";
 @import "node-waves/waves";
 @import "animate-css/animate";
+@import "multi-select/css/multi-select";
 @import "bootstrap-material-datetimepicker/css/bootstrap-material-datetimepicker";
 @import "bootstrap-select/css/bootstrap-select";
 @import "morrisjs/morris";
@@ -71,7 +72,7 @@ section.content {
 }
 
 .nav-tabs li a.active {
-  color: #222 !important; 
+  color: #000 !important; 
 }
 
 .info-box {
@@ -81,6 +82,15 @@ section.content {
 .card {
   margin-bottom: 20px;
 }
+.card .card-header {
+    padding: 0.5rem;
+}
+.card .card-title{
+  margin-bottom:0.5rem;
+}
+.card .card-block {
+    padding: 0.5rem 1rem 1rem;
+}
 
 .checkbox label, label.checkbox-inline {
   padding-left: 0;
@@ -124,7 +134,7 @@ select.form-control {
 }
 
 /* End Reset */
-
+/*
 .dining {
   min-height:470px;
   max-height:570px; 
@@ -136,7 +146,7 @@ select.form-control {
   max-height:500px; 
   overflow:auto
 }
-
+*/
 .others-payment{
   line-height:100px;
   text-align:center;