"before merge"

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>

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 {
+.chat-left {
-    /*border: solid #845663;*/
+    float: left;
-    width: 80%;
+    width: 20%;
-    height: 500px;
+    height: 100%;
-    margin: auto auto;
+    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;
+    float: right;
-    padding: 5px 0;
+    margin-right: 10px;
-    border-radius: 10px;
 }
 
-.chat-field {
+/* Chat history. */
-    padding: 15px;
+.chat-history {
-}
+    height: 600px;
-
+    overflow-y: auto;
-.chat-field input {
+    padding-bottom: 10px;
-    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-message {
@@ -51,7 +57,6 @@
 
 .chat-message-self {
     float: right;
-
     margin-right: 10px;
     background-color: darkgreen;
     color: white;
@@ -62,3 +67,24 @@
     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;
+}

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>

website/views/chat.php

@@ -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>