merge origin master

2017-06-23 17:53:53 +06:30
parent a996ccc7ee 81c50f220a
commit e01ecc6e0f
8 changed files with 177 additions and 37 deletions
--- a/app/assets/stylesheets/origami.scss
+++ b/app/assets/stylesheets/origami.scss
@@ -130,6 +130,11 @@
 	text-align: right;
 }

+.item-attr-edit{
+	width: 10%;
+	text-align: left;
+}
+
 .display-none{
 	display: none;
 }