fixed conflict

app/assets/stylesheets/origami.scss

@@ -7,17 +7,36 @@
 //   min-height: 75rem;
 //   padding-top: 4.5rem;
 // }
+.others-payment{
+	line-height:100px;
+	text-align:center;
+	color:white;
+	width:300px;
+	height:100px;
+	font-size:18px;
+}
 
 .cashier_number{
-	height:76px;
-	line-height:80px;
+	width: 30%;
+	height:71px;
+	line-height:71px;
+
 	text-align:center;
 	background:#54A5AF;
-	float:left;
-	margin:2px;
+	// float:left;
+	// margin:2px;
+	font-size:20px;
+	color:white;
+	// cursor:pointer;
+}
+
+.pay{
+	width: 98%;
+  height:210px;
+	line-height:210px;
+	text-align:center;
 	font-size:20px;
 	color:white;
-	cursor:pointer;
 }
 
 .cashier_number:hover{
@@ -25,7 +44,7 @@
 }
 
 .long{
-	width:100%
+	width:49%
 }
 
 .sold {
@@ -42,17 +61,17 @@
 }
 
 .charges-name {
-	width: 80%; 
+	width: 80%;
 	text-align: left;
 }
 
 .item-name {
-	width: 60%; 
+	width: 60%;
 	text-align: left;
 }
 
 .item-attr {
-	width: 20%; 
+	width: 20%;
 	text-align: right;
 }
 
@@ -70,7 +89,13 @@
 	background-color: #009900
 }
 
+.left{
+	margin-left:1px;
+}
 
+.bottom{
+	margin-bottom: 1px;
+}
 /*----- Reset -----*/
 
 select.form-control {

app/assets/stylesheets/origami/redeem_payments.scss

@@ -0,0 +1,3 @@
+// Place all the styles related to the origami/redeem_payments controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/