From 6f8a1095740bc50f599461ed1d0ac942b16a85a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adomas=20Ven=C4=8Dkauskas?= <adomas.ven@gmail.com>
Date: Fri, 5 Apr 2024 13:30:10 +0300
Subject: [PATCH] fx115: Fix menubar text colour and window control buttons on
 Linux

Window control buttons are a regression in c8d49e76
---
 scss/components/_titleBar.scss | 1 +
 scss/linux/_titleBar.scss      | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/scss/components/_titleBar.scss b/scss/components/_titleBar.scss
index b46784c858..76c3cf5aac 100644
--- a/scss/components/_titleBar.scss
+++ b/scss/components/_titleBar.scss
@@ -64,6 +64,7 @@
 
 #titlebar {
 	display: flex;
+	flex-direction: row;
 	justify-content: center;
 	-moz-window-dragging: drag;
 	menu {
diff --git a/scss/linux/_titleBar.scss b/scss/linux/_titleBar.scss
index 900f1fe2ab..ee872a1191 100644
--- a/scss/linux/_titleBar.scss
+++ b/scss/linux/_titleBar.scss
@@ -27,6 +27,11 @@
 	height: var(--tab-min-height);
 	appearance: none;
 	flex: 1;
+	color: CaptionText;
+}
+
+#toolbar-menubar:-moz-window-inactive {
+	color: InactiveCaptionText;
 }
 
 #menubar-items {
@@ -60,9 +65,6 @@
  * window state. Otherwise, elements in the navigator-toolbox, like the menubar,
  * can swallow those events. */
 .titlebar-buttonbox {
-	right: 0px;
-	position: absolute;
-	height: var(--tab-min-height);
 	z-index: 1;
 	display: flex;
 	align-items: center;