diff options
author | Joram Wilander <jwawilander@gmail.com> | 2017-01-04 14:12:35 -0500 |
---|---|---|
committer | Harrison Healey <harrisonmhealey@gmail.com> | 2017-01-04 14:12:35 -0500 |
commit | eae6b13fca9a620051869aa449cedba042984531 (patch) | |
tree | ee49d33d6f3c22df8fa0ad74ba65a5c9ffd5014c /webapp/sass/components | |
parent | 635628cf30460a75d3a870394ad66db91f3bea9f (diff) | |
download | chat-eae6b13fca9a620051869aa449cedba042984531.tar.gz chat-eae6b13fca9a620051869aa449cedba042984531.tar.bz2 chat-eae6b13fca9a620051869aa449cedba042984531.zip |
Revert "Ui fixes" (#4963)
Diffstat (limited to 'webapp/sass/components')
-rw-r--r-- | webapp/sass/components/_modal.scss | 39 |
1 files changed, 27 insertions, 12 deletions
diff --git a/webapp/sass/components/_modal.scss b/webapp/sass/components/_modal.scss index f98d23341..d17ba1706 100644 --- a/webapp/sass/components/_modal.scss +++ b/webapp/sass/components/_modal.scss @@ -460,10 +460,24 @@ 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; @@ -478,6 +492,7 @@ } .filter-row { + @include clearfix; margin: 5px 0 10px; width: 300px; } @@ -542,11 +557,7 @@ .more-modal__list { display: flex; flex-direction: column; - - > div { - min-height: 100%; - overflow: auto; - } + overflow: auto; .popover & { font-size: .95em; @@ -591,7 +602,6 @@ .more-modal__actions { flex-grow: 0; flex-shrink: 0; - margin: 5px 0 10px; padding-left: 20px; } @@ -614,7 +624,8 @@ .more-modal__row { border-bottom: 1px solid $light-gray; display: flex; - padding: 10px 15px; + min-height: 70px; + padding: 8px 15px; } p { @@ -635,15 +646,16 @@ .filtered-user-list { display: flex; flex-direction: column; - height: calc(90vh - 120px); width: 100%; - > div { - flex: 1; + .filter-row { + flex-grow: 0; + flex-shrink: 0; } - .more-modal__list { - flex-grow: 500; + .user-list { + flex-grow: 1; + flex-shrink: 1; } .filter-button { @@ -653,6 +665,9 @@ } .filter-controls { + @include clearfix; + flex-grow: 0; + flex-shrink: 0; padding: 1em 1.5em 0; .filter-control__next { |