From 640651aea26fe16f4b79319419295f2543ba9fc4 Mon Sep 17 00:00:00 2001 From: Udo Walter Date: Sun, 31 Mar 2019 22:36:51 +0000 Subject: [webapp/systemlog] add colors to category --- server/lib/httpresponse.js | 2 +- webapp/src/components/LogModule.vue | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/server/lib/httpresponse.js b/server/lib/httpresponse.js index 8b6c452..cb4b216 100644 --- a/server/lib/httpresponse.js +++ b/server/lib/httpresponse.js @@ -11,7 +11,7 @@ class HttpResponse { if (this.httpStatus >= 400) response.error = this.idString else if (this.idString) response.action = this.idString if (this.message) response.message = this.message - res.status(this.httpStatus).send({ ...response, ...this.data }) + res.status(this.httpStatus).send({ ...this.data, ...response }) } } diff --git a/webapp/src/components/LogModule.vue b/webapp/src/components/LogModule.vue index 6f580cb..a381fb2 100644 --- a/webapp/src/components/LogModule.vue +++ b/webapp/src/components/LogModule.vue @@ -189,6 +189,14 @@ {{ $t('log') }} + @@ -356,4 +364,12 @@ export default { min-width: 70px; width: 70px; } + +.theme--dark .primary--text { + color: white !important; +} + +.error--text, .warning--text { + font-weight: bold; +} -- cgit v1.2.3-55-g7522