diff options
| author | ThibG <thib@sitedethib.com> | 2020-03-08 22:09:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-08 22:09:53 +0100 |
| commit | 840b17e3444f9a68d3639f1ffeb326e8cb1e03b1 (patch) | |
| tree | 8254538ed33f4c4b974b5379f3b5a0b489ba095a /app/javascript/flavours/glitch/styles/components/announcements.scss | |
| parent | 13ef4d5fb0dbb66074f42df7989ae40509a4724f (diff) | |
| parent | 9c2922958783f7e499cdda5bb874d6096e47eb0a (diff) | |
Merge pull request #1297 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/styles/components/announcements.scss')
| -rw-r--r-- | app/javascript/flavours/glitch/styles/components/announcements.scss | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/styles/components/announcements.scss b/app/javascript/flavours/glitch/styles/components/announcements.scss index eab6c728b..52feefd3c 100644 --- a/app/javascript/flavours/glitch/styles/components/announcements.scss +++ b/app/javascript/flavours/glitch/styles/components/announcements.scss @@ -1,5 +1,6 @@ .announcements__item__content { word-wrap: break-word; + overflow-y: auto; .emojione { width: 20px; @@ -69,17 +70,21 @@ 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 { |