Fix confict after merge branch master

2020-10-13 11:58:28 +09:00
parent bd63a0131a ae17b99a0c
commit 57528851ff
166 changed files with 31383 additions and 382 deletions
@@ -6,7 +6,7 @@
 }

 .react-flow__renderer,
-.react-flow__zoompane,
+.react-flow__pane,
 .react-flow__selectionpane {
  width: 100%;
  height: 100%;
@@ -15,12 +15,16 @@
  left: 0;
 }

-.react-flow__zoompane {
+.react-flow__pane {
  z-index: 1;
 }

+.react-flow__renderer {
+  z-index: 4;
+}
+
 .react-flow__selectionpane {
-  z-index: 2;
+  z-index: 5;
 }

 .react-flow__selection {
@@ -42,6 +46,10 @@
 .react-flow__edge {
  pointer-events: all;

+  &.inactive {
+    pointer-events: none;
+  }
+
  &.selected {
    .react-flow__edge-path {
      stroke: #555;