diff options
author | Asaad Mahmood <asaadmahmood@users.noreply.github.com> | 2017-04-03 22:38:15 +0500 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2017-04-03 10:38:15 -0700 |
commit | 4ebc85e05c3f45d2978c6fb8f9874b93658c3607 (patch) | |
tree | 80f6167de3c6a60f89f0608d373d80d40e0daf37 /webapp/utils | |
parent | 1cbe6e797517089140ee2db12d73c0781f5e3e6b (diff) | |
download | chat-4ebc85e05c3f45d2978c6fb8f9874b93658c3607.tar.gz chat-4ebc85e05c3f45d2978c6fb8f9874b93658c3607.tar.bz2 chat-4ebc85e05c3f45d2978c6fb8f9874b93658c3607.zip |
Ui improvements (#5948)
* PLT-5849 - Code block wrap on IOS
* PLT-5972 - Comment has first line indented
* PLT-6048 - Adjusting UI for link previews
* PLT-5733 - Adding error text theme option
Diffstat (limited to 'webapp/utils')
-rw-r--r-- | webapp/utils/constants.jsx | 9 | ||||
-rw-r--r-- | webapp/utils/utils.jsx | 4 |
2 files changed, 13 insertions, 0 deletions
diff --git a/webapp/utils/constants.jsx b/webapp/utils/constants.jsx index 61c418047..4f00a8559 100644 --- a/webapp/utils/constants.jsx +++ b/webapp/utils/constants.jsx @@ -449,6 +449,7 @@ export const Constants = { linkColor: '#2f81b7', buttonBg: '#1dacfc', buttonColor: '#FFFFFF', + errorTextColor: '#a94442', mentionHighlightBg: '#f3e197', mentionHighlightLink: '#2f81b7', codeTheme: 'github', @@ -474,6 +475,7 @@ export const Constants = { linkColor: '#2389d7', buttonBg: '#23A2FF', buttonColor: '#FFFFFF', + errorTextColor: '#a94442', mentionHighlightBg: '#f3e197', mentionHighlightLink: '#2f81b7', codeTheme: 'github', @@ -499,6 +501,7 @@ export const Constants = { linkColor: '#A4FFEB', buttonBg: '#4CBBA4', buttonColor: '#FFFFFF', + errorTextColor: '#ff6461', mentionHighlightBg: '#984063', mentionHighlightLink: '#A4FFEB', codeTheme: 'solarized-dark', @@ -524,6 +527,7 @@ export const Constants = { linkColor: '#0D93FF', buttonBg: '#0177e7', buttonColor: '#FFFFFF', + errorTextColor: '#ff6461', mentionHighlightBg: '#784098', mentionHighlightLink: '#A4FFEB', codeTheme: 'monokai', @@ -608,6 +612,11 @@ export const Constants = { }, { group: 'centerChannelElements', + id: 'errorTextColor', + uiName: 'Error Text Color' + }, + { + group: 'centerChannelElements', id: 'mentionHighlightBg', uiName: 'Mention Highlight BG' }, diff --git a/webapp/utils/utils.jsx b/webapp/utils/utils.jsx index d2cebafa7..55ea72e8d 100644 --- a/webapp/utils/utils.jsx +++ b/webapp/utils/utils.jsx @@ -707,6 +707,10 @@ export function applyTheme(theme) { changeCss('.app__body .btn.btn-primary, .app__body .post__pinned-badge', 'color:' + theme.buttonColor); } + if (theme.errorTextColor) { + changeCss('.app__body .has-error .help-block, .app__body .has-error .control-label, .app__body .has-error .radio, .app__body .has-error .checkbox, .app__body .has-error .radio-inline, .app__body .has-error .checkbox-inline, .app__body .has-error.radio label, .app__body .has-error.checkbox label, .app__body .has-error.radio-inline label, .app__body .has-error.checkbox-inline label', 'color:' + theme.errorTextColor); + } + if (theme.mentionHighlightBg) { changeCss('.app__body .mention--highlight, .app__body .search-highlight', 'background:' + theme.mentionHighlightBg); changeCss('.app__body .post.post--comment .post__body.mention-comment', 'border-color:' + theme.mentionHighlightBg); |