Make window unscrollable // Fixes #692

// FREEBIE
This commit is contained in:
lilia 2016-02-22 10:47:48 -08:00
parent f4387cc231
commit 34d50f94a9
3 changed files with 15 additions and 14 deletions

View File

@ -18,9 +18,11 @@
</div>
</div>
<div class='gutter'>
<div class='conversations scrollable inbox'></div>
<div class='conversations scrollable search-results hide'>
<div class='new-contact contact hide'></div>
<div class='content'>
<div class='conversations scrollable inbox'></div>
<div class='conversations scrollable search-results hide'>
<div class='new-contact contact hide'></div>
</div>
</div>
</div>
<div class='conversation-stack'>

View File

@ -1,7 +1,3 @@
.gutter {
padding: $header-height 0 0;
}
.conversation-stack,
.new-conversation, .inbox, .gutter {
height: 100%;
@ -14,11 +10,15 @@
.gutter {
float: left;
margin: 10px 0;
width: 300px;
.content {
height: 100%;
padding: 46px 0 10px;
}
.conversations {
overflow-y: scroll;
height: calc(100% - 20px);
height: 100%;
width: 100%;
}
}

View File

@ -383,9 +383,6 @@ img.emoji {
text-align: center;
font-size: 19px; }
.gutter {
padding: 36px 0 0; }
.conversation-stack,
.new-conversation, .inbox, .gutter {
height: 100%; }
@ -396,11 +393,13 @@ img.emoji {
.gutter {
float: left;
margin: 10px 0;
width: 300px; }
.gutter .content {
height: 100%;
padding: 46px 0 10px; }
.gutter .conversations {
overflow-y: scroll;
height: calc(100% - 20px);
height: 100%;
width: 100%; }
.socket-status {