merge with master

app/assets/stylesheets/CRM.scss

@@ -13,6 +13,7 @@
 @import "BSBMaterial/style";
 @import "BSBMaterial/themes/all-themes";
 @import "reset";
+@import "fileinput.min";
 
 .sx-margin-0 {
   margin: 0 !important;

app/assets/stylesheets/login.scss

@@ -8,6 +8,11 @@
   background-color: #2790a5;
 }
 
+.active_tab{
+  border-style: solid;
+  border-color: #2790a5;
+}
+
 .login-page {
   margin: 0% auto;
   background-color: #2790a5;
@@ -75,3 +80,13 @@
   background-color: #fff;
   border-top: none;
 }
+
+.p-card{
+  margin: 20px 0;
+  text-align: center;
+}
+
+.p-name{
+  padding-bottom: 20px;
+  font-size: 14px;
+}

app/assets/stylesheets/origami.scss

@@ -198,6 +198,18 @@ select.form-control {
 	background-color: blue !important;
 }
 
+.selected-payment {
+  color: #fff !important;
+  background-color: blue !important;
+}
+.payment_btn {
+  white-space: normal !important;
+  margin-bottom: 15px;
+  margin-right: 15px;
+  color:#fff !important;
+ # background-color: green !important;
+} 
+
 /* Reciept Style */
 #order-charges-table td {
 	border-top: none !important;
@@ -314,7 +326,7 @@ tr.discount-item-row:hover {
 	position: relative;
 	left: 42%;
 	top: 30%;
-	background-color: #d9534f;	
+	background-color: #32ad1a;	
 	color: #fff;
 	text-align: center;
     width: 200px;
@@ -396,3 +408,27 @@ i.logout_icon{
 	color: #fff !important;
 	background-color: #5DADE2 !important;
 }
+
+/* Start Is Member Modal */
+#is_memberModal .modal-body {
+	height: 260px !important;
+}
+
+#is_memberModal .btn {
+	width: 80%;
+}
+/* End Is Member Modal */
+
+/* Start iframe */
+iframe {
+	border: none;
+	overflow: hidden !important;
+	width: 400px;
+	height: 550px;
+}
+
+#pdfModal .btn {
+	width: 150%;
+	height: 100%;
+}
+/* End iframe */