diff --git a/frontend/src/html/pages/settings.html b/frontend/src/html/pages/settings.html
index a2c2d6646..8abbd84c2 100644
--- a/frontend/src/html/pages/settings.html
+++ b/frontend/src/html/pages/settings.html
@@ -864,8 +864,8 @@
-
-
+
+
diff --git a/frontend/src/ts/commandline/commandline-metadata.ts b/frontend/src/ts/commandline/commandline-metadata.ts
index 0269d74f1..199658377 100644
--- a/frontend/src/ts/commandline/commandline-metadata.ts
+++ b/frontend/src/ts/commandline/commandline-metadata.ts
@@ -513,8 +513,10 @@ export const commandlineConfigMetadata: CommandlineConfigMetadataObject = {
alias: "wpm",
},
timerStyle: {
- display: "Live progress style...",
- subgroup: { options: "fromSchema" },
+ subgroup: {
+ options: "fromSchema",
+ display: (value) => value.replaceAll(/_/g, " "),
+ },
alias: "timer",
},
timerColor: {
diff --git a/frontend/src/ts/config-metadata.ts b/frontend/src/ts/config-metadata.ts
index 5ad4f4d97..1cd44f864 100644
--- a/frontend/src/ts/config-metadata.ts
+++ b/frontend/src/ts/config-metadata.ts
@@ -463,7 +463,7 @@ export const configMetadata: ConfigMetadataObject = {
// appearance
timerStyle: {
icon: "fa-chart-pie",
- displayString: "timer style",
+ displayString: "live progress style",
changeRequiresRestart: false,
},
liveSpeedStyle: {
diff --git a/frontend/src/ts/test/timer-progress.ts b/frontend/src/ts/test/timer-progress.ts
index cbf5b2103..274d1d7d5 100644
--- a/frontend/src/ts/test/timer-progress.ts
+++ b/frontend/src/ts/test/timer-progress.ts
@@ -36,7 +36,7 @@ export function show(): void {
textEl.classList.remove("hidden");
},
});
- } else if (Config.timerStyle === "flash mini") {
+ } else if (Config.timerStyle === "flash_mini") {
animate(miniEl, {
opacity: [0, 1],
duration: applyReducedMotion(125),
@@ -44,7 +44,7 @@ export function show(): void {
miniEl.classList.remove("hidden");
},
});
- } else if (Config.timerStyle === "flash text") {
+ } else if (Config.timerStyle === "flash_text") {
animate(textEl, {
opacity: [0, 1],
duration: applyReducedMotion(125),
@@ -140,7 +140,7 @@ export function update(): void {
if (textEl !== null) {
textEl.innerHTML = "
" + displayTime + "
";
}
- } else if (Config.timerStyle === "flash mini") {
+ } else if (Config.timerStyle === "flash_mini") {
let displayTime = DateTime.secondsToString(maxtime - time);
if (maxtime === 0) {
displayTime = DateTime.secondsToString(time);
@@ -153,7 +153,7 @@ export function update(): void {
}
miniEl.innerHTML = "
" + displayTime + "
";
}
- } else if (Config.timerStyle === "flash text") {
+ } else if (Config.timerStyle === "flash_text") {
let displayTime = DateTime.secondsToString(maxtime - time);
if (maxtime === 0) {
displayTime = DateTime.secondsToString(time);
@@ -203,13 +203,13 @@ export function update(): void {
} else {
textEl.innerHTML = `
${getCurrentCount()}/${outof}
`;
}
- } else if (Config.timerStyle === "flash mini") {
+ } else if (Config.timerStyle === "flash_mini") {
if (outof === 0) {
miniEl.innerHTML = `${TestInput.input.getHistory().length}`;
} else {
miniEl.innerHTML = `${getCurrentCount()}/${outof}`;
}
- } else if (Config.timerStyle === "flash text") {
+ } else if (Config.timerStyle === "flash_text") {
if (outof === 0) {
textEl.innerHTML = `
${TestInput.input.getHistory().length}
`;
} else {
@@ -225,9 +225,9 @@ export function update(): void {
} else if (Config.mode === "zen") {
if (Config.timerStyle === "text") {
textEl.innerHTML = `
${TestInput.input.getHistory().length}
`;
- } else if (Config.timerStyle === "flash mini") {
+ } else if (Config.timerStyle === "flash_mini") {
miniEl.innerHTML = `${TestInput.input.getHistory().length}`;
- } else if (Config.timerStyle === "flash text") {
+ } else if (Config.timerStyle === "flash_text") {
textEl.innerHTML = `
${TestInput.input.getHistory().length}
`;
} else {
miniEl.innerHTML = `${TestInput.input.getHistory().length}`;
diff --git a/packages/schemas/src/configs.ts b/packages/schemas/src/configs.ts
index e5a2f698f..e7246854f 100644
--- a/packages/schemas/src/configs.ts
+++ b/packages/schemas/src/configs.ts
@@ -59,8 +59,8 @@ export const TimerStyleSchema = z.enum([
"bar",
"text",
"mini",
- "flash text",
- "flash mini",
+ "flash_text",
+ "flash_mini",
]);
export type TimerStyle = z.infer
;