Merge branch 'master' into kevin-prototype

2017-01-11 11:30:04 +01:00
parent ee7a91a6aa c354bdb330
commit 019a89c865
17 changed files with 279 additions and 249 deletions
--- a/website/views/head.php
+++ b/website/views/head.php
@@ -4,8 +4,12 @@
    <!-- Add your javascript files here. -->
    <script src="js/jquery.js"></script>
    <style>
-    /* Add your css files here. */
+        /* Add your css files here. */
        @import url("styles/main.css");
        @import url("styles/profile.css");
+        @import url("styles/chat.css");
+        @import url("styles/font-awesome.css");
+        @import url("styles/header.css");
+        @import url("styles/menu.css");
    </style>
 </head>