diff options
Diffstat (limited to 'webapp/components/user_settings')
| -rw-r--r-- | webapp/components/user_settings/premade_theme_chooser.jsx | 26 | ||||
| -rw-r--r-- | webapp/components/user_settings/user_settings_display.jsx | 10 |
2 files changed, 20 insertions, 16 deletions
diff --git a/webapp/components/user_settings/premade_theme_chooser.jsx b/webapp/components/user_settings/premade_theme_chooser.jsx index 7ccc76d7a..4b0faf865 100644 --- a/webapp/components/user_settings/premade_theme_chooser.jsx +++ b/webapp/components/user_settings/premade_theme_chooser.jsx @@ -51,17 +51,21 @@ export default class PremadeThemeChooser extends React.Component { return ( <div className='row appearance-section'> - {premadeThemes} - <div className='col-sm-12 padding-bottom x2'> - <a - href='http://docs.mattermost.com/help/settings/theme-colors.html#custom-theme-examples' - target='_blank' - > - <FormattedMessage - id='user.settings.display.theme.otherThemes' - defaultMessage='See other themes' - /> - </a> + <div className='clearfix'> + {premadeThemes} + </div> + <div className='clearfix'> + <div className='col-sm-12 padding-bottom x2'> + <a + href='http://docs.mattermost.com/help/settings/theme-colors.html#custom-theme-examples' + target='_blank' + > + <FormattedMessage + id='user.settings.display.theme.otherThemes' + defaultMessage='See other themes' + /> + </a> + </div> </div> </div> ); diff --git a/webapp/components/user_settings/user_settings_display.jsx b/webapp/components/user_settings/user_settings_display.jsx index 481cde9a5..c4af57d4c 100644 --- a/webapp/components/user_settings/user_settings_display.jsx +++ b/webapp/components/user_settings/user_settings_display.jsx @@ -369,7 +369,7 @@ export default class UserSettingsDisplay extends React.Component { /> <FormattedMessage id='user.settings.display.fixedWidthCentered' - defaultMessage='Fixed with, centered' + defaultMessage='Fixed width, centered' /> </label> <br/> @@ -383,7 +383,7 @@ export default class UserSettingsDisplay extends React.Component { /> <FormattedMessage id='user.settings.display.fullScreen' - defaultMessage='Full screen' + defaultMessage='Full width' /> </label> <br/> @@ -392,7 +392,7 @@ export default class UserSettingsDisplay extends React.Component { <br/> <FormattedMessage id='user.settings.display.channeldisplaymode' - defaultMessage='How to display channels.' + defaultMessage='Select how text in a channel is displayed.' /> </div> </div> @@ -421,14 +421,14 @@ export default class UserSettingsDisplay extends React.Component { describe = ( <FormattedMessage id='user.settings.display.fixedWidthCentered' - defaultMessage='Fixed with, centered' + defaultMessage='Fixed width, centered' /> ); } else { describe = ( <FormattedMessage id='user.settings.display.fullScreen' - defaultMessage='Full screen' + defaultMessage='Full width' /> ); } |