diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2017-05-19 12:19:04 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-19 12:19:04 -0400 |
| commit | 04cd7b1a89f63f10265e0dcfc95b6f67f164cf75 (patch) | |
| tree | 921a1fd1488dc972102ba577a7cdeeb8962c07dd /webapp/sass/components | |
| parent | c998fd4f52ba1d03e8fc0d7b39ced5202ce35dfc (diff) | |
| download | chat-04cd7b1a89f63f10265e0dcfc95b6f67f164cf75.tar.gz chat-04cd7b1a89f63f10265e0dcfc95b6f67f164cf75.tar.bz2 chat-04cd7b1a89f63f10265e0dcfc95b6f67f164cf75.zip | |
Merge 3.9 RC5 fixes into master (#6459)
* UI fixes for 3.9 (#6400)
* UI fixes for header icon alignment
* PLT-6569 - Fixing pin icon in header
* PLT-6505 - Updating z-index for emoji picker
* Updating z-index for overlaying sidebar
* PLT-6134 - Fix for emoji picker on comments
* Reverting emoji picker fix
* Fixing alignment for header icons
* Removing channel title changes
* Don't show mention badge for active channel (#6411)
* PLT-6583 - Fixing RHS compact view (#6413)
Diffstat (limited to 'webapp/sass/components')
| -rw-r--r-- | webapp/sass/components/_emoticons.scss | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/webapp/sass/components/_emoticons.scss b/webapp/sass/components/_emoticons.scss index ebbd222d9..210c8620b 100644 --- a/webapp/sass/components/_emoticons.scss +++ b/webapp/sass/components/_emoticons.scss @@ -143,15 +143,16 @@ } .emoji-picker { + @include user-select(none); + border-radius: 3px; + border: 1px solid; display: flex; flex-direction: column; - @include user-select(none); position: absolute; + right: 0; top: -361px; - right: 0px; width: 278px; - border: 1px solid; - border-radius: 3px; + z-index: 8; .emoji-picker__search-container { position: relative; |