From abb47e2f2c659ddec77252946ff408b410170e03 Mon Sep 17 00:00:00 2001 From: Dominic Egginton Date: Mon, 27 Apr 2020 02:36:32 +0100 Subject: [PATCH 1/2] fix: alert kayout margins --- sass/event.sass | 1 + sass/includes/text.sass | 3 ++- views/camera.pug | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/sass/event.sass b/sass/event.sass index 2747a07..b3648bd 100644 --- a/sass/event.sass +++ b/sass/event.sass @@ -23,6 +23,7 @@ height: $event_hight .event_preview + margin: 20 0 10 0 color: $text-dark .motion diff --git a/sass/includes/text.sass b/sass/includes/text.sass index c671df5..5eababe 100644 --- a/sass/includes/text.sass +++ b/sass/includes/text.sass @@ -16,10 +16,11 @@ h1 line-height: 4.5rem margin: 0 0 0 0 margin-top: 2rem + margin-bottom: 2rem h2 font-size: 1.8rem margin: 0 0 0 0 - margin-top: 2rem + margin-top: 1.5rem h3 font-size: 1.3rem margin: 0 0 0 0 diff --git a/views/camera.pug b/views/camera.pug index 55e3cf5..f1ecb1f 100644 --- a/views/camera.pug +++ b/views/camera.pug @@ -12,6 +12,7 @@ html(lang='en') h1=camera.name .stream_container(id=camera.id) img.stream(src='') + h2 Alerts .events include includes/createEvent.pug script. From 430742694d776cbbe406e85762f52eb4d65f4619 Mon Sep 17 00:00:00 2001 From: Dominic Egginton Date: Mon, 27 Apr 2020 02:39:22 +0100 Subject: [PATCH 2/2] fix: assign "Safe" to alert message when catergrized as safe --- modules/stream.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/stream.js b/modules/stream.js index 58255a3..880592f 100644 --- a/modules/stream.js +++ b/modules/stream.js @@ -57,7 +57,7 @@ class Stream { if (recognizedFaces.length > 0) { // create safe event this.currentEvent.type = 'safe' - this.currentEvent.message = '' + this.currentEvent.message = 'Safe' } else { // threat detected if (this.currentEvent.type !== 'safe') {