diff options
author | Reed Garmsen <rgarmsen2295@gmail.com> | 2015-06-18 14:10:47 -0700 |
---|---|---|
committer | Reed Garmsen <rgarmsen2295@gmail.com> | 2015-06-18 14:10:47 -0700 |
commit | 3cd793fcb9bb02d5a130f277bff18f93db13d970 (patch) | |
tree | bab4b9b559874b4ee79a43064a8018eda2a5af34 /web/react/components/user_settings.jsx | |
parent | 66425c97e49615111448aa24e31225dfa3b51cda (diff) | |
parent | 4f321383b33ab805f22e7172a54925b1cd353fcb (diff) | |
download | chat-3cd793fcb9bb02d5a130f277bff18f93db13d970.tar.gz chat-3cd793fcb9bb02d5a130f277bff18f93db13d970.tar.bz2 chat-3cd793fcb9bb02d5a130f277bff18f93db13d970.zip |
Merge pull request #13 from rgarmsen2295/master
Remerge
Diffstat (limited to 'web/react/components/user_settings.jsx')
-rw-r--r-- | web/react/components/user_settings.jsx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/web/react/components/user_settings.jsx b/web/react/components/user_settings.jsx index a9c2433f2..110634b50 100644 --- a/web/react/components/user_settings.jsx +++ b/web/react/components/user_settings.jsx @@ -1056,7 +1056,7 @@ var AppearanceTab = React.createClass({ themeSection = ( <SettingItemMax - title="Theme" + title="Theme Color" inputs={inputs} submit={this.submitTheme} server_error={server_error} @@ -1066,7 +1066,7 @@ var AppearanceTab = React.createClass({ } else { themeSection = ( <SettingItemMin - title="Theme" + title="Theme Color" describe={this.state.theme} updateSection={function(){self.props.updateSection("theme");}} /> |