diff options
| author | Corey Hulen <corey@hulen.com> | 2015-11-03 13:24:39 -0800 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2015-11-03 13:24:39 -0800 |
| commit | 3656ba5344cdaa26a5563323f3fe8cb179fac6dd (patch) | |
| tree | a8fc23009f1c4645a4c533f6fcc7b101af0040af /web/sass-files | |
| parent | 1904a57891d92e84e90c197249fa8497dcee1d9d (diff) | |
| parent | b1a8cf6fc56d25b5e3f5425d06c52d379b900ebc (diff) | |
| download | chat-3656ba5344cdaa26a5563323f3fe8cb179fac6dd.tar.gz chat-3656ba5344cdaa26a5563323f3fe8cb179fac6dd.tar.bz2 chat-3656ba5344cdaa26a5563323f3fe8cb179fac6dd.zip | |
Merge pull request #1290 from mattermost/fixed-embed-height
PLT-991 Fixing height of embeded images
Diffstat (limited to 'web/sass-files')
| -rw-r--r-- | web/sass-files/sass/partials/_headers.scss | 4 | ||||
| -rw-r--r-- | web/sass-files/sass/partials/_markdown.scss | 4 | ||||
| -rw-r--r-- | web/sass-files/sass/partials/_videos.scss | 5 |
3 files changed, 12 insertions, 1 deletions
diff --git a/web/sass-files/sass/partials/_headers.scss b/web/sass-files/sass/partials/_headers.scss index feb392234..5c8313454 100644 --- a/web/sass-files/sass/partials/_headers.scss +++ b/web/sass-files/sass/partials/_headers.scss @@ -1,5 +1,6 @@ #channel-header { padding: 3px 0; + height: 58px; } .row { &.header { @@ -42,6 +43,9 @@ text-overflow: ellipsis; margin-top: 2px; max-height: 45px; + .markdown-inline-img { + max-height: 45px + } } &.popover { white-space: normal; diff --git a/web/sass-files/sass/partials/_markdown.scss b/web/sass-files/sass/partials/_markdown.scss index 70c99f504..87e809694 100644 --- a/web/sass-files/sass/partials/_markdown.scss +++ b/web/sass-files/sass/partials/_markdown.scss @@ -8,6 +8,10 @@ margin-left: 4px; } } +.markdown-inline-img { + max-height: 500px; + height: 500px; +} .post-body { hr { height: 4px; diff --git a/web/sass-files/sass/partials/_videos.scss b/web/sass-files/sass/partials/_videos.scss index f6999d15c..bcfc28f19 100644 --- a/web/sass-files/sass/partials/_videos.scss +++ b/web/sass-files/sass/partials/_videos.scss @@ -56,5 +56,8 @@ max-width: 450px; max-height: 500px; margin-bottom: 8px; - border-radius:5px + border-radius:5px; + &.placeholder { + height: 500px; + } } |