From 96f089d48665c2e393944ed6f6b841e0a07f8a4b Mon Sep 17 00:00:00 2001 From: Rodrigo Nascimento Date: Wed, 13 Apr 2016 10:39:02 -0300 Subject: [PATCH] Use different color for mentions "all" --- packages/rocketchat-mentions/client.coffee | 2 +- .../assets/stylesheets/base.less | 24 +++++++++++++------ packages/rocketchat-ui/lib/RoomManager.coffee | 6 +++-- 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/packages/rocketchat-mentions/client.coffee b/packages/rocketchat-mentions/client.coffee index bf1c700fa63e..7150ebbc81d2 100644 --- a/packages/rocketchat-mentions/client.coffee +++ b/packages/rocketchat-mentions/client.coffee @@ -21,7 +21,7 @@ class MentionsClient mentions = mentions.join('|') msg = msg.replace new RegExp("(?:^|\\s|\\n)(@(#{mentions}):?)[:.,\s]?", 'g'), (match, mention, username) -> if username is 'all' - return match.replace mention, "#{mention}" + return match.replace mention, "#{mention}" if not message.temp? if not _.findWhere(message.mentions, {username: username})? diff --git a/packages/rocketchat-theme/assets/stylesheets/base.less b/packages/rocketchat-theme/assets/stylesheets/base.less index e1b70e310dcb..4896afc15751 100644 --- a/packages/rocketchat-theme/assets/stylesheets/base.less +++ b/packages/rocketchat-theme/assets/stylesheets/base.less @@ -2471,6 +2471,10 @@ a.github-fork { width: 100%; top: 50%; position: absolute; + border-radius: 2px; + } + .tick-all { + background-color: #9C27B0; } } @@ -3774,14 +3778,20 @@ body:not(.is-cordova) { position: fixed; } -.mention-link.mention-link-me { - background-color: #008ce3; - border-radius: 4px; - padding: 0px 4px 2px 4px; - font-weight: bold; - color: white; - &:hover { +.mention-link { + &.mention-link-me, &.mention-link-all { + background-color: #008ce3; + border-radius: 4px; + padding: 0px 4px 2px 4px; + font-weight: bold; color: white; + &:hover { + color: white; + } + + &.mention-link-all { + background-color: #9C27B0; + } } } diff --git a/packages/rocketchat-ui/lib/RoomManager.coffee b/packages/rocketchat-ui/lib/RoomManager.coffee index 1caa5b2a0f5c..a1a8172be026 100644 --- a/packages/rocketchat-ui/lib/RoomManager.coffee +++ b/packages/rocketchat-ui/lib/RoomManager.coffee @@ -240,8 +240,10 @@ RocketChat.Notifications.onUser 'message', (msg) -> $('.messages-box .mention-link-me').each (index, item) -> topOffset = $(item).offset().top + scrollTop percent = 100 / totalHeight * topOffset - ticksBar.append('
') - + if $(item).hasClass('mention-link-all') + ticksBar.append('
') + else + ticksBar.append('
') open: open close: close