diff options
author | Reed Garmsen <rgarmsen2295@gmail.com> | 2015-11-03 09:39:07 -0800 |
---|---|---|
committer | Reed Garmsen <rgarmsen2295@gmail.com> | 2015-11-04 13:05:55 -0800 |
commit | 0054924cdbcdb3e3631bd7036244aebba4234c33 (patch) | |
tree | 7d6ab9bc25066a4e025f3cd879099dcace7785c3 /web/react/components/user_settings/custom_theme_chooser.jsx | |
parent | aee6d9b608aceb7b68ab1e1a583917c2c3ee4485 (diff) | |
download | chat-0054924cdbcdb3e3631bd7036244aebba4234c33.tar.gz chat-0054924cdbcdb3e3631bd7036244aebba4234c33.tar.bz2 chat-0054924cdbcdb3e3631bd7036244aebba4234c33.zip |
Moved code theme picker into custom theme subarea
Diffstat (limited to 'web/react/components/user_settings/custom_theme_chooser.jsx')
-rw-r--r-- | web/react/components/user_settings/custom_theme_chooser.jsx | 78 |
1 files changed, 61 insertions, 17 deletions
diff --git a/web/react/components/user_settings/custom_theme_chooser.jsx b/web/react/components/user_settings/custom_theme_chooser.jsx index 095e5b622..07e3fb24c 100644 --- a/web/react/components/user_settings/custom_theme_chooser.jsx +++ b/web/react/components/user_settings/custom_theme_chooser.jsx @@ -55,26 +55,70 @@ export default class CustomThemeChooser extends React.Component { const elements = []; let colors = ''; Constants.THEME_ELEMENTS.forEach((element, index) => { - elements.push( - <div - className='col-sm-4 form-group' - key={'custom-theme-key' + index} - > - <label className='custom-label'>{element.uiName}</label> + if (element.id === 'codeTheme') { + const codeThemeOptions = []; + + element.themes.forEach((codeTheme, codeThemeIndex) => { + codeThemeOptions.push( + <option + key={'code-theme-key' + codeThemeIndex} + value={codeTheme.id} + > + {codeTheme.uiName} + </option> + ); + }); + + elements.push( <div - className='input-group color-picker' - id={element.id} + className='col-sm-4 form-group' + key={'custom-theme-key' + index} > - <input - className='form-control' - type='text' - defaultValue={theme[element.id]} - onChange={this.onInputChange} - /> - <span className='input-group-addon'><i></i></span> + <label className='custom-label'>{element.uiName}</label> + <div + className='input-group dropdown' + id={element.id} + > + <select + className='form-control' + type='text' + defaultValue={theme[element.id]} + onChange={this.onInputChange} + > + {codeThemeOptions} + </select> + <span className='input-group-addon'> + <i> + <img + src={'/static/images/themes/code_themes/' + theme[element.id] + '.png'} + /> + </i> + </span> + </div> </div> - </div> - ); + ); + } else { + elements.push( + <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' + id={element.id} + > + <input + className='form-control' + type='text' + defaultValue={theme[element.id]} + onChange={this.onInputChange} + /> + <span className='input-group-addon'><i></i></span> + </div> + </div> + ); + } colors += theme[element.id] + ','; }); |