diff options
| author | Christopher Speller <crspeller@gmail.com> | 2016-03-21 10:20:35 -0400 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-03-21 10:20:35 -0400 |
| commit | a3872e5f5ea59c78c9a1d8b4fcb77a418c6c25b6 (patch) | |
| tree | bdc4c8959ccff1fef7348101a63b14479311d0b8 /webapp/utils | |
| parent | 85837efe06a93b38e449c750108a4105cc629611 (diff) | |
| download | chat-a3872e5f5ea59c78c9a1d8b4fcb77a418c6c25b6.tar.gz chat-a3872e5f5ea59c78c9a1d8b4fcb77a418c6c25b6.tar.bz2 chat-a3872e5f5ea59c78c9a1d8b4fcb77a418c6c25b6.zip | |
Merge release branch commits
Diffstat (limited to 'webapp/utils')
| -rw-r--r-- | webapp/utils/constants.jsx | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/webapp/utils/constants.jsx b/webapp/utils/constants.jsx index a4aa7604c..872bdb8ab 100644 --- a/webapp/utils/constants.jsx +++ b/webapp/utils/constants.jsx @@ -429,6 +429,21 @@ export default { uiName: 'Mention Highlight Link' }, { + group: 'linkAndButtonElements', + id: 'linkColor', + uiName: 'Link Color' + }, + { + group: 'linkAndButtonElements', + id: 'buttonBg', + uiName: 'Button BG' + }, + { + group: 'linkAndButtonElements', + id: 'buttonColor', + uiName: 'Button Text' + }, + { group: 'centerChannelElements', id: 'codeTheme', uiName: 'Code Theme', @@ -458,21 +473,6 @@ export default { iconURL: monokaiIcon } ] - }, - { - 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', |