fixed conflict

2017-06-07 17:15:51 +06:30
parent d2ce74f648 4323da6589
commit bd345dbc3f
33 changed files with 291 additions and 139 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
+}