diff --git a/main.go b/main.go index 1dcfe3f..e96246b 100644 --- a/main.go +++ b/main.go @@ -26,7 +26,7 @@ import ( "time" ) -const VERSION = "v13" +const VERSION = "v12" var ( logger *slog.Logger diff --git a/static/css/datapoints.css b/static/css/datapoints.css index 54d331a..8333e8e 100644 --- a/static/css/datapoints.css +++ b/static/css/datapoints.css @@ -26,11 +26,8 @@ body { } h1, h2 { - margin-bottom: 4px; -} -h1:first-child, -h2:first-child { margin-top: 0px; + margin-bottom: 4px; } h1 { font-size: 1.5em; @@ -39,11 +36,10 @@ h1 { } h2 { font-size: 1.25em; - color: #b8bb26; font-weight: 500; } a { - color: #3f9da1; + color: #fabd2f; text-decoration: none; } a:hover { @@ -111,11 +107,9 @@ label { #datapoints .group { font-size: 1.1em; font-weight: bold; - color: #b8bb26; + color: #fabd2f; margin-top: 1.5em; padding-bottom: 4px; -} -#datapoints h2 { border-bottom: unset; } #datapoints .header { diff --git a/static/css/index.css b/static/css/index.css deleted file mode 100644 index 1cb2413..0000000 --- a/static/css/index.css +++ /dev/null @@ -1,109 +0,0 @@ -html { - box-sizing: border-box; -} -*, -*:before, -*:after { - box-sizing: inherit; -} -*:focus { - outline: none; -} -[onClick] { - cursor: pointer; -} -html, -body { - margin: 0; - padding: 0; -} -body { - background: #282828; - font-family: sans-serif; - font-weight: 300; - color: #d5c4a1; - font-size: 11pt; -} -h1, -h2 { - margin-bottom: 4px; -} -h1:first-child, -h2:first-child { - margin-top: 0px; -} -h1 { - font-size: 1.5em; - color: #fb4934; - font-weight: 500; -} -h2 { - font-size: 1.25em; - color: #b8bb26; - font-weight: 500; -} -a { - color: #3f9da1; - text-decoration: none; -} -a:hover { - text-decoration: underline; -} -b { - font-weight: 500; -} -input[type="text"], -textarea, -select { - font-family: monospace; - background: #202020; - color: #d5c4a1; - padding: 4px 8px; - border: none; - font-size: 1em; - line-height: 1.5em; -} -button { - background: #202020; - color: #d5c4a1; - padding: 8px 32px; - border: 1px solid #535353; - font-size: 1em; - height: 3em; -} -button:focus { - background: #333; -} -.line { - grid-column: 1 / -1; - border-bottom: 1px solid #4e4e4e; -} -span.date { - color: #d5c4a1; - font-weight: 500; -} -span.time { - font-size: 0.9em; - color: #d5c4a1; -} -span.seconds { - display: none; -} -label { - user-select: none; -} -.description { - border: 1px solid #737373; - color: #3f9da1; - background: #202020; - padding: 4px 8px; - margin-top: 8px; - white-space: nowrap; - width: min-content; - border-radius: 8px; -} -.graph { - margin-top: 32px; - padding: 32px; - border-radius: 16px; -} diff --git a/static/css/main.css b/static/css/main.css index 67e2da9..c2dc070 100644 --- a/static/css/main.css +++ b/static/css/main.css @@ -26,11 +26,8 @@ body { } h1, h2 { - margin-bottom: 4px; -} -h1:first-child, -h2:first-child { margin-top: 0px; + margin-bottom: 4px; } h1 { font-size: 1.5em; @@ -39,11 +36,10 @@ h1 { } h2 { font-size: 1.25em; - color: #b8bb26; font-weight: 500; } a { - color: #3f9da1; + color: #fabd2f; text-decoration: none; } a:hover { @@ -182,10 +178,6 @@ label { margin-top: 12px; margin-bottom: 20px; } -#areas .area .section.configuration { - margin-top: 8px; - margin-bottom: 8px; -} #areas .area .section:last-child { margin-bottom: 12px; } diff --git a/static/css/problems.css b/static/css/problems.css index 820b6e0..4cb921b 100644 --- a/static/css/problems.css +++ b/static/css/problems.css @@ -26,11 +26,8 @@ body { } h1, h2 { - margin-bottom: 4px; -} -h1:first-child, -h2:first-child { margin-top: 0px; + margin-bottom: 4px; } h1 { font-size: 1.5em; @@ -39,11 +36,10 @@ h1 { } h2 { font-size: 1.25em; - color: #b8bb26; font-weight: 500; } a { - color: #3f9da1; + color: #fabd2f; text-decoration: none; } a:hover { diff --git a/static/css/theme.css b/static/css/theme.css index 215acbb..104cf3d 100644 --- a/static/css/theme.css +++ b/static/css/theme.css @@ -26,11 +26,8 @@ body { } h1, h2 { - margin-bottom: 4px; -} -h1:first-child, -h2:first-child { margin-top: 0px; + margin-bottom: 4px; } h1 { font-size: 1.5em; @@ -39,11 +36,10 @@ h1 { } h2 { font-size: 1.25em; - color: #b8bb26; font-weight: 500; } a { - color: #3f9da1; + color: #fabd2f; text-decoration: none; } a:hover { diff --git a/static/css/trigger_edit.css b/static/css/trigger_edit.css index 71cbb6a..b2600b6 100644 --- a/static/css/trigger_edit.css +++ b/static/css/trigger_edit.css @@ -26,11 +26,8 @@ body { } h1, h2 { - margin-bottom: 4px; -} -h1:first-child, -h2:first-child { margin-top: 0px; + margin-bottom: 4px; } h1 { font-size: 1.5em; @@ -39,11 +36,10 @@ h1 { } h2 { font-size: 1.25em; - color: #b8bb26; font-weight: 500; } a { - color: #3f9da1; + color: #fabd2f; text-decoration: none; } a:hover { diff --git a/static/images/graph.drawio b/static/images/graph.drawio deleted file mode 100644 index 1f93f5a..0000000 --- a/static/images/graph.drawio +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/static/images/graph.svg b/static/images/graph.svg deleted file mode 100644 index 8915efe..0000000 --- a/static/images/graph.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - -
Datapoint
/entry/<name>
Datapoint...
Problem
is raised
Problem...
 true 
 true 
 false 
 false 
Trigger
is evaluated
Trigger...
 Data 
 Data 
Notification
is sent
Notification...
Datapoint
/entry/<name>
Datapoint...
 Data 
 Data 
Problem
is resolved
Problem...
Text is not SVG - cannot display
\ No newline at end of file diff --git a/static/less/datapoints.less b/static/less/datapoints.less index 04086c7..770db5f 100644 --- a/static/less/datapoints.less +++ b/static/less/datapoints.less @@ -9,11 +9,9 @@ .group { font-size: 1.10em; font-weight: bold; - color: @color3; + color: @color2; margin-top: 1.5em; padding-bottom: 4px; - } - h2 { border-bottom: unset; } diff --git a/static/less/index.less b/static/less/index.less deleted file mode 100644 index 7c65786..0000000 --- a/static/less/index.less +++ /dev/null @@ -1,7 +0,0 @@ -@import "theme.less"; - -.graph { - margin-top: 32px; - padding: 32px; - border-radius: 16px; -} diff --git a/static/less/main.less b/static/less/main.less index bd42096..baf874c 100644 --- a/static/less/main.less +++ b/static/less/main.less @@ -94,11 +94,6 @@ margin-top: 12px; margin-bottom: 20px; - &.configuration { - margin-top: 8px; - margin-bottom: 8px; - } - &:last-child { margin-bottom: 12px; } diff --git a/static/less/theme.less b/static/less/theme.less index 93872ea..11ae2fc 100644 --- a/static/less/theme.less +++ b/static/less/theme.less @@ -52,10 +52,8 @@ body { h1, h2 { + margin-top: 0px; margin-bottom: 4px; - &:first-child { - margin-top: 0px; - } } h1 { @@ -66,12 +64,11 @@ h1 { h2 { font-size: 1.25em; - color: @color3; font-weight: @bold; } a { - color: @color4; + color: @color2; text-decoration: none; &:hover { diff --git a/views/pages/configuration.gotmpl b/views/pages/configuration.gotmpl index 0fdfd54..d65b27d 100644 --- a/views/pages/configuration.gotmpl +++ b/views/pages/configuration.gotmpl @@ -64,7 +64,7 @@ Create {{ range .SortedSections }} -
+
{{ .Name }}
{{ end }} diff --git a/views/pages/datapoints.gotmpl b/views/pages/datapoints.gotmpl index 4f4340d..91fc6c1 100644 --- a/views/pages/datapoints.gotmpl +++ b/views/pages/datapoints.gotmpl @@ -10,7 +10,7 @@ {{ $prevGroup := "kalle" }} {{ range .Data.Datapoints }} {{ if ne $prevGroup .Group }} -

{{ .Group }}

+
{{ .Group }}
Name
Datatype
Last value
diff --git a/views/pages/index.gotmpl b/views/pages/index.gotmpl index 413e8b8..7e6e275 100644 --- a/views/pages/index.gotmpl +++ b/views/pages/index.gotmpl @@ -1,5 +1,4 @@ {{ define "page" }} -
@@ -8,10 +7,6 @@

SMon

{{ .VERSION }}

- -
- -
{{ end }}