From a37e20560dfd120db5d2d8b7645197f1eb6c5f79 Mon Sep 17 00:00:00 2001
From: Frank <91616163+softhack007@users.noreply.github.com>
Date: Fri, 13 Dec 2024 13:16:39 +0100
Subject: [PATCH] minor HTML and CSS fixes

* duplicate use of ID "heart"
* "& " --> "&amp; "
* missed changes in simple UI
---
 wled00/data/index.css         | 6 ++++++
 wled00/data/index.htm         | 2 +-
 wled00/data/index.js          | 1 +
 wled00/data/settings.htm      | 4 ++--
 wled00/data/settings_leds.htm | 2 +-
 wled00/data/settings_wifi.htm | 4 ++--
 wled00/data/simple.css        | 6 ++++++
 wled00/data/simple.htm        | 1 +
 wled00/data/simple.js         | 7 ++++---
 9 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/wled00/data/index.css b/wled00/data/index.css
index 617f971bd0..deb0cc64e7 100644
--- a/wled00/data/index.css
+++ b/wled00/data/index.css
@@ -665,6 +665,12 @@ button {
 	color: #f00;
 }
 
+#heartMM {
+	transition: color 0.9s;
+	font-size: 16px;
+	color: #0f0;
+}
+
 img {
 	max-width: 100%;
 	max-height: 100%;
diff --git a/wled00/data/index.htm b/wled00/data/index.htm
index e0c9ca547c..57fca4cf8e 100644
--- a/wled00/data/index.htm
+++ b/wled00/data/index.htm
@@ -389,7 +389,7 @@
 	</div>
 	<br>
 	<span class="h">WLED made with <span id="heart">&#10084;&#xFE0E;</span> by Aircoookie and the <a href="https://wled.discourse.group/" target="_blank">WLED community</a></span><br>
-	<span class="h">WLED MM made with <span id="heart">&#10084;&#xFE0E;</span> by Softhack007 & Ewowi and the <a href="https://discord.gg/8P7wGuqT/" target="_blank">WLED 2D & Audio Dev</a> community</span>
+	<span class="h">WLED MM made with <span id="heartMM">&#10084;&#xFE0E;</span> by Softhack007 &amp; Ewowi and the <a href="https://discord.gg/8P7wGuqT/" target="_blank">WLED 2D &amp; Audio Dev</a> community</span>
 </div>
 
 <div id="nodes" class="modal">
diff --git a/wled00/data/index.js b/wled00/data/index.js
index fb183d820d..a89958f575 100644
--- a/wled00/data/index.js
+++ b/wled00/data/index.js
@@ -3216,6 +3216,7 @@ setInterval(()=>{
 	if (hc==144) hc+=36;
 	if (hc==108) hc+=18;
 	gId('heart').style.color = `hsl(${hc}, 100%, 50%)`;
+	gId('heartMM').style.color = `hsl(${hc}, 100%, 50%)`;
 }, 910);
 
 function openGH() { window.open("https://github.com/Aircoookie/WLED/wiki"); }
diff --git a/wled00/data/settings.htm b/wled00/data/settings.htm
index e52d3bd745..9e22466495 100644
--- a/wled00/data/settings.htm
+++ b/wled00/data/settings.htm
@@ -102,8 +102,8 @@
 <button type="submit" onclick="window.location='./settings/ui'">User Interface</button>
 <button id="dmxbtn" style="display:none;" type="submit" onclick="window.location='./settings/dmx'">DMX Output</button>
 <button type="submit" onclick="window.location='./settings/sync'">Sync Interfaces</button>
-<button type="submit" onclick="window.location='./settings/time'">Time & Macros</button>
-<button type="submit" onclick="window.location='./settings/sec'">Security & Updates</button>
+<button type="submit" onclick="window.location='./settings/time'">Time &amp; Macros</button>
+<button type="submit" onclick="window.location='./settings/sec'">Security &amp; Updates</button>
 <button type="submit" onclick="window.location='./edit'">File System ☾</button> <!--WLEDMM-->
 </body>
 </html>
\ No newline at end of file
diff --git a/wled00/data/settings_leds.htm b/wled00/data/settings_leds.htm
index 375cfa39d5..03b6482595 100644
--- a/wled00/data/settings_leds.htm
+++ b/wled00/data/settings_leds.htm
@@ -741,7 +741,7 @@ <h3>Defaults</h3>
 		Use Gamma value: <input name="GV" type="number" class="m" placeholder="2.8" min="1" max="3" step="0.1" required><br><br>
 		Brightness factor: <input name="BF" type="number" class="m" min="1" max="255" required> %
 		<h3>Transitions</h3>
-		Crossfade: <input type="checkbox" name="TF"><br>
+		Cross-fade: <input type="checkbox" name="TF"><br>
 		Transition Time: <input name="TD" type="number" class="xl" min="0" max="65500"> ms<br>
 		Enable Palette transitions: <input type="checkbox" name="PF"><br>
 		<i>Random Cycle</i> Palette Time: <input name="TP" type="number" class="m" min="1" max="255"> s<br>
diff --git a/wled00/data/settings_wifi.htm b/wled00/data/settings_wifi.htm
index 8b40c3c109..98f1494eaf 100644
--- a/wled00/data/settings_wifi.htm
+++ b/wled00/data/settings_wifi.htm
@@ -139,7 +139,7 @@
 	<form id="form_s" name="Sf" method="post">
 		<div class="toprow">
 		<div class="helpB"><button type="button" onclick="H()">?</button></div>
-		<button type="button" onclick="B()">Back</button><button type="submit">Save & Connect</button><hr>
+		<button type="button" onclick="B()">Back</button><button type="submit">Save &amp; Connect</button><hr>
 		</div>
 		<h2>WiFi setup</h2>
 		<h3>Connect to existing network</h3>
@@ -211,7 +211,7 @@ <h3>Ethernet Type</h3>
 			</select><br><br>
 		</div>
 		<hr>
-		<button type="button" onclick="B()">Back</button><button type="submit">Save & Connect</button>
+		<button type="button" onclick="B()">Back</button><button type="submit">Save &amp; Connect</button>
 	</form>
 </body>
 </html>
diff --git a/wled00/data/simple.css b/wled00/data/simple.css
index 87eecee736..b7b9a30d12 100644
--- a/wled00/data/simple.css
+++ b/wled00/data/simple.css
@@ -361,6 +361,12 @@ button:hover {
 	color: #f00;
 }
 
+#heartMM {
+	transition: color 0.9s;
+	font-size: 16px;
+	color: #0f0;
+}
+
 img {
 	max-width: 100%;
 	max-height: 100%;
diff --git a/wled00/data/simple.htm b/wled00/data/simple.htm
index 955bd65d81..599ee1102c 100644
--- a/wled00/data/simple.htm
+++ b/wled00/data/simple.htm
@@ -246,6 +246,7 @@
 	<button class="btn" id="resetbtn" onclick="cnfReset()">Reboot WLED</button>
 	</div>
 	<span class="h">Made with <span id="heart">&#10084;&#xFE0E;</span> by Aircoookie and the <a href="https://wled.discourse.group/" target="_blank">WLED community</a></span>
+	<span class="h">WLED MM made with <span id="heartMM">&#10084;&#xFE0E;</span> by Softhack007 &amp; Ewowi and the <a href="https://discord.gg/8P7wGuqT/" target="_blank">WLED 2D &amp; Audio Dev</a> community</span>
 </div>
 
 <div id="nodes" class="modal">
diff --git a/wled00/data/simple.js b/wled00/data/simple.js
index aa4fb22cbb..d773b41b8a 100644
--- a/wled00/data/simple.js
+++ b/wled00/data/simple.js
@@ -509,10 +509,11 @@ function populateInfo(i)
 	if (i.ver.startsWith("0.14.")) vcn = "Hoshi";
 	if (i.ver.includes("-bl")) vcn = "Supāku";
 	if (i.cn) vcn = i.cn;
+	if (i.ver.includes("14.5.")) vcn = "Small Step";
 
 	//WLEDMM: add total heap and total PSRAM, and build number
-	if (i.ver.includes("14.1-")) vcn = "Sitting Ducks"; // easter egg
-	if (i.ver.includes("14.0-mdev")) vcn = "Lupo";
+	//if (i.ver.includes("14.1-")) vcn = "Sitting Ducks"; // easter egg
+	//if (i.ver.includes("14.0-mdev")) vcn = "Lupo";
 	cn += `v${i.ver} &nbsp;<i>"${vcn}"</i><p><em>build ${i.vid}</em></p><table>
 ${urows}
 ${inforow("Build",i.vid)}
@@ -1281,7 +1282,7 @@ function setBalance(b)
 
 var hc = 0;
 setInterval(()=>{if (!isInfo) return; hc+=18; if (hc>300) hc=0; if (hc>200)hc=306; if (hc==144) hc+=36; if (hc==108) hc+=18;
-gId('heart').style.color = `hsl(${hc}, 100%, 50%)`;}, 910);
+gId('heart').style.color = `hsl(${hc}, 100%, 50%)`; gId('heartMM').style.color = `hsl(${hc}, 100%, 50%)`;}, 910);
 
 function openGH() { window.open("https://github.com/Aircoookie/WLED/wiki"); }