Pull from master

2018-05-03 09:31:36 +06:30
parent caa0180e8c
commit 45531453c7
47 changed files with 1042 additions and 263 deletions
--- a/app/assets/stylesheets/order_reservation.scss
+++ b/app/assets/stylesheets/order_reservation.scss
@@ -85,4 +85,10 @@
 }
 .tr-active{
  background-color : #FFCDD2;
+}
+.div_order_margin {
+  margin: 0px 0px 0px -5px !important
+}
+.div_card_order {
+  margin: 0px -5px !important
 }