1
0
mirror of https://github.com/exane/not-gwent-online synced 2024-10-31 10: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 {
float: left;
overflow-y: scroll;
height: calc(100% - 100px);
overflow-y: auto;
height: calc(100% - 80px);
width: 100%;
}
.chatbox {
height: 100px;
height: 80px;
float: left;
width: 100%;
border: 0;

View File

@ -16,7 +16,7 @@
top: 0;
right: 0;
bottom: 0;
background: rgba(14,27,43,.5);
background: rgba(14, 27, 43, .5);
z-index: 10;
opacity: 0;
visibility: hidden;
@ -24,18 +24,25 @@
&.active {
visibility: visible;
opacity: 1;
transition: all .3s ease-in-out 0s;
@include transition();
}
}
.modal-banner {
z-index: 20;
background: rgba(6,13,22,.95);
background: rgba(6, 13, 22, .95);
width: 100%;
color: #fff;
padding: 50px 0;
margin: 25vh 0 0 0;
margin: 24vh 0 0 0;
float: left;
.active & {
@include transition();
margin: 25vh 0 0 0;
}
}
.icon-content-load {
@ -71,6 +78,6 @@
cursor: pointer;
&:hover {
color: #8798ac;
color: #8798ac;
}
}