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

app/assets/stylesheets/origami.scss

@@ -21,8 +21,9 @@
 }
 
 .cashier_number{
-	height:60px;
-	line-height:60px;
+	width: 33%;
+	height:70px;
+	line-height:70px;
 	text-align:center;
 	background:#54A5AF;
 	// float:left;
@@ -34,8 +35,8 @@
 
 .pay{
 	width: 98%;
-  height:210px;
-	line-height:210px;
+  height:211px;
+	line-height:211px;
 	text-align:center;
 	font-size:20px;
 	color:white;
@@ -46,7 +47,7 @@
 }
 
 .long{
-	width:100%;
+	width:49%;
 }
 
 .sold {
@@ -121,4 +122,4 @@ select.form-control {
 
 tr.discount-item-row:hover {
 	background-color: #e3e3e3 !important;
-}
+}

app/assets/stylesheets/settings/orders.scss

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