diff --git a/main.go b/main.go index 76e4166..9e83055 100644 --- a/main.go +++ b/main.go @@ -29,7 +29,7 @@ import ( "time" ) -const VERSION = "v37" +const VERSION = "v36" var ( logger *slog.Logger diff --git a/static/css/default_light/trigger_edit.css b/static/css/default_light/trigger_edit.css index 959c7cf..5192604 100644 --- a/static/css/default_light/trigger_edit.css +++ b/static/css/default_light/trigger_edit.css @@ -13,24 +13,17 @@ .widgets .datapoints { font: "Roboto Mono", monospace; display: grid; - grid-template-columns: repeat(4, min-content); + grid-template-columns: min-content min-content 1fr; gap: 6px 8px; margin-bottom: 8px; white-space: nowrap; } -.widgets .datapoints div { - white-space: nowrap; -} .widgets .datapoints .invalid { color: #c83737; } .widgets .datapoints .delete img { height: 16px; } -.widgets .datapoints .values img { - height: 16px; - width: 16px; -} .widgets .action { display: grid; grid-template-columns: min-content min-content 1fr; diff --git a/static/css/gruvbox/trigger_edit.css b/static/css/gruvbox/trigger_edit.css index ee5b1fc..711dc17 100644 --- a/static/css/gruvbox/trigger_edit.css +++ b/static/css/gruvbox/trigger_edit.css @@ -13,24 +13,17 @@ .widgets .datapoints { font: "Roboto Mono", monospace; display: grid; - grid-template-columns: repeat(4, min-content); + grid-template-columns: min-content min-content 1fr; gap: 6px 8px; margin-bottom: 8px; white-space: nowrap; } -.widgets .datapoints div { - white-space: nowrap; -} .widgets .datapoints .invalid { color: #c83737; } .widgets .datapoints .delete img { height: 16px; } -.widgets .datapoints .values img { - height: 16px; - width: 16px; -} .widgets .action { display: grid; grid-template-columns: min-content min-content 1fr; diff --git a/static/js/trigger_edit.mjs b/static/js/trigger_edit.mjs index e74c2e3..826afd4 100644 --- a/static/js/trigger_edit.mjs +++ b/static/js/trigger_edit.mjs @@ -19,10 +19,9 @@ export class UI { let html = Object.keys(this.trigger.datapoints).sort().map(dpName => { const dp = this.trigger.datapoints[dpName] return ` +
${dp.Name}
${dp.Found ? dp.LastDatapointValue.TemplateValue : ''}
-
-
` }).join('') datapoints.innerHTML += html @@ -85,7 +84,7 @@ export class UI { }) }//}}} deleteDatapoint(name) {//{{{ - if (!confirm(`Remove datapoint ${name} from this trigger?`)) { + if (!confirm(`Delete ${name}?`)) { return } diff --git a/static/less/trigger_edit.less b/static/less/trigger_edit.less index ee1c616..4e3f0e2 100644 --- a/static/less/trigger_edit.less +++ b/static/less/trigger_edit.less @@ -19,15 +19,11 @@ .datapoints { font: "Roboto Mono", monospace; display: grid; - grid-template-columns: repeat(4, min-content); + grid-template-columns: min-content min-content 1fr; gap: 6px 8px; margin-bottom: 8px; white-space: nowrap; - div { - white-space: nowrap; - } - .invalid { color: #c83737; } @@ -35,11 +31,6 @@ .delete img { height: 16px; } - - .values img { - height: 16px; - width: 16px; - } } .action {