diff options
author | Christopher Speller <crspeller@gmail.com> | 2016-11-14 07:09:41 -0500 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2016-11-14 07:09:41 -0500 |
commit | 323ce8b203c570ed6a1dd57b44d6637ad8207616 (patch) | |
tree | efc3c61b905244bdb0e1ace0ce9f5ae4876644ad /webapp/sass/components/_modal.scss | |
parent | d1207d34c1d99eba9ebf85c98d267ee7e955ea7d (diff) | |
parent | b55ec6148caa93d54b660afe55408c643d217108 (diff) | |
download | chat-323ce8b203c570ed6a1dd57b44d6637ad8207616.tar.gz chat-323ce8b203c570ed6a1dd57b44d6637ad8207616.tar.bz2 chat-323ce8b203c570ed6a1dd57b44d6637ad8207616.zip |
Merge branch 'release-3.5'
Diffstat (limited to 'webapp/sass/components/_modal.scss')
-rw-r--r-- | webapp/sass/components/_modal.scss | 42 |
1 files changed, 29 insertions, 13 deletions
diff --git a/webapp/sass/components/_modal.scss b/webapp/sass/components/_modal.scss index 3faf78bc6..f89fb5c40 100644 --- a/webapp/sass/components/_modal.scss +++ b/webapp/sass/components/_modal.scss @@ -125,6 +125,7 @@ } .modal-dialog { + margin-bottom: 0; margin-left: auto; margin-right: auto; max-width: 95%; @@ -237,19 +238,6 @@ top: 0; } - &.more-channel__modal { - .modal-body { - overflow-x: hidden; - padding: 10px 0 15px; - } - - .channel-count { - @include opacity(.8); - float: right; - margin-top: 5px; - } - } - .modal-image { height: 100%; margin: 0 auto; @@ -449,9 +437,37 @@ } } } + + &.more-channel__modal { + .modal-body { + overflow-x: hidden; + padding: 10px 0 15px; + } + + .channel-count { + @include opacity(.8); + float: right; + margin-top: 5px; + } + + .more-modal__list { + max-height: calc(100vh - 270px); + } + } } .more-modal { + .more-modal__list { + height: 100vh; + max-height: calc(100vh - 340px); + } + + &.more-direct-channels { + .more-modal__list { + max-height: calc(100vh - 325px); + } + } + .user-list { margin-top: 10px; overflow-x: hidden; |