From 4759b0c08e1e5667ad01cdb3299eb69889883e5e Mon Sep 17 00:00:00 2001
From: TeaTinyTool <tinygit@ingob.de>
Date: Sat, 13 Jun 2026 17:52:26 +0200
Subject: [PATCH 1/2] Improve dark mode support for editor and preview

Make the ACE editor and file preview follow the current TinyFileManager theme.

Dark mode now uses a matching ACE theme and a separate Highlight.js style for previews, while light mode keeps the existing behavior. Plain text previews without Highlight.js also receive dark mode styling.
---
 tinyfilemanager.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/tinyfilemanager.php b/tinyfilemanager.php
index 9dfa94cf9..7e459441a 100644
--- a/tinyfilemanager.php
+++ b/tinyfilemanager.php
@@ -49,6 +49,7 @@
 // highlight.js style
 // for dark theme use 'ir-black'
 $highlightjs_style = 'vs';
+$highlightjs_style_dark = 'vs2015';
 
 // Enable ace.js (https://ace.c9.io/) on view's page
 $edit_files = true;
@@ -176,6 +177,7 @@
     'css-dropzone' => '<link href="https://cdnjs.cloudflare.com/ajax/libs/dropzone/5.9.3/min/dropzone.min.css" rel="stylesheet">',
     'css-font-awesome' => '<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" crossorigin="anonymous">',
     'css-highlightjs' => '<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.9.0/styles/' . $highlightjs_style . '.min.css">',
+    'css-highlightjs-dark' => '<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.9.0/styles/' . $highlightjs_style_dark . '.min.css">',
     'js-ace' => '<script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.32.2/ace.js"></script>',
     'js-bootstrap' => '<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-YvpcrYf0tY3lHB60NNkmXc5s9fDVZLESaAA55NDzOxhy9GkcIdslK1eN7N6jIeHz" crossorigin="anonymous"></script>',
     'js-dropzone' => '<script src="https://cdnjs.cloudflare.com/ajax/libs/dropzone/5.9.3/min/dropzone.min.js"></script>',
@@ -4028,7 +4030,7 @@ function fm_show_header()
         <?php print_external('css-bootstrap'); ?>
         <?php print_external('css-font-awesome'); ?>
         <?php if (FM_USE_HIGHLIGHTJS && isset($_GET['view'])): ?>
-            <?php print_external('css-highlightjs'); ?>
+            <?php print_external(FM_THEME == 'dark' ? 'css-highlightjs-dark' : 'css-highlightjs'); ?>
         <?php endif; ?>
         <script type="text/javascript">
             window.csrf = '<?php echo $_SESSION['token']; ?>';
@@ -4727,6 +4729,12 @@ function fm_show_header()
                 form.dropzone {
                     border-color: #79755e;
                 }
+
+                .theme-dark .file-preview-content pre {
+                    background-color: #101518;
+                    color: #CFD8DC;
+                    padding: 1rem;
+                }
             </style>
         <?php endif; ?>
     </head>
@@ -5202,7 +5210,7 @@ function confirmDialog(e, id = 0, title = "Action", content = "", action = null)
                     path: "ace/mode/<?php echo $ext; ?>",
                     inline: true
                 });
-                //editor.setTheme("ace/theme/twilight"); // Dark Theme
+                editor.setTheme("ace/theme/<?php echo FM_THEME == 'dark' ? 'twilight' : 'textmate'; ?>");
                 editor.setShowPrintMargin(false); // Hide the vertical ruler
                 function ace_commend(cmd) {
                     editor.commands.exec(cmd, editor);

From ba36b3c2c665ed8bc7b0c8a29f5e03a09305dc14 Mon Sep 17 00:00:00 2001
From: TeaTinyTool <tinygit@ingob.de>
Date: Mon, 27 Jul 2026 08:55:41 +0200
Subject: [PATCH 2/2] Fix dark plain-text preview selector

Replace the inert .file-preview-content selector with a dedicated plain-text-preview class on the non-Highlight.js preview fallback.

This scopes the dark-mode preview styling to the actual plain-text <pre> output and fixes the case where Highlight.js is disabled.
---
 tinyfilemanager.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tinyfilemanager.php b/tinyfilemanager.php
index a0297863c..cf35bedeb 100644
--- a/tinyfilemanager.php
+++ b/tinyfilemanager.php
@@ -1936,7 +1936,7 @@ class="edit-file"><i class="fa fa-pencil-square"></i> <?php echo lng('AdvancedEd
                         // php highlight
                         $content = highlight_string($content, true);
                     } else {
-                        $content = '<pre>' . fm_enc($content) . '</pre>';
+                        $content = '<pre class="plain-text-preview">' . fm_enc($content) . '</pre>';
                     }
                     echo $content;
                 }
@@ -4738,7 +4738,7 @@ function fm_show_header()
                     border-color: #79755e;
                 }
 
-                .theme-dark .file-preview-content pre {
+                .theme-dark pre.plain-text-preview {
                     background-color: #101518;
                     color: #CFD8DC;
                     padding: 1rem;