Merge with current master

website/styles/chat.css

@@ -1,14 +1,22 @@
 .chat {
     text-align: center;
+    padding-top: 15px;
 }
 
 .chat-history {
     /*border: solid #845663;*/
     width: 80%;
     height: 500px;
-    margin: 20px auto;
+    margin: auto auto;
     background-color: white;
     vertical-align: bottom;
+    overflow-y: scroll;
+    padding: 5px 0;
+    border-radius: 10px;
+}
+
+.chat-field {
+    padding: 15px;
 }
 
 .chat-field input {
@@ -22,31 +30,34 @@
 
 .chat-field input[type="submit"] {
     width: 60px;
-
+    background-color: #845663;
+    color: white;
+    padding: 5px;
 }
+
 .chat-message {
     width: 100%;
-    height: 40px;
+    min-height: 40px;
     padding-top: 10px;
+    clear: both;
 }
 
 .chat-message-self, .chat-message-other {
+    text-align: left;
     border-radius: 20px;
     padding: 10px 12px;
-    min-width: 10%;
     max-width: 45%;
 }
 
 .chat-message-self {
-    text-align: right;
     float: right;
+
     margin-right: 10px;
     background-color: darkgreen;
     color: white;
 }
 
 .chat-message-other {
-    text-align: left;
     float: left;
     margin-left: 10px;
     background-color: aquamarine;

website/styles/main.css

@@ -16,7 +16,7 @@ body {
 }
 
 .content {
-    margin-top: 95px;
+    margin-top: 80px;
 }
 
 ::selection {
@@ -36,11 +36,6 @@ body {
     border: 0;
 }
 
-input[type="submit"], button {
-    background-color: #845663;
-    color: white;
-    padding: 5px;
-}
 
 input[type="text"] {
     padding: 5px;

website/views/chat.php

@@ -13,6 +13,18 @@
             <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">