summaryrefslogtreecommitdiffstats
path: root/web/react/components/user_settings/custom_theme_chooser.jsx
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2015-10-30 09:21:53 -0400
committerHarrison Healey <harrisonmhealey@gmail.com>2015-10-30 09:21:53 -0400
commitc2cd58a33f52c6567e39d8ba563425dc06916d41 (patch)
tree492f80236bf30aa05514f1428296cf6b0432f435 /web/react/components/user_settings/custom_theme_chooser.jsx
parentb686e51cfde4c50fba8e2797a532c8813ee8aade (diff)
parentd630567c91d01d5b78be84ac1a5e638e4e72516c (diff)
downloadchat-c2cd58a33f52c6567e39d8ba563425dc06916d41.tar.gz
chat-c2cd58a33f52c6567e39d8ba563425dc06916d41.tar.bz2
chat-c2cd58a33f52c6567e39d8ba563425dc06916d41.zip
Merge pull request #1220 from florianorben/PLT-395
PLT-395: Add syntax highlighting to Markdown code blocks
Diffstat (limited to 'web/react/components/user_settings/custom_theme_chooser.jsx')
-rw-r--r--web/react/components/user_settings/custom_theme_chooser.jsx5
1 files changed, 4 insertions, 1 deletions
diff --git a/web/react/components/user_settings/custom_theme_chooser.jsx b/web/react/components/user_settings/custom_theme_chooser.jsx
index 44b3f4544..095e5b622 100644
--- a/web/react/components/user_settings/custom_theme_chooser.jsx
+++ b/web/react/components/user_settings/custom_theme_chooser.jsx
@@ -40,11 +40,12 @@ export default class CustomThemeChooser extends React.Component {
const theme = {type: 'custom'};
let index = 0;
Constants.THEME_ELEMENTS.forEach((element) => {
- if (index < colors.length) {
+ if (index < colors.length - 1) {
theme[element.id] = colors[index];
}
index++;
});
+ theme.codeTheme = colors[colors.length - 1];
this.props.updateTheme(theme);
}
@@ -78,6 +79,8 @@ export default class CustomThemeChooser extends React.Component {
colors += theme[element.id] + ',';
});
+ colors += theme.codeTheme;
+
const pasteBox = (
<div className='col-sm-12'>
<label className='custom-label'>