Merge pull request #2413 from asaadmahmoodspin/themeFix

PLT-2138 - Fixing theme sharing box

web/react/components/user_settings/custom_theme_chooser.jsx

@@ -253,6 +253,8 @@ class CustomThemeChooser extends React.Component {
                         </div>
                     </div>
                 );
+
+                colors += theme[element.id] + ',';
             } else if (element.group === 'sidebarElements') {
                 sidebarElements.push(
                     <div

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',

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;