update conflict oragimi.scss

app/assets/stylesheets/origami.scss

@@ -10,7 +10,8 @@
 //   padding-top: 4.5rem;
 // }
 .card-columns {
-	font-size: 18px !important;}
+	font-size: 18px !important;
+}
 
 .others-payment{
 	line-height:100px;
@@ -53,7 +54,8 @@
 
 .payment{
 	height:70px;line-height:70px;
-	align:center;color:white;
+	align:center;
+	color:white;
 	font-size:16px;
 	margin-top:5px;
 }
@@ -161,15 +163,15 @@
 }
 
 .green{
-	background-color: #009900
+	background-color: #009900;
 }
 
 .orange{
-	background-color: #FF8C00
+	background-color: #FF8C00;
 }
 
 .blue{
-	background-color: blue
+	background-color: blue;
 }
 
 /* End Colors */
@@ -212,3 +214,57 @@ tr.discount-item-row:hover {
 	margin-top:-40px !important;
 }
 
+#sxModal {
+	display: none;
+    overflow: auto;
+    width: 100%;
+    height: 100%;
+    background-color: #000;
+    background-color: rgba(0,0,0,0.4);
+    position: fixed;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    z-index: 1100;
+}
+
+#sxModal-Content {	
+	position: relative;
+	left: 42%;
+	top: 30%;
+	background-color: #d9534f;	
+	color: #fff;
+	text-align: center;
+    width: 200px;
+    height: 200px;
+    padding-top: 5%;
+    border-radius: 100px;
+    z-index: 1101;
+}
+
+/*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 */
+        
+}