diff options
author | Asaad Mahmood <asaadmahmood@users.noreply.github.com> | 2017-03-30 06:07:39 +0500 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2017-03-29 21:07:39 -0400 |
commit | 6d6b8134462d9e718f21e76f9c47f73604574c9b (patch) | |
tree | e27994e586d238ca72f8a8b7b932ae264e65832d /webapp/sass/layout | |
parent | 8b868828bfe769e65bdda49091be2161b19d5ceb (diff) | |
download | chat-6d6b8134462d9e718f21e76f9c47f73604574c9b.tar.gz chat-6d6b8134462d9e718f21e76f9c47f73604574c9b.tar.bz2 chat-6d6b8134462d9e718f21e76f9c47f73604574c9b.zip |
Ui ifxes (#5890)
* PLT-5975 - Back arrow in flag list cutting off
* PLT-6049 - Fixing pin icon color, and hover state
* PLT-5989 - Channel member and pin icon issue
* PLT-6067 - Pinned icon misaligned in firefox
* PLT-5885 - Adjusting icon spacing in modal
Diffstat (limited to 'webapp/sass/layout')
-rw-r--r-- | webapp/sass/layout/_content.scss | 18 | ||||
-rw-r--r-- | webapp/sass/layout/_headers.scss | 1 | ||||
-rw-r--r-- | webapp/sass/layout/_sidebar-right.scss | 4 |
3 files changed, 15 insertions, 8 deletions
diff --git a/webapp/sass/layout/_content.scss b/webapp/sass/layout/_content.scss index b6fe98eb4..b42818930 100644 --- a/webapp/sass/layout/_content.scss +++ b/webapp/sass/layout/_content.scss @@ -6,9 +6,11 @@ .search-bar__container { display: none; } + .search-btns { display: none; } + .header-list__right { // the negative margin-right is used // to prevent the icons in the header from @@ -17,12 +19,11 @@ // the below z-index is used to ensure the icons // stays on the top and don't get hidden by the // search's input block - position: relative; - z-index: 6; - + float: right; margin-right: -18px; padding-right: 0px !important; - float: right; + position: relative; + z-index: 6; } } @@ -30,9 +31,11 @@ .search-bar__container { display: none; } + .search-btns { display: none; } + .header-list__right { // the negative margin-right is used // to prevent the icons in the header from @@ -41,12 +44,11 @@ // the below z-index is used to ensure the icons // stays on the top and don't get hidden by the // search's input block - position: relative; - z-index: 6; - + float: right; margin-right: -18px; padding-right: 0px !important; - float: right + position: relative; + z-index: 6; } } } diff --git a/webapp/sass/layout/_headers.scss b/webapp/sass/layout/_headers.scss index f8211d433..4368fc397 100644 --- a/webapp/sass/layout/_headers.scss +++ b/webapp/sass/layout/_headers.scss @@ -44,6 +44,7 @@ font-weight: normal !important; &.header-list__right { + white-space: nowrap; padding-right: 4px; } } diff --git a/webapp/sass/layout/_sidebar-right.scss b/webapp/sass/layout/_sidebar-right.scss index 8d5a1d044..8d801a0c2 100644 --- a/webapp/sass/layout/_sidebar-right.scss +++ b/webapp/sass/layout/_sidebar-right.scss @@ -14,6 +14,10 @@ z-index: 5; } + &.sidebar--right--expanded { + z-index: 10; + } + .sidebar--right__bg { @include single-transition(background-color, .5s, ease); background-color: alpha-color($black, 0); |