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/responsive/_mobile.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/responsive/_mobile.scss')
-rw-r--r-- | webapp/sass/responsive/_mobile.scss | 51 |
1 files changed, 24 insertions, 27 deletions
diff --git a/webapp/sass/responsive/_mobile.scss b/webapp/sass/responsive/_mobile.scss index 67f56b8a2..5ade6046e 100644 --- a/webapp/sass/responsive/_mobile.scss +++ b/webapp/sass/responsive/_mobile.scss @@ -20,6 +20,12 @@ } } + .settings-modal { + .modal-body { + overflow: auto; + } + } + #header-popover { @include single-transition(all, .35s, ease); @include translate3d(0, 100%, 0); @@ -347,10 +353,6 @@ } .post__img { - .status-wrapper { - display: inline-block; - } - img { display: block; } @@ -430,8 +432,8 @@ } .search-help-popover { - margin-left: 10px; - max-width: calc(100% - 20px); + left: 55px; + max-width: calc(100% - 80px); } .modal-direct-channels, @@ -1088,7 +1090,7 @@ .post-error { top: 0; left: 0; - } + } } } @@ -1217,6 +1219,16 @@ } @media screen and (max-width: 640px) { + .filtered-user-list { + height: calc(100vh - 80px); + } + + .more-modal--action { + .filtered-user-list { + height: calc(100vh - 110px); + } + } + .app__body { .modal { .more-modal { @@ -1224,10 +1236,6 @@ max-height: calc(100vh - 62px); padding-bottom: 5px; } - - .more-modal__list { - max-height: calc(100vh - 230px); - } } } @@ -1388,15 +1396,14 @@ @media screen and (max-width: 550px) { .app__body { .more-modal { - .filter-row { - width: 100%; - } - - &.more-direct-channels { + &.more-system-members { .filter-row { - padding-bottom: 50px; + min-height: 80px; + width: 100%; } + } + &.more-direct-channels { .member-show { display: none; } @@ -1454,16 +1461,6 @@ .app__body { .modal { - &.more-channel__modal { - .more-modal__list { - max-height: calc(100vh - 250px); - } - - .modal-body { - padding-bottom: 35px; - } - } - .settings-modal { &.display--content { .modal-body { |