diff options
author | Corey Hulen <corey@hulen.com> | 2015-08-25 16:49:48 -0700 |
---|---|---|
committer | Corey Hulen <corey@hulen.com> | 2015-08-25 16:49:48 -0700 |
commit | d653dc18e47c3548c974722ab3b0f4e7645a5b25 (patch) | |
tree | d5f0e3a0bf82c70397f477f17bbfa676edf7600b | |
parent | 3ba4914b49a001fd3b8318ee9521afbb2e6ca3e4 (diff) | |
parent | 146b34918387664efcac883d89c123eb80d7ec16 (diff) | |
download | chat-d653dc18e47c3548c974722ab3b0f4e7645a5b25.tar.gz chat-d653dc18e47c3548c974722ab3b0f4e7645a5b25.tar.bz2 chat-d653dc18e47c3548c974722ab3b0f4e7645a5b25.zip |
Merge pull request #476 from rgarmsen2295/mm-1915
MM-1915 Added white background to non-image file previews
-rw-r--r-- | web/react/components/view_image.jsx | 1 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_base.scss | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/web/react/components/view_image.jsx b/web/react/components/view_image.jsx index fefd8d57d..24efce0f1 100644 --- a/web/react/components/view_image.jsx +++ b/web/react/components/view_image.jsx @@ -224,6 +224,7 @@ module.exports = React.createClass({ </div> </div> ); + bgClass = 'white-bg'; // asynchronously request the actual size of this file if (!(filename in this.state.fileSizes)) { diff --git a/web/sass-files/sass/partials/_base.scss b/web/sass-files/sass/partials/_base.scss index 5b68b488f..e817761ee 100644 --- a/web/sass-files/sass/partials/_base.scss +++ b/web/sass-files/sass/partials/_base.scss @@ -124,3 +124,7 @@ div.theme { .black-bg { background-color: black !important; } + +.white-bg { + background-color: white !important; +} |