diff --git a/main.go b/main.go index 5df1074..6b0a45c 100644 --- a/main.go +++ b/main.go @@ -27,7 +27,7 @@ import ( "time" ) -const VERSION = "v21" +const VERSION = "v20" var ( logger *slog.Logger diff --git a/static/css/default_light/datapoints.css b/static/css/default_light/datapoints.css index b99c128..5ca8d48 100644 --- a/static/css/default_light/datapoints.css +++ b/static/css/default_light/datapoints.css @@ -3,11 +3,6 @@ grid-template-columns: repeat(6, min-content); grid-gap: 8px 16px; margin-top: 16px; - background-color: #2979b8; - padding: 16px; - width: min-content; - border-top-left-radius: 8px; - border-top-right-radius: 8px; } #datapoints .group { font-size: 1.1em; @@ -22,7 +17,7 @@ #datapoints .header { font-weight: 800; font-size: 0.85em; - color: #555; + color: #333; } #datapoints div { white-space: nowrap; diff --git a/static/css/default_light/default_light.css b/static/css/default_light/default_light.css index 778c5cb..f1ece36 100644 --- a/static/css/default_light/default_light.css +++ b/static/css/default_light/default_light.css @@ -1,6 +1,3 @@ -body { - background-color: #f8f8f8; -} .widgets .action #run-result { background-color: #fff !important; border: 1px solid #ccc; @@ -38,9 +35,3 @@ button:focus { #areas .area .section .name { font-weight: normal; } -#datapoints, -#problems-list, -#acknowledged-list { - background-color: #fff !important; - border: 1px solid #ddd; -} diff --git a/static/css/default_light/gruvbox.css b/static/css/default_light/gruvbox.css index 621bb00..e69de29 100644 --- a/static/css/default_light/gruvbox.css +++ b/static/css/default_light/gruvbox.css @@ -1,6 +0,0 @@ -body { - background-image: url(/images/v0/gruvbox/background.svg); -} -#areas .area { - box-shadow: 5px 5px 15px 0px rgba(0, 0, 0, 0.5); -} diff --git a/static/css/default_light/main.css b/static/css/default_light/main.css index 786fa5f..d543b2f 100644 --- a/static/css/default_light/main.css +++ b/static/css/default_light/main.css @@ -72,7 +72,7 @@ html { #areas { display: flex; flex-wrap: wrap; - gap: 24px; + gap: 12px; margin-top: 16px; } #areas .area { @@ -110,7 +110,7 @@ html { dialog { background: #1b4e78; border: 1px solid #3f90d4; - color: #555; + color: #333; box-shadow: 10px 10px 15px 0px rgba(0, 0, 0, 0.25); } html, @@ -122,7 +122,7 @@ body { background: #fff; font-family: sans-serif; font-weight: 300; - color: #555; + color: #333; font-size: 11pt; } h1, @@ -159,7 +159,7 @@ textarea, select { font-family: monospace; background: #fff; - color: #555; + color: #333; padding: 4px 8px; border: 1px solid #484848; font-size: 1em; @@ -167,7 +167,7 @@ select { } button { background: #1b4e78; - color: #555; + color: #333; padding: 8px 32px; border: 1px solid #2e84cb; font-size: 1em; @@ -181,12 +181,12 @@ button:focus { border-bottom: 1px solid #d9d9d9; } span.date { - color: #555; + color: #333; font-weight: 800; } span.time { font-size: 0.9em; - color: #555; + color: #333; } span.seconds { display: none; diff --git a/static/css/default_light/problems.css b/static/css/default_light/problems.css index 0fea820..ffe8a97 100644 --- a/static/css/default_light/problems.css +++ b/static/css/default_light/problems.css @@ -3,13 +3,7 @@ display: grid; grid-template-columns: repeat(6, min-content); grid-gap: 4px 16px; - margin-top: 32px; margin-bottom: 32px; - background-color: #2979b8; - padding: 16px; - width: min-content; - border-top-left-radius: 8px; - border-top-right-radius: 8px; } #problems-list div, #acknowledged-list div { @@ -35,7 +29,7 @@ #areas { display: flex; flex-wrap: wrap; - gap: 24px; + gap: 12px; margin-top: 16px; } #areas .area .section { diff --git a/static/css/default_light/trigger_edit.css b/static/css/default_light/trigger_edit.css index 5192604..0ba9a92 100644 --- a/static/css/default_light/trigger_edit.css +++ b/static/css/default_light/trigger_edit.css @@ -37,7 +37,7 @@ min-height: 8em; } .widgets .action #run-result.ok { - color: #555; + color: #333; } .widgets .action #run-result.error { color: #fb4934; diff --git a/static/css/gruvbox/datapoints.css b/static/css/gruvbox/datapoints.css index a9db4f0..4b896e4 100644 --- a/static/css/gruvbox/datapoints.css +++ b/static/css/gruvbox/datapoints.css @@ -3,11 +3,6 @@ grid-template-columns: repeat(6, min-content); grid-gap: 8px 16px; margin-top: 16px; - background-color: #333; - padding: 16px; - width: min-content; - border-top-left-radius: 8px; - border-top-right-radius: 8px; } #datapoints .group { font-size: 1.1em; diff --git a/static/css/gruvbox/default_light.css b/static/css/gruvbox/default_light.css index c6c66ca..d30536b 100644 --- a/static/css/gruvbox/default_light.css +++ b/static/css/gruvbox/default_light.css @@ -1,6 +1,3 @@ -body { - background-color: #f8f8f8; -} .widgets .action #run-result { background-color: #fff !important; border: 1px solid #ccc; @@ -38,9 +35,3 @@ button:focus { #areas .area .section .name { font-weight: normal; } -#datapoints, -#problems-list, -#acknowledged-list { - background-color: #fff !important; - border: 1px solid #ddd; -} diff --git a/static/css/gruvbox/gruvbox.css b/static/css/gruvbox/gruvbox.css index 621bb00..e69de29 100644 --- a/static/css/gruvbox/gruvbox.css +++ b/static/css/gruvbox/gruvbox.css @@ -1,6 +0,0 @@ -body { - background-image: url(/images/v0/gruvbox/background.svg); -} -#areas .area { - box-shadow: 5px 5px 15px 0px rgba(0, 0, 0, 0.5); -} diff --git a/static/css/gruvbox/main.css b/static/css/gruvbox/main.css index 91cde42..1ab2986 100644 --- a/static/css/gruvbox/main.css +++ b/static/css/gruvbox/main.css @@ -72,7 +72,7 @@ html { #areas { display: flex; flex-wrap: wrap; - gap: 24px; + gap: 12px; margin-top: 16px; } #areas .area { diff --git a/static/css/gruvbox/problems.css b/static/css/gruvbox/problems.css index 1063758..6cd6c90 100644 --- a/static/css/gruvbox/problems.css +++ b/static/css/gruvbox/problems.css @@ -3,13 +3,7 @@ display: grid; grid-template-columns: repeat(6, min-content); grid-gap: 4px 16px; - margin-top: 32px; margin-bottom: 32px; - background-color: #333; - padding: 16px; - width: min-content; - border-top-left-radius: 8px; - border-top-right-radius: 8px; } #problems-list div, #acknowledged-list div { @@ -35,7 +29,7 @@ #areas { display: flex; flex-wrap: wrap; - gap: 24px; + gap: 12px; margin-top: 16px; } #areas .area .section { diff --git a/static/images/default_light/acknowledge-filled.svg b/static/images/default_light/acknowledge-filled.svg index dc17ddb..f2d8a57 100644 --- a/static/images/default_light/acknowledge-filled.svg +++ b/static/images/default_light/acknowledge-filled.svg @@ -62,6 +62,6 @@ + style="stroke-width:0.384845;fill:#fb4934;fill-opacity:1" /> diff --git a/static/images/default_light/acknowledge-outline.svg b/static/images/default_light/acknowledge-outline.svg index 0028767..7e97bfb 100644 --- a/static/images/default_light/acknowledge-outline.svg +++ b/static/images/default_light/acknowledge-outline.svg @@ -64,6 +64,6 @@ + style="stroke-width:0.384845;fill:#fb4934;fill-opacity:1" /> diff --git a/static/images/gruvbox/background.svg b/static/images/gruvbox/background.svg deleted file mode 100644 index 114b042..0000000 --- a/static/images/gruvbox/background.svg +++ /dev/null @@ -1,198 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/static/js/problems.mjs b/static/js/problems.mjs index 1e2361f..e3e2587 100644 --- a/static/js/problems.mjs +++ b/static/js/problems.mjs @@ -7,19 +7,6 @@ export class UI { list.classList.remove('hidden') } - const display = localStorage.getItem('problems_display') - if (display === null) - this.displayAreas() - else { - switch (display) { - case 'areas': - this.displayAreas() - break - case 'list': - this.displayList() - break - } - } } toggleAcknowledged(evt) { @@ -37,14 +24,9 @@ export class UI { displayList() { document.querySelector('.display-list').classList.remove('hidden') document.querySelector('.display-areas').classList.add('hidden') - localStorage.setItem('problems_display', 'list') - document.getElementById('display-list').setAttribute('checked', 'checked') } - displayAreas() { document.querySelector('.display-list').classList.add('hidden') document.querySelector('.display-areas').classList.remove('hidden') - localStorage.setItem('problems_display', 'areas') - document.getElementById('display-table').setAttribute('checked', 'checked') } } diff --git a/static/js/trigger_edit.mjs b/static/js/trigger_edit.mjs index f706136..ab90143 100644 --- a/static/js/trigger_edit.mjs +++ b/static/js/trigger_edit.mjs @@ -1,5 +1,5 @@ export class UI { - constructor(version, theme) {//{{{ + constructor(version) {//{{{ document.getElementById('button-run'). addEventListener('click', evt => evt.preventDefault()) @@ -8,7 +8,6 @@ export class UI { document.querySelector('input[name="name"]').focus() this.version = version - this.theme = theme this.datapoints = [] }//}}} render() {//{{{ @@ -19,7 +18,7 @@ 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 : ''}
` diff --git a/static/less/datapoints.less b/static/less/datapoints.less index 403c7da..878623d 100644 --- a/static/less/datapoints.less +++ b/static/less/datapoints.less @@ -5,11 +5,6 @@ grid-template-columns: repeat(6, min-content); grid-gap: 8px 16px; margin-top: 16px; - background-color: @bg3; - padding: 16px; - width: min-content; - border-top-left-radius: 8px; - border-top-right-radius: 8px; .group { font-size: 1.10em; diff --git a/static/less/default_light.less b/static/less/default_light.less index cda1760..8afa131 100644 --- a/static/less/default_light.less +++ b/static/less/default_light.less @@ -1,9 +1,5 @@ @import "theme-@{THEME}.less"; -body { - background-color: #f8f8f8; -} - .widgets { .action { #run-result { @@ -55,8 +51,3 @@ button { } } } - -#datapoints, #problems-list, #acknowledged-list { - background-color: #fff !important; - border: 1px solid #ddd; -} diff --git a/static/less/gruvbox.less b/static/less/gruvbox.less index 6beb230..f369797 100644 --- a/static/less/gruvbox.less +++ b/static/less/gruvbox.less @@ -1,11 +1 @@ @import "theme-@{THEME}.less"; - -body { - background-image: url(/images/v0/gruvbox/background.svg); -} - -#areas { - .area { - box-shadow: 5px 5px 15px 0px rgba(0,0,0,0.5); - } -} diff --git a/static/less/main.less b/static/less/main.less index 1d0e3b9..4c61a90 100644 --- a/static/less/main.less +++ b/static/less/main.less @@ -91,7 +91,7 @@ html { #areas { display: flex; flex-wrap: wrap; - gap: 24px; + gap: 12px; margin-top: 16px; .area { diff --git a/static/less/problems.less b/static/less/problems.less index 940c6a0..29caf1f 100644 --- a/static/less/problems.less +++ b/static/less/problems.less @@ -4,13 +4,7 @@ display: grid; grid-template-columns: repeat(6, min-content); grid-gap: 4px 16px; - margin-top: 32px; margin-bottom: 32px; - background-color: @bg3; - padding: 16px; - width: min-content; - border-top-left-radius: 8px; - border-top-right-radius: 8px; div { white-space: nowrap; @@ -40,7 +34,7 @@ #areas { display: flex; flex-wrap: wrap; - gap: 24px; + gap: 12px; margin-top: 16px; .area { diff --git a/static/less/theme-default_light.less b/static/less/theme-default_light.less index 2139c0e..36dca3d 100644 --- a/static/less/theme-default_light.less +++ b/static/less/theme-default_light.less @@ -2,7 +2,7 @@ @bg2: #1b4e78; @bg3: #2979b8; -@text1: #555; +@text1: #333; @text2: #000; @text3: #7bb8eb; diff --git a/views/pages/datapoints.gotmpl b/views/pages/datapoints.gotmpl index 96bbff0..26168be 100644 --- a/views/pages/datapoints.gotmpl +++ b/views/pages/datapoints.gotmpl @@ -8,7 +8,7 @@ Create
- {{ $prevGroup := "15ecfcc0-b1aa-45cd-af9c-74146a7e7f56-not-very-likely" }} + {{ $prevGroup := "kalle" }} {{ range .Data.Datapoints }} {{ if ne $prevGroup .Group }}

{{ .Group }}

diff --git a/views/pages/problems.gotmpl b/views/pages/problems.gotmpl index 4df5aee..8c74697 100644 --- a/views/pages/problems.gotmpl +++ b/views/pages/problems.gotmpl @@ -1,6 +1,5 @@ {{ define "page" }} {{ $version := .VERSION }} - {{ $theme := .CONFIG.THEME }}