pleroma-fe

commit: eca533aab68322a6bb3b4fd91e62709c66daaff4
parent: 752ee9d70c48050fc9fe5da5501773b24fc597fc
Author: Shpuld Shpludson <shp@cock.li>
Date:   Thu, 20 Jun 2019 13:00:10 +0000

Merge branch 'fix/messed-up-long-polls' into 'develop'

Fix/messed up long polls

See merge request pleroma/pleroma-fe!843
Diffstat:
M
src/App.scss
2
++
M
src/components/poll/poll.vue
12
++++++++----

2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/App.scss b/src/App.scss
@@ -200,6 +200,7 @@ input, textarea, .select {
       }
     }
     + label::before {
+      flex-shrink: 0;
       display: inline-block;
       content: '';
       transition: box-shadow 200ms;
@@ -236,6 +237,7 @@ input, textarea, .select {
       }
     }
     + label::before {
+      flex-shrink: 0;
       display: inline-block;
       content: '✔';
       transition: color 200ms;
diff --git a/src/components/poll/poll.vue b/src/components/poll/poll.vue
@@ -31,8 +31,8 @@
           :disabled="loading"
           :value="index"
         >
-        <label>
-          {{option.title}}
+        <label class="option-vote">
+          <div>{{option.title}}</div>
         </label>
       </div>
     </div>
@@ -68,8 +68,7 @@
     margin: 0 0 0.5em;
   }
   .poll-option {
-    margin: 0.5em 0;
-    height: 1.5em;
+    margin: 0.75em 0.5em;
   }
   .option-result {
     height: 100%;
@@ -87,6 +86,7 @@
   }
   .result-percentage {
     width: 3.5em;
+    flex-shrink: 0;
   }
   .result-fill {
     height: 100%;
@@ -99,6 +99,10 @@
     left: 0;
     transition: width 0.5s;
   }
+  .option-vote {
+    display: flex;
+    align-items: center;
+  }
   input {
     width: 3.5em;
   }