PLT-4344 - Guest account UI improvements

mattermost · Oct 4, 2016 · 82abc57 · 82abc57
1 parent 85b4db6
commit 82abc57
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 10 deletions.
diff --git a/webapp/components/invite_members/invite_members_view.jsx b/webapp/components/invite_members/invite_members_view.jsx
@@ -160,7 +160,6 @@ export default class InviteMembersView extends React.Component {
         } else if (this.props.sendInvitesState === 'done') {
             sendButtonLabel = (
                 <span>
-                    <i className='fa fa-check'/>
                     <FormattedMessage
                         id='invite_member.done'
                         defaultMessage=' Close'
@@ -208,13 +207,17 @@ export default class InviteMembersView extends React.Component {
         let doneMessage = null;
         if (this.props.sendInvitesState === 'done') {
             doneMessage = (
-                <div className='form-group has-success'>
-                    <label className='control-label'>
-                        <FormattedMessage
-                            id='invite_member.success'
-                            defaultMessage='Members sucessfully invited.'
-                        />
-                    </label>
+                <div>
+                    <div className='clearfix'/>
+                    <div className='form-group has-success'>
+                        <label className='control-label'>
+                            <i className='fa fa-check'/>
+                            <FormattedMessage
+                                id='invite_member.success'
+                                defaultMessage='Members sucessfully invited.'
+                            />
+                        </label>
+                    </div>
                 </div>
             );
         }

diff --git a/webapp/sass/components/_modal.scss b/webapp/sass/components/_modal.scss
@@ -102,6 +102,10 @@
                     }
                 }
 
+                .fa {
+                    margin-right: 5px;
+                }
+
                 .form-group {
                     text-align: left;
 

diff --git a/webapp/utils/utils.jsx b/webapp/utils/utils.jsx
@@ -592,8 +592,8 @@ export function applyTheme(theme) {
         changeCss('.app__body .modal .status .offline--icon, .app__body .channel-header__links .icon, .app__body .sidebar--right .sidebar--right__subheader .usage__icon', 'fill:' + theme.centerChannelColor, 1);
         changeCss('@media(min-width: 768px){.app__body .post:hover .post__header .col__reply, .app__body .post.post--hovered .post__header .col__reply', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.2), 2);
         changeCss('.app__body .sidebar--left, .app__body .sidebar--right .sidebar--right__header, .app__body .suggestion-list__content .command', 'border-color:' + changeOpacity(theme.centerChannelColor, 0.2), 1);
-        changeCss('.app__body .post.post--system .post__body, .app__body .modal.modal--fullscreen .modal-body--invite .invite-type__icon', 'color:' + changeOpacity(theme.centerChannelColor, 0.6), 1);
-        changeCss('.app__body .modal.modal--fullscreen, .app__body .input-group-addon, .app__body .app__content, .app__body .post-create__container .post-create-body .btn-file, .app__body .post-create__container .post-create-footer .msg-typing, .app__body .suggestion-list__content .command, .app__body .modal .modal-content, .app__body .dropdown-menu, .app__body .popover, .app__body .mentions__name, .app__body .tip-overlay, .app__body .form-control[disabled], .app__body .form-control[readonly], .app__body fieldset[disabled] .form-control', 'color:' + theme.centerChannelColor, 1);
+        changeCss('.app__body .post.post--system .post__body, .app__body .modal.modal--fullscreen .modal-body--invite .invite-type__icon, .app__body .modal--fullscreen .modal-header button.close', 'color:' + changeOpacity(theme.centerChannelColor, 0.6), 1);
+        changeCss('.app__body .modal.modal--fullscreen, .app__body .input-group-addon, .app__body .app__content, .app__body .post-create__container .post-create-body .btn-file, .app__body .post-create__container .post-create-footer .msg-typing, .app__body .suggestion-list__content .command, .app__body .modal .modal-content, .app__body .dropdown-menu, .app__body .popover, .app__body .mentions__name, .app__body .tip-overlay, .app__body .form-control[disabled], .app__body .form-control[readonly], .app__body fieldset[disabled] .form-control, .app__body .modal--fullscreen .modal-header .modal-title', 'color:' + theme.centerChannelColor, 1);
         changeCss('.app__body .post .post__link', 'color:' + changeOpacity(theme.centerChannelColor, 0.65), 1);
         changeCss('.app__body #archive-link-home, .video-div .video-thumbnail__error', 'background:' + changeOpacity(theme.centerChannelColor, 0.15), 1);
         changeCss('.app__body #post-create', 'color:' + theme.centerChannelColor, 2);