From e098b5dfad0332f79408934b5594e79dbb164f2e Mon Sep 17 00:00:00 2001 From: Nabil Adouani Date: Sun, 8 Nov 2020 12:54:13 +0100 Subject: [PATCH] #1625 Update the observable-label component to allo inline display --- .../scripts/components/common/observable-flags.component.js | 1 + frontend/app/styles/main.css | 4 ++++ .../views/components/alert/observable-list.component.html | 5 +---- .../views/components/common/observable-flags.component.html | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/frontend/app/scripts/components/common/observable-flags.component.js b/frontend/app/scripts/components/common/observable-flags.component.js index 391331b2be..9bb6c344ce 100644 --- a/frontend/app/scripts/components/common/observable-flags.component.js +++ b/frontend/app/scripts/components/common/observable-flags.component.js @@ -15,6 +15,7 @@ templateUrl: 'views/components/common/observable-flags.component.html', bindings: { observable: '<', + inline: '<', onFilter: '&' } }); diff --git a/frontend/app/styles/main.css b/frontend/app/styles/main.css index 050fbc4e9a..842300eac5 100644 --- a/frontend/app/styles/main.css +++ b/frontend/app/styles/main.css @@ -723,3 +723,7 @@ table tr td.task-actions span.action-button { background-color: #8a0000 !important; /*background: rgba(0,0,0,0.2) !important;*/ } + +.observable-flags.inline div { + display: inline; +} diff --git a/frontend/app/views/components/alert/observable-list.component.html b/frontend/app/views/components/alert/observable-list.component.html index 21abc48972..c9776b6ee3 100644 --- a/frontend/app/views/components/alert/observable-list.component.html +++ b/frontend/app/views/components/alert/observable-list.component.html @@ -33,10 +33,7 @@ - - - - + {{observable.dataType}} diff --git a/frontend/app/views/components/common/observable-flags.component.html b/frontend/app/views/components/common/observable-flags.component.html index 699d749fd6..704858f0ca 100644 --- a/frontend/app/views/components/common/observable-flags.component.html +++ b/frontend/app/views/components/common/observable-flags.component.html @@ -1,4 +1,4 @@ -
+