diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2016-12-15 11:40:46 -0500 |
|---|---|---|
| committer | enahum <nahumhbl@gmail.com> | 2016-12-15 13:40:46 -0300 |
| commit | 7f48a7fc9d2238134414668e0b520115706b8b2d (patch) | |
| tree | c7b485e0305a46e10ea997ea3450c2c040efcb95 /webapp/sass | |
| parent | c35b95709e293680f882f27ab6e616bf8f92a7cc (diff) | |
| download | chat-7f48a7fc9d2238134414668e0b520115706b8b2d.tar.gz chat-7f48a7fc9d2238134414668e0b520115706b8b2d.tar.bz2 chat-7f48a7fc9d2238134414668e0b520115706b8b2d.zip | |
PLT-4815 Refactor 'More Channels' modal into the new modal pattern (#4742)
* Refactor 'More Channels' modal into the new modal pattern
* Fix unit test
* Readded CSS changes
Diffstat (limited to 'webapp/sass')
| -rw-r--r-- | webapp/sass/components/_modal.scss | 1 | ||||
| -rw-r--r-- | webapp/sass/responsive/_mobile.scss | 40 |
2 files changed, 18 insertions, 23 deletions
diff --git a/webapp/sass/components/_modal.scss b/webapp/sass/components/_modal.scss index beb9ee8a1..c7d82feb9 100644 --- a/webapp/sass/components/_modal.scss +++ b/webapp/sass/components/_modal.scss @@ -483,6 +483,7 @@ .filter-row { @include clearfix; margin: 5px 0 10px; + width: 300px; } .member-count { diff --git a/webapp/sass/responsive/_mobile.scss b/webapp/sass/responsive/_mobile.scss index d69569899..9d76f7010 100644 --- a/webapp/sass/responsive/_mobile.scss +++ b/webapp/sass/responsive/_mobile.scss @@ -75,12 +75,6 @@ } .app__body { - .more-modal { - .filter-row { - width: 330px; - } - } - .edit-modal-body { .custom-textarea { max-height: 30vh; @@ -1172,6 +1166,19 @@ @media screen and (max-width: 640px) { .app__body { + .modal { + .more-modal { + .modal-body { + max-height: calc(100vh - 62px); + padding-bottom: 5px; + } + + .more-modal__list { + max-height: calc(100vh - 230px); + } + } + } + .post { .open { > .dropdown-menu__content { @@ -1329,10 +1336,13 @@ @media screen and (max-width: 550px) { .app__body { .more-modal { + .filter-row { + width: 100%; + } + &.more-direct-channels { .filter-row { padding-bottom: 50px; - width: 100%; } .member-show { @@ -1391,22 +1401,6 @@ } .app__body { - .more-modal { - .modal-body { - padding-bottom: 5px; - } - - .more-modal__list { - max-height: calc(100vh - 260px); - } - - &.more-direct-channels { - .more-modal__list { - max-height: calc(100vh - 295px); - } - } - } - .modal { &.more-channel__modal { .more-modal__list { |