From d41c9a717ca3f52b0a67bbb2b0ab8b0c898bba4b Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Sun, 14 Jun 2020 13:16:08 +0200
Subject: Polls: Construct an html field during normalization.

---
 src/components/poll/poll.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src/components/poll/poll.vue')

diff --git a/src/components/poll/poll.vue b/src/components/poll/poll.vue
index 56e91cca..28f90006 100644
--- a/src/components/poll/poll.vue
+++ b/src/components/poll/poll.vue
@@ -17,7 +17,7 @@
           <span class="result-percentage">
             {{ percentageForOption(option.votes_count) }}%
           </span>
-          <span>{{ option.title }}</span>
+          <span v-html="option.title_html"></span>
         </div>
         <div
           class="result-fill"
@@ -75,6 +75,12 @@
 @import '../../_variables.scss';
 
 .poll {
+  img.emoji {
+    vertical-align: middle;
+    object-fit: contain;
+    width: 32px;
+    height: 32px;
+  }
   .votes {
     display: flex;
     flex-direction: column;
-- 
cgit v1.2.3-70-g09d2


From b0b33be9ddeb96fe808770604f6fab9c4d8d15c0 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Thu, 18 Jun 2020 14:41:40 +0200
Subject: Poll, StatusContent: Move emoji css to status body.

---
 src/components/poll/poll.vue                     |  6 ------
 src/components/status_content/status_content.vue | 24 ++++++++++++------------
 2 files changed, 12 insertions(+), 18 deletions(-)

(limited to 'src/components/poll/poll.vue')

diff --git a/src/components/poll/poll.vue b/src/components/poll/poll.vue
index 28f90006..adbb0555 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 8c2e8749..89f917dc 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;
-- 
cgit v1.2.3-70-g09d2


From dce057f24ec7b8ea6806210c97a4bf2c65584cc2 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Tue, 4 Aug 2020 19:16:55 +0300
Subject: lint

---
 src/components/poll/poll.vue     | 2 +-
 src/components/status/status.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/components/poll/poll.vue')

diff --git a/src/components/poll/poll.vue b/src/components/poll/poll.vue
index adbb0555..ceba9eea 100644
--- a/src/components/poll/poll.vue
+++ b/src/components/poll/poll.vue
@@ -17,7 +17,7 @@
           <span class="result-percentage">
             {{ percentageForOption(option.votes_count) }}%
           </span>
-          <span v-html="option.title_html"></span>
+          <span v-html="option.title_html" />
         </div>
         <div
           class="result-fill"
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
index 8df82edc..45251f17 100644
--- a/src/components/status/status.vue
+++ b/src/components/status/status.vue
@@ -150,8 +150,8 @@
                   {{ status.user.screen_name }}
                 </router-link>
                 <img
-                  class="status-favicon"
                   v-if="!!(status.user && status.user.favicon)"
+                  class="status-favicon"
                   :src="status.user.favicon"
                 >
               </div>
-- 
cgit v1.2.3-70-g09d2


From c9ea2db69dbf0289f57cac53bf625bb44867943f Mon Sep 17 00:00:00 2001
From: Shpuld Shpuldson <shp@cock.li>
Date: Tue, 25 Aug 2020 12:17:42 +0300
Subject: fix long poll labels overflowing

---
 src/components/poll/poll.vue | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/components/poll/poll.vue')

diff --git a/src/components/poll/poll.vue b/src/components/poll/poll.vue
index ceba9eea..1858f3e1 100644
--- a/src/components/poll/poll.vue
+++ b/src/components/poll/poll.vue
@@ -96,6 +96,7 @@
     align-items: center;
     padding: 0.1em 0.25em;
     z-index: 1;
+    word-break: break-word;
   }
   .result-percentage {
     width: 3.5em;
-- 
cgit v1.2.3-70-g09d2

