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/utils/constants.jsx | |
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/utils/constants.jsx')
-rw-r--r-- | web/react/utils/constants.jsx | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/web/react/utils/constants.jsx b/web/react/utils/constants.jsx index 2cff4dbed..3de562b7b 100644 --- a/web/react/utils/constants.jsx +++ b/web/react/utils/constants.jsx @@ -270,7 +270,7 @@ export default { buttonColor: '#FFFFFF', mentionHighlightBg: '#984063', mentionHighlightLink: '#A4FFEB', - codeTheme: 'solarized_dark' + codeTheme: 'solarized-dark' }, windows10: { type: 'Windows Dark', @@ -374,21 +374,6 @@ export default { uiName: 'New Message Separator' }, { - group: 'linkAndButtonElements', - id: 'linkColor', - uiName: 'Link Color' - }, - { - group: 'linkAndButtonElements', - id: 'buttonBg', - uiName: 'Button BG' - }, - { - group: 'linkAndButtonElements', - id: 'buttonColor', - uiName: 'Button Text' - }, - { group: 'centerChannelElements', id: 'mentionHighlightBg', uiName: 'Mention Highlight BG' @@ -404,11 +389,11 @@ export default { uiName: 'Code Theme', themes: [ { - id: 'solarized_dark', + id: 'solarized-dark', uiName: 'Solarized Dark' }, { - id: 'solarized_light', + id: 'solarized-light', uiName: 'Solarized Light' }, { @@ -420,6 +405,21 @@ export default { uiName: 'Monokai' } ] + }, + { + group: 'linkAndButtonElements', + id: 'linkColor', + uiName: 'Link Color' + }, + { + group: 'linkAndButtonElements', + id: 'buttonBg', + uiName: 'Button BG' + }, + { + group: 'linkAndButtonElements', + id: 'buttonColor', + uiName: 'Button Text' } ], DEFAULT_CODE_THEME: 'github', |