about summary refs log tree commit diff
path: root/app/javascript
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2020-03-06 15:20:14 +0100
committerGitHub <noreply@github.com>2020-03-06 15:20:14 +0100
commit503eab1c1f101e92f163ed4f8457cac9a6193ffc (patch)
tree06b2390acc434850de780c4358c182cfc2efede0 /app/javascript
parente69a3f54a10e58d32d7e46c494d98be948dde4b3 (diff)
Fix too large announcements not being scrollable in web UI (#13211)
Diffstat (limited to 'app/javascript')
-rw-r--r--app/javascript/styles/mastodon/components.scss7
1 files changed, 6 insertions, 1 deletions
diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 1be93dfea..456929f3a 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -870,6 +870,7 @@
 
 .announcements__item__content {
   word-wrap: break-word;
+  overflow-y: auto;
 
   .emojione {
     width: 20px;
@@ -6676,17 +6677,21 @@ noscript {
     box-sizing: border-box;
     width: 100%;
     padding: 15px;
-    padding-right: 15px + 18px;
     position: relative;
     font-size: 15px;
     line-height: 20px;
     word-wrap: break-word;
     font-weight: 400;
+    max-height: 50vh;
+    overflow: hidden;
+    display: flex;
+    flex-direction: column;
 
     &__range {
       display: block;
       font-weight: 500;
       margin-bottom: 10px;
+      padding-right: 18px;
     }
 
     &__unread {