diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-11-06 11:40:48 -0500 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-11-06 11:40:48 -0500 |
| commit | 5fd8b56836595d6fa1fe2cb0d0a9c9474fc4dfdd (patch) | |
| tree | 4fd7d31c99dd8c90a47d1b2213eea40476dde6d1 | |
| parent | cb1995eac24f4102945ea9735eb89a11c77ebdde (diff) | |
| download | chat-5fd8b56836595d6fa1fe2cb0d0a9c9474fc4dfdd.tar.gz chat-5fd8b56836595d6fa1fe2cb0d0a9c9474fc4dfdd.tar.bz2 chat-5fd8b56836595d6fa1fe2cb0d0a9c9474fc4dfdd.zip | |
Fixing broken markdown images taking up too much space. Fixed unnessisary expantion of markdown images not in center channel.
| -rw-r--r-- | web/react/utils/markdown.jsx | 2 | ||||
| -rw-r--r-- | web/sass-files/sass/partials/_markdown.scss | 11 |
2 files changed, 8 insertions, 5 deletions
diff --git a/web/react/utils/markdown.jsx b/web/react/utils/markdown.jsx index 374caf6dc..ee63b8689 100644 --- a/web/react/utils/markdown.jsx +++ b/web/react/utils/markdown.jsx @@ -94,7 +94,7 @@ class MattermostMarkdownRenderer extends marked.Renderer { if (title) { out += ' title="' + title + '"'; } - out += ' onload="window.markdownImageLoaded(this)" class="markdown-inline-img"'; + out += ' onload="window.markdownImageLoaded(this)" onerror="window.markdownImageLoaded(this)" class="markdown-inline-img"'; out += this.options.xhtml ? '/>' : '>'; return out; } diff --git a/web/sass-files/sass/partials/_markdown.scss b/web/sass-files/sass/partials/_markdown.scss index 241377252..8b0a32704 100644 --- a/web/sass-files/sass/partials/_markdown.scss +++ b/web/sass-files/sass/partials/_markdown.scss @@ -8,11 +8,14 @@ margin-left: 4px; } } -.markdown-inline-img { - -moz-force-broken-image-icon: 1; - max-height: 500px; - height: 500px; +#post-list { + .markdown-inline-img { + -moz-force-broken-image-icon: 1; + max-height: 500px; + height: 500px; + } } + .post-body { hr { height: 4px; |