diff --git a/ui/admin/app/components/ordered-series-diagram/index.hbs b/ui/admin/app/components/ordered-series-diagram/index.hbs index e7ce96ed4..babe7c955 100644 --- a/ui/admin/app/components/ordered-series-diagram/index.hbs +++ b/ui/admin/app/components/ordered-series-diagram/index.hbs @@ -1,10 +1,8 @@ -
-
    - {{yield - (hash - Item=(component 'ordered-series-diagram/item') - Group=(component 'ordered-series-diagram/group') - ) - }} -
-
\ No newline at end of file +
    + {{yield + (hash + Item=(component 'ordered-series-diagram/item') + Group=(component 'ordered-series-diagram/group') + ) + }} +
\ No newline at end of file diff --git a/ui/admin/app/components/worker-diagram/dual-filter/hcp/index.hbs b/ui/admin/app/components/worker-diagram/dual-filter/hcp/index.hbs index ad62b4f71..21a04bad5 100644 --- a/ui/admin/app/components/worker-diagram/dual-filter/hcp/index.hbs +++ b/ui/admin/app/components/worker-diagram/dual-filter/hcp/index.hbs @@ -18,13 +18,11 @@ -
- - {{t - 'resources.target.workers.filter-explainer.dual-egress-on-ingress-on' - }} - -
+

+ {{t 'resources.target.workers.filter-explainer.dual-egress-on-ingress-on'}} +

{{else if @ingressWorkerFilterEnabled}} @@ -37,11 +35,11 @@ {{t 'resources.target.workers.diagram.host'}} -
- - {{t 'resources.target.workers.filter-explainer.ingress-worker'}} - -
+

+ {{t 'resources.target.workers.filter-explainer.ingress-worker'}} +

{{else if @egressWorkerFilterEnabled}} @@ -66,11 +64,11 @@ -
- - {{t 'resources.target.workers.filter-explainer.hcp-dual-egress-on'}} - -
+

+ {{t 'resources.target.workers.filter-explainer.hcp-dual-egress-on'}} +

{{else}} @@ -83,9 +81,9 @@ {{t 'resources.target.workers.diagram.host'}} -
- - {{t 'resources.target.workers.filter-explainer.hcp-worker'}} - -
+

+ {{t 'resources.target.workers.filter-explainer.hcp-worker'}} +

{{/if}} \ No newline at end of file diff --git a/ui/admin/app/components/worker-diagram/dual-filter/index.hbs b/ui/admin/app/components/worker-diagram/dual-filter/index.hbs index 27c6e5000..ebda04384 100644 --- a/ui/admin/app/components/worker-diagram/dual-filter/index.hbs +++ b/ui/admin/app/components/worker-diagram/dual-filter/index.hbs @@ -18,13 +18,11 @@ -
- - {{t - 'resources.target.workers.filter-explainer.dual-egress-on-ingress-on' - }} - -
+

+ {{t 'resources.target.workers.filter-explainer.dual-egress-on-ingress-on'}} +

{{else if @ingressWorkerFilterEnabled}} @@ -37,11 +35,11 @@ {{t 'resources.target.workers.diagram.host'}} -
- - {{t 'resources.target.workers.filter-explainer.ingress-worker'}} - -
+

+ {{t 'resources.target.workers.filter-explainer.ingress-worker'}} +

{{else if @egressWorkerFilterEnabled}} @@ -62,11 +60,11 @@ -
- - {{t 'resources.target.workers.filter-explainer.dual-egress-on'}} - -
+

+ {{t 'resources.target.workers.filter-explainer.dual-egress-on'}} +

{{else}} @@ -79,9 +77,9 @@ {{t 'resources.target.workers.diagram.host'}} -
- - {{t 'resources.target.workers.filter-explainer.any-worker'}} - -
+

+ {{t 'resources.target.workers.filter-explainer.any-worker'}} +

{{/if}} \ No newline at end of file diff --git a/ui/admin/app/components/worker-diagram/index.hbs b/ui/admin/app/components/worker-diagram/index.hbs index a3b8e2838..edb3cd95d 100644 --- a/ui/admin/app/components/worker-diagram/index.hbs +++ b/ui/admin/app/components/worker-diagram/index.hbs @@ -1,17 +1,19 @@ -{{#if (feature-flag 'target-worker-filters-v2-ingress')}} - {{#if (feature-flag 'target-worker-filters-v2-hcp')}} - +
+ {{#if (feature-flag 'target-worker-filters-v2-ingress')}} + {{#if (feature-flag 'target-worker-filters-v2-hcp')}} + + {{else}} + + {{/if}} {{else}} - {{/if}} -{{else}} - -{{/if}} \ No newline at end of file +
\ No newline at end of file diff --git a/ui/admin/app/components/worker-diagram/single-filter/index.hbs b/ui/admin/app/components/worker-diagram/single-filter/index.hbs index 848b27d5d..fdbe22b0a 100644 --- a/ui/admin/app/components/worker-diagram/single-filter/index.hbs +++ b/ui/admin/app/components/worker-diagram/single-filter/index.hbs @@ -15,11 +15,11 @@ -
- - {{t 'resources.target.workers.filter-explainer.egress-worker'}} - -
+

+ {{t 'resources.target.workers.filter-explainer.egress-worker'}} +

{{else}} @@ -32,9 +32,9 @@ {{t 'resources.target.workers.diagram.host'}} -
- - {{t 'resources.target.workers.filter-explainer.any-worker'}} - -
+

+ {{t 'resources.target.workers.filter-explainer.any-worker'}} +

{{/if}} \ No newline at end of file diff --git a/ui/admin/app/styles/app.scss b/ui/admin/app/styles/app.scss index e0a10fac1..796a617d1 100644 --- a/ui/admin/app/styles/app.scss +++ b/ui/admin/app/styles/app.scss @@ -559,8 +559,6 @@ } &-group { - display: flex; - &-content { border-radius: 0.5rem; padding: 0 0.75rem 0.75rem; @@ -600,6 +598,10 @@ .hds-form-legend { font-size: sizing.rems(l) - sizing.rems(xxs); // 20 + + + .hds-form-helper-text { + margin-bottom: 1rem; + } } .hds-alert { @@ -626,16 +628,12 @@ } } - .worker-diagram-explainer { - min-height: 4rem; // 1 - } + .worker-diagram { + min-height: 15rem; - .worker-wrapper { - display: flex; - align-items: center; - min-height: 11rem; - margin-top: sizing.rems(xs) - sizing.rems(xxxxs); // 10 - width: 100%; + .ordered-series-diagram { + min-height: 10rem; + } } }