From 2fc30fb7c2e58fdcdea5b430d1e308cfd154f60b Mon Sep 17 00:00:00 2001 From: Sree Sai Chaitanya Nagarajugari Date: Wed, 2 Oct 2019 11:54:45 -0700 Subject: [PATCH 1/3] fix(flow-client):fix scroll issues of flow-branch,flow-trigger,flow-task components. Fixes #1199. --- libs/assets/styles/_mapper-modal.less | 1 + .../flow-client/src/lib/shared/mapper/list/list.component.less | 2 +- .../flow-client/src/lib/shared/mapper/tree/tree.component.less | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/libs/assets/styles/_mapper-modal.less b/libs/assets/styles/_mapper-modal.less index 20fdebfcc..fd1798b05 100644 --- a/libs/assets/styles/_mapper-modal.less +++ b/libs/assets/styles/_mapper-modal.less @@ -18,6 +18,7 @@ .mapper-modal__content { display: flex; flex: 1; + height: 80vh; } .mapper-modal__close { diff --git a/libs/plugins/flow-client/src/lib/shared/mapper/list/list.component.less b/libs/plugins/flow-client/src/lib/shared/mapper/list/list.component.less index f92227108..c2141f4b7 100644 --- a/libs/plugins/flow-client/src/lib/shared/mapper/list/list.component.less +++ b/libs/plugins/flow-client/src/lib/shared/mapper/list/list.component.less @@ -11,7 +11,7 @@ .nodes { flex: 1; position: relative; - overflow: hidden; + overflow: auto; margin-right: -10px; color: #212121; width: 100%; diff --git a/libs/plugins/flow-client/src/lib/shared/mapper/tree/tree.component.less b/libs/plugins/flow-client/src/lib/shared/mapper/tree/tree.component.less index aca033ace..79f329b10 100644 --- a/libs/plugins/flow-client/src/lib/shared/mapper/tree/tree.component.less +++ b/libs/plugins/flow-client/src/lib/shared/mapper/tree/tree.component.less @@ -21,6 +21,7 @@ overflow-x: hidden; overflow-y: auto; margin-right: -10px; + max-height: 500px; } .nodes { @@ -32,6 +33,7 @@ border: 0; color: #212121; width: 100%; + height: 100%; background: transparent; } From 2b6f9ae9d0599493fafac28b95dcb7f519f7f0d6 Mon Sep 17 00:00:00 2001 From: Sree Sai Chaitanya Nagarajugari Date: Wed, 2 Oct 2019 13:37:35 -0700 Subject: [PATCH 2/3] fix(stream-client):fix scroll issues of stream-trigger, stream-stage components. --- .../src/lib/shared/mapper/list/list.component.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/plugins/stream-client/src/lib/shared/mapper/list/list.component.less b/libs/plugins/stream-client/src/lib/shared/mapper/list/list.component.less index f92227108..c2141f4b7 100644 --- a/libs/plugins/stream-client/src/lib/shared/mapper/list/list.component.less +++ b/libs/plugins/stream-client/src/lib/shared/mapper/list/list.component.less @@ -11,7 +11,7 @@ .nodes { flex: 1; position: relative; - overflow: hidden; + overflow: auto; margin-right: -10px; color: #212121; width: 100%; From 60f885621dd8e14d0ae8be1715fe0fcefa6c0032 Mon Sep 17 00:00:00 2001 From: Sree Sai Chaitanya Nagarajugari Date: Wed, 2 Oct 2019 16:40:23 -0700 Subject: [PATCH 3/3] Refactor: Refactor the css properties of mapper-modal.less of libs and flow-mapper tree component. --- libs/assets/styles/_mapper-modal.less | 2 +- .../flow-client/src/lib/shared/mapper/tree/tree.component.less | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/libs/assets/styles/_mapper-modal.less b/libs/assets/styles/_mapper-modal.less index fd1798b05..1c8c5bbb2 100644 --- a/libs/assets/styles/_mapper-modal.less +++ b/libs/assets/styles/_mapper-modal.less @@ -18,7 +18,7 @@ .mapper-modal__content { display: flex; flex: 1; - height: 80vh; + overflow: hidden; } .mapper-modal__close { diff --git a/libs/plugins/flow-client/src/lib/shared/mapper/tree/tree.component.less b/libs/plugins/flow-client/src/lib/shared/mapper/tree/tree.component.less index 79f329b10..aca033ace 100644 --- a/libs/plugins/flow-client/src/lib/shared/mapper/tree/tree.component.less +++ b/libs/plugins/flow-client/src/lib/shared/mapper/tree/tree.component.less @@ -21,7 +21,6 @@ overflow-x: hidden; overflow-y: auto; margin-right: -10px; - max-height: 500px; } .nodes { @@ -33,7 +32,6 @@ border: 0; color: #212121; width: 100%; - height: 100%; background: transparent; }