Merge branch 'marijn-chat' into 'lars-chat'

# Conflicts: # website/views/chat-view.php
2017-01-11 15:31:49 +01:00
parent 0f562bd39c 1e6e454de4
commit 544db8b608
4 changed files with 44 additions and 7 deletions
--- a/website/styles/chat.css
+++ b/website/styles/chat.css
@@ -18,14 +18,14 @@
    display: inline-flex;

 }
-.chat-list, .chat-history {
+.chat-recent, .chat-history {
    border-radius: 20px;
    width: 100%;
    background-color: white;
 }

 /* List of chats. */
-.chat-list {
+.chat-recent {
    height: 600px;
    overflow-y: auto;
    padding: 10px;