Merge branch '589-poll-options' into 'develop'

Polls: Construct an html field during normalization.

Closes #589

See merge request pleroma/pleroma-fe!1146
This commit is contained in:
Shpuld Shpludson 2020-06-18 13:33:00 +00:00
commit 6343ee929c
4 changed files with 20 additions and 13 deletions

View file

@ -164,23 +164,23 @@ $status-margin: 0.75em;
word-break: break-all;
}
img, video {
max-width: 100%;
max-height: 400px;
vertical-align: middle;
object-fit: contain;
&.emoji {
width: 32px;
height: 32px;
}
}
.status-content {
font-family: var(--postFont, sans-serif);
line-height: 1.4em;
white-space: pre-wrap;
img, video {
max-width: 100%;
max-height: 400px;
vertical-align: middle;
object-fit: contain;
&.emoji {
width: 32px;
height: 32px;
}
}
blockquote {
margin: 0.2em 0 0.2em 2em;
font-style: italic;