diff --git a/site/client/app/views/chat.html b/site/client/app/views/chat.html index c805c34..84df707 100644 --- a/site/client/app/views/chat.html +++ b/site/client/app/views/chat.html @@ -2,12 +2,16 @@ <nav> <ul> <li><a class="active">Lobby Chat</a></li> - <li><a>Current Match</a></li> + <!--li><a>Current Match</a></li--> </ul> </nav> <div class="chat"> - blaa blaa + <div class="chats"> + blaa blaa + </div> + + <textarea class="chatbox" placeholder="Type an message..." autofocus></textarea> </div> </section> \ No newline at end of file diff --git a/site/client/assets/sass/_chat.scss b/site/client/assets/sass/_chat.scss index 0e0c2d7..b9598ad 100644 --- a/site/client/assets/sass/_chat.scss +++ b/site/client/assets/sass/_chat.scss @@ -12,11 +12,36 @@ float: left; width: 100%; padding: 20px; - height: calc(100vh - 300px); + height: calc(100vh - 200px); min-height: 400px; clear: both; + position: relative; color: #fff; + @include contentGradient(); +} + +.chats { + float: left; + overflow-y: scroll; + height: calc(100% - 100px); + width: 100%; +} + +.chatbox { + height: 100px; + float: left; + width: 100%; + border: 0; + resize: none; + position: absolute; + bottom: 0; + left: 0; + padding: 20px; + font-size: 15px; + font-weight: 300; + color: #8798ac; + @include contentGradient(); } \ No newline at end of file diff --git a/site/client/assets/sass/_inner.scss b/site/client/assets/sass/_inner.scss index cb35627..4320c68 100644 --- a/site/client/assets/sass/_inner.scss +++ b/site/client/assets/sass/_inner.scss @@ -18,7 +18,7 @@ main { float: left; width: 100%; padding: 20px; - height: calc(100vh - 300px); + height: calc(100vh - 200px); min-height: 400px; clear: both;