diff options
| author | Christopher Speller <crspeller@gmail.com> | 2016-03-14 07:17:31 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-03-14 07:17:31 -0400 |
| commit | bf7ae0711743926cfbb031675cc3320d7a942465 (patch) | |
| tree | 44ad955ae2dba1991c8b7b7986d90c1a79cdfb65 /web/react/components/user_settings | |
| parent | 975159b52ac6bf0ee6b2d5b73d2391b2e0c6e165 (diff) | |
| parent | 72ed22d7421f50bc686e5adaea2f4a416fcbad27 (diff) | |
| download | chat-bf7ae0711743926cfbb031675cc3320d7a942465.tar.gz chat-bf7ae0711743926cfbb031675cc3320d7a942465.tar.bz2 chat-bf7ae0711743926cfbb031675cc3320d7a942465.zip | |
Merge branch 'release-2.1'
Diffstat (limited to 'web/react/components/user_settings')
| -rw-r--r-- | web/react/components/user_settings/custom_theme_chooser.jsx | 2 |
1 files changed, 2 insertions, 0 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..4ee9fd0e2 100644 --- a/web/react/components/user_settings/custom_theme_chooser.jsx +++ b/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 |