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

2017-10-12 10:16:00 +06:30
parent 5057b8e224 60b5a17388
commit de1469bd5e
11 changed files with 188 additions and 41 deletions
--- a/app/assets/stylesheets/addorder.scss
+++ b/app/assets/stylesheets/addorder.scss
@@ -9,6 +9,7 @@
    background-color: #54A5AF;
    padding:5px;
    color :#fff;
+
 }

 .custom-card {