fixed conflictfile

app/assets/stylesheets/origami.scss

@@ -16,11 +16,14 @@
 	font-size:18px;
 }
 
-.cashier_number{
-	width: 30%;
-	height:71px;
-	line-height:71px;
+.orders-table {
+	cursor: pointer;
+}
 
+.cashier_number{
+	width: 33%;
+	height:70px;
+	line-height:70px;
 	text-align:center;
 	background:#54A5AF;
 	// float:left;
@@ -32,8 +35,8 @@
 
 .pay{
 	width: 98%;
-  height:210px;
-	line-height:210px;
+  height:211px;
+	line-height:211px;
 	text-align:center;
 	font-size:20px;
 	color:white;
@@ -44,15 +47,20 @@
 }
 
 .long{
-	width:49%
+	width:49%;
 }
 
 .sold {
 	background-color: red;
 }
 
+.paid {
+	background-color: green;
+}
+
 .selected-item {
-	background-color: blue;
+	color: #fff !important;
+	background-color: blue !important;
 }
 
 /* Reciept Style */
@@ -101,3 +109,17 @@
 select.form-control {
   height: inherit !important;
 }
+
+.form-horizontal .form-group {
+	margin-right: 0px !important;
+}
+
+/*  Discount */
+
+.discount-item-row {
+	cursor: pointer;
+}
+
+tr.discount-item-row:hover {
+	background-color: #e3e3e3 !important;
+}