fixed merge

This commit is contained in:
Lars van Hijfte
2017-01-11 11:13:04 +01:00
8 changed files with 116 additions and 1 deletions

29
website/views/chat.php Normal file
View File

@@ -0,0 +1,29 @@
<div class="content">
<div class="chat">
<div class="chat-history">
<div class="chat-message">
<div class="chat-message-self">Hi!</div>
</div>
<div class="chat-message">
<div class="chat-message-other">Hi!</div>
</div>
<div class="chat-message">
<div class="chat-message-self">How it's going?</div>
</div>
<div class="chat-message">
<div class="chat-message-self">Hi!</div>
</div>
</div>
<form class="chat-field" method="post">
<input type="text"
name="message"
placeholder="Typ een chatbericht om te verzenden"
required
>
<input type="submit"
value="Verstuur"
>
</form>
</div>
</div>

View File

@@ -6,6 +6,7 @@
<style>
/* Add your css files here. */
@import url("styles/main.css");
@import url("styles/chat.css");
@import url("styles/font-awesome.css");
@import url("styles/header.css");
@import url("styles/menu.css");

View File

@@ -1,6 +1,6 @@
<header>
<div id="header-logo">
<img src="img/Logo.png" />
<img src="img/logo.png" />
</div>
<div id="header-search">
<form action="php/search.php" method="get">