summaryrefslogtreecommitdiffstats
path: root/webapp/components/suggestion
diff options
context:
space:
mode:
authorAsaad Mahmood <asaadmahmood@users.noreply.github.com>2017-07-06 18:07:43 +0500
committerJoram Wilander <jwawilander@gmail.com>2017-07-06 09:07:43 -0400
commitd64d1f4029505f48bb86035a557e2f4229e55443 (patch)
treeeb71e96007d21f96ecc4957f802cb2302748ad4f /webapp/components/suggestion
parent97cfe62309d7f94a2ea041bc04a7ff25cb1c91fd (diff)
downloadchat-d64d1f4029505f48bb86035a557e2f4229e55443.tar.gz
chat-d64d1f4029505f48bb86035a557e2f4229e55443.tar.bz2
chat-d64d1f4029505f48bb86035a557e2f4229e55443.zip
PLT-6905 - Updating channel header design (#6789)
* PLT-6905 - Updating channel header design * Updating border-radius * Updating radius for wide icons * Updating trigger for overlay * Updating UI for channel header * Updating channel header sizing * Updating channel header css * Updating sidebar css * Updating status icons * Adjusting border * Updating comment * Removing type from status icon * Fixing UI issues for the channel header/sidebar * make "Add a channel description" open the channel header modal * Updating status and opacity * Updating stauts icon positioning * Updating description and heading size * Updating UI changes * Updating UI changes * add a focused class to the parent div .search__form and then remove when hover away * Fix active state for pinned posts icon * Updating UI changes * Update channel header text
Diffstat (limited to 'webapp/components/suggestion')
-rw-r--r--webapp/components/suggestion/switch_channel_provider.jsx16
1 files changed, 14 insertions, 2 deletions
diff --git a/webapp/components/suggestion/switch_channel_provider.jsx b/webapp/components/suggestion/switch_channel_provider.jsx
index 346721cd6..ba060d924 100644
--- a/webapp/components/suggestion/switch_channel_provider.jsx
+++ b/webapp/components/suggestion/switch_channel_provider.jsx
@@ -26,6 +26,8 @@ class SwitchChannelSuggestion extends Suggestion {
render() {
const {item, isSelection} = this.props;
const channel = item.channel;
+ const globeIcon = Constants.GLOBE_ICON_SVG;
+ const lockIcon = Constants.LOCK_ICON_SVG;
let className = 'mentions__name';
if (isSelection) {
@@ -35,9 +37,19 @@ class SwitchChannelSuggestion extends Suggestion {
let displayName = channel.display_name;
let icon = null;
if (channel.type === Constants.OPEN_CHANNEL) {
- icon = <div className='status'><i className='fa fa-globe'/></div>;
+ icon = (
+ <span
+ className='icon icon__globe icon--body'
+ dangerouslySetInnerHTML={{__html: globeIcon}}
+ />
+ );
} else if (channel.type === Constants.PRIVATE_CHANNEL) {
- icon = <div className='status'><i className='fa fa-lock'/></div>;
+ icon = (
+ <span
+ className='icon icon__lock icon--body'
+ dangerouslySetInnerHTML={{__html: lockIcon}}
+ />
+ );
} else if (channel.type === Constants.GM_CHANNEL) {
displayName = getChannelDisplayName(channel);
icon = <div className='status status--group'>{'G'}</div>;