summaryrefslogtreecommitdiffstats
path: root/web/sass-files
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2015-11-03 15:39:40 -0500
committerChristopher Speller <crspeller@gmail.com>2015-11-03 15:39:40 -0500
commitb1a8cf6fc56d25b5e3f5425d06c52d379b900ebc (patch)
tree347ec343d31922f33abba844f1cdc359d0c9ea06 /web/sass-files
parentc68e53aa23ebaf657d2ba29e5db83271e79bea1e (diff)
downloadchat-b1a8cf6fc56d25b5e3f5425d06c52d379b900ebc.tar.gz
chat-b1a8cf6fc56d25b5e3f5425d06c52d379b900ebc.tar.bz2
chat-b1a8cf6fc56d25b5e3f5425d06c52d379b900ebc.zip
Fixing height of embeded images
Diffstat (limited to 'web/sass-files')
-rw-r--r--web/sass-files/sass/partials/_headers.scss4
-rw-r--r--web/sass-files/sass/partials/_markdown.scss4
-rw-r--r--web/sass-files/sass/partials/_videos.scss5
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;
+ }
}