From ab26e20c3568e16c857b73ba646cdd7b2a208824 Mon Sep 17 00:00:00 2001 From: CTomlyn Date: Wed, 8 Mar 2023 20:35:51 -0800 Subject: [PATCH] #1394 Reverse change to common-canvas scss (#1395) --- .../common-canvas/src/common-canvas/svg-canvas-d3.scss | 4 ---- .../custom-canvases/stages/decorations/tri-down.svg | 3 +++ .../images/custom-canvases/stages/decorations/tri-up.svg | 3 +++ .../components/custom-canvases/read-only/read-only.jsx | 8 ++++---- .../stages-card-node/stages-card-node-canvas.jsx | 8 ++++---- .../components/custom-canvases/stages/stages-canvas.jsx | 8 ++++---- 6 files changed, 18 insertions(+), 16 deletions(-) create mode 100644 canvas_modules/harness/assets/images/custom-canvases/stages/decorations/tri-down.svg create mode 100644 canvas_modules/harness/assets/images/custom-canvases/stages/decorations/tri-up.svg diff --git a/canvas_modules/common-canvas/src/common-canvas/svg-canvas-d3.scss b/canvas_modules/common-canvas/src/common-canvas/svg-canvas-d3.scss index 176cb9e6d1..8505ffd5ee 100644 --- a/canvas_modules/common-canvas/src/common-canvas/svg-canvas-d3.scss +++ b/canvas_modules/common-canvas/src/common-canvas/svg-canvas-d3.scss @@ -906,10 +906,6 @@ g.bkg-col-cyan-50 { stroke-width: 1; stroke-dasharray: 0; } -.d3-link-decorations-group g rect { - stroke: transparent; - stroke-width: 0px; -} /* 'object link' is the historical name for an association link */ /* This styles is used for association links on a regular data flow canvas */ diff --git a/canvas_modules/harness/assets/images/custom-canvases/stages/decorations/tri-down.svg b/canvas_modules/harness/assets/images/custom-canvases/stages/decorations/tri-down.svg new file mode 100644 index 0000000000..9771249ccb --- /dev/null +++ b/canvas_modules/harness/assets/images/custom-canvases/stages/decorations/tri-down.svg @@ -0,0 +1,3 @@ + + + diff --git a/canvas_modules/harness/assets/images/custom-canvases/stages/decorations/tri-up.svg b/canvas_modules/harness/assets/images/custom-canvases/stages/decorations/tri-up.svg new file mode 100644 index 0000000000..908d5f94d3 --- /dev/null +++ b/canvas_modules/harness/assets/images/custom-canvases/stages/decorations/tri-up.svg @@ -0,0 +1,3 @@ + + + diff --git a/canvas_modules/harness/src/client/components/custom-canvases/read-only/read-only.jsx b/canvas_modules/harness/src/client/components/custom-canvases/read-only/read-only.jsx index 6a92f82b06..06eaa42858 100644 --- a/canvas_modules/harness/src/client/components/custom-canvases/read-only/read-only.jsx +++ b/canvas_modules/harness/src/client/components/custom-canvases/read-only/read-only.jsx @@ -160,10 +160,10 @@ export default class ReadOnlyCanvas extends React.Component { getDecorationsArray(linkLabel) { const decs = [ { id: "dec-0", position: "source", path: "M 0 -5 A 5 5 0 1 1 0 5 A 5 5 0 1 1 0 -5", class_name: "det-link-dot", temporary: true }, - { id: "dec-1", position: "source", image: "images/up-triangle.svg", class_name: "det-tri", - distance: 40, x_pos: -16, y_pos: -16, width: 36, height: 36, outline: true, tooltip: "Up Triangle", temporary: true }, - { id: "dec-2", position: "target", image: "images/down-triangle.svg", class_name: "det-tri", - distance: -40, x_pos: -16, y_pos: -16, width: 36, height: 36, outline: true, tooltip: "Down Triangle", temporary: true }, + { id: "dec-1", position: "source", image: "images/custom-canvases/stages/decorations/tri-up.svg", class_name: "det-tri", + distance: 40, x_pos: -7, y_pos: -7, width: 14, height: 14, outline: true, tooltip: "Up Triangle", temporary: true }, + { id: "dec-2", position: "target", image: "images/custom-canvases/stages/decorations/tri-down.svg", class_name: "det-tri", + distance: -40, x_pos: -7, y_pos: -7, width: 14, height: 14, outline: true, tooltip: "Down Triangle", temporary: true }, { id: "dec-3", position: "middle", path: "M -25 -20 L -25 20 25 20 25 -20 Z", class_name: "det-link-label-background", temporary: true }, { id: "dec-4", position: "middle", label: linkLabel, x_pos: -16, y_pos: -10, width: 30, height: 25, temporary: true } ]; diff --git a/canvas_modules/harness/src/client/components/custom-canvases/stages-card-node/stages-card-node-canvas.jsx b/canvas_modules/harness/src/client/components/custom-canvases/stages-card-node/stages-card-node-canvas.jsx index 64188a5eb8..9df7fef6a7 100644 --- a/canvas_modules/harness/src/client/components/custom-canvases/stages-card-node/stages-card-node-canvas.jsx +++ b/canvas_modules/harness/src/client/components/custom-canvases/stages-card-node/stages-card-node-canvas.jsx @@ -162,10 +162,10 @@ export default class DetachedCanvas extends React.Component { getDecorationsArray(linkLabel) { const decs = [ { id: "dec-0", position: "source", path: "M 0 -5 A 5 5 0 1 1 0 5 A 5 5 0 1 1 0 -5", class_name: "det-link-dot", temporary: true }, - { id: "dec-1", position: "source", image: "images/up-triangle.svg", class_name: "det-tri", - distance: 40, x_pos: -16, y_pos: -16, width: 36, height: 36, outline: true, tooltip: "Up Triangle", temporary: true }, - { id: "dec-2", position: "target", image: "images/down-triangle.svg", class_name: "det-tri", - distance: -40, x_pos: -16, y_pos: -16, width: 36, height: 36, outline: true, tooltip: "Down Triangle", temporary: true }, + { id: "dec-1", position: "source", image: "images/custom-canvases/stages/decorations/tri-up.svg", class_name: "det-tri", + distance: 40, x_pos: -7, y_pos: -7, width: 14, height: 14, outline: true, tooltip: "Up Triangle", temporary: true }, + { id: "dec-2", position: "target", image: "images/custom-canvases/stages/decorations/tri-down.svg", class_name: "det-tri", + distance: -40, x_pos: -7, y_pos: -7, width: 14, height: 14, outline: true, tooltip: "Down Triangle", temporary: true }, { id: "dec-3", position: "middle", path: "M -25 -20 L -25 20 25 20 25 -20 Z", class_name: "det-link-label-background", temporary: true }, { id: "link-label", position: "middle", label: linkLabel, label_editable: true, label_allow_return_key: "save", x_pos: -16, y_pos: -10, width: 30, height: 25, temporary: true } diff --git a/canvas_modules/harness/src/client/components/custom-canvases/stages/stages-canvas.jsx b/canvas_modules/harness/src/client/components/custom-canvases/stages/stages-canvas.jsx index e9a7a23207..3b7831e471 100644 --- a/canvas_modules/harness/src/client/components/custom-canvases/stages/stages-canvas.jsx +++ b/canvas_modules/harness/src/client/components/custom-canvases/stages/stages-canvas.jsx @@ -132,10 +132,10 @@ export default class DetachedCanvas extends React.Component { getDecorationsArray(linkLabel) { const decs = [ { id: "dec-0", position: "source", path: "M 0 -5 A 5 5 0 1 1 0 5 A 5 5 0 1 1 0 -5", class_name: "det-link-dot", temporary: true }, - { id: "dec-1", position: "source", image: "images/up-triangle.svg", class_name: "det-tri", - distance: 40, x_pos: -16, y_pos: -16, width: 36, height: 36, outline: true, tooltip: "Up Triangle", temporary: true }, - { id: "dec-2", position: "target", image: "images/down-triangle.svg", class_name: "det-tri", - distance: -40, x_pos: -16, y_pos: -16, width: 36, height: 36, outline: true, tooltip: "Down Triangle", temporary: true }, + { id: "dec-1", position: "source", image: "images/custom-canvases/stages/decorations/tri-up.svg", class_name: "det-tri", + distance: 40, x_pos: -7, y_pos: -7, width: 14, height: 14, outline: true, tooltip: "Up Triangle", temporary: true }, + { id: "dec-2", position: "target", image: "images/custom-canvases/stages/decorations/tri-down.svg", class_name: "det-tri", + distance: -40, x_pos: -7, y_pos: -7, width: 14, height: 14, outline: true, tooltip: "Down Triangle", temporary: true }, { id: "dec-3", position: "middle", path: "M -25 -20 L -25 20 25 20 25 -20 Z", class_name: "det-link-label-background", temporary: true }, { id: "link-label", position: "middle", label: linkLabel, label_editable: true, label_allow_return_key: "save", x_pos: -16, y_pos: -10, width: 30, height: 25, temporary: true }