diff options
author | =Corey Hulen <corey@hulen.com> | 2015-10-22 09:19:18 -0700 |
---|---|---|
committer | =Corey Hulen <corey@hulen.com> | 2015-10-22 09:19:18 -0700 |
commit | 54894e90ac705eab3bf0f34c8dd197bb0929feae (patch) | |
tree | 2fd5c6bc1bdb8cef1ea6095e8f12f8fd73a52ce9 /web/react/utils/utils.jsx | |
parent | c4c04e5f02253dfdfc2bd09e06955f1f5932ce18 (diff) | |
parent | 649f42e3fc706f8fa829276bcdb825381bc703f2 (diff) | |
download | chat-54894e90ac705eab3bf0f34c8dd197bb0929feae.tar.gz chat-54894e90ac705eab3bf0f34c8dd197bb0929feae.tar.bz2 chat-54894e90ac705eab3bf0f34c8dd197bb0929feae.zip |
Fixing merge conflict
Diffstat (limited to 'web/react/utils/utils.jsx')
-rw-r--r-- | web/react/utils/utils.jsx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx index 53e328384..c72c3f32c 100644 --- a/web/react/utils/utils.jsx +++ b/web/react/utils/utils.jsx @@ -544,6 +544,7 @@ export function applyTheme(theme) { if (theme.buttonBg) { changeCss('.btn.btn-primary', 'background:' + theme.buttonBg, 1); changeCss('.btn.btn-primary:hover, .btn.btn-primary:active, .btn.btn-primary:focus', 'background:' + changeColor(theme.buttonBg, -0.25), 1); + changeCss('.file-playback-controls', 'color:' + changeColor(theme.buttonBg, -0.25), 1); } if (theme.buttonColor) { |