From 299d822b8e37528312887f83ab0b73bd38a3b76d Mon Sep 17 00:00:00 2001
From: BPower0036 <80090789+BPower0036@users.noreply.github.com>
Date: Tue, 26 Apr 2022 18:51:07 +0000
Subject: [PATCH 1/4] https://github.com/black7375/Firefox-UI-Fix/issues/363

---
 src/icons/_layout_menu.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/icons/_layout_menu.scss b/src/icons/_layout_menu.scss
index ba14f04..dbb393a 100644
--- a/src/icons/_layout_menu.scss
+++ b/src/icons/_layout_menu.scss
@@ -87,7 +87,7 @@ menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup)
   }
   :not(menu, #ContentSelectDropdown, #context-navigation)
     > menupopup
-    > menuitem[type="checkbox"][checked="false"]
+    > menuitem[type="checkbox"]:not([checked="true"])
     > .menu-iconic-left {
     padding-inline-start: var(--context-menu-text-padding);
   }

From 38f03a590acf1769cea3d0509b442b446d11bd53 Mon Sep 17 00:00:00 2001
From: alstjr7375 <alstjr7375@daum.net>
Date: Wed, 27 Apr 2022 04:44:24 +0900
Subject: [PATCH 2/4] Fix: Tabbar - Cut off at windows #368 #370

---
 css/leptonChrome.css   | 11 +++++++++++
 src/tabbar/_index.scss |  6 ++++++
 2 files changed, 17 insertions(+)

diff --git a/css/leptonChrome.css b/css/leptonChrome.css
index e72481d..edebceb 100644
--- a/css/leptonChrome.css
+++ b/css/leptonChrome.css
@@ -3661,6 +3661,17 @@
   #titlebar {
     -moz-appearance: none !important;
   }
+
+  @media (-moz-os-version: windows-win7),
+    (-moz-platform: windows-win7),
+    (-moz-os-version: windows-win8),
+    (-moz-platform: windows-win8),
+    (-moz-os-version: windows-win10),
+    (-moz-platform: windows-win10) {
+    :root[tabsintitlebar="true"][sizemode="maximized"] #navigator-toolbox {
+      padding-top: 8px;
+    }
+  }
 }
 @supports -moz-bool-pref("userChrome.tab.on_bottom") {
   /* Source file https://github.com/MrOtherGuy/firefox-csshacks/tree/master/chrome/tabs_on_bottom.css made available under Mozilla Public License v. 2.0
diff --git a/src/tabbar/_index.scss b/src/tabbar/_index.scss
index c8ee31a..105d7b3 100644
--- a/src/tabbar/_index.scss
+++ b/src/tabbar/_index.scss
@@ -16,6 +16,12 @@
   #titlebar {
     -moz-appearance: none !important;
   }
+  @include OS($win) {
+    // Prevent sideeffect #370
+    :root[tabsintitlebar="true"][sizemode="maximized"] #navigator-toolbox {
+      padding-top: 8px; // Don't use margin-top for reserved fullscreen animation
+    }
+  }
 }
 
 @include Option("userChrome.tab.on_bottom") {

From f2042f7e88d75b6a3bb32973aa5bfd53fabda6a7 Mon Sep 17 00:00:00 2001
From: alstjr7375 <alstjr7375@daum.net>
Date: Wed, 27 Apr 2022 05:09:02 +0900
Subject: [PATCH 3/4] Add: Build PR #374

---
 CREDITS              | 3 +++
 css/leptonChrome.css | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CREDITS b/CREDITS
index 944d2c5..a2cc636 100644
--- a/CREDITS
+++ b/CREDITS
@@ -42,6 +42,9 @@ W: https://www.reddit.com/user/Backseat-Driver/
 N: badprogramshere
 W: https://github.com/badprogramshere
 
+N: BPower0036
+W: https://github.com/BPower0036
+
 N: Burak Yigit Kaya
 E: ben@byk.im
 W: https://byk.im/
diff --git a/css/leptonChrome.css b/css/leptonChrome.css
index edebceb..4801c16 100644
--- a/css/leptonChrome.css
+++ b/css/leptonChrome.css
@@ -6019,7 +6019,7 @@
 
     :not(menu, #ContentSelectDropdown, #context-navigation)
       > menupopup
-      > menuitem[type="checkbox"][checked="false"]
+      > menuitem[type="checkbox"]:not([checked="true"])
       > .menu-iconic-left {
       padding-inline-start: var(--context-menu-text-padding);
     }

From 979dd77ab336774aa7de90c10a09624476efad5f Mon Sep 17 00:00:00 2001
From: alstjr7375 <alstjr7375@daum.net>
Date: Wed, 27 Apr 2022 10:32:56 +0900
Subject: [PATCH 4/4] Fix: Bookmark menu - position #372

It's a sideeffect of `display: flex` at `:root[sizemode="normal"]`.
---
 css/leptonChrome.css            | 32 ++++++++++++++------------------
 docs/Restrictions.md            |  2 ++
 src/tabbar/_index.scss          | 21 ++++++++-------------
 src/tabbar/_tabs_on_bottom.scss |  9 ++++++---
 4 files changed, 30 insertions(+), 34 deletions(-)

diff --git a/css/leptonChrome.css b/css/leptonChrome.css
index 4801c16..7c2f73f 100644
--- a/css/leptonChrome.css
+++ b/css/leptonChrome.css
@@ -3643,35 +3643,25 @@
 /** Tab Bar UI ****************************************************************/
 /*= Tabs on Bottom ===========================================================*/
 @supports -moz-bool-pref("userChrome.tab.on_bottom") or -moz-bool-pref("userChrome.fullscreen.overlap") {
-  #navigator-toolbox {
+  /* Don't use display: flex at not fullscreen!! side effect #372 */
+  :root[sizemode="fullscreen"] #navigator-toolbox {
     display: flex !important;
     /* Needed for content to take up entire height, compatibility with tabs on bottom */
     flex-wrap: wrap;
   }
 
-  #titlebar,
-  #nav-bar,
-  #PersonalToolbar,
-  #tab-notification-deck,
-  #tab-notification-deck-template {
+  :root[sizemode="fullscreen"] #titlebar,
+  :root[sizemode="fullscreen"] #nav-bar,
+  :root[sizemode="fullscreen"] #PersonalToolbar,
+  :root[sizemode="fullscreen"] #tab-notification-deck,
+  :root[sizemode="fullscreen"] #tab-notification-deck-template {
     flex-basis: 100%;
   }
 
   /* -moz-default-appearance: -moz-window-titlebar */
-  #titlebar {
+  :root[sizemode="fullscreen"] #titlebar {
     -moz-appearance: none !important;
   }
-
-  @media (-moz-os-version: windows-win7),
-    (-moz-platform: windows-win7),
-    (-moz-os-version: windows-win8),
-    (-moz-platform: windows-win8),
-    (-moz-os-version: windows-win10),
-    (-moz-platform: windows-win10) {
-    :root[tabsintitlebar="true"][sizemode="maximized"] #navigator-toolbox {
-      padding-top: 8px;
-    }
-  }
 }
 @supports -moz-bool-pref("userChrome.tab.on_bottom") {
   /* Source file https://github.com/MrOtherGuy/firefox-csshacks/tree/master/chrome/tabs_on_bottom.css made available under Mozilla Public License v. 2.0
@@ -3679,11 +3669,15 @@
   /*= Tabbar - Move to bottom ==================================================*/
   #titlebar {
     order: 2;
+    /* When userChrome.fullscreen.overlap */
+    -moz-box-ordinal-group: 2;
     --tabs-navbar-shadow-size: 0px;
   }
 
   #tab-notification-deck {
     order: 2;
+    /* When userChrome.fullscreen.overlap */
+    -moz-box-ordinal-group: 2;
   }
 
   #TabsToolbar .titlebar-spacer {
@@ -3693,6 +3687,8 @@
   @supports -moz-bool-pref("userChrome.tab.on_bottom.above_bookmark") {
     #PersonalToolbar {
       order: 2;
+      /* When userChrome.fullscreen.overlap */
+      -moz-box-ordinal-group: 2;
     }
   }
   @supports not -moz-bool-pref("userChrome.tab.on_bottom.above_bookmark") {
diff --git a/docs/Restrictions.md b/docs/Restrictions.md
index 12427ff..910d0f7 100644
--- a/docs/Restrictions.md
+++ b/docs/Restrictions.md
@@ -63,6 +63,8 @@ The following code will cause extension panels fail to open and trying to open t
 ```
 Info: `#nav-bar` is [`toolbar`](https://udn.realityripple.com/docs/Archive/Mozilla/XUL/toolbar).
 
+Another `display: flex`'s side effect examples. [#368](https://github.com/black7375/Firefox-UI-Fix/issues/368) [#372](https://github.com/black7375/Firefox-UI-Fix/issues/372)
+
 ## Internals
 ### CSS Loading Order
 User CSS(`userChrome.css`, `userContent.css`) is usually loaded first.
diff --git a/src/tabbar/_index.scss b/src/tabbar/_index.scss
index 105d7b3..4b18055 100644
--- a/src/tabbar/_index.scss
+++ b/src/tabbar/_index.scss
@@ -1,27 +1,22 @@
 /*= Tabs on Bottom ===========================================================*/
 @include Option("userChrome.tab.on_bottom", "userChrome.fullscreen.overlap") {
-  #navigator-toolbox {
+  /* Don't use display: flex at not fullscreen!! side effect #372 */
+  :root[sizemode="fullscreen"] #navigator-toolbox {
     display: flex !important; /* Needed for content to take up entire height, compatibility with tabs on bottom */
     flex-wrap: wrap;
   }
-  #titlebar,
-  #nav-bar,
-  #PersonalToolbar,
-  #tab-notification-deck,
-  #tab-notification-deck-template {
+  :root[sizemode="fullscreen"] #titlebar,
+  :root[sizemode="fullscreen"] #nav-bar,
+  :root[sizemode="fullscreen"] #PersonalToolbar,
+  :root[sizemode="fullscreen"] #tab-notification-deck,
+  :root[sizemode="fullscreen"] #tab-notification-deck-template {
     flex-basis: 100%;
   }
 
   /* -moz-default-appearance: -moz-window-titlebar */
-  #titlebar {
+  :root[sizemode="fullscreen"] #titlebar {
     -moz-appearance: none !important;
   }
-  @include OS($win) {
-    // Prevent sideeffect #370
-    :root[tabsintitlebar="true"][sizemode="maximized"] #navigator-toolbox {
-      padding-top: 8px; // Don't use margin-top for reserved fullscreen animation
-    }
-  }
 }
 
 @include Option("userChrome.tab.on_bottom") {
diff --git a/src/tabbar/_tabs_on_bottom.scss b/src/tabbar/_tabs_on_bottom.scss
index acf3ed1..f197f8a 100644
--- a/src/tabbar/_tabs_on_bottom.scss
+++ b/src/tabbar/_tabs_on_bottom.scss
@@ -3,11 +3,13 @@ See the above repository for updates as well as full license text. */
 
 /*= Tabbar - Move to bottom ==================================================*/
 #titlebar{
-  order: 2;
+  order: 2; /* When userChrome.fullscreen.overlap */
+  -moz-box-ordinal-group: 2;
   --tabs-navbar-shadow-size: 0px;
 }
 #tab-notification-deck {
-  order: 2;
+  order: 2; /* When userChrome.fullscreen.overlap */
+  -moz-box-ordinal-group: 2;
 }
 
 #TabsToolbar .titlebar-spacer {
@@ -16,7 +18,8 @@ See the above repository for updates as well as full license text. */
 
 @include Option("userChrome.tab.on_bottom.above_bookmark") {
   #PersonalToolbar {
-    order: 2;
+    order: 2; /* When userChrome.fullscreen.overlap */
+    -moz-box-ordinal-group: 2;
   }
 }
 @include NotOption("userChrome.tab.on_bottom.above_bookmark") {