Merge branch 'master' of https://github.com/krebscode/painload

2 files changed, 35 insertions, 4 deletions

diff --git a/webchat/public/client.js b/webchat/public/client.js
index 95b67ad0..e13ab1f7 100644
--- a/webchat/public/client.js
+++ b/webchat/public/client.js
@@ -26,7 +26,7 @@ $(function connect() {
       var safe_message = $('<div/>').text(object.message).html();
       safe_message = replaceURLWithHTMLLinks(safe_message);
   var safe_from = $('<div/>').text(object.from).html();
-  $('#chatbox').append('<tr><td class="chat_from">'+safe_from+'</td><td class="chat_msg">'+safe_message+'</td></tr>');
+  $('<tr><td class="chat_date">'+(new Date).getHours() + ':' + (new Date).getMinutes() + ':' + (new Date).getSeconds()+'</td><td class="chat_from">'+safe_from+'</td><td class="chat_msg">'+safe_message+'</td></tr>').insertBefore('#foot');
 
     } catch (error) {
       console.log(error);
diff --git a/webchat/public/reset.css b/webchat/public/reset.css
index 46b52478..2b67f153 100644
--- a/webchat/public/reset.css
+++ b/webchat/public/reset.css
@@ -21,6 +21,7 @@ time, mark, audio, video {
   border: 0;
   font-size: 100%;
   font: inherit;
+  font-family: monospace;
   vertical-align: baseline;
 }
 /* HTML5 display-role reset for older browsers */
@@ -47,16 +48,28 @@ q:before, q:after {
 #chatbox {
   border-collapse: collapse;
   border-spacing: 0;
-  border: solid 2px black;
-  background-color: white;
-  color: black;
+  background-color: black;
+  color: white;
+  border: 5px solid black;
+  width: 100%;
+  height:100%;
+  opacity: 0.8;
+}
+#input{
+  width: 100%;
+  background-color: black;
+  border: 1px solid black;
+  color: white;
 }
 .chat_from {
+  color:grey;
   font-weight: bold;
   text-align: right;
+  font-size:12px;
 }
 .chat_from:after {
   content: ":";
+  padding-right: 6px;
 }
 #bg {
   background-image: url(krebs.png);
@@ -66,3 +79,21 @@ q:before, q:after {
   left: 0;
   right: 0;
 }
+#chatter {
+  width: 75%;
+}
+.chat_date,.chat_from,.chat_msg{
+}
+.chat_msg{
+  width: 100%;
+}
+a {
+  color: red;
+}
+.chat_date {
+  color: green;
+}
+.chat_date:after {
+  content: "";
+  padding-right: 4px;
+}
\ No newline at end of file