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

2018-05-11 13:06:13 +06:30
parent dcd654a885 ae5ced251b
commit 9daf8235a7
65 changed files with 2677 additions and 1366 deletions
--- a/app/assets/stylesheets/origami.scss
+++ b/app/assets/stylesheets/origami.scss
@@ -453,6 +453,10 @@ iframe {
 	width: 150%;
 	height: 100%;
 }
+
+#receipt_pdf {
+	height: 400px;
+}
 /* End iframe */

 /* section class for webview */