summaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
authorAsaad Mahmood <asaad@spinpunch.com>2016-03-10 22:55:16 +0500
committerAsaad Mahmood <asaad@spinpunch.com>2016-03-10 22:55:16 +0500
commit461e8532a7b82b31964c47b2e69e8350b9c77474 (patch)
tree8ea24f39909f8f268e1a813031f58643ad6ccd50 /web
parent12434f8963b7e93836e2fa44ae1ce8806cea63cb (diff)
downloadchat-461e8532a7b82b31964c47b2e69e8350b9c77474.tar.gz
chat-461e8532a7b82b31964c47b2e69e8350b9c77474.tar.bz2
chat-461e8532a7b82b31964c47b2e69e8350b9c77474.zip
PLT-2138 - Fixing theme sharing box
Diffstat (limited to 'web')
-rw-r--r--web/react/components/user_settings/custom_theme_chooser.jsx4
-rw-r--r--web/react/utils/constants.jsx30
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 1e724bb6e..143eadccb 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 daea9f43e..4b1f73b79 100644
--- a/web/react/utils/constants.jsx
+++ b/web/react/utils/constants.jsx
@@ -371,21 +371,6 @@ export default {
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',
uiName: 'Mention Highlight BG'
@@ -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',