Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui

app/assets/stylesheets/addorder.scss

@@ -1,3 +1,6 @@
+section .content{
+  padding:50px 15px 0 225px !important;
+}
 .custom-card-head{
     height: 40px;
     background-color: #54A5AF;
@@ -78,11 +81,9 @@ element.style {
 }
 
 .selected-attribute {
-  color: #fff !important;
   background-color: green !important;
 }
 .selected-option {
-  color: #fff !important;
   background-color: green !important;
 }
 
@@ -94,12 +95,14 @@ element.style {
   white-space: normal !important;
   margin-bottom: 5px;
   margin-right: 5px;
+  color:#111 !important;
 }
 
 .option_btn {
   white-space: normal !important;
   margin-bottom: 5px;
   margin-right: 5px;
+  color:#111 !important;
 } 
 #logo{
     margin: auto;

app/assets/stylesheets/origami.scss

@@ -39,12 +39,6 @@ select.form-control {
 
 /* End Reset */
 
-.dining {
-	min-height:470px;
-	max-height:570px; 
-	overflow:auto
-}
-
 .order-info {
 	min-height:300px; 
 	max-height:500px; 
@@ -103,15 +97,15 @@ select.form-control {
 }
 
 .cash-color{
-	background-color:#80CBC4;
+	background-color:#2196F3;
 }
 
 .credit-color{
-	background-color:#FFCCBC;
+	background-color:#FF5722;
 }
 
 .other-payment-color{
-	background-color:#E1BEE7;
+	background-color:#795548;
 }
 
 .cashier_number:hover{
@@ -207,7 +201,7 @@ select.form-control {
 }
 
 .red {
-	background-color:#ff0000;
+	background-color:#F44336;
 }
 
 .green{