From b0b33be9ddeb96fe808770604f6fab9c4d8d15c0 Mon Sep 17 00:00:00 2001 From: lain Date: Thu, 18 Jun 2020 14:41:40 +0200 Subject: [PATCH] Poll, StatusContent: Move emoji css to status body. --- src/components/poll/poll.vue | 6 ----- .../status_content/status_content.vue | 24 +++++++++---------- 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/src/components/poll/poll.vue b/src/components/poll/poll.vue index 28f9000684..adbb05558e 100644 --- a/src/components/poll/poll.vue +++ b/src/components/poll/poll.vue @@ -75,12 +75,6 @@ @import '../../_variables.scss'; .poll { - img.emoji { - vertical-align: middle; - object-fit: contain; - width: 32px; - height: 32px; - } .votes { display: flex; flex-direction: column; diff --git a/src/components/status_content/status_content.vue b/src/components/status_content/status_content.vue index 8c2e87498f..89f917dc2a 100644 --- a/src/components/status_content/status_content.vue +++ b/src/components/status_content/status_content.vue @@ -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;