From f45bea76c50a73e27d156b0fddfda961d186a2ec Mon Sep 17 00:00:00 2001
From: Charles Hacskaylo <charlesh88@gmail.com>
Date: Tue, 30 Sep 2025 10:19:21 -0700
Subject: [PATCH 1/3] Time Strip fixes

Closes #8169
- CSS and markup changes to fix swimlane overflow and Inspector layout for Time Strip.
---
 .../timeline/TimelineElementsContent.vue      |  5 ++--
 src/plugins/timeline/TimelineElementsPool.vue | 29 ++++++++++---------
 src/plugins/timeline/timeline.scss            |  1 +
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/src/plugins/timeline/TimelineElementsContent.vue b/src/plugins/timeline/TimelineElementsContent.vue
index e726bcadbb9..454b7ef089b 100644
--- a/src/plugins/timeline/TimelineElementsContent.vue
+++ b/src/plugins/timeline/TimelineElementsContent.vue
@@ -3,18 +3,17 @@
     <input
       :value="size"
       aria-labelledby="pixelSize"
-      class="field control"
+      class="field control c-input--sm"
       :pattern="/\d+/"
       type="number"
       name="value"
       min="0"
       @change="changeSize"
     />
-    <span>px</span>
   </template>
   <select v-model="fixed" aria-label="fixedOrFlex" @change="toggleFixed">
     <option :value="false">flex</option>
-    <option :value="true">fixed</option>
+    <option :value="true">px</option>
   </select>
 </template>
 <script>
diff --git a/src/plugins/timeline/TimelineElementsPool.vue b/src/plugins/timeline/TimelineElementsPool.vue
index 6f549ebe61f..5469df77a57 100644
--- a/src/plugins/timeline/TimelineElementsPool.vue
+++ b/src/plugins/timeline/TimelineElementsPool.vue
@@ -4,20 +4,23 @@
       <TimelineElementsContent :index="index" :container="containers[index]" />
     </template>
     <template #custom>
-      <div class="c-inspector__properties c-inspect-properties" aria-label="Swim Lane Label Width">
-        <div class="c-inspect-properties__header">Swim Lane Label Width</div>
+      <div class="c-inspector__properties c-inspect-properties" aria-label="Swimlane Column">
+        <div class="c-inspect-properties__header">Swimlane Column</div>
         <div v-if="isEditing" class="c-inspect-properties__row">
-          <input
-            :value="swimLaneLabelWidth"
-            aria-labelledby="Width in pixels"
-            class="field control"
-            :pattern="/\d+/"
-            type="number"
-            name="value"
-            min="0"
-            @change="changeSwimLaneLabelWidth"
-          />
-          <span>px</span>
+          <span class="c-inspect-properties__label">Width</span>
+          <div class="c-inspect-properties__label align-right">
+            <input
+              :value="swimLaneLabelWidth"
+              aria-labelledby="Width in pixels"
+              class="field control c-input--sm"
+              :pattern="/\d+/"
+              type="number"
+              name="value"
+              min="0"
+              @change="changeSwimLaneLabelWidth"
+            />
+            <span>px</span>
+          </div>
         </div>
         <div v-else class="c-inspect-properties__row">{{ swimLaneLabelWidth }}px</div>
       </div>
diff --git a/src/plugins/timeline/timeline.scss b/src/plugins/timeline/timeline.scss
index cbfec691910..b3a53c121fb 100644
--- a/src/plugins/timeline/timeline.scss
+++ b/src/plugins/timeline/timeline.scss
@@ -52,6 +52,7 @@
   }
 
   &__content {
+    overflow: auto;
     &.--scales {
       flex-grow: 1;
       flex-shrink: 1;

From 5e96bce137a1d6caef43cb141a0d4add7a8a95aa Mon Sep 17 00:00:00 2001
From: Charles Hacskaylo <charlesh88@gmail.com>
Date: Wed, 1 Oct 2025 14:02:20 -0700
Subject: [PATCH 2/3] Fixes swimlane overlap problem.

---
 src/ui/components/swim-lane/swimlane.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ui/components/swim-lane/swimlane.scss b/src/ui/components/swim-lane/swimlane.scss
index c8721906273..dfc61bdadd9 100644
--- a/src/ui/components/swim-lane/swimlane.scss
+++ b/src/ui/components/swim-lane/swimlane.scss
@@ -31,7 +31,7 @@
   grid-template-columns: 100px 100px 1fr;
   grid-column-gap: 1px;
   grid-row-gap: 1px; // Used for grid within a swimlane for Plan views
-  min-height: $btnStdH;
+  min-height: max-content; // Must use max-content to prevent swimlane from collapsing
   width: 100%;
 
   &__time-axis {

From 8874434b923649251b4f6c3b6fc5de20413ec6da Mon Sep 17 00:00:00 2001
From: Charles Hacskaylo <charlesh88@gmail.com>
Date: Wed, 1 Oct 2025 16:34:20 -0700
Subject: [PATCH 3/3] Fixes swimlane overlap problem.

---
 src/ui/components/swim-lane/swimlane.scss | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/ui/components/swim-lane/swimlane.scss b/src/ui/components/swim-lane/swimlane.scss
index dfc61bdadd9..78d4bf22619 100644
--- a/src/ui/components/swim-lane/swimlane.scss
+++ b/src/ui/components/swim-lane/swimlane.scss
@@ -31,9 +31,14 @@
   grid-template-columns: 100px 100px 1fr;
   grid-column-gap: 1px;
   grid-row-gap: 1px; // Used for grid within a swimlane for Plan views
-  min-height: max-content; // Must use max-content to prevent swimlane from collapsing
+  min-height: max-content; // Plan and Gantt views: must use max-content to prevent swimlane from collapsing
   width: 100%;
 
+  .is-object-type-time-strip & {
+    min-height: $btnStdH;
+
+  }
+
   &__time-axis {
     flex: 0 0 auto;
     height: 32px;