diff options
Diffstat (limited to 'webapp/components')
| -rw-r--r-- | webapp/components/center_panel.jsx | 5 | ||||
| -rw-r--r-- | webapp/components/more_channels.jsx | 2 | ||||
| -rw-r--r-- | webapp/components/new_channel_modal.jsx | 2 | ||||
| -rw-r--r-- | webapp/components/popover_list_members.jsx | 1 | ||||
| -rw-r--r-- | webapp/components/user_settings/user_settings_security.jsx | 42 | ||||
| -rw-r--r-- | webapp/components/view_image.jsx | 6 |
6 files changed, 34 insertions, 24 deletions
diff --git a/webapp/components/center_panel.jsx b/webapp/components/center_panel.jsx index 17e5e43d9..6c156f2a8 100644 --- a/webapp/components/center_panel.jsx +++ b/webapp/components/center_panel.jsx @@ -120,7 +120,10 @@ export default class CenterPanel extends React.Component { id='app-content' className='app__content' > - <div id='channel-header'> + <div + id='channel-header' + className='channel-header' + > <ChannelHeader user={this.state.user} /> diff --git a/webapp/components/more_channels.jsx b/webapp/components/more_channels.jsx index fc047eaff..d0eeec1ef 100644 --- a/webapp/components/more_channels.jsx +++ b/webapp/components/more_channels.jsx @@ -160,7 +160,7 @@ export default class MoreChannels extends React.Component { return ( <div - className='modal fade' + className='modal fade more-channel__modal' id='more_channels' ref='modal' tabIndex='-1' diff --git a/webapp/components/new_channel_modal.jsx b/webapp/components/new_channel_modal.jsx index 628687f27..f69eeed49 100644 --- a/webapp/components/new_channel_modal.jsx +++ b/webapp/components/new_channel_modal.jsx @@ -38,7 +38,7 @@ class NewChannelModal extends React.Component { } componentDidMount() { if (Utils.isBrowserIE()) { - $('body').addClass('browser--IE'); + $('body').addClass('browser--ie'); } } handleSubmit(e) { diff --git a/webapp/components/popover_list_members.jsx b/webapp/components/popover_list_members.jsx index 81760eb6e..7d048019c 100644 --- a/webapp/components/popover_list_members.jsx +++ b/webapp/components/popover_list_members.jsx @@ -158,6 +158,7 @@ export default class PopoverListMembers extends React.Component { <Popover ref='memebersPopover' title={title} + className='member-list__popover' id='member-list-popover' > <div className='more-modal__list'>{popoverHtml}</div> diff --git a/webapp/components/user_settings/user_settings_security.jsx b/webapp/components/user_settings/user_settings_security.jsx index 8688c7f2f..e42de91ea 100644 --- a/webapp/components/user_settings/user_settings_security.jsx +++ b/webapp/components/user_settings/user_settings_security.jsx @@ -221,24 +221,30 @@ class SecurityTab extends React.Component { var d = new Date(this.props.user.last_password_update); const hours12 = !Utils.isMilitaryTime(); - describe = formatMessage(holders.lastUpdated, { - date: ( - <FormattedDate - value={d} - day='2-digit' - month='short' - year='numeric' - /> - ), - time: ( - <FormattedTime - value={d} - hour12={hours12} - hour='2-digit' - minute='2-digit' - /> - ) - }); + describe = ( + <FormattedMessage + id='user.settings.security.lastUpdated' + defaultMessage='Last updated {date} at {time}' + values={{ + date: ( + <FormattedDate + value={d} + day='2-digit' + month='short' + year='numeric' + /> + ), + time: ( + <FormattedTime + value={d} + hour12={hours12} + hour='2-digit' + minute='2-digit' + /> + ) + }} + /> + ); updateSectionStatus = function updateSection() { this.props.updateSection('password'); diff --git a/webapp/components/view_image.jsx b/webapp/components/view_image.jsx index e739fca30..2b7e03382 100644 --- a/webapp/components/view_image.jsx +++ b/webapp/components/view_image.jsx @@ -311,15 +311,15 @@ class ViewImageModal extends React.Component { <Modal show={this.props.show} onHide={this.props.onModalDismissed} - className='image_modal' + className='modal-image' dialogClassName='modal-image' > <Modal.Body - modalClassName='image-body' + modalClassName='modal-image__body' onClick={this.props.onModalDismissed} > <div - className={'image-wrapper'} + className={'modal-image__wrapper'} onClick={this.props.onModalDismissed} > <div |