merge with staging

2017-10-12 09:59:24 +06:30
parent 1f6c05b314 476aafa791
commit bc2101bf42
89 changed files with 1810 additions and 1372 deletions
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -31,8 +31,11 @@
                <!-- <a href="<%= logout_path %>"><i class="material-icons">input</i>Sign Out</a> -->
                </li>   
            </ul>
-            <a href="javascript:void(0);" class="js-right-sidebar" data-close="true"><i class="material-icons">more_vert</i></a>
+            <a href="javascript:void(0);" class="js-right-sidebar" data-close="true">
+                <i class="material-icons">more_vert</i>
+            </a>
        </div>
    </div>
 </nav>
 <!-- #Top Bar
+