diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2015-09-24 09:17:59 -0400 |
|---|---|---|
| committer | Harrison Healey <harrisonmhealey@gmail.com> | 2015-09-24 09:17:59 -0400 |
| commit | 4f371254c68fe41365f3c03001743a035bc63384 (patch) | |
| tree | 6bebdde639c6612eed317c951e59abdb596996a7 /web/react/components/user_settings | |
| parent | 90d1f4c6a130deeb7685b86bcce44472f9c7ece5 (diff) | |
| parent | ef8705ab6b9f11da77d8056e68b9fc2adb2ef496 (diff) | |
| download | chat-4f371254c68fe41365f3c03001743a035bc63384.tar.gz chat-4f371254c68fe41365f3c03001743a035bc63384.tar.bz2 chat-4f371254c68fe41365f3c03001743a035bc63384.zip | |
Merge pull request #771 from rgarmsen2295/plt-143
PLT-143 Support for text drag and drop
Diffstat (limited to 'web/react/components/user_settings')
| -rw-r--r-- | web/react/components/user_settings/custom_theme_chooser.jsx | 7 | ||||
| -rw-r--r-- | web/react/components/user_settings/premade_theme_chooser.jsx | 5 |
2 files changed, 9 insertions, 3 deletions
diff --git a/web/react/components/user_settings/custom_theme_chooser.jsx b/web/react/components/user_settings/custom_theme_chooser.jsx index 44630a318..c680d75d1 100644 --- a/web/react/components/user_settings/custom_theme_chooser.jsx +++ b/web/react/components/user_settings/custom_theme_chooser.jsx @@ -53,9 +53,12 @@ export default class CustomThemeChooser extends React.Component { const elements = []; let colors = ''; - Constants.THEME_ELEMENTS.forEach((element) => { + Constants.THEME_ELEMENTS.forEach((element, index) => { elements.push( - <div className='col-sm-4 form-group'> + <div + className='col-sm-4 form-group' + key={'custom-theme-key' + index} + > <label className='custom-label'>{element.uiName}</label> <div className='input-group color-picker' diff --git a/web/react/components/user_settings/premade_theme_chooser.jsx b/web/react/components/user_settings/premade_theme_chooser.jsx index e6aa2f5b9..f8f916bd0 100644 --- a/web/react/components/user_settings/premade_theme_chooser.jsx +++ b/web/react/components/user_settings/premade_theme_chooser.jsx @@ -23,7 +23,10 @@ export default class PremadeThemeChooser extends React.Component { } premadeThemes.push( - <div className='col-sm-3 premade-themes'> + <div + className='col-sm-3 premade-themes' + key={'premade-theme-key' + k} + > <div className={activeClass} onClick={() => this.props.updateTheme(premadeTheme)} |