Merge branch 'staging'

2017-07-17 15:13:31 +06:30
parent 6f57bb8a79 bd0b8681c9
commit df06b81b28
58 changed files with 1375 additions and 1252 deletions
--- a/app/assets/stylesheets/origami.scss
+++ b/app/assets/stylesheets/origami.scss
@@ -213,3 +213,29 @@ tr.discount-item-row:hover {
 	margin-left:-40px !important;
 	margin-top:-40px !important;
 }
+
+/*Loading gif for payment*/
+
+#loading_wrapper{
+
+    position: fixed;
+    background-color: #C8C8C8 ;
+    height: 100%;
+    width: 100%;
+    left: 0;
+    opacity: 0.6;
+    top: 0;
+    z-index: 9999999;
+}
+#loading{
+    position: relative;
+    height: 100%;
+    width: 100%;
+    background-image: url('../../../image/loading-ajax.gif');
+    background-position:  center center;
+    background-repeat: no-repeat;
+    opacity: 1;
+    filter: alpha(opacity=100); /* ie */
+    -moz-opacity: 1; /* mozilla */
+        
+}