Merge branch 'marijn-chat' of ssh://gitlab-fnwi.uva.nl:1337/11166932/WebDB into marijn-chat

This commit is contained in:
Marijn Jansen
2017-01-11 15:32:22 +01:00
3 changed files with 39 additions and 6 deletions

View File

@@ -1,16 +1,21 @@
/* Overall chat-screen */
.chat {
position: fixed;
top: 80px;
left: 256px;
text-align: center;
padding: 15px 0;
width: 100%
width: calc(100% - 256px);
height: calc(100% - 120px);
display: inline-flex;
}
.chat-left {
float: left;
width: 20%;
width: 256px;
height: 100%;
margin-left: 10px;
margin-right: 10px;
display: inline-flex;
}
.chat-recent, .chat-history {
@@ -32,16 +37,16 @@
}
.chat-right {
width: 75%;
width: calc(100% - 256px - 40px);
height: calc(100% - 80px);
vertical-align: bottom;
float: right;
margin-right: 10px;
}
/* Chat history. */
.chat-history {
height: 600px;
overflow-y: auto;
height: 100%;
padding-bottom: 10px;
}