diff options
Diffstat (limited to 'webapp/components')
-rw-r--r-- | webapp/components/analytics/system_analytics.jsx | 24 | ||||
-rw-r--r-- | webapp/components/rhs_comment.jsx | 2 | ||||
-rw-r--r-- | webapp/components/select_team/components/select_team_item.jsx | 7 |
3 files changed, 20 insertions, 13 deletions
diff --git a/webapp/components/analytics/system_analytics.jsx b/webapp/components/analytics/system_analytics.jsx index 89cc98f0b..a3517899a 100644 --- a/webapp/components/analytics/system_analytics.jsx +++ b/webapp/components/analytics/system_analytics.jsx @@ -217,7 +217,7 @@ class SystemAnalytics extends React.Component { ); advancedStats = ( - <div className='row'> + <div> <StatisticCount title={ <FormattedMessage @@ -388,7 +388,7 @@ class SystemAnalytics extends React.Component { let secondRow; if (isLicensed && skippedIntensiveQueries) { firstRow = ( - <div className='row'> + <div> {userCount} {teamCount} {channelCount} @@ -397,7 +397,7 @@ class SystemAnalytics extends React.Component { ); secondRow = ( - <div className='row'> + <div> {commandCount} {incomingCount} {outgoingCount} @@ -405,7 +405,7 @@ class SystemAnalytics extends React.Component { ); } else if (isLicensed && !skippedIntensiveQueries) { firstRow = ( - <div className='row'> + <div> {userCount} {teamCount} {channelCount} @@ -414,7 +414,7 @@ class SystemAnalytics extends React.Component { ); secondRow = ( - <div className='row'> + <div> {sessionCount} {commandCount} {incomingCount} @@ -423,7 +423,7 @@ class SystemAnalytics extends React.Component { ); } else if (!isLicensed) { firstRow = ( - <div className='row'> + <div> {userCount} {teamCount} {channelCount} @@ -433,7 +433,7 @@ class SystemAnalytics extends React.Component { } const thirdRow = ( - <div className='row'> + <div> {dailyActiveUsers} {monthlyActiveUsers} </div> @@ -448,10 +448,12 @@ class SystemAnalytics extends React.Component { /> </h3> {banner} - {firstRow} - {secondRow} - {thirdRow} - {advancedStats} + <div className='row'> + {firstRow} + {secondRow} + {thirdRow} + {advancedStats} + </div> {advancedGraphs} {postTotalGraph} {activeUserGraph} diff --git a/webapp/components/rhs_comment.jsx b/webapp/components/rhs_comment.jsx index 67fd394b9..cb527d850 100644 --- a/webapp/components/rhs_comment.jsx +++ b/webapp/components/rhs_comment.jsx @@ -286,7 +286,7 @@ export default class RhsComment extends React.Component { const isSystemMessage = PostUtils.isSystemMessage(post); var currentUserCss = ''; - if (this.props.currentUser === post.user_id) { + if (this.props.currentUser.id === post.user_id) { currentUserCss = 'current--user'; } diff --git a/webapp/components/select_team/components/select_team_item.jsx b/webapp/components/select_team/components/select_team_item.jsx index c6943722d..bff9e28d8 100644 --- a/webapp/components/select_team/components/select_team_item.jsx +++ b/webapp/components/select_team/components/select_team_item.jsx @@ -5,6 +5,7 @@ import React from 'react'; import {Link} from 'react-router/es6'; import {Tooltip, OverlayTrigger} from 'react-bootstrap'; +import {Constants} from 'utils/constants.jsx'; export default class SelectTeamItem extends React.Component { static propTypes = { @@ -26,6 +27,7 @@ export default class SelectTeamItem extends React.Component { render() { let icon; + const infoIcon = Constants.TEAM_INFO_SVG; if (this.props.loading) { icon = ( <span className='fa fa-refresh fa-spin right signup-team__icon'/> @@ -53,7 +55,10 @@ export default class SelectTeamItem extends React.Component { overlay={descriptionTooltip} ref='descriptionOverlay' > - <span className='fa fa-info-circle signup-team__icon'/> + <span + className='icon icon--info' + dangerouslySetInnerHTML={{__html: infoIcon}} + /> </OverlayTrigger> ); } |