diff options
| author | Asaad Mahmood <asaadmahmood@users.noreply.github.com> | 2017-05-04 23:25:12 +0500 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2017-05-04 14:25:12 -0400 |
| commit | 72351c8ef8557c83b130568724fc2d6ff3acd454 (patch) | |
| tree | 3194b5c6f9c2be53235bfb2cc74b72b497a8b718 | |
| parent | 4f074fed0d653a28779ac586e418341232d43e95 (diff) | |
| download | chat-72351c8ef8557c83b130568724fc2d6ff3acd454.tar.gz chat-72351c8ef8557c83b130568724fc2d6ff3acd454.tar.bz2 chat-72351c8ef8557c83b130568724fc2d6ff3acd454.zip | |
PLT-6297 - Pinned label overlapping on heading (#6324)
* PLT-6297 - Pinned label overlapping on heading
* PLT-6500 - Fixing mention badge styling
| -rw-r--r-- | webapp/sass/layout/_post.scss | 18 | ||||
| -rw-r--r-- | webapp/utils/utils.jsx | 8 |
2 files changed, 22 insertions, 4 deletions
diff --git a/webapp/sass/layout/_post.scss b/webapp/sass/layout/_post.scss index 5f308fbd7..4985e3cba 100644 --- a/webapp/sass/layout/_post.scss +++ b/webapp/sass/layout/_post.scss @@ -904,6 +904,24 @@ } &.same--root { + &.post--pinned { + h1, + h2 { + &:first-child { + margin-top: 15px; + } + } + + h3, + h4, + h5, + h6 { + &:first-child { + margin-top: 20px; + } + } + } + &.same--user { padding: 0 .5em 0 1em; diff --git a/webapp/utils/utils.jsx b/webapp/utils/utils.jsx index f56b9bb09..9e5d23252 100644 --- a/webapp/utils/utils.jsx +++ b/webapp/utils/utils.jsx @@ -558,14 +558,14 @@ export function applyTheme(theme) { if (theme.mentionBj) { changeCss('.sidebar--left .nav-pills__unread-indicator, .app__body .new-messages__button div', 'background:' + theme.mentionBj); - changeCss('.sidebar--left .badge', 'background:' + theme.mentionBj); - changeCss('.multi-teams .team-sidebar .team-wrapper .team-container .team-btn .badge', 'background:' + theme.mentionBj); + changeCss('.sidebar--left .badge', 'background:' + theme.mentionBj + ' !important'); + changeCss('.multi-teams .team-sidebar .team-wrapper .team-container .team-btn .badge', 'background:' + theme.mentionBj + ' !important'); } if (theme.mentionColor) { changeCss('.app__body .sidebar--left .nav-pills__unread-indicator, .app__body .new-messages__button div', 'color:' + theme.mentionColor); - changeCss('.app__body .sidebar--left .badge', 'color:' + theme.mentionColor); - changeCss('.app__body .multi-teams .team-sidebar .team-wrapper .team-container .team-btn .badge', 'color:' + theme.mentionColor); + changeCss('.app__body .sidebar--left .badge', 'color:' + theme.mentionColor + ' !important'); + changeCss('.app__body .multi-teams .team-sidebar .team-wrapper .team-container .team-btn .badge', 'color:' + theme.mentionColor + ' !important'); } if (theme.centerChannelBg) { |