about summary refs log tree commit diff
diff options
context:
space:
mode:
authormultiple creatures <dev@multiple-creature.party>2019-03-10 12:05:45 +0000
committermultiple creatures <dev@multiple-creature.party>2019-05-21 03:16:21 -0500
commit2f136e9889bde7dc5b4c67e6f47056b452c02ede (patch)
treed03165069ab513cfa414968d0b62d1096f18a730
parentb57383e025db2f6b0e3733960f4622ffe26c3f65 (diff)
allow text wrapping in polls + smaller font
-rw-r--r--app/javascript/flavours/glitch/styles/polls.scss7
-rw-r--r--app/javascript/styles/mastodon/polls.scss7
2 files changed, 4 insertions, 10 deletions
diff --git a/app/javascript/flavours/glitch/styles/polls.scss b/app/javascript/flavours/glitch/styles/polls.scss
index 50bb45e7c..3448ee211 100644
--- a/app/javascript/flavours/glitch/styles/polls.scss
+++ b/app/javascript/flavours/glitch/styles/polls.scss
@@ -5,7 +5,6 @@
   li {
     margin-bottom: 10px;
     position: relative;
-    height: 18px + 12px;
   }
 
   &__chart {
@@ -25,10 +24,9 @@
   &__text {
     position: relative;
     display: inline-block;
-    padding: 6px 0;
+    padding: 4px 0 0 4px;
     line-height: 18px;
     cursor: default;
-    white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
 
@@ -45,7 +43,7 @@
       display: block;
       box-sizing: border-box;
       width: 100%;
-      font-size: 14px;
+      font-size: 12px;
       color: $inverted-text-color;
       display: block;
       outline: 0;
@@ -96,7 +94,6 @@
 
   &__number {
     display: inline-block;
-    width: 36px;
     font-weight: 700;
     padding: 0 10px;
     text-align: right;
diff --git a/app/javascript/styles/mastodon/polls.scss b/app/javascript/styles/mastodon/polls.scss
index 0d55afda4..d731ce5ae 100644
--- a/app/javascript/styles/mastodon/polls.scss
+++ b/app/javascript/styles/mastodon/polls.scss
@@ -5,7 +5,6 @@
   li {
     margin-bottom: 10px;
     position: relative;
-    height: 18px + 12px;
   }
 
   &__chart {
@@ -25,10 +24,9 @@
   &__text {
     position: relative;
     display: inline-block;
-    padding: 6px 0;
+    padding: 4px 0 0 4px;
     line-height: 18px;
     cursor: default;
-    white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
 
@@ -45,7 +43,7 @@
       display: block;
       box-sizing: border-box;
       width: 100%;
-      font-size: 14px;
+      font-size: 12px;
       color: $inverted-text-color;
       display: block;
       outline: 0;
@@ -96,7 +94,6 @@
 
   &__number {
     display: inline-block;
-    width: 36px;
     font-weight: 700;
     padding: 0 10px;
     text-align: right;