From 3ec4bdec2b2ce4dfa62c005ea801658d7fe2d64c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Magnus=20=C3=85hall?= Date: Tue, 25 Jun 2024 09:49:09 +0200 Subject: [PATCH] Fixed icons --- static/css/default_light/index.css | 4 - static/css/default_light/main.css | 2 +- static/css/gruvbox/index.css | 4 - static/css/gruvbox/main.css | 2 +- static/images/default_light/graph.svg | 850 +++++++++++++++++++- static/images/default_light/info-filled.svg | 2 +- static/images/default_light/values.svg | 2 +- static/less/index.less | 5 - static/less/main.less | 2 +- views/pages/configuration.gotmpl | 5 +- views/pages/datapoints.gotmpl | 2 +- views/pages/index.gotmpl | 6 +- views/pages/triggers.gotmpl | 2 +- 13 files changed, 858 insertions(+), 30 deletions(-) diff --git a/static/css/default_light/index.css b/static/css/default_light/index.css index 32a3a60..e69de29 100644 --- a/static/css/default_light/index.css +++ b/static/css/default_light/index.css @@ -1,4 +0,0 @@ -.graph { - margin-top: 192px; - border-radius: 16px; -} diff --git a/static/css/default_light/main.css b/static/css/default_light/main.css index ab1f58e..d543b2f 100644 --- a/static/css/default_light/main.css +++ b/static/css/default_light/main.css @@ -128,13 +128,13 @@ body { h1, h2 { margin-bottom: 4px; - margin-top: 32px; } h1:first-child, h2:first-child { margin-top: 0px; } h1 { + margin-top: 32px; font-size: 1.5em; color: #1b4e78; font-weight: 800; diff --git a/static/css/gruvbox/index.css b/static/css/gruvbox/index.css index 32a3a60..e69de29 100644 --- a/static/css/gruvbox/index.css +++ b/static/css/gruvbox/index.css @@ -1,4 +0,0 @@ -.graph { - margin-top: 192px; - border-radius: 16px; -} diff --git a/static/css/gruvbox/main.css b/static/css/gruvbox/main.css index 5c174e2..1ab2986 100644 --- a/static/css/gruvbox/main.css +++ b/static/css/gruvbox/main.css @@ -128,13 +128,13 @@ body { h1, h2 { margin-bottom: 4px; - margin-top: 32px; } h1:first-child, h2:first-child { margin-top: 0px; } h1 { + margin-top: 32px; font-size: 1.5em; color: #fb4934; font-weight: 800; diff --git a/static/images/default_light/graph.svg b/static/images/default_light/graph.svg index 8915efe..32135be 100644 --- a/static/images/default_light/graph.svg +++ b/static/images/default_light/graph.svg @@ -1,4 +1,848 @@ - + - -
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 + + + + + + + + + + + + + + + + + + + + + Datapoint + + /entry/<name> + + + + + Datapoint... + + + + + + + + + + + + + + + + Problem + + is raised + + + + + Problem... + + + + + + + + + + + + +  true  + + + +  true  + + + + + + + + + + + + +  false  + + + +  false  + + + + + + Triggeris evaluated + + + + + + + + + + + +  Data  + + + +  Data  + + + + + + + + + + + Notification + + is sent + + + + + Notification... + + + + + + + + + + + + + + + + Datapoint + + /entry/<name> + + + + + Datapoint... + + + + + + + + + + + + +  Data  + + + +  Data  + + + + + + + + + + + + + + + + Problem + + is resolved + + + + + Problem... + + + + + + Text is not SVG - cannot display + + + diff --git a/static/images/default_light/info-filled.svg b/static/images/default_light/info-filled.svg index 219eedb..2e6e386 100644 --- a/static/images/default_light/info-filled.svg +++ b/static/images/default_light/info-filled.svg @@ -64,6 +64,6 @@ + style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#1b4e78;fill-opacity:1;stroke-width:0.311724;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;stop-color:#000000;stop-opacity:1" /> diff --git a/static/images/default_light/values.svg b/static/images/default_light/values.svg index 3609d81..4cc90a7 100644 --- a/static/images/default_light/values.svg +++ b/static/images/default_light/values.svg @@ -62,6 +62,6 @@ + style="font-variation-settings:normal;opacity:1;vector-effect:none;fill:#1b4e78;fill-opacity:1;stroke-width:0.311724;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;-inkscape-stroke:none;stop-color:#000000;stop-opacity:1" /> diff --git a/static/less/index.less b/static/less/index.less index 015fe1e..f369797 100644 --- a/static/less/index.less +++ b/static/less/index.less @@ -1,6 +1 @@ @import "theme-@{THEME}.less"; - -.graph { - margin-top: 192px; - border-radius: 16px; -} diff --git a/static/less/main.less b/static/less/main.less index b0c4729..4c61a90 100644 --- a/static/less/main.less +++ b/static/less/main.less @@ -158,13 +158,13 @@ body { h1, h2 { margin-bottom: 4px; - margin-top: 32px; &:first-child { margin-top: 0px; } } h1 { + margin-top: 32px; font-size: 1.5em; color: @color1; font-weight: @bold; diff --git a/views/pages/configuration.gotmpl b/views/pages/configuration.gotmpl index 5c1fbaa..5129f2e 100644 --- a/views/pages/configuration.gotmpl +++ b/views/pages/configuration.gotmpl @@ -1,5 +1,6 @@ {{ define "page" }} {{ $version := .VERSION }} + {{ $theme := .CONFIG.THEME }}