PLT-3508/PLT-3516/PLT-3558/PLT-3570/PLT-3497 Multiple UI Improvements (#3553)

* PLT-3627 - Fixing spacing in RHS

* PLT-3516 - Fixing errors in backstage

* PLT-3558 - Fixing system console menu on small screens

* PLT-3570 - Fixing account settings sidebar truncating issue

* PLT-3497 - Moving see other themes link

* Removing formatted message import from premade theme chooser

webapp/components/emoji/components/add_emoji.jsx

@@ -277,7 +277,10 @@ export default class AddEmoji extends React.Component {
                         </div>
                         {preview}
                         <div className='backstage-form__footer'>
-                            <FormError error={this.state.error}/>
+                            <FormError
+                                type='backstage'
+                                error={this.state.error}
+                            />
                             <Link
                                 className='btn btn-sm'
                                 to={'/' + this.props.team.name + '/emoji'}

webapp/components/form_error.jsx

@@ -7,6 +7,7 @@ export default class FormError extends React.Component {
     static get propTypes() {
         // accepts either a single error or an array of errors
         return {
+            type: React.PropTypes.node,
             error: React.PropTypes.node,
             margin: React.PropTypes.node,
             errors: React.PropTypes.arrayOf(React.PropTypes.node)
@@ -40,6 +41,16 @@ export default class FormError extends React.Component {
             return null;
         }
 
+        if (this.props.type === 'backstage') {
+            return (
+                <div className='pull-left has-error'>
+                    <label className='control-label'>
+                        {message}
+                    </label>
+                </div>
+            );
+        }
+
         if (this.props.margin) {
             return (
                 <div className='form-group has-error'>

webapp/components/integrations/components/add_command.jsx

@@ -537,7 +537,10 @@ export default class AddCommand extends React.Component {
                         </div>
                         {autocompleteFields}
                         <div className='backstage-form__footer'>
-                            <FormError errors={[this.state.serverError, this.state.clientError]}/>
+                            <FormError
+                                type='backstage'
+                                errors={[this.state.serverError, this.state.clientError]}
+                            />
                             <Link
                                 className='btn btn-sm'
                                 to={'/' + this.props.team.name + '/integrations/commands'}

webapp/components/integrations/components/add_incoming_webhook.jsx

@@ -186,7 +186,10 @@ export default class AddIncomingWebhook extends React.Component {
                             </div>
                         </div>
                         <div className='backstage-form__footer'>
-                            <FormError errors={[this.state.serverError, this.state.clientError]}/>
+                            <FormError
+                                type='backstage'
+                                errors={[this.state.serverError, this.state.clientError]}
+                            />
                             <Link
                                 className='btn btn-sm'
                                 to={'/' + this.props.team.name + '/integrations/incoming_webhooks'}

webapp/components/integrations/components/add_outgoing_webhook.jsx

@@ -319,7 +319,10 @@ export default class AddOutgoingWebhook extends React.Component {
                             </div>
                         </div>
                         <div className='backstage-form__footer'>
-                            <FormError errors={[this.state.serverError, this.state.clientError]}/>
+                            <FormError
+                                type='backstage'
+                                errors={[this.state.serverError, this.state.clientError]}
+                            />
                             <Link
                                 className='btn btn-sm'
                                 to={'/' + this.props.team.name + '/integrations/outgoing_webhooks'}

webapp/components/user_settings/premade_theme_chooser.jsx

@@ -7,8 +7,6 @@ import Constants from 'utils/constants.jsx';
 
 import React from 'react';
 
-import {FormattedMessage} from 'react-intl';
-
 export default class PremadeThemeChooser extends React.Component {
     constructor(props) {
         super(props);
@@ -54,20 +52,6 @@ export default class PremadeThemeChooser extends React.Component {
                 <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'
-                            rel='noopener noreferrer'
-                        >
-                            <FormattedMessage
-                                id='user.settings.display.theme.otherThemes'
-                                defaultMessage='See other themes'
-                            />
-                        </a>
-                    </div>
-                </div>
             </div>
         );
     }

webapp/components/user_settings/user_settings_theme.jsx

@@ -257,8 +257,26 @@ export default class ThemeSetting extends React.Component {
             inputs.push(custom);
 
             inputs.push(
-                <div key='importSlackThemeButton'>
+                <div>
                     <br/>
+                    <a
+                        href='http://docs.mattermost.com/help/settings/theme-colors.html#custom-theme-examples'
+                        target='_blank'
+                        rel='noopener noreferrer'
+                    >
+                        <FormattedMessage
+                            id='user.settings.display.theme.otherThemes'
+                            defaultMessage='See other themes'
+                        />
+                    </a>
+                </div>
+            );
+
+            inputs.push(
+                <div
+                    key='importSlackThemeButton'
+                    className='padding-top'
+                >
                     <a
                         className='theme'
                         onClick={this.handleImportModal}