diff options
Diffstat (limited to 'webapp/components')
-rw-r--r-- | webapp/components/navbar_dropdown.jsx | 5 | ||||
-rw-r--r-- | webapp/components/post.jsx | 27 | ||||
-rw-r--r-- | webapp/components/rhs_thread.jsx | 9 | ||||
-rw-r--r-- | webapp/components/team_general_tab.jsx | 6 |
4 files changed, 25 insertions, 22 deletions
diff --git a/webapp/components/navbar_dropdown.jsx b/webapp/components/navbar_dropdown.jsx index 68ea625f8..a2592787c 100644 --- a/webapp/components/navbar_dropdown.jsx +++ b/webapp/components/navbar_dropdown.jsx @@ -80,7 +80,6 @@ export default class NavbarDropdown extends React.Component { var inviteLink = ''; var manageLink = ''; var sysAdminLink = ''; - var adminDivider = ''; var currentUser = this.props.currentUser; var isAdmin = false; var isSystemAdmin = false; @@ -134,8 +133,6 @@ export default class NavbarDropdown extends React.Component { </li> ); - adminDivider = (<li className='divider'></li>); - teamSettings = ( <li> <a @@ -312,7 +309,7 @@ export default class NavbarDropdown extends React.Component { /> </a> </li> - {adminDivider} + <li className='divider'></li> {teamSettings} {integrationsLink} {manageLink} diff --git a/webapp/components/post.jsx b/webapp/components/post.jsx index de32568d1..084fb9171 100644 --- a/webapp/components/post.jsx +++ b/webapp/components/post.jsx @@ -191,24 +191,21 @@ export default class Post extends React.Component { systemMessageClass = 'post--system'; } - let profilePic = null; - if (!this.props.hideProfilePic || this.props.compactDisplay) { + let profilePic = ( + <img + src={Utils.getProfilePicSrcForPost(post, timestamp)} + height='36' + width='36' + /> + ); + + if (Utils.isSystemMessage(post)) { profilePic = ( - <img - src={Utils.getProfilePicSrcForPost(post, timestamp)} - height='36' - width='36' + <span + className='icon' + dangerouslySetInnerHTML={{__html: mattermostLogo}} /> ); - - if (Utils.isSystemMessage(post)) { - profilePic = ( - <span - className='icon' - dangerouslySetInnerHTML={{__html: mattermostLogo}} - /> - ); - } } let centerClass = ''; diff --git a/webapp/components/rhs_thread.jsx b/webapp/components/rhs_thread.jsx index 2398e5e69..ca5ed2dc8 100644 --- a/webapp/components/rhs_thread.jsx +++ b/webapp/components/rhs_thread.jsx @@ -17,6 +17,14 @@ import Scrollbars from 'react-custom-scrollbars'; import React from 'react'; +export function renderView(props) { + return ( + <div + {...props} + className='scrollbar--view' + />); +} + export function renderThumbHorizontal(props) { return ( <div @@ -211,6 +219,7 @@ export default class RhsThread extends React.Component { autoHideDuration={500} renderThumbHorizontal={renderThumbHorizontal} renderThumbVertical={renderThumbVertical} + renderView={renderView} > <div className='post-right__scroll'> <RootPost diff --git a/webapp/components/team_general_tab.jsx b/webapp/components/team_general_tab.jsx index 9242fc03d..70d52740e 100644 --- a/webapp/components/team_general_tab.jsx +++ b/webapp/components/team_general_tab.jsx @@ -9,7 +9,7 @@ import Client from 'utils/web_client.jsx'; import * as Utils from 'utils/utils.jsx'; import TeamStore from 'stores/team_store.jsx'; -import {intlShape, injectIntl, defineMessages, FormattedMessage} from 'react-intl'; +import {intlShape, injectIntl, defineMessages, FormattedMessage, FormattedHTMLMessage} from 'react-intl'; const holders = defineMessages({ dirDisabled: { @@ -378,9 +378,9 @@ class GeneralTab extends React.Component { </div> </div> <div className='setting-list__hint'> - <FormattedMessage + <FormattedHTMLMessage id='general_tab.codeLongDesc' - defaultMessage='The Invite Code is used as part of the URL in the team invitation link created by **Get Team Invite Link** in the main menu. Regenerating creates a new team invitation link and invalidates the previous link.' + defaultMessage='The Invite Code is used as part of the URL in the team invitation link created by <strong>Get Team Invite Link</strong> in the main menu. Regenerating creates a new team invitation link and invalidates the previous link.' /> </div> </div> |