diff options
author | Harrison Healey <harrisonmhealey@gmail.com> | 2015-08-20 11:33:29 -0400 |
---|---|---|
committer | Harrison Healey <harrisonmhealey@gmail.com> | 2015-08-20 11:33:29 -0400 |
commit | 4fafac5225d85c603140df261ab1535a63e918b6 (patch) | |
tree | cce82d70d9a11c7f37e9839adff54d8622610894 /web/react/components/post_list.jsx | |
parent | 47bff0ac16b69f2d28102420ced1d8f59773a88b (diff) | |
parent | 1fd26d25f291cae2d93bb5aac3448e76a3200646 (diff) | |
download | chat-4fafac5225d85c603140df261ab1535a63e918b6.tar.gz chat-4fafac5225d85c603140df261ab1535a63e918b6.tar.bz2 chat-4fafac5225d85c603140df261ab1535a63e918b6.zip |
Merge pull request #416 from asaadmahmoodspin/ui-changes
Multiple UI Improvements
Diffstat (limited to 'web/react/components/post_list.jsx')
-rw-r--r-- | web/react/components/post_list.jsx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/web/react/components/post_list.jsx b/web/react/components/post_list.jsx index 8b60f0251..67a69985f 100644 --- a/web/react/components/post_list.jsx +++ b/web/react/components/post_list.jsx @@ -75,6 +75,7 @@ module.exports = React.createClass({ utils.changeCss('.mention-link', 'color: ' + user.props.theme + ';'); utils.changeCss('@media(max-width: 768px){.search-bar__container', 'background: ' + user.props.theme + ';}'); utils.changeCss('.search-item-container:hover', 'background: ' + utils.changeOpacity(user.props.theme, 0.05) + ';'); + utils.changeCss('.nav-pills__unread-indicator', 'background: ' + utils.changeOpacity(user.props.theme, 0.05) + ';'); } if (user.props.theme !== '#000000' && user.props.theme !== '#585858') { @@ -377,8 +378,8 @@ module.exports = React.createClass({ <strong><UserProfile userId={teammate.id} /></strong> </div> <p className='channel-intro-text'> - {'This is the start of your private message history with ' + teammateName + '.'}<br/> - {'Private messages and files shared here are not shown to people outside this area.'} + This is the start of your private message history with <strong>{teammateName}</strong>.<br/> + Private messages and files shared here are not shown to people outside this area. </p> <a className='intro-links' href='#' style={userStyle} data-toggle='modal' data-target='#edit_channel' data-desc={channel.description} data-title={channel.display_name} data-channelid={channel.id}><i className='fa fa-pencil'></i>Set a description</a> </div> @@ -416,9 +417,9 @@ module.exports = React.createClass({ <div className='channel-intro'> <h4 className='channel-intro__title'>Beginning of {uiName}</h4> <p className='channel-intro__content'> - Welcome to {uiName}! + Welcome to <strong>{uiName}</strong>! <br/><br/> - {'This is the first channel ' + strings.Team + 'mates see when they'} + This is the first channel {strings.Team} mates see when they <br/> sign up - use it for posting updates everyone needs to know. <br/><br/> @@ -434,7 +435,7 @@ module.exports = React.createClass({ <div className='channel-intro'> <h4 className='channel-intro__title'>Beginning of {uiName}</h4> <p className='channel-intro__content'> - {'This is the start of ' + uiName + ', a channel for non-work-related conversations.'} + This is the start of <strong>{uiName}</strong>, a channel for non-work-related conversations. <br/> </p> <a className='intro-links' href='#' style={userStyle} data-toggle='modal' data-target='#edit_channel' data-desc={channel.description} data-title={uiName} data-channelid={channel.id}><i className='fa fa-pencil'></i>Set a description</a> @@ -453,7 +454,7 @@ module.exports = React.createClass({ var createMessage; if (creatorName !== '') { - createMessage = 'This is the start of the ' + uiName + ' ' + uiType + ', created by ' + creatorName + ' on ' + utils.displayDate(channel.create_at) + '.'; + createMessage = (<span>This is the start of the <strong>{uiName}</strong> {uiType} created by <strong>{creatorName}</strong> on <strong>{utils.displayDate(channel.create_at)}</strong></span>); } else { createMessage = 'This is the start of the ' + uiName + ' ' + uiType + ', created on ' + utils.displayDate(channel.create_at) + '.'; } |