From f3a266ee5d25bfff322acd3cc5eef91a6dce8954 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Wed, 8 Mar 2017 14:13:50 +0500 Subject: Ui improvements and bug fixes (#5677) * PLT-5565 - Fixing theme colors not updating * PLT-4721 - Removing status ind for system messages * PLT-5735 - Fixing ellipsis in firefox * PLT-5010 - Removing extra space in channel modal * PLT-5584 - Inline image overrning edit textarea * PLT-5475 - Fixing tutorials on mobile * PLT-5142 - Disabling poitner events for status * PLT-5728 - Fixing emoji highlight on hover --- webapp/sass/components/_modal.scss | 2 +- webapp/sass/components/_multi-select.scss | 1 - webapp/sass/layout/_post.scss | 9 ++++++++- webapp/sass/responsive/_mobile.scss | 3 +++ 4 files changed, 12 insertions(+), 3 deletions(-) (limited to 'webapp/sass') diff --git a/webapp/sass/components/_modal.scss b/webapp/sass/components/_modal.scss index 03a8ad1e8..93bd9fda4 100644 --- a/webapp/sass/components/_modal.scss +++ b/webapp/sass/components/_modal.scss @@ -566,7 +566,7 @@ .more-modal__actions { flex-grow: 0; flex-shrink: 0; - margin: 5px 0 10px; + margin: 5px 0; padding-left: 20px; } diff --git a/webapp/sass/components/_multi-select.scss b/webapp/sass/components/_multi-select.scss index a33116aa4..beceb7b9c 100644 --- a/webapp/sass/components/_multi-select.scss +++ b/webapp/sass/components/_multi-select.scss @@ -29,7 +29,6 @@ .Select-value-label { overflow: hidden; - text-overflow: ellipsis; } } diff --git a/webapp/sass/layout/_post.scss b/webapp/sass/layout/_post.scss index de45eedd5..69cbbd712 100644 --- a/webapp/sass/layout/_post.scss +++ b/webapp/sass/layout/_post.scss @@ -3,7 +3,7 @@ .custom-textarea { background: transparent; border: 1px solid #cccccc; - height: auto; + height: 100%; line-height: 20px; min-height: 36px; overflow-x: hidden; @@ -576,6 +576,12 @@ } } + &.post--system { + .status { + visibility: hidden; + } + } + .post__img { padding-top: 0; } @@ -583,6 +589,7 @@ .status-wrapper { cursor: auto; height: 14px; + pointer-events: none; .status { bottom: auto; diff --git a/webapp/sass/responsive/_mobile.scss b/webapp/sass/responsive/_mobile.scss index 37c91846e..f31b325f6 100644 --- a/webapp/sass/responsive/_mobile.scss +++ b/webapp/sass/responsive/_mobile.scss @@ -9,6 +9,7 @@ .Select-value-label { max-width: 190px; + text-overflow: ellipsis; } } @@ -1622,6 +1623,7 @@ } } } + .attachment { .attachment__image { &.attachment__image--openraph { @@ -1635,6 +1637,7 @@ left: 0; position: fixed; top: 0; + z-index: 9999; .tutorial__content { .tutorial__steps { -- cgit v1.2.3-1-g7c22 From afbe5bab1182af8f58da2c33970b7c88f9a55927 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Wed, 8 Mar 2017 14:16:18 +0500 Subject: Bug fixes (#5682) * PLT-5740 - Fixing overlapping attachment icon * PLT-5748 - Scroll not visible in RHS IE11 --- webapp/sass/layout/_post.scss | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'webapp/sass') diff --git a/webapp/sass/layout/_post.scss b/webapp/sass/layout/_post.scss index 69cbbd712..5ecd50468 100644 --- a/webapp/sass/layout/_post.scss +++ b/webapp/sass/layout/_post.scss @@ -359,6 +359,10 @@ } .post-create__container { + .custom-textarea { + overflow: hidden; + } + form { margin: 0 auto; padding: .5em 15px 0; @@ -376,6 +380,8 @@ } .custom-textarea { + -ms-overflow-style: auto; + overflow: auto; padding-right: 43px; } } @@ -523,6 +529,7 @@ .col__reply { min-width: 0; } + .dropdown { margin-right: 0; } -- cgit v1.2.3-1-g7c22 From 6ff46f30509819d518799561f66358dcd1ec4230 Mon Sep 17 00:00:00 2001 From: Asaad Mahmood Date: Thu, 9 Mar 2017 20:05:11 +0500 Subject: Multiple bug fixes (#5699) * Multiple bug fixes * Fixing modal on mobile --- webapp/sass/layout/_markdown.scss | 7 ++++--- webapp/sass/responsive/_mobile.scss | 7 +++++++ webapp/sass/routes/_signup.scss | 3 ++- 3 files changed, 13 insertions(+), 4 deletions(-) (limited to 'webapp/sass') diff --git a/webapp/sass/layout/_markdown.scss b/webapp/sass/layout/_markdown.scss index e6ab35f8a..1f8ea041e 100644 --- a/webapp/sass/layout/_markdown.scss +++ b/webapp/sass/layout/_markdown.scss @@ -51,6 +51,7 @@ .hljs { position: relative; + visibility: visible; } } @@ -163,11 +164,11 @@ code { } .hljs { + background: #f8f8f8; + color: #333; display: block; overflow-x: auto; padding: 0.5em; - color: #333; - background: #f8f8f8; } .container { @@ -175,7 +176,7 @@ code { } .links { - margin-top: 30px; font-size: 1.2em; + margin-top: 30px; } } \ No newline at end of file diff --git a/webapp/sass/responsive/_mobile.scss b/webapp/sass/responsive/_mobile.scss index f31b325f6..891b0ed48 100644 --- a/webapp/sass/responsive/_mobile.scss +++ b/webapp/sass/responsive/_mobile.scss @@ -550,6 +550,13 @@ } .modal { + .modal--scroll { + .modal-body { + max-height: calc(100vh - 62px); + overflow: auto; + } + } + .nav-pills { > li { &.active { diff --git a/webapp/sass/routes/_signup.scss b/webapp/sass/routes/_signup.scss index c73c32656..13ee95e76 100644 --- a/webapp/sass/routes/_signup.scss +++ b/webapp/sass/routes/_signup.scss @@ -450,6 +450,7 @@ .signup-team-dir { background: #fafafa; border-top: 1px solid #d5d5d5; + overflow: hidden; &:first-child { border: none; @@ -458,7 +459,7 @@ .icon { cursor: pointer; float: left; - margin: 18px 7px 0 15px; + margin: 16px 7px 0 15px; opacity: .45; svg { -- cgit v1.2.3-1-g7c22