From 52ab1b60a3a8ea5dfe3d29ab7cf0813d1f6602b1 Mon Sep 17 00:00:00 2001
From: James Smith <jamessmith1@outlook.com>
Date: Wed, 13 May 2026 10:15:14 +0100
Subject: [PATCH] fix(meshcore): move UI into visuals container, fix layout
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

meshcoreMode partial was inside the generic .sidebar which gets hidden
when meshcore mode is active. Moved the include into meshcoreVisuals
(inside the output panel) — matching the same pattern as Meshtastic.
Also overrides mesh-visuals-container's column/padding defaults so the
meshcore sidebar+main row layout renders correctly.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 static/css/modes/meshcore.css          | 15 ++++++++++-----
 templates/index.html                   |  2 +-
 templates/partials/modes/meshcore.html |  2 +-
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/static/css/modes/meshcore.css b/static/css/modes/meshcore.css
index a705896..cce677b 100644
--- a/static/css/modes/meshcore.css
+++ b/static/css/modes/meshcore.css
@@ -1,14 +1,19 @@
 /* Meshcore mode — scoped styles */
 
-#meshcoreMode {
-    display: none;
+/* Override the shared mesh-visuals-container column layout */
+#meshcoreVisuals {
     flex-direction: row;
-    height: 100%;
+    padding: 0;
     gap: 0;
 }
 
-#meshcoreMode.active {
-    display: flex !important;
+#meshcoreMode {
+    display: flex;
+    flex-direction: row;
+    flex: 1;
+    min-height: 0;
+    overflow: hidden;
+    gap: 0;
 }
 
 /* ── Sidebar ── */
diff --git a/templates/index.html b/templates/index.html
index d0ee02f..290e27f 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -779,7 +779,6 @@
                 {% include 'partials/modes/spy-stations.html' %}
 
                 {% include 'partials/modes/meshtastic.html' %}
-                {% include 'partials/modes/meshcore.html' %}
 
                 {% include 'partials/modes/websdr.html' %}
 
@@ -2366,6 +2365,7 @@
 
                 <!-- Meshcore Dashboard -->
                 <div id="meshcoreVisuals" class="mesh-visuals-container" style="display: none;">
+                    {% include 'partials/modes/meshcore.html' %}
                 </div>
 
                 <!-- SSTV Decoder Dashboard -->
diff --git a/templates/partials/modes/meshcore.html b/templates/partials/modes/meshcore.html
index e6f7c69..9241dcf 100644
--- a/templates/partials/modes/meshcore.html
+++ b/templates/partials/modes/meshcore.html
@@ -1,5 +1,5 @@
 {# Meshcore Mode Partial #}
-<div id="meshcoreMode" class="mode-content" style="display:none; flex-direction: row; height: 100%;">
+<div id="meshcoreMode" style="display:flex; flex-direction: row; flex: 1; min-height: 0; overflow: hidden;">
 
   {# ── Sidebar ── #}
   <div class="meshcore-sidebar">