1
0
mirror of https://github.com/exane/not-gwent-online synced 2024-11-23 19:36:53 +00:00

Merge remote-tracking branch 'origin/master'

This commit is contained in:
exane 2015-06-22 17:29:22 +02:00
commit a48d36b5ba
2 changed files with 15 additions and 8 deletions

View File

@ -24,13 +24,13 @@
.chats { .chats {
float: left; float: left;
overflow-y: scroll; overflow-y: auto;
height: calc(100% - 100px); height: calc(100% - 80px);
width: 100%; width: 100%;
} }
.chatbox { .chatbox {
height: 100px; height: 80px;
float: left; float: left;
width: 100%; width: 100%;
border: 0; border: 0;

View File

@ -24,7 +24,8 @@
&.active { &.active {
visibility: visible; visibility: visible;
opacity: 1; opacity: 1;
transition: all .3s ease-in-out 0s;
@include transition();
} }
} }
@ -34,8 +35,14 @@
width: 100%; width: 100%;
color: #fff; color: #fff;
padding: 50px 0; padding: 50px 0;
margin: 25vh 0 0 0; margin: 24vh 0 0 0;
float: left; float: left;
.active & {
@include transition();
margin: 25vh 0 0 0;
}
} }
.icon-content-load { .icon-content-load {