diff --git a/static/css/default_light/datapoints.css b/static/css/default_light/datapoints.css index 5ca8d48..b99c128 100644 --- a/static/css/default_light/datapoints.css +++ b/static/css/default_light/datapoints.css @@ -3,6 +3,11 @@ 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; @@ -17,7 +22,7 @@ #datapoints .header { font-weight: 800; font-size: 0.85em; - color: #333; + color: #555; } #datapoints div { white-space: nowrap; diff --git a/static/css/default_light/default_light.css b/static/css/default_light/default_light.css index f1ece36..778c5cb 100644 --- a/static/css/default_light/default_light.css +++ b/static/css/default_light/default_light.css @@ -1,3 +1,6 @@ +body { + background-color: #f8f8f8; +} .widgets .action #run-result { background-color: #fff !important; border: 1px solid #ccc; @@ -35,3 +38,9 @@ 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 e69de29..621bb00 100644 --- a/static/css/default_light/gruvbox.css +++ b/static/css/default_light/gruvbox.css @@ -0,0 +1,6 @@ +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 d543b2f..786fa5f 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: 12px; + gap: 24px; margin-top: 16px; } #areas .area { @@ -110,7 +110,7 @@ html { dialog { background: #1b4e78; border: 1px solid #3f90d4; - color: #333; + color: #555; 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: #333; + color: #555; font-size: 11pt; } h1, @@ -159,7 +159,7 @@ textarea, select { font-family: monospace; background: #fff; - color: #333; + color: #555; padding: 4px 8px; border: 1px solid #484848; font-size: 1em; @@ -167,7 +167,7 @@ select { } button { background: #1b4e78; - color: #333; + color: #555; padding: 8px 32px; border: 1px solid #2e84cb; font-size: 1em; @@ -181,12 +181,12 @@ button:focus { border-bottom: 1px solid #d9d9d9; } span.date { - color: #333; + color: #555; font-weight: 800; } span.time { font-size: 0.9em; - color: #333; + color: #555; } span.seconds { display: none; diff --git a/static/css/default_light/problems.css b/static/css/default_light/problems.css index ffe8a97..0fea820 100644 --- a/static/css/default_light/problems.css +++ b/static/css/default_light/problems.css @@ -3,7 +3,13 @@ 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 { @@ -29,7 +35,7 @@ #areas { display: flex; flex-wrap: wrap; - gap: 12px; + gap: 24px; 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 0ba9a92..5192604 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: #333; + color: #555; } .widgets .action #run-result.error { color: #fb4934; diff --git a/static/css/gruvbox/datapoints.css b/static/css/gruvbox/datapoints.css index 4b896e4..a9db4f0 100644 --- a/static/css/gruvbox/datapoints.css +++ b/static/css/gruvbox/datapoints.css @@ -3,6 +3,11 @@ 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 d30536b..c6c66ca 100644 --- a/static/css/gruvbox/default_light.css +++ b/static/css/gruvbox/default_light.css @@ -1,3 +1,6 @@ +body { + background-color: #f8f8f8; +} .widgets .action #run-result { background-color: #fff !important; border: 1px solid #ccc; @@ -35,3 +38,9 @@ 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 e69de29..621bb00 100644 --- a/static/css/gruvbox/gruvbox.css +++ b/static/css/gruvbox/gruvbox.css @@ -0,0 +1,6 @@ +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 1ab2986..91cde42 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: 12px; + gap: 24px; margin-top: 16px; } #areas .area { diff --git a/static/css/gruvbox/problems.css b/static/css/gruvbox/problems.css index 6cd6c90..1063758 100644 --- a/static/css/gruvbox/problems.css +++ b/static/css/gruvbox/problems.css @@ -3,7 +3,13 @@ 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 { @@ -29,7 +35,7 @@ #areas { display: flex; flex-wrap: wrap; - gap: 12px; + gap: 24px; 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 f2d8a57..dc17ddb 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:#1b4e78;fill-opacity:1" /> diff --git a/static/images/default_light/acknowledge-outline.svg b/static/images/default_light/acknowledge-outline.svg index 7e97bfb..0028767 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:#1b4e78;fill-opacity:1" /> diff --git a/static/images/gruvbox/background.svg b/static/images/gruvbox/background.svg new file mode 100644 index 0000000..114b042 --- /dev/null +++ b/static/images/gruvbox/background.svg @@ -0,0 +1,198 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/static/js/trigger_edit.mjs b/static/js/trigger_edit.mjs index ab90143..f706136 100644 --- a/static/js/trigger_edit.mjs +++ b/static/js/trigger_edit.mjs @@ -1,5 +1,5 @@ export class UI { - constructor(version) {//{{{ + constructor(version, theme) {//{{{ document.getElementById('button-run'). addEventListener('click', evt => evt.preventDefault()) @@ -8,6 +8,7 @@ export class UI { document.querySelector('input[name="name"]').focus() this.version = version + this.theme = theme this.datapoints = [] }//}}} render() {//{{{ @@ -18,7 +19,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 878623d..403c7da 100644 --- a/static/less/datapoints.less +++ b/static/less/datapoints.less @@ -5,6 +5,11 @@ 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 8afa131..cda1760 100644 --- a/static/less/default_light.less +++ b/static/less/default_light.less @@ -1,5 +1,9 @@ @import "theme-@{THEME}.less"; +body { + background-color: #f8f8f8; +} + .widgets { .action { #run-result { @@ -51,3 +55,8 @@ 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 f369797..6beb230 100644 --- a/static/less/gruvbox.less +++ b/static/less/gruvbox.less @@ -1 +1,11 @@ @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 4c61a90..1d0e3b9 100644 --- a/static/less/main.less +++ b/static/less/main.less @@ -91,7 +91,7 @@ html { #areas { display: flex; flex-wrap: wrap; - gap: 12px; + gap: 24px; margin-top: 16px; .area { diff --git a/static/less/problems.less b/static/less/problems.less index 29caf1f..940c6a0 100644 --- a/static/less/problems.less +++ b/static/less/problems.less @@ -4,7 +4,13 @@ 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; @@ -34,7 +40,7 @@ #areas { display: flex; flex-wrap: wrap; - gap: 12px; + gap: 24px; margin-top: 16px; .area { diff --git a/static/less/theme-default_light.less b/static/less/theme-default_light.less index 36dca3d..2139c0e 100644 --- a/static/less/theme-default_light.less +++ b/static/less/theme-default_light.less @@ -2,7 +2,7 @@ @bg2: #1b4e78; @bg3: #2979b8; -@text1: #333; +@text1: #555; @text2: #000; @text3: #7bb8eb; diff --git a/views/pages/datapoints.gotmpl b/views/pages/datapoints.gotmpl index 26168be..96bbff0 100644 --- a/views/pages/datapoints.gotmpl +++ b/views/pages/datapoints.gotmpl @@ -8,7 +8,7 @@ Create
- {{ $prevGroup := "kalle" }} + {{ $prevGroup := "15ecfcc0-b1aa-45cd-af9c-74146a7e7f56-not-very-likely" }} {{ range .Data.Datapoints }} {{ if ne $prevGroup .Group }}

{{ .Group }}

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