Merge branch 'master' into marijn-settings

website/views/chat-view.php

@@ -1,7 +1,7 @@
 <div class="content">
     <div class="chat">
         <div class="chat-left">
-            <nav class="chat-recent">
+            <nav class="chat-recent platform">
                 <h5>Chats</h5>
                 <a href="#"><div class="chat-conversation">
                         <img class="profile-picture" src="https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcTDnuRSeeyPve7KwDvJJ6OBzj3gyghwLcE2z9kZeYBOyZavh3mw">
@@ -15,7 +15,7 @@
         </div>
 
         <div class="chat-right">
-            <div class="chat-history">
+            <div class="chat-history platform">
                 <div class="chat-message">
                     <div class="chat-message-self">Hi!</div>
                 </div>
@@ -43,14 +43,16 @@
             </div>
             <div class="chat-field">
                 <form  method="post">
-                    <input type="text"
-                           name="message"
-                           placeholder="Reageer..."
-                           required
-                    >
                     <input type="submit"
                            value="Verstuur"
                     >
+                    <span>
+                        <input type="text"
+                               name="message"
+                               placeholder="Reageer..."
+                               required
+                        >
+                    </span>
                 </form>
             </div>
         </div>

website/views/head.php

@@ -13,6 +13,7 @@
         @import url("styles/header.css");
         @import url("styles/menu.css");
         @import url("styles/footer.css");
+        @import url("styles/search.css");
         @import url("styles/adminpanel.css");
         @import url("styles/chat.css");
         @import url("styles/settings.css");

website/views/header.php

@@ -4,7 +4,7 @@
     </div>
     <div id="header-search">
         <form action="search.php" method="get">
-            <input name="search" type="text" placeholder="search people, friends and pages" />
+            <input name="search" type="text" placeholder="zoek naar van alles" />
             <input type="submit" value="Zoek"/>
         </form>
     </div>