Merge pull request #2416 from Squidly271/Chore/RemoveExtremeFontSizes

Chore: Only support small / normal / large font sizes
This commit is contained in:
tom mortensen
2025-10-14 17:33:31 -07:00
committed by GitHub
4 changed files with 19 additions and 11 deletions

View File

@@ -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() {

6
emhttp/plugins/dynamix/DisplaySettings.page Normal file → Executable file
View File

@@ -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:

17
emhttp/plugins/dynamix/include/DefaultPageLayout.php Normal file → Executable file
View File

@@ -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'];