From 0f1b45f0d8f590526472e2d03ca49dd4a2400f92 Mon Sep 17 00:00:00 2001
From: Squidly271 <unraidsquid@gmail.com>
Date: Fri, 3 Oct 2025 01:42:13 -0400
Subject: [PATCH 1/2] Chore: Only support small / normal / large font sizes

---
 emhttp/plugins/dynamix/DisplaySettings.page     |  6 ------
 .../dynamix/include/DefaultPageLayout.php       | 17 ++++++++++++++---
 sbin/upgrade                                    |  5 ++++-
 3 files changed, 18 insertions(+), 10 deletions(-)
 mode change 100644 => 100755 emhttp/plugins/dynamix/DisplaySettings.page
 mode change 100644 => 100755 emhttp/plugins/dynamix/include/DefaultPageLayout.php

diff --git a/emhttp/plugins/dynamix/DisplaySettings.page b/emhttp/plugins/dynamix/DisplaySettings.page
old mode 100644
new mode 100755
index 647d2931c..741f17321
--- a/emhttp/plugins/dynamix/DisplaySettings.page
+++ b/emhttp/plugins/dynamix/DisplaySettings.page
@@ -152,24 +152,18 @@ _(Language)_:
 
 _(Font size)_:
 : <select name="font" id='font'>
-  <?=mk_option($display['font'], "50", _('Very small'))?>
   <?=mk_option($display['font'], "56.25", _('Small'))?>
   <?=mk_option($display['font'], "", _('Normal'))?>
   <?=mk_option($display['font'], "68.75", _('Large'))?>
-  <?=mk_option($display['font'], "75", _('Very large'))?>
-  <?=mk_option($display['font'], "80", _('Huge'))?>
   </select>
 
 :display_font_size_help:
 
 _(Terminal font size)_:
 : <select name="tty" id="tty">
-  <?=mk_option($display['tty'], "11", _('Very small'))?>
   <?=mk_option($display['tty'], "13", _('Small'))?>
   <?=mk_option($display['tty'], "15", _('Normal'))?>
   <?=mk_option($display['tty'], "17", _('Large'))?>
-  <?=mk_option($display['tty'], "19", _('Very large'))?>
-  <?=mk_option($display['tty'], "21", _('Huge'))?>
   </select>
 
 :display_tty_size_help:
diff --git a/emhttp/plugins/dynamix/include/DefaultPageLayout.php b/emhttp/plugins/dynamix/include/DefaultPageLayout.php
old mode 100644
new mode 100755
index cc5e088a4..a985f8903
--- a/emhttp/plugins/dynamix/include/DefaultPageLayout.php
+++ b/emhttp/plugins/dynamix/include/DefaultPageLayout.php
@@ -1,6 +1,6 @@
 <?php
-/* Copyright 2005-2024, Lime Technology
- * Copyright 2012-2024, Bergware International.
+/* Copyright 2005-2025, Lime Technology
+ * Copyright 2012-2025, Bergware International.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
@@ -19,7 +19,18 @@ $themes2 = $themeHelper->isSidebarTheme();
 $themeHelper->updateDockerLogColor($docroot);
 
 $display['font'] = filter_var($_COOKIE['fontSize'] ?? $display['font'] ?? '', FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
-
+// adjust font size if cookie was set to a value that is not supported
+switch ($display['font']) {
+    case "50": 
+        $display['font'] = "56.25";
+        break;
+    case "75":
+        $display['font'] = "68.75";
+        break;
+    case "80":
+        $display['font'] = "68.75";
+        break;
+}
 $header  = $display['header']; // keep $header, $backgnd vars for plugin backwards compatibility for the time being
 $backgnd = $display['background'];
 
diff --git a/sbin/upgrade b/sbin/upgrade
index d84d52a49..90e0afa0f 100755
--- a/sbin/upgrade
+++ b/sbin/upgrade
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright 2021 Lime Technology, Inc.
+# Copyright 2025 Lime Technology, Inc.
 
 # Unraid OS upgrade script.
 # Invoked early in emhttpd execution.
@@ -31,5 +31,8 @@ fi
 # stating with 6.10 'USE_SSL="auto"' without a LE cert is invalid
 [[ ! -f /boot/config/ssl/certs/certificate_bundle.pem ]] && sed -i s/USE_SSL=\"auto\"/USE_SSL=\"no\"/ /boot/config/ident.cfg
 
+# remove support for huge / very large / very small font sizes (replace with nearest size still supported)
+[ -f "/boot/config/plugins/dynamix/dynamix.cfg" ] && sed -ri -e 's/font="(80|75)"/font="68.75"/g' -e 's/font="50"/font="56.25"/g' -e 's/tty="11"/tty="13"/g' -e 's/tty="(19|21)"/tty="17"/g' "/boot/config/plugins/dynamix/dynamix.cfg"
+
 # delete any temp dir left over from a version downgrade (see dynamix.plugin.manager/include/Downgrade.php)
 rm -rf /boot/deletemedowngrade.*

From ec0ecf34306f03716a5b9e26f1497e8bf0752bd7 Mon Sep 17 00:00:00 2001
From: Squidly271 <unraidsquid@gmail.com>
Date: Fri, 3 Oct 2025 02:07:45 -0400
Subject: [PATCH 2/2] Chore: Adjust Button placement on VMs page

https://github.com/unraid/webgui/pull/2411 accounted for Huge / Very Large.

Just need to account for Large
---
 emhttp/plugins/dynamix.vm.manager/VMMachines.page | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/emhttp/plugins/dynamix.vm.manager/VMMachines.page b/emhttp/plugins/dynamix.vm.manager/VMMachines.page
index aed7115b2..80b7f199e 100755
--- a/emhttp/plugins/dynamix.vm.manager/VMMachines.page
+++ b/emhttp/plugins/dynamix.vm.manager/VMMachines.page
@@ -471,7 +471,7 @@ function loadlist() {
         elementSelectorsForSpacing: [
           '#kvm_table',
         ],
-        manualSpacingOffset: 30, // without this, the main content will still be scrollable by like 20px
+        manualSpacingOffset: 50, // without this, the main content will still be scrollable by like 20px
       });
       // Handle table header fixed positioning after resize
       function tableHeaderResize() {