Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant

app/assets/stylesheets/origami.scss

@@ -96,7 +96,7 @@ select.form-control {
 }
 
 .pay{
-	width: 98%;
+	width: 86%;
   	height:211px;
 	line-height:211px;
 	text-align:center;
@@ -105,11 +105,12 @@ select.form-control {
 }
 
 .payment{
-	height:70px;line-height:70px;
+	height:70px;
+	line-height:70px;
 	align:center;
 	color:white;
 	font-size:16px;
-	margin-top:5px;
+	margin:5px;
 }
 
 .font-12 {
@@ -157,7 +158,7 @@ select.form-control {
 }
 
 .long{
-	width:49%;
+	width:43%;
 }
 
 .sold {
@@ -239,7 +240,7 @@ select.form-control {
 /* End Colors */
 
 .left{
-	margin-left:1px;
+	margin-left:20px;
 }
 
 .bottom{
@@ -259,6 +260,14 @@ tr.discount-item-row:hover {
     color: red !important;
 }
 
+.border-top{
+  border-top:1px solid #fff;
+}
+
+.border-right{
+  border-right:1px solid #fff;
+}
+
 .border-left{
   border-left:1px solid #fff;
 }