Merge branch 'master' into kevin-prototype

This commit is contained in:
Kevin Nobel
2017-01-11 15:47:29 +01:00
10 changed files with 159 additions and 57 deletions

View File

@@ -0,0 +1,58 @@
<div class="content">
<div class="chat">
<div class="chat-left">
<nav class="chat-recent">
<h5>Chats</h5>
<a href="#"><div class="chat-conversation">
<img class="profile-picture" src="https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcTDnuRSeeyPve7KwDvJJ6OBzj3gyghwLcE2z9kZeYBOyZavh3mw">
Rudolf Leslo
</div></a>
<a href="#"><div class="chat-conversation">
<img class="profile-picture" src=http://www.kpop-map.com/wp-content/uploads/2016/01/sm-rookies-kun-profile.jpg">
Henk de Boer
</div></a>
</nav>
</div>
<div class="chat-right">
<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">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</div>
</div>
<div class="chat-message">
<div class="chat-message-other">Hi!</div>
</div>
<div class="chat-message">
<div class="chat-message-other">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</div>
</div>
<div class="chat-message">
<div class="chat-message-other">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</div>
</div>
<div class="chat-message">
<div class="chat-message-self">Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</div>
</div>
</div>
<div class="chat-field">
<form method="post">
<input type="text"
name="message"
placeholder="Reageer..."
required
>
<input type="submit"
value="Verstuur"
>
</form>
</div>
</div>
</div>
</div>

View File

@@ -1,29 +0,0 @@
<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

@@ -1,6 +1,6 @@
<header>
<div id="header-logo">
<img src="img/Logo.png" alt="MyHyvesbook+" />
<a href="profile.php"><img src="img/top-logo.png" alt="MyHyvesbook+" /></a>
</div>
<div id="header-search">
<form action="php/search.php" method="get">
@@ -12,7 +12,7 @@
<div id="profile-menu-popup">
<a href="#"><span style="color: red;" class="fa fa-sign-out" data-title="Uitloggen"></span></a> |
<a href="#"><span style="color: blue;" class="fa fa-cog" data-title="Instellingen"></span></a> |
<a href="#"><span style="color: green;" class="fa fa-user" data-title="Profiel"></span></a>
<a href="profile.php"><span style="color: green;" class="fa fa-user" data-title="Profiel"></span></a>
</div>
<div id="profile-hello-popup">
<div id="hello-loop">