From 1fdb6f396455f42050554edc2a4dcad1f4ae9be6 Mon Sep 17 00:00:00 2001
From: Asaad Mahmood <asaad@mattermost.com>
Date: Tue, 13 Sep 2016 21:23:10 +0500
Subject: [PATCH 1/5] PLT-4174 - Settings UI Improvements

---
 src/browser/settings.jsx | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/browser/settings.jsx b/src/browser/settings.jsx
index 8dd78756..54345293 100644
--- a/src/browser/settings.jsx
+++ b/src/browser/settings.jsx
@@ -207,13 +207,23 @@ var SettingsPage = React.createClass({
 
     const settingsPage = {
       navbar: {
-        backgroundColor: '#fff'
+        backgroundColor: '#fff',
+      },
+      close: {
+        position: 'absolute',
+        right: '0',
+        top: '20px',
+        fontSize: '1.3em',
+        fontWeight: 'normal',
+        color: '#bbb',
+        cursor: 'pointer'
       },
       heading: {
         textAlign: 'center',
         fontSize: '24px',
         margin: '0',
-        padding: '1em 0'
+        padding: '1em 0',
+        position: 'relative'
       },
       sectionHeading: {
         fontSize: '20px',
@@ -242,9 +252,14 @@ var SettingsPage = React.createClass({
     return (
       <div>
         <Navbar className="navbar-fixed-top" style={ settingsPage.navbar }>
-          <h1 style={ settingsPage.heading }>Settings</h1>
+          <h1 style={ settingsPage.heading }>
+            Settings
+            <div style={ settingsPage.close } onClick={ this.handleCancel }>
+              <span>×</span>
+            </div>
+          </h1>
         </Navbar>
-        <Grid className="settingsPage" style={ { 'padding-top': '100px', 'padding-bottom': '70px' } }>
+        <Grid className="settingsPage" style={ { 'padding': '100px 15px' } }>
           <Row>
             <Col md={ 10 } xs={ 8 }>
             <h2 style={ settingsPage.sectionHeading }>Team Management</h2>
@@ -257,8 +272,11 @@ var SettingsPage = React.createClass({
           <hr/>
           { options_row }
           <div>
-            <hr />
           </div>
+          <Row>
+            <Col md={ 12 }>
+            </Col>
+          </Row>
         </Grid>
         <Navbar className="navbar-fixed-bottom">
           <div className='text-right' style={ settingsPage.footer }>

From acf969ccfacbf0c835922d0449caae4470b5aed6 Mon Sep 17 00:00:00 2001
From: Asaad Mahmood <asaad@mattermost.com>
Date: Tue, 13 Sep 2016 21:25:39 +0500
Subject: [PATCH 2/5] Pretifying settings

---
 src/browser/settings.jsx | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/browser/settings.jsx b/src/browser/settings.jsx
index 54345293..b3ca3362 100644
--- a/src/browser/settings.jsx
+++ b/src/browser/settings.jsx
@@ -253,11 +253,11 @@ var SettingsPage = React.createClass({
       <div>
         <Navbar className="navbar-fixed-top" style={ settingsPage.navbar }>
           <h1 style={ settingsPage.heading }>
-            Settings
-            <div style={ settingsPage.close } onClick={ this.handleCancel }>
-              <span>×</span>
-            </div>
-          </h1>
+                  Settings
+                  <div style={ settingsPage.close } onClick={ this.handleCancel }>
+                    <span>×</span>
+                  </div>
+                </h1>
         </Navbar>
         <Grid className="settingsPage" style={ { 'padding': '100px 15px' } }>
           <Row>

From 06a9081f98d8f145174a0b8dcc6c69605be5c8ca Mon Sep 17 00:00:00 2001
From: Asaad Mahmood <asaad@mattermost.com>
Date: Tue, 13 Sep 2016 22:12:32 +0500
Subject: [PATCH 3/5] Removing unnecessary code from settings page

---
 src/browser/settings.jsx | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/browser/settings.jsx b/src/browser/settings.jsx
index b3ca3362..69e9731f 100644
--- a/src/browser/settings.jsx
+++ b/src/browser/settings.jsx
@@ -253,11 +253,11 @@ var SettingsPage = React.createClass({
       <div>
         <Navbar className="navbar-fixed-top" style={ settingsPage.navbar }>
           <h1 style={ settingsPage.heading }>
-                  Settings
-                  <div style={ settingsPage.close } onClick={ this.handleCancel }>
-                    <span>×</span>
-                  </div>
-                </h1>
+            Settings
+            <div style={ settingsPage.close } onClick={ this.handleCancel }>
+              <span>×</span>
+            </div>
+          </h1>
         </Navbar>
         <Grid className="settingsPage" style={ { 'padding': '100px 15px' } }>
           <Row>
@@ -271,12 +271,6 @@ var SettingsPage = React.createClass({
           { teams_row }
           <hr/>
           { options_row }
-          <div>
-          </div>
-          <Row>
-            <Col md={ 12 }>
-            </Col>
-          </Row>
         </Grid>
         <Navbar className="navbar-fixed-bottom">
           <div className='text-right' style={ settingsPage.footer }>

From 2865ab395a4268b8b0bab1261a1bea1ba6ade967 Mon Sep 17 00:00:00 2001
From: Asaad Mahmood <asaad@mattermost.com>
Date: Tue, 13 Sep 2016 22:30:04 +0500
Subject: [PATCH 4/5] Running prettify

---
 src/browser/settings.jsx | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/browser/settings.jsx b/src/browser/settings.jsx
index 69e9731f..b36d2a32 100644
--- a/src/browser/settings.jsx
+++ b/src/browser/settings.jsx
@@ -253,11 +253,11 @@ var SettingsPage = React.createClass({
       <div>
         <Navbar className="navbar-fixed-top" style={ settingsPage.navbar }>
           <h1 style={ settingsPage.heading }>
-            Settings
-            <div style={ settingsPage.close } onClick={ this.handleCancel }>
-              <span>×</span>
-            </div>
-          </h1>
+                  Settings
+                  <div style={ settingsPage.close } onClick={ this.handleCancel }>
+                    <span>×</span>
+                  </div>
+                </h1>
         </Navbar>
         <Grid className="settingsPage" style={ { 'padding': '100px 15px' } }>
           <Row>

From e38dd49d9533645ed3023ef6c46d5d4dd003823c Mon Sep 17 00:00:00 2001
From: Asaad Mahmood <asaad@mattermost.com>
Date: Wed, 14 Sep 2016 06:25:41 +0500
Subject: [PATCH 5/5] Updating styles for error page

---
 src/browser/settings.jsx | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/browser/settings.jsx b/src/browser/settings.jsx
index b36d2a32..e489b209 100644
--- a/src/browser/settings.jsx
+++ b/src/browser/settings.jsx
@@ -207,13 +207,13 @@ var SettingsPage = React.createClass({
 
     const settingsPage = {
       navbar: {
-        backgroundColor: '#fff',
+        backgroundColor: '#fff'
       },
       close: {
         position: 'absolute',
         right: '0',
-        top: '20px',
-        fontSize: '1.3em',
+        top: '10px',
+        fontSize: '35px',
         fontWeight: 'normal',
         color: '#bbb',
         cursor: 'pointer'
@@ -222,8 +222,7 @@ var SettingsPage = React.createClass({
         textAlign: 'center',
         fontSize: '24px',
         margin: '0',
-        padding: '1em 0',
-        position: 'relative'
+        padding: '1em 0'
       },
       sectionHeading: {
         fontSize: '20px',
@@ -252,12 +251,12 @@ var SettingsPage = React.createClass({
     return (
       <div>
         <Navbar className="navbar-fixed-top" style={ settingsPage.navbar }>
-          <h1 style={ settingsPage.heading }>
-                  Settings
-                  <div style={ settingsPage.close } onClick={ this.handleCancel }>
-                    <span>×</span>
-                  </div>
-                </h1>
+          <div style={ { 'position': 'relative' } }>
+            <h1 style={ settingsPage.heading }>Settings</h1>
+            <div style={ settingsPage.close } onClick={ this.handleCancel }>
+              <span>×</span>
+            </div>
+          </div>
         </Navbar>
         <Grid className="settingsPage" style={ { 'padding': '100px 15px' } }>
           <Row>