From e69a3f54a10e58d32d7e46c494d98be948dde4b3 Mon Sep 17 00:00:00 2001
From: koyu <me@koyu.space>
Date: Fri, 6 Mar 2020 05:31:51 +0100
Subject: Change GIF label to be displayed even when autoplay is enabled in web
 UI (#13209)

---
 app/javascript/styles/mastodon/components.scss | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'app/javascript/styles')

diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 653ad8188..1be93dfea 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -5058,12 +5058,6 @@ a.status-card.compact:hover {
 }
 
 .media-gallery__gifv {
-  &.autoplay {
-    .media-gallery__gifv__label {
-      display: none;
-    }
-  }
-
   &:hover {
     .media-gallery__gifv__label {
       opacity: 1;
-- 
cgit 


From 503eab1c1f101e92f163ed4f8457cac9a6193ffc Mon Sep 17 00:00:00 2001
From: ThibG <thib@sitedethib.com>
Date: Fri, 6 Mar 2020 15:20:14 +0100
Subject: Fix too large announcements not being scrollable in web UI (#13211)

---
 app/javascript/styles/mastodon/components.scss | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'app/javascript/styles')

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 {
-- 
cgit 


From 2e18b1a2a2976f04f84e92d187b0620223a64fa6 Mon Sep 17 00:00:00 2001
From: "Mélanie Chauvel (ariasuni)" <perso@hack-libre.org>
Date: Sun, 8 Mar 2020 15:36:50 +0100
Subject: Fix text area above/right of emoji picker being accidentally
 clickable in web UI (#13148)

---
 app/javascript/styles/mastodon/components.scss | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'app/javascript/styles')

diff --git a/app/javascript/styles/mastodon/components.scss b/app/javascript/styles/mastodon/components.scss
index 456929f3a..7d3644d16 100644
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -388,8 +388,8 @@
 
   .emoji-picker-dropdown {
     position: absolute;
-    top: 5px;
-    right: 5px;
+    top: 0;
+    right: 0;
   }
 
   .compose-form__autosuggest-wrapper {
@@ -4061,10 +4061,7 @@ a.status-card.compact:hover {
 
 .emoji-button {
   display: block;
-  font-size: 24px;
-  line-height: 24px;
-  margin-left: 2px;
-  width: 24px;
+  padding: 5px 5px 2px 2px;
   outline: 0;
   cursor: pointer;
 
@@ -4080,7 +4077,6 @@ a.status-card.compact:hover {
     margin: 0;
     width: 22px;
     height: 22px;
-    margin-top: 2px;
   }
 
   &:hover,
-- 
cgit