diff options
author | Christopher Speller <crspeller@gmail.com> | 2017-01-12 19:59:37 -0500 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2017-01-12 19:59:37 -0500 |
commit | 8fb66c2b834ee4e0669de173e5ddfebd56c34d58 (patch) | |
tree | 9e8e66772d44c4f9010a48c8e0afed70421238b1 /webapp/sass/components/_modal.scss | |
parent | 4208e42ba9df02b9c4bd7081179922c21206d83d (diff) | |
parent | aafb8be87c79c60df7534b3b69f967c6301b157e (diff) | |
download | chat-8fb66c2b834ee4e0669de173e5ddfebd56c34d58.tar.gz chat-8fb66c2b834ee4e0669de173e5ddfebd56c34d58.tar.bz2 chat-8fb66c2b834ee4e0669de173e5ddfebd56c34d58.zip |
Merge branch 'release-3.6'
Diffstat (limited to 'webapp/sass/components/_modal.scss')
-rw-r--r-- | webapp/sass/components/_modal.scss | 52 |
1 files changed, 17 insertions, 35 deletions
diff --git a/webapp/sass/components/_modal.scss b/webapp/sass/components/_modal.scss index d17ba1706..83f2ef907 100644 --- a/webapp/sass/components/_modal.scss +++ b/webapp/sass/components/_modal.scss @@ -12,7 +12,6 @@ .modal-body { max-height: calc(90vh - 62px); - overflow: auto; padding: 20px 15px; } @@ -460,24 +459,10 @@ 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; @@ -492,7 +477,6 @@ } .filter-row { - @include clearfix; margin: 5px 0 10px; width: 300px; } @@ -557,7 +541,15 @@ .more-modal__list { display: flex; flex-direction: column; - overflow: auto; + + .browser--ie & { + flex: 20; + } + + > div { + min-height: 100%; + overflow: auto; + } .popover & { font-size: .95em; @@ -602,6 +594,7 @@ .more-modal__actions { flex-grow: 0; flex-shrink: 0; + margin: 5px 0 10px; padding-left: 20px; } @@ -624,8 +617,7 @@ .more-modal__row { border-bottom: 1px solid $light-gray; display: flex; - min-height: 70px; - padding: 8px 15px; + padding: 10px 15px; } p { @@ -646,16 +638,15 @@ .filtered-user-list { display: flex; flex-direction: column; + height: calc(90vh - 120px); width: 100%; - .filter-row { - flex-grow: 0; - flex-shrink: 0; + > div { + flex: 1 1 auto; } - .user-list { - flex-grow: 1; - flex-shrink: 1; + .more-modal__list { + flex-grow: 500; } .filter-button { @@ -665,9 +656,6 @@ } .filter-controls { - @include clearfix; - flex-grow: 0; - flex-shrink: 0; padding: 1em 1.5em 0; .filter-control__next { @@ -679,10 +667,4 @@ margin-left: 0; padding-left: 0; } -} - -.channel-switch-modal { - .modal-body { - overflow: visible; - } -} +}
\ No newline at end of file |