diff options
| author | =Corey Hulen <corey@hulen.com> | 2016-03-14 10:23:51 -0700 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2016-03-14 10:23:51 -0700 |
| commit | ea3f25924ea64a2dd1e73624c0d30824e1efb240 (patch) | |
| tree | a4a2b2bdc37bd675fb89837713995ad44a27427b /web/react/components/user_settings/custom_theme_chooser.jsx | |
| parent | 397ebec88c2db3569efd77238bf877e976492d34 (diff) | |
| parent | bf7ae0711743926cfbb031675cc3320d7a942465 (diff) | |
| download | chat-ea3f25924ea64a2dd1e73624c0d30824e1efb240.tar.gz chat-ea3f25924ea64a2dd1e73624c0d30824e1efb240.tar.bz2 chat-ea3f25924ea64a2dd1e73624c0d30824e1efb240.zip | |
Merge branch 'master' into PLT-2115
Diffstat (limited to 'web/react/components/user_settings/custom_theme_chooser.jsx')
| -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 |