diff --git a/src/public/main.js b/src/public/main.js index c2cc9eb..71838e8 100644 --- a/src/public/main.js +++ b/src/public/main.js @@ -37,9 +37,9 @@ $(function() { function addParticipantsMessage (data) { var message = ''; if (data.numUsers === 1) { - message += "there's 1 participant"; + message += "There's 1 participant"; } else { - message += "there are " + data.numUsers + " participants"; + message += "There are " + data.numUsers + " participants"; } log(message); } @@ -167,7 +167,6 @@ $(function() { } $messages[0].scrollTop = $messages[0].scrollHeight; // minus 60 for key - console.log($messages[0]); } // Prevents input from having injected markup @@ -289,5 +288,10 @@ $(function() { removeChatTyping(data); }); - setUsername() + setUsername(); + + $('span.key-btn').click(function() { + $('#key-modal').modal('show'); + }); + }); diff --git a/src/public/style.css b/src/public/style.css index bfc8037..867d295 100644 --- a/src/public/style.css +++ b/src/public/style.css @@ -5,19 +5,20 @@ } html { - font-weight: 300; + font-weight: 400; -webkit-font-smoothing: antialiased; } -html, input { +html, body, input { font-family: + "Open Sans", "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", - sans-serif; + sans-serif !important; } html, body { @@ -113,7 +114,7 @@ ul { .chatArea { height: 100%; - padding-bottom: 60px; + padding-bottom: 80px; } .messages { @@ -138,23 +139,33 @@ ul { /* Input */ .inputMessage{ - border: 10px solid #000; + border: none; + border-top: 2px solid #ececec; bottom: 0; - height: 60px; + height: 70px; left: 0; outline: none; padding-left: 10px; + padding-right: 70px; position: absolute; right: 0; width: 100%; } -#key { - border: 10px solid #000; - height: 60px; - left: 0; - outline: none; - padding-left: 10px; - right: 0; - width: 100%; +span.key-btn { + position: absolute; + right: 7px; + bottom: 8px; + cursor: pointer; +} + +span.key-btn img { + width: 50px; +} + +#key-modal input{ + width: 100%; + height: 50px; + padding: 0px 15px; +} } diff --git a/src/views/index.mustache b/src/views/index.mustache index b3fb3a1..0d3233f 100644 --- a/src/views/index.mustache +++ b/src/views/index.mustache @@ -4,6 +4,8 @@