From 2b6a25c609e2d1814e5dd586e9f40868d944c8bc Mon Sep 17 00:00:00 2001
From: Mashiro <moezhx@outlook.com>
Date: Fri, 19 Nov 2021 05:01:31 +0800
Subject: Add lazy load to emoji-mart (#16907)

* perf: lazyload emoji-mart!

* Bump lazyload
---
 app/javascript/styles/mastodon/emoji_picker.scss | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'app/javascript/styles')

diff --git a/app/javascript/styles/mastodon/emoji_picker.scss b/app/javascript/styles/mastodon/emoji_picker.scss
index adddd4533..e025c97ed 100644
--- a/app/javascript/styles/mastodon/emoji_picker.scss
+++ b/app/javascript/styles/mastodon/emoji_picker.scss
@@ -169,14 +169,15 @@
   }
 
   &:hover::before {
-    z-index: 0;
+    z-index: -1;
     content: "";
     position: absolute;
     top: 0;
     left: 0;
     width: 100%;
     height: 100%;
-    background-color: rgba($ui-secondary-color, 0.7);
+    // background-color: rgba($ui-secondary-color, 0.7);
+    background-color: #f4f4f4;
     border-radius: 100%;
   }
 }
-- 
cgit 


From 6159020617a70aa4ff90181703e23f8aa4ffb70d Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 19 Nov 2021 18:21:37 +0100
Subject: Fix background-color of emoji-mart selector (#17011)

Reverts part of #16907 to fix hardcoded color
---
 app/javascript/styles/mastodon/emoji_picker.scss | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'app/javascript/styles')

diff --git a/app/javascript/styles/mastodon/emoji_picker.scss b/app/javascript/styles/mastodon/emoji_picker.scss
index e025c97ed..e73057465 100644
--- a/app/javascript/styles/mastodon/emoji_picker.scss
+++ b/app/javascript/styles/mastodon/emoji_picker.scss
@@ -176,8 +176,7 @@
     left: 0;
     width: 100%;
     height: 100%;
-    // background-color: rgba($ui-secondary-color, 0.7);
-    background-color: #f4f4f4;
+    background-color: rgba($ui-secondary-color, 0.7);
     border-radius: 100%;
   }
 }
-- 
cgit 


From db32835338e113f23a474d323e398916a999619f Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Fri, 19 Nov 2021 18:22:49 +0100
Subject: Fix overflow of long profile fields in admin view (#17010)

---
 app/javascript/styles/mastodon/admin.scss | 1 +
 1 file changed, 1 insertion(+)

(limited to 'app/javascript/styles')

diff --git a/app/javascript/styles/mastodon/admin.scss b/app/javascript/styles/mastodon/admin.scss
index 489646e1f..dbf8a6e7a 100644
--- a/app/javascript/styles/mastodon/admin.scss
+++ b/app/javascript/styles/mastodon/admin.scss
@@ -831,6 +831,7 @@ a.name-tag,
     padding: 0 5px;
     margin-bottom: 10px;
     flex: 1 0 50%;
+    max-width: 100%;
   }
 
   .account__header__fields,
-- 
cgit