Merge branch 'master' into kevin-prototype

2017-01-11 14:04:51 +01:00
parent cd93dcb719 4be13bb66c
commit 69d1ee9cd8
19 changed files with 2857 additions and 14 deletions
--- a/website/views/head.php
+++ b/website/views/head.php
@@ -3,13 +3,17 @@
    <title>MyHyvesbook+</title>
    <!-- Add your javascript files here. -->
    <script src="js/jquery.js"></script>
+    <script src="js/header.js"></script>
+    <script src="js/menu.js"></script>
    <style>
        /* 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");
+        @import url("styles/footer.css");
+
+        @import url("styles/chat.css");
    </style>
 </head>