From 4a7536bd8db93f3a13dda4558f00c93b3c8ca16c Mon Sep 17 00:00:00 2001
From: Mo Mesgin <mmesgin@Mos-M2-MacBook-Pro.local>
Date: Thu, 13 Feb 2025 15:10:33 -0800
Subject: [PATCH] fix app modal overlay + revert flexContent removal

---
 shell/assets/styles/base/_variables.scss  | 6 +++---
 shell/components/AppModal.vue             | 2 +-
 shell/components/ResourceDetail/index.vue | 6 ++++++
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/shell/assets/styles/base/_variables.scss b/shell/assets/styles/base/_variables.scss
index 0d39f58424..a544f98e17 100644
--- a/shell/assets/styles/base/_variables.scss
+++ b/shell/assets/styles/base/_variables.scss
@@ -39,14 +39,14 @@ $z-indexes: (
 
   mainHeader: 14,
 
-  modalOverlay: 20,
-  modalContent: 21,
-
   tooltip: 30,
 
   dropdownOverlay: 40,
   dropdownContent: 41,
 
+  modalOverlay: 42,
+  modalContent: 43,
+
   loadingMain: 51
 );
 
diff --git a/shell/components/AppModal.vue b/shell/components/AppModal.vue
index 50c109d381..58b2ca7a5b 100644
--- a/shell/components/AppModal.vue
+++ b/shell/components/AppModal.vue
@@ -208,7 +208,7 @@ export default defineComponent({
     display: flex;
     justify-content: center;
     align-items: center;
-    z-index: 20;
+    z-index: z-index('modalOverlay');
 
     .modal-container {
       background-color: var(--modal-bg);
diff --git a/shell/components/ResourceDetail/index.vue b/shell/components/ResourceDetail/index.vue
index 239f0d3942..d122732366 100644
--- a/shell/components/ResourceDetail/index.vue
+++ b/shell/components/ResourceDetail/index.vue
@@ -71,6 +71,11 @@ export default {
       default: null,
     },
 
+    flexContent: {
+      type:    Boolean,
+      default: false,
+    },
+
     /**
      * Inherited global identifier prefix for tests
      * Define a term based on the parent component to avoid conflicts on multiple components
@@ -484,6 +489,7 @@ export default {
       :initial-value="initialModel"
       :live-value="liveModel"
       :real-mode="realMode"
+      :class="{'flex-content': flexContent}"
       @update:value="$emit('input', $event)"
       @set-subtype="setSubtype"
     />