diff options
author | Asaad Mahmood <Unknowngi@live.com> | 2015-11-05 10:26:44 +0500 |
---|---|---|
committer | Asaad Mahmood <Unknowngi@live.com> | 2015-11-05 10:26:44 +0500 |
commit | 11ccb14fd46daf76bbde67c39c349ee742788b45 (patch) | |
tree | 62de1fd3b058956777b37f21e7931a47c08834bf /web/react/utils/utils.jsx | |
parent | 8c2dace188c066f5f70264bc2a34b50d87512e10 (diff) | |
parent | 4897997025d07998e77cee4dd1c4252fff763db4 (diff) | |
download | chat-11ccb14fd46daf76bbde67c39c349ee742788b45.tar.gz chat-11ccb14fd46daf76bbde67c39c349ee742788b45.tar.bz2 chat-11ccb14fd46daf76bbde67c39c349ee742788b45.zip |
Merge branch 'plt-960' of https://github.com/rgarmsen2295/platform into PLT-960
Diffstat (limited to 'web/react/utils/utils.jsx')
-rw-r--r-- | web/react/utils/utils.jsx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx index e8d34dccd..770ab01c5 100644 --- a/web/react/utils/utils.jsx +++ b/web/react/utils/utils.jsx @@ -438,11 +438,6 @@ export function toTitleCase(str) { } export function applyTheme(theme) { - if (!theme.codeTheme) { - theme.codeTheme = Constants.DEFAULT_CODE_THEME; - } - updateCodeTheme(theme.codeTheme); - if (theme.sidebarBg) { changeCss('.sidebar--left, .settings-modal .settings-table .settings-links, .sidebar--menu', 'background:' + theme.sidebarBg, 1); } @@ -598,6 +593,11 @@ export function applyTheme(theme) { if (theme.mentionHighlightLink) { changeCss('.mention-highlight .mention-link', 'color:' + theme.mentionHighlightLink, 1); } + + if (!theme.codeTheme) { + theme.codeTheme = Constants.DEFAULT_CODE_THEME; + } + updateCodeTheme(theme.codeTheme); } export function changeCss(className, classValue, classRepeat) { // we need invisible container to store additional css definitions |