From f91b9d4a654ff27777580651d853b6372a425af6 Mon Sep 17 00:00:00 2001
From: Asaad Mahmood <asaadmahmoodspin@users.noreply.github.com>
Date: Wed, 6 Jul 2016 00:46:36 +0500
Subject: PLT-3418, PLT-2950, PLT-3375, PLT-3382, PLT-3446, PLT-3465: Multiple
 UI Improvements (#3449)

Improving help text margins

Updating changes for get link and create post files

Fixing icon for select team screen

Fixing styles for select team button

Adding improvements to posts UI

Adding improvement to post layout

Updating changes for post controls

Updating z-index for sidebar--right

Updating help text position

Fixing code for posts

Fixing css for post view

Pushing improvements for posts view

Updating changes for post view

Updating post layout

Fixing system time css

Updating header for system posts

Updating post css

Removing opacity and changing color for system messages

Simplifying root post and system post behaviour

Removing images from compact view

Updating help text for display

Updating embed preview text for advanced option

PLT-3490 - Fixing RHS issue on Edge
---
 webapp/components/admin_console/brand_image_setting.jsx | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'webapp/components/admin_console/brand_image_setting.jsx')

diff --git a/webapp/components/admin_console/brand_image_setting.jsx b/webapp/components/admin_console/brand_image_setting.jsx
index 74d0814a6..252328f25 100644
--- a/webapp/components/admin_console/brand_image_setting.jsx
+++ b/webapp/components/admin_console/brand_image_setting.jsx
@@ -105,9 +105,14 @@ export default class BrandImageSetting extends React.Component {
     }
 
     render() {
-        let btnClass = 'btn';
+        let btnPrimaryClass = 'btn';
         if (this.state.brandImage) {
-            btnClass += ' btn-primary';
+            btnPrimaryClass += ' btn-primary';
+        }
+
+        let letbtnDefaultClass = 'btn';
+        if (!this.props.disabled) {
+            letbtnDefaultClass += ' btn-default';
         }
 
         let img = null;
@@ -152,7 +157,7 @@ export default class BrandImageSetting extends React.Component {
                 <div className='col-sm-8'>
                     <div className='file__upload'>
                         <button
-                            className='btn btn-default'
+                            className={letbtnDefaultClass}
                             disabled={this.props.disabled}
                         >
                             <FormattedMessage
@@ -169,12 +174,12 @@ export default class BrandImageSetting extends React.Component {
                         />
                     </div>
                     <button
-                        className={btnClass}
+                        className={btnPrimaryClass}
                         disabled={this.props.disabled || !this.state.brandImage}
                         onClick={this.handleImageSubmit}
                         id='upload-button'
-                        data-loading-text={'<span class=\'glyphicon glyphicon-refresh glyphicon-refresh-animate\'></span> ' + Utils.localizeMessage('admin.team.uploading', 'Uploading..')}
-                        data-complete-text={'<span class=\'glyphicon glyphicon-ok\'></span> ' + Utils.localizeMessage('admin.team.uploaded', 'Uploaded!')}
+                        data-loading-text={'<span class=\'fa fa-refresh fa-rotate\'></span> ' + Utils.localizeMessage('admin.team.uploading', 'Uploading..')}
+                        data-complete-text={'<span class=\'fa fa-check\'></span> ' + Utils.localizeMessage('admin.team.uploaded', 'Uploaded!')}
                     >
                         <FormattedMessage
                             id='admin.team.upload'
-- 
cgit v1.2.3-1-g7c22

