From eecdcad53883fe7515e7abb80fffee36c99ecbad Mon Sep 17 00:00:00 2001
From: Marijn Jansen <marijn@jansen.onl>
Date: Wed, 11 Jan 2017 14:04:04 +0100
Subject: [PATCH] "before merge"

---
 website/chat.php            |  2 +-
 website/styles/chat.css     | 82 ++++++++++++++++++++++++-------------
 website/views/chat-view.php | 43 +++++++++++++++++++
 website/views/chat.php      | 41 -------------------
 4 files changed, 98 insertions(+), 70 deletions(-)
 create mode 100644 website/views/chat-view.php
 delete mode 100644 website/views/chat.php

diff --git a/website/chat.php b/website/chat.php
index b94e08c..e7b5af5 100644
--- a/website/chat.php
+++ b/website/chat.php
@@ -12,7 +12,7 @@
              include("views/main.php");
 
             /* Add your view files here. */
-            include("views/chat.php");
+            include("views/chat-view.php");
         ?>
     </body>
 </html>
diff --git a/website/styles/chat.css b/website/styles/chat.css
index 640bb1d..c26366a 100644
--- a/website/styles/chat.css
+++ b/website/styles/chat.css
@@ -1,38 +1,44 @@
+/* Overall chat-screen */
 .chat {
     text-align: center;
-    padding-top: 15px;
+    padding: 15px 0;
+    width: 100%
 }
 
-.chat-history {
-    /*border: solid #845663;*/
-    width: 80%;
-    height: 500px;
-    margin: auto auto;
+.chat-left {
+    float: left;
+    width: 20%;
+    height: 100%;
+    margin-left: 10px;
+    margin-right: 10px;
+
+}
+.chat-list, .chat-history {
+    border-radius: 20px;
+    width: 100%;
     background-color: white;
+}
+
+
+/* List of chats. */
+.chat-list {
+    height: 600px;
+    overflow-y: auto;
+    padding: 10px;
+}
+
+.chat-right {
+    width: 75%;
     vertical-align: bottom;
-    overflow-y: scroll;
-    padding: 5px 0;
-    border-radius: 10px;
+    float: right;
+    margin-right: 10px;
 }
 
-.chat-field {
-    padding: 15px;
-}
-
-.chat-field input {
-    border-radius: 8px;
-}
-
-.chat-field input[type="text"] {
-    width: calc(75% - 60px);
-
-}
-
-.chat-field input[type="submit"] {
-    width: 60px;
-    background-color: #845663;
-    color: white;
-    padding: 5px;
+/* Chat history. */
+.chat-history {
+    height: 600px;
+    overflow-y: auto;
+    padding-bottom: 10px;
 }
 
 .chat-message {
@@ -51,7 +57,6 @@
 
 .chat-message-self {
     float: right;
-
     margin-right: 10px;
     background-color: darkgreen;
     color: white;
@@ -61,4 +66,25 @@
     float: left;
     margin-left: 10px;
     background-color: aquamarine;
+}
+
+/* Chat reply field */
+
+.chat-field {
+    padding: 15px;
+}
+
+.chat-field input {
+    border-radius: 8px;
+}
+
+.chat-field input[type="text"] {
+    width: calc(100% - 80px);
+}
+
+.chat-field input[type="submit"] {
+    width: 60px;
+    background-color: #845663;
+    color: white;
+    padding: 5px;
 }
\ No newline at end of file
diff --git a/website/views/chat-view.php b/website/views/chat-view.php
new file mode 100644
index 0000000..1e3f7f1
--- /dev/null
+++ b/website/views/chat-view.php
@@ -0,0 +1,43 @@
+<div class="content">
+    <div class="chat">
+        <div class="chat-left">
+            <div class="chat-list">
+                Friends?
+            </div>
+        </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>
+
+            <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>
+</div>
\ No newline at end of file
diff --git a/website/views/chat.php b/website/views/chat.php
deleted file mode 100644
index d6e6644..0000000
--- a/website/views/chat.php
+++ /dev/null
@@ -1,41 +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 class="chat-message">
-                <div class="chat-message-self">The Quick Brown fox jumps over the lazy dog.</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>
-        <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>
\ No newline at end of file