diff --git a/web/src/Top.tsx b/web/src/Top.tsx index 7465ae3..73181d4 100644 --- a/web/src/Top.tsx +++ b/web/src/Top.tsx @@ -264,7 +264,9 @@ export default function Top() { const load = s?.load ?? pt?.load ?? [0, 0, 0] const mem = s?.mem ?? pt?.mem ?? { total: 0, used: 0, avail: 0 } const uptime = s?.uptime ?? pt?.uptime ?? 0 - const model = (pt?.cpu_model ?? '').replace(/\(R\)|\(TM\)|CPU|Processor/g, '').replace(/\s+/g, ' ').trim() + // "11th Gen Intel(R) Core(TM) i7-11700T @ 1.40GHz" is a whole line of border to itself; the + // clock is already beside it, and the generation is in the model number + const model = (pt?.cpu_model ?? '').replace(/\(R\)|\(TM\)|CPU|Processor/g, '').replace(/@.*$/, '').replace(/^\d+th Gen\s*/i, '').replace(/\s+/g, ' ').trim() // the hottest thing that looks like a CPU sensor, and one per core where the chip names them const coreTemp = (i: number) => s?.temps.find((t) => new RegExp(`core ${i}\\b`, 'i').test(t.label))?.c const cpuTemp = pt?.cpu_temp ?? s?.temps.find((t) => /package|tctl|tdie|cpu/i.test(t.label))?.c ?? coreTemp(0) diff --git a/web/src/styles.css b/web/src/styles.css index 47d3083..48c1537 100644 --- a/web/src/styles.css +++ b/web/src/styles.css @@ -561,7 +561,8 @@ pre.diff .add { color: var(--ok); background: color-mix(in srgb, var(--ok) 12%, .t-cpu-graph { flex: 1; min-width: 0; min-height: 0; display: flex; flex-direction: column; } .t-up { color: #6b7280; font-size: 12px; padding-top: 2px; } .t-cores { width: 310px; flex-shrink: 0; border: 1px solid #303a4a; border-radius: 3px; padding: 4px 6px; display: flex; flex-direction: column; gap: 1px; overflow-y: auto; scrollbar-width: thin; } -.t-cores-head { display: flex; gap: 8px; color: #7b8496; font-size: 12px; } .t-cores-head b { color: #dddddd; font-weight: 400; } +.t-cores-head { display: flex; gap: 8px; color: #7b8496; font-size: 12px; white-space: nowrap; } +.t-cores-head b { color: #dddddd; font-weight: 400; overflow: hidden; text-overflow: ellipsis; } .t-core { display: flex; align-items: center; gap: 6px; } .t-core-n { width: 30px; color: #cccccc; } .t-core-p { width: 34px; text-align: right; color: #dddddd; } .t-core-g { flex: 1; color: #00d35c; letter-spacing: 0; overflow: hidden; white-space: nowrap; }