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 | |
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')
-rw-r--r-- | webapp/sass/components/_modal.scss | 42 | ||||
-rw-r--r-- | webapp/sass/responsive/_mobile.scss | 95 |
2 files changed, 99 insertions, 38 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; diff --git a/webapp/sass/responsive/_mobile.scss b/webapp/sass/responsive/_mobile.scss index 6a6153469..00f89ff15 100644 --- a/webapp/sass/responsive/_mobile.scss +++ b/webapp/sass/responsive/_mobile.scss @@ -36,21 +36,24 @@ padding: 15px 20px 100px; } - .close__icon { - @include border-radius(50%); - border: 1px solid $white; - bottom: 25px; - color: $white; + .close { + font-family: 'Open Sans', sans-serif; display: block; - font-size: 23px; - font-weight: 300; + position: fixed; + bottom: 25px; height: 30px; + width: 30px; + margin-left: -15px; left: 50%; - line-height: 23px; - margin-left: -25px; - position: fixed; + font-size: 23px; + line-height: 27px; + border-radius: 50%; + border: 1px solid $white; text-align: center; - width: 30px; + opacity: 1; + text-shadow: none; + color: white; + font-weight: 200; } } @@ -81,9 +84,10 @@ .tutorial-steps__container { .tutorial__content { .tutorial__steps { - margin-bottom: 0; - min-height: auto; - padding-bottom: 8em; + margin-top: 15%; + margin-bottom: 15%; + max-height: 70%; + padding-bottom: 0; } } } @@ -749,22 +753,24 @@ top: 42px; width: 100%; - &:after { - @include border-radius(50%); - border: 1px solid $white; - bottom: 25px; - color: $white; - content: '\D7'; + .close { + font-family: 'Open Sans', sans-serif; display: block; - font-size: 23px; - font-weight: 300; + position: fixed; + bottom: 25px; height: 30px; + width: 30px; + margin-left: -15px; left: 50%; + font-size: 23px; line-height: 27px; - margin-left: -25px; - position: fixed; + border-radius: 50%; + border: 1px solid $white; text-align: center; - width: 30px; + opacity: 1; + text-shadow: none; + color: white; + font-weight: 200; } > li { @@ -1306,8 +1312,28 @@ } .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 { + max-height: calc(100vh - 250px); + } + .modal-body { padding-bottom: 35px; } @@ -1394,6 +1420,25 @@ .tutorial__steps { padding: 0 20px; width: 100%; + h1 { + font-size: 35px; + margin: -5px 0 20px; + } + h3 { + margin-bottom: 10px; + } + .tutorial__app-icons { + margin: 10px 0; + } + .tutorial__circles { + margin: 0 0 15px; + bottom: 60px; + position: absolute; + } + .tutorial__footer { + bottom: 30px; + position: absolute; + } } } } |