Merge branch 'master' into oqs

2017-06-23 19:22:07 +06:30
parent 9ed6b510c4 1f6a0eb1f6
commit 30df25d78a
35 changed files with 739 additions and 393 deletions
--- a/app/assets/stylesheets/origami.scss
+++ b/app/assets/stylesheets/origami.scss
@@ -9,6 +9,8 @@
 //   min-height: 75rem;
 //   padding-top: 4.5rem;
 // }
+.card-columns {
+	font-size: 18px !important;}

 .others-payment{
 	line-height:100px;
@@ -128,6 +130,11 @@
 	text-align: right;
 }

+.item-attr-edit{
+	width: 10%;
+	text-align: left;
+}
+
 .display-none{
 	display: none;
 }
@@ -186,4 +193,4 @@ tr.discount-item-row:hover {

 .jconfirm-box-container{
 	margin-left:-40px !important
-}
+}