From 87f17fc624ec7396b11dfd35b44532bc462e60ee Mon Sep 17 00:00:00 2001
From: Muffin <muffin@mailbox.org>
Date: Wed, 3 Jan 2024 01:42:26 -0600
Subject: [PATCH] merge-upstream: fix editor-compact

---
 src/addons/addons/editor-compact/userstyle.css | 3 ++-
 src/addons/generated/upstream-meta.json        | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/addons/addons/editor-compact/userstyle.css b/src/addons/addons/editor-compact/userstyle.css
index 2e60af0a2..08ee95eb2 100644
--- a/src/addons/addons/editor-compact/userstyle.css
+++ b/src/addons/addons/editor-compact/userstyle.css
@@ -53,7 +53,8 @@
   padding: 0 0.5rem;
 }
 
-[class*="menu-bar_menu-bar-button"] {
+[class*="menu-bar_menu-bar-button"],
+[class*="menu-bar_feedback-button_"] {
   height: 1.5rem;
   padding-left: 0.5rem;
   padding-right: 0.5rem;
diff --git a/src/addons/generated/upstream-meta.json b/src/addons/generated/upstream-meta.json
index f9f140123..6db35e5f0 100644
--- a/src/addons/generated/upstream-meta.json
+++ b/src/addons/generated/upstream-meta.json
@@ -1 +1 @@
-{"commit":"fc4cbcc"}
\ No newline at end of file
+{"commit":"4fa414f"}
\ No newline at end of file