1
0
mirror of https://github.com/exane/not-gwent-online synced 2024-11-27 03:46:54 +00:00

Merge remote-tracking branch 'origin/master'

This commit is contained in:
exane 2015-06-22 16:12:12 +02:00
commit e167de2179
3 changed files with 33 additions and 4 deletions

View File

@ -2,12 +2,16 @@
<nav> <nav>
<ul> <ul>
<li><a class="active">Lobby Chat</a></li> <li><a class="active">Lobby Chat</a></li>
<li><a>Current Match</a></li> <!--li><a>Current Match</a></li-->
</ul> </ul>
</nav> </nav>
<div class="chat"> <div class="chat">
<div class="chats">
blaa blaa blaa blaa
</div> </div>
<textarea class="chatbox" placeholder="Type an message..." autofocus></textarea>
</div>
</section> </section>

View File

@ -12,11 +12,36 @@
float: left; float: left;
width: 100%; width: 100%;
padding: 20px; padding: 20px;
height: calc(100vh - 300px); height: calc(100vh - 200px);
min-height: 400px; min-height: 400px;
clear: both; clear: both;
position: relative;
color: #fff; color: #fff;
@include contentGradient(); @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();
}

View File

@ -18,7 +18,7 @@ main {
float: left; float: left;
width: 100%; width: 100%;
padding: 20px; padding: 20px;
height: calc(100vh - 300px); height: calc(100vh - 200px);
min-height: 400px; min-height: 400px;
clear: both; clear: both;