From 07d6acfb52796d66dd4e91677dc291dedb450468 Mon Sep 17 00:00:00 2001
From: LB Johnston <mail@lb.ee>
Date: Wed, 28 Feb 2024 20:30:25 +1000
Subject: [PATCH] Fix - Ensure that modal tabs width are not impacted by side
 panel opening

Regression from #11150
---
 CHANGELOG.txt                                 |  6 ++++++
 client/scss/components/forms/_form-width.scss | 15 +++++++++------
 docs/releases/6.0.2.md                        | 16 ++++++++++++++++
 docs/releases/index.rst                       |  1 +
 4 files changed, 32 insertions(+), 6 deletions(-)
 create mode 100644 docs/releases/6.0.2.md

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 5d89004e31..b5868e7ded 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -40,6 +40,12 @@ Changelog
  * Maintenance: Remove usage of inline scripts and instead use event dispatching to instantiate standalone Draftail editor instances (Chiemezuo Akujobi)
 
 
+6.0.2 (xx.xx.xxxx) - IN DEVELOPMENT
+~~~~~~~~~~~~~~~~~~
+
+ * Fix: Ensure that modal tabs width are not impacted by side panel opening (LB (Ben) Johnston)
+
+
 6.0.1 (15.02.2024)
 ~~~~~~~~~~~~~~~~~~
 
diff --git a/client/scss/components/forms/_form-width.scss b/client/scss/components/forms/_form-width.scss
index a4b9878fe9..d5c36aeeb8 100644
--- a/client/scss/components/forms/_form-width.scss
+++ b/client/scss/components/forms/_form-width.scss
@@ -4,22 +4,25 @@
 
 @include media-breakpoint-up(md) {
   .minimap-open {
-    .tab-content {
-      width: theme('width.[4/5]');
+    .w-form-width {
+      max-width: theme('width.[4/5]');
     }
   }
 
   .side-panel-open {
-    .tab-content {
+    .w-form-width {
       // Account for dynamic width of the side panel when open.
-      width: max(theme('width.[1/3]'), calc(100% - var(--side-panel-width)));
+      max-width: max(
+        theme('width.[1/3]'),
+        calc(100% - var(--side-panel-width))
+      );
     }
   }
 
   .side-panel-open.minimap-open {
-    .tab-content {
+    .w-form-width {
       // Account for additional space taken up by the minimap.
-      width: max(
+      max-width: max(
         theme('width.[2/5]'),
         calc(100% - var(--side-panel-width) - 15rem)
       );
diff --git a/docs/releases/6.0.2.md b/docs/releases/6.0.2.md
new file mode 100644
index 0000000000..7926c497fc
--- /dev/null
+++ b/docs/releases/6.0.2.md
@@ -0,0 +1,16 @@
+# Wagtail 6.0.2 release notes - IN DEVELOPMENT
+
+_Unreleased_
+
+```{contents}
+---
+local:
+depth: 1
+---
+```
+
+## What's new
+
+### Bug fixes
+
+ * Ensure that modal tabs width are not impacted by side panel opening (LB (Ben) Johnston)
diff --git a/docs/releases/index.rst b/docs/releases/index.rst
index 209a383bf5..a8c05784d8 100644
--- a/docs/releases/index.rst
+++ b/docs/releases/index.rst
@@ -6,6 +6,7 @@ Release notes
 
    upgrading
    6.1
+   6.0.2
    6.0.1
    6.0
    5.2.3