merge with settings_backend

2017-06-26 14:46:31 +06:30
parent cc67abcfc1 46ad87314a
commit 813f2ecf2d
16 changed files with 647 additions and 63 deletions
--- a/app/assets/stylesheets/origami.scss
+++ b/app/assets/stylesheets/origami.scss
@@ -160,6 +160,10 @@
 	background-color: #FF8C00
 }

+.blue{
+	background-color: blue
+}
+
 .left{
 	margin-left:1px;
 }