From 461e8532a7b82b31964c47b2e69e8350b9c77474 Mon Sep 17 00:00:00 2001
From: Asaad Mahmood <asaad@spinpunch.com>
Date: Thu, 10 Mar 2016 22:55:16 +0500
Subject: [PATCH 1/4] PLT-2138 - Fixing theme sharing box

---
 .../user_settings/custom_theme_chooser.jsx    |  4 +++
 web/react/utils/constants.jsx                 | 30 +++++++++----------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/web/react/components/user_settings/custom_theme_chooser.jsx b/web/react/components/user_settings/custom_theme_chooser.jsx
index 1e724bb6ef..143eadccbc 100644
--- a/web/react/components/user_settings/custom_theme_chooser.jsx
+++ b/web/react/components/user_settings/custom_theme_chooser.jsx
@@ -253,6 +253,9 @@ class CustomThemeChooser extends React.Component {
                         </div>
                     </div>
                 );
+
+                colors += theme[element.id] + ',';
+
             } else if (element.group === 'sidebarElements') {
                 sidebarElements.push(
                     <div
@@ -303,6 +306,7 @@ class CustomThemeChooser extends React.Component {
         });
 
         colors += theme.codeTheme;
+        console.log(colors);
 
         const pasteBox = (
             <div className='col-sm-12'>
diff --git a/web/react/utils/constants.jsx b/web/react/utils/constants.jsx
index daea9f43e7..4b1f73b794 100644
--- a/web/react/utils/constants.jsx
+++ b/web/react/utils/constants.jsx
@@ -370,21 +370,6 @@ export default {
             id: 'newMessageSeparator',
             uiName: 'New Message Separator'
         },
-        {
-            group: 'linkAndButtonElements',
-            id: 'linkColor',
-            uiName: 'Link Color'
-        },
-        {
-            group: 'linkAndButtonElements',
-            id: 'buttonBg',
-            uiName: 'Button BG'
-        },
-        {
-            group: 'linkAndButtonElements',
-            id: 'buttonColor',
-            uiName: 'Button Text'
-        },
         {
             group: 'centerChannelElements',
             id: 'mentionHighlightBg',
@@ -417,6 +402,21 @@ export default {
                     uiName: 'Monokai'
                 }
             ]
+        },
+        {
+            group: 'linkAndButtonElements',
+            id: 'linkColor',
+            uiName: 'Link Color'
+        },
+        {
+            group: 'linkAndButtonElements',
+            id: 'buttonBg',
+            uiName: 'Button BG'
+        },
+        {
+            group: 'linkAndButtonElements',
+            id: 'buttonColor',
+            uiName: 'Button Text'
         }
     ],
     DEFAULT_CODE_THEME: 'github',

From b9f468623cac8e7afd5552da100f39c22c44ec25 Mon Sep 17 00:00:00 2001
From: Asaad Mahmood <asaad@spinpunch.com>
Date: Thu, 10 Mar 2016 23:03:06 +0500
Subject: [PATCH 2/4] Removing console

---
 web/react/components/user_settings/custom_theme_chooser.jsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/web/react/components/user_settings/custom_theme_chooser.jsx b/web/react/components/user_settings/custom_theme_chooser.jsx
index 143eadccbc..33191a9f0a 100644
--- a/web/react/components/user_settings/custom_theme_chooser.jsx
+++ b/web/react/components/user_settings/custom_theme_chooser.jsx
@@ -306,7 +306,6 @@ class CustomThemeChooser extends React.Component {
         });
 
         colors += theme.codeTheme;
-        console.log(colors);
 
         const pasteBox = (
             <div className='col-sm-12'>

From 060cc2c825cd951c37a715af79b982f8aa99ebc4 Mon Sep 17 00:00:00 2001
From: Asaad Mahmood <asaad@spinpunch.com>
Date: Thu, 10 Mar 2016 23:19:36 +0500
Subject: [PATCH 3/4] Fixing padding issue

---
 web/react/components/user_settings/custom_theme_chooser.jsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/web/react/components/user_settings/custom_theme_chooser.jsx b/web/react/components/user_settings/custom_theme_chooser.jsx
index 33191a9f0a..4ee9fd0e24 100644
--- a/web/react/components/user_settings/custom_theme_chooser.jsx
+++ b/web/react/components/user_settings/custom_theme_chooser.jsx
@@ -255,7 +255,6 @@ class CustomThemeChooser extends React.Component {
                 );
 
                 colors += theme[element.id] + ',';
-
             } else if (element.group === 'sidebarElements') {
                 sidebarElements.push(
                     <div

From 601c4cd72db876a05d2352d8034c3481a4363ff2 Mon Sep 17 00:00:00 2001
From: Asaad Mahmood <asaad@spinpunch.com>
Date: Fri, 11 Mar 2016 18:04:07 +0500
Subject: [PATCH 4/4] Small fix for search loading icon on mobile

---
 web/sass-files/sass/partials/_responsive.scss | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss
index a9a5727686..06ce17041f 100644
--- a/web/sass-files/sass/partials/_responsive.scss
+++ b/web/sass-files/sass/partials/_responsive.scss
@@ -573,8 +573,7 @@
             .glyphicon-refresh-animate {
                 right: 33px;
                 top: 15px;
-                color: #fff;
-                color: rgba(255,255,255,0.5);
+                color: #aaa;
             }
             .form-control {
                 border: none;