fixed conflict request_bill_con and origami index

2017-06-07 16:48:28 +06:30
parent 387ffa996b 4323da6589
commit 9ad04323f0
28 changed files with 264 additions and 115 deletions
--- a/app/assets/stylesheets/orgiami.scss
+++ b/app/assets/stylesheets/orgiami.scss
@@ -25,3 +25,15 @@
 .long{
 	width:100%
 }
+
+.purple {
+	background-color:#7a62d3;
+}
+
+.red {
+	background-color:#ff0000;
+}
+
+.green{
+	background-color: #009900
+}