diff --git a/d2compiler/compile.go b/d2compiler/compile.go index 7d0d9c77a..3d46bea2d 100644 --- a/d2compiler/compile.go +++ b/d2compiler/compile.go @@ -681,6 +681,13 @@ func (c *compiler) compileReserved(attrs *d2graph.Attributes, f *d2ir.Field) { case "classes": } + if attrs.Link != nil && attrs.Label.Value != "" { + u, err := url.ParseRequestURI(attrs.Label.Value) + if err == nil && u.Host != "" { + c.errorf(scalar, "Label cannot be set to URL when link is also set (for security)") + } + } + if attrs.Link != nil && attrs.Tooltip != nil { u, err := url.ParseRequestURI(attrs.Tooltip.Value) if err == nil && u.Host != "" { @@ -775,7 +782,6 @@ func (c *compiler) compileEdge(obj *d2graph.Object, e *d2ir.Edge) { if e.Primary() != nil { c.compileLabel(&edge.Attributes, e) } - if e.Map() != nil { c.compileEdgeMap(edge, e.Map()) } @@ -846,19 +852,6 @@ func (c *compiler) compileEdgeField(edge *d2graph.Edge, f *d2ir.Field) { _, isReserved := d2ast.SimpleReservedKeywords[keyword] if isReserved { c.compileReserved(&edge.Attributes, f) - - if f.Name != "link" { - return - } - - if edge.Label.Value == "" { - edge.Label.Value = edge.Link.Value - } else { - u, err := url.ParseRequestURI(edge.Label.Value) - if err == nil && u.Host != "" { - c.errorf(f.Primary_.Value, "Label cannot be set to URL when link is also set (for security)") - } - } return } else if f.Name.ScalarString() == "style" { if f.Map() == nil { diff --git a/d2renderers/d2sketch/testdata/all_shapes/sketch.exp.svg b/d2renderers/d2sketch/testdata/all_shapes/sketch.exp.svg index b556ef19c..ffc280b99 100644 --- a/d2renderers/d2sketch/testdata/all_shapes/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/all_shapes/sketch.exp.svg @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD + .d2-691596124 .fill-N1{fill:#0A0F25;} + .d2-691596124 .fill-N2{fill:#676C7E;} + .d2-691596124 .fill-N3{fill:#9499AB;} + .d2-691596124 .fill-N4{fill:#CFD2DD;} + .d2-691596124 .fill-N5{fill:#DEE1EB;} + .d2-691596124 .fill-N6{fill:#EEF1F8;} + .d2-691596124 .fill-N7{fill:#FFFFFF;} + .d2-691596124 .fill-B1{fill:#0D32B2;} + .d2-691596124 .fill-B2{fill:#0D32B2;} + .d2-691596124 .fill-B3{fill:#E3E9FD;} + .d2-691596124 .fill-B4{fill:#E3E9FD;} + .d2-691596124 .fill-B5{fill:#EDF0FD;} + .d2-691596124 .fill-B6{fill:#F7F8FE;} + .d2-691596124 .fill-AA2{fill:#4A6FF3;} + .d2-691596124 .fill-AA4{fill:#EDF0FD;} + .d2-691596124 .fill-AA5{fill:#F7F8FE;} + .d2-691596124 .fill-AB4{fill:#EDF0FD;} + .d2-691596124 .fill-AB5{fill:#F7F8FE;} + .d2-691596124 .stroke-N1{stroke:#0A0F25;} + .d2-691596124 .stroke-N2{stroke:#676C7E;} + .d2-691596124 .stroke-N3{stroke:#9499AB;} + .d2-691596124 .stroke-N4{stroke:#CFD2DD;} + .d2-691596124 .stroke-N5{stroke:#DEE1EB;} + .d2-691596124 .stroke-N6{stroke:#EEF1F8;} + .d2-691596124 .stroke-N7{stroke:#FFFFFF;} + .d2-691596124 .stroke-B1{stroke:#0D32B2;} + .d2-691596124 .stroke-B2{stroke:#0D32B2;} + .d2-691596124 .stroke-B3{stroke:#E3E9FD;} + .d2-691596124 .stroke-B4{stroke:#E3E9FD;} + .d2-691596124 .stroke-B5{stroke:#EDF0FD;} + .d2-691596124 .stroke-B6{stroke:#F7F8FE;} + .d2-691596124 .stroke-AA2{stroke:#4A6FF3;} + .d2-691596124 .stroke-AA4{stroke:#EDF0FD;} + .d2-691596124 .stroke-AA5{stroke:#F7F8FE;} + .d2-691596124 .stroke-AB4{stroke:#EDF0FD;} + .d2-691596124 .stroke-AB5{stroke:#F7F8FE;} + .d2-691596124 .background-color-N1{background-color:#0A0F25;} + .d2-691596124 .background-color-N2{background-color:#676C7E;} + .d2-691596124 .background-color-N3{background-color:#9499AB;} + .d2-691596124 .background-color-N4{background-color:#CFD2DD;} + .d2-691596124 .background-color-N5{background-color:#DEE1EB;} + .d2-691596124 .background-color-N6{background-color:#EEF1F8;} + .d2-691596124 .background-color-N7{background-color:#FFFFFF;} + .d2-691596124 .background-color-B1{background-color:#0D32B2;} + .d2-691596124 .background-color-B2{background-color:#0D32B2;} + .d2-691596124 .background-color-B3{background-color:#E3E9FD;} + .d2-691596124 .background-color-B4{background-color:#E3E9FD;} + .d2-691596124 .background-color-B5{background-color:#EDF0FD;} + .d2-691596124 .background-color-B6{background-color:#F7F8FE;} + .d2-691596124 .background-color-AA2{background-color:#4A6FF3;} + .d2-691596124 .background-color-AA4{background-color:#EDF0FD;} + .d2-691596124 .background-color-AA5{background-color:#F7F8FE;} + .d2-691596124 .background-color-AB4{background-color:#EDF0FD;} + .d2-691596124 .background-color-AB5{background-color:#F7F8FE;} + .d2-691596124 .color-N1{color:#0A0F25;} + .d2-691596124 .color-N2{color:#676C7E;} + .d2-691596124 .color-N3{color:#9499AB;} + .d2-691596124 .color-N4{color:#CFD2DD;} + .d2-691596124 .color-N5{color:#DEE1EB;} + .d2-691596124 .color-N6{color:#EEF1F8;} + .d2-691596124 .color-N7{color:#FFFFFF;} + .d2-691596124 .color-B1{color:#0D32B2;} + .d2-691596124 .color-B2{color:#0D32B2;} + .d2-691596124 .color-B3{color:#E3E9FD;} + .d2-691596124 .color-B4{color:#E3E9FD;} + .d2-691596124 .color-B5{color:#EDF0FD;} + .d2-691596124 .color-B6{color:#F7F8FE;} + .d2-691596124 .color-AA2{color:#4A6FF3;} + .d2-691596124 .color-AA4{color:#EDF0FD;} + .d2-691596124 .color-AA5{color:#F7F8FE;} + .d2-691596124 .color-AB4{color:#EDF0FD;} + .d2-691596124 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> @@ -104,7 +114,13 @@ +<<<<<<< HEAD customeremployeerentalitem rent(this, i, p) new(this, i, p) isValid() isRentable(c) is(Adult) true +||||||| parent of cb2f2823c (Fix changes) +customeremployeerentalitem rent(this, i, p) new(this, i, p) isValid() isRentable(c) is(Adult) true +======= +customeremployeerentalitem rent(this, i, p) new(this, i, p) isValid() isRentable(c) is(Adult) true +>>>>>>> cb2f2823c (Fix changes) diff --git a/d2renderers/d2sketch/testdata/connection_label/sketch.exp.svg b/d2renderers/d2sketch/testdata/connection_label/sketch.exp.svg index 635408f20..bc4121fcd 100644 --- a/d2renderers/d2sketch/testdata/connection_label/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/connection_label/sketch.exp.svg @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD customerissuerstoreLike starbucks or somethingacquirerI'm not sure what this isnetworkcustomer bankstore bankinitial transactionpayment processor behind the scenessimplified 1 banana please$10 dollarsthinking: wow, inflationchecks bank accountSavings: $11I can do that, here's my cardRun this cardProcess to card issuerProcess this payment$10 debit$10 creditAn error in judgement is about to occurLike starbucks or something1I'm not sure what this is2 + +======= + .d2-36945276 .fill-N1{fill:#0A0F25;} + .d2-36945276 .fill-N2{fill:#676C7E;} + .d2-36945276 .fill-N3{fill:#9499AB;} + .d2-36945276 .fill-N4{fill:#CFD2DD;} + .d2-36945276 .fill-N5{fill:#DEE1EB;} + .d2-36945276 .fill-N6{fill:#EEF1F8;} + .d2-36945276 .fill-N7{fill:#FFFFFF;} + .d2-36945276 .fill-B1{fill:#0D32B2;} + .d2-36945276 .fill-B2{fill:#0D32B2;} + .d2-36945276 .fill-B3{fill:#E3E9FD;} + .d2-36945276 .fill-B4{fill:#E3E9FD;} + .d2-36945276 .fill-B5{fill:#EDF0FD;} + .d2-36945276 .fill-B6{fill:#F7F8FE;} + .d2-36945276 .fill-AA2{fill:#4A6FF3;} + .d2-36945276 .fill-AA4{fill:#EDF0FD;} + .d2-36945276 .fill-AA5{fill:#F7F8FE;} + .d2-36945276 .fill-AB4{fill:#EDF0FD;} + .d2-36945276 .fill-AB5{fill:#F7F8FE;} + .d2-36945276 .stroke-N1{stroke:#0A0F25;} + .d2-36945276 .stroke-N2{stroke:#676C7E;} + .d2-36945276 .stroke-N3{stroke:#9499AB;} + .d2-36945276 .stroke-N4{stroke:#CFD2DD;} + .d2-36945276 .stroke-N5{stroke:#DEE1EB;} + .d2-36945276 .stroke-N6{stroke:#EEF1F8;} + .d2-36945276 .stroke-N7{stroke:#FFFFFF;} + .d2-36945276 .stroke-B1{stroke:#0D32B2;} + .d2-36945276 .stroke-B2{stroke:#0D32B2;} + .d2-36945276 .stroke-B3{stroke:#E3E9FD;} + .d2-36945276 .stroke-B4{stroke:#E3E9FD;} + .d2-36945276 .stroke-B5{stroke:#EDF0FD;} + .d2-36945276 .stroke-B6{stroke:#F7F8FE;} + .d2-36945276 .stroke-AA2{stroke:#4A6FF3;} + .d2-36945276 .stroke-AA4{stroke:#EDF0FD;} + .d2-36945276 .stroke-AA5{stroke:#F7F8FE;} + .d2-36945276 .stroke-AB4{stroke:#EDF0FD;} + .d2-36945276 .stroke-AB5{stroke:#F7F8FE;} + .d2-36945276 .background-color-N1{background-color:#0A0F25;} + .d2-36945276 .background-color-N2{background-color:#676C7E;} + .d2-36945276 .background-color-N3{background-color:#9499AB;} + .d2-36945276 .background-color-N4{background-color:#CFD2DD;} + .d2-36945276 .background-color-N5{background-color:#DEE1EB;} + .d2-36945276 .background-color-N6{background-color:#EEF1F8;} + .d2-36945276 .background-color-N7{background-color:#FFFFFF;} + .d2-36945276 .background-color-B1{background-color:#0D32B2;} + .d2-36945276 .background-color-B2{background-color:#0D32B2;} + .d2-36945276 .background-color-B3{background-color:#E3E9FD;} + .d2-36945276 .background-color-B4{background-color:#E3E9FD;} + .d2-36945276 .background-color-B5{background-color:#EDF0FD;} + .d2-36945276 .background-color-B6{background-color:#F7F8FE;} + .d2-36945276 .background-color-AA2{background-color:#4A6FF3;} + .d2-36945276 .background-color-AA4{background-color:#EDF0FD;} + .d2-36945276 .background-color-AA5{background-color:#F7F8FE;} + .d2-36945276 .background-color-AB4{background-color:#EDF0FD;} + .d2-36945276 .background-color-AB5{background-color:#F7F8FE;} + .d2-36945276 .color-N1{color:#0A0F25;} + .d2-36945276 .color-N2{color:#676C7E;} + .d2-36945276 .color-N3{color:#9499AB;} + .d2-36945276 .color-N4{color:#CFD2DD;} + .d2-36945276 .color-N5{color:#DEE1EB;} + .d2-36945276 .color-N6{color:#EEF1F8;} + .d2-36945276 .color-N7{color:#FFFFFF;} + .d2-36945276 .color-B1{color:#0D32B2;} + .d2-36945276 .color-B2{color:#0D32B2;} + .d2-36945276 .color-B3{color:#E3E9FD;} + .d2-36945276 .color-B4{color:#E3E9FD;} + .d2-36945276 .color-B5{color:#EDF0FD;} + .d2-36945276 .color-B6{color:#F7F8FE;} + .d2-36945276 .color-AA2{color:#4A6FF3;} + .d2-36945276 .color-AA4{color:#EDF0FD;} + .d2-36945276 .color-AA5{color:#F7F8FE;} + .d2-36945276 .color-AB4{color:#EDF0FD;} + .d2-36945276 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>customerissuerstoreLike starbucks or somethingacquirerI'm not sure what this isnetworkcustomer bankstore bankinitial transactionpayment processor behind the scenessimplified 1 banana please$10 dollarsthinking: wow, inflationchecks bank accountSavings: $11I can do that, here's my cardRun this cardProcess to card issuerProcess this payment$10 debit$10 creditAn error in judgement is about to occurLike starbucks or something1I'm not sure what this is2 + +>>>>>>> 638c1311a (fixed e2e tests) +======= + .d2-3813038541 .fill-N1{fill:#0A0F25;} + .d2-3813038541 .fill-N2{fill:#676C7E;} + .d2-3813038541 .fill-N3{fill:#9499AB;} + .d2-3813038541 .fill-N4{fill:#CFD2DD;} + .d2-3813038541 .fill-N5{fill:#DEE1EB;} + .d2-3813038541 .fill-N6{fill:#EEF1F8;} + .d2-3813038541 .fill-N7{fill:#FFFFFF;} + .d2-3813038541 .fill-B1{fill:#0D32B2;} + .d2-3813038541 .fill-B2{fill:#0D32B2;} + .d2-3813038541 .fill-B3{fill:#E3E9FD;} + .d2-3813038541 .fill-B4{fill:#E3E9FD;} + .d2-3813038541 .fill-B5{fill:#EDF0FD;} + .d2-3813038541 .fill-B6{fill:#F7F8FE;} + .d2-3813038541 .fill-AA2{fill:#4A6FF3;} + .d2-3813038541 .fill-AA4{fill:#EDF0FD;} + .d2-3813038541 .fill-AA5{fill:#F7F8FE;} + .d2-3813038541 .fill-AB4{fill:#EDF0FD;} + .d2-3813038541 .fill-AB5{fill:#F7F8FE;} + .d2-3813038541 .stroke-N1{stroke:#0A0F25;} + .d2-3813038541 .stroke-N2{stroke:#676C7E;} + .d2-3813038541 .stroke-N3{stroke:#9499AB;} + .d2-3813038541 .stroke-N4{stroke:#CFD2DD;} + .d2-3813038541 .stroke-N5{stroke:#DEE1EB;} + .d2-3813038541 .stroke-N6{stroke:#EEF1F8;} + .d2-3813038541 .stroke-N7{stroke:#FFFFFF;} + .d2-3813038541 .stroke-B1{stroke:#0D32B2;} + .d2-3813038541 .stroke-B2{stroke:#0D32B2;} + .d2-3813038541 .stroke-B3{stroke:#E3E9FD;} + .d2-3813038541 .stroke-B4{stroke:#E3E9FD;} + .d2-3813038541 .stroke-B5{stroke:#EDF0FD;} + .d2-3813038541 .stroke-B6{stroke:#F7F8FE;} + .d2-3813038541 .stroke-AA2{stroke:#4A6FF3;} + .d2-3813038541 .stroke-AA4{stroke:#EDF0FD;} + .d2-3813038541 .stroke-AA5{stroke:#F7F8FE;} + .d2-3813038541 .stroke-AB4{stroke:#EDF0FD;} + .d2-3813038541 .stroke-AB5{stroke:#F7F8FE;} + .d2-3813038541 .background-color-N1{background-color:#0A0F25;} + .d2-3813038541 .background-color-N2{background-color:#676C7E;} + .d2-3813038541 .background-color-N3{background-color:#9499AB;} + .d2-3813038541 .background-color-N4{background-color:#CFD2DD;} + .d2-3813038541 .background-color-N5{background-color:#DEE1EB;} + .d2-3813038541 .background-color-N6{background-color:#EEF1F8;} + .d2-3813038541 .background-color-N7{background-color:#FFFFFF;} + .d2-3813038541 .background-color-B1{background-color:#0D32B2;} + .d2-3813038541 .background-color-B2{background-color:#0D32B2;} + .d2-3813038541 .background-color-B3{background-color:#E3E9FD;} + .d2-3813038541 .background-color-B4{background-color:#E3E9FD;} + .d2-3813038541 .background-color-B5{background-color:#EDF0FD;} + .d2-3813038541 .background-color-B6{background-color:#F7F8FE;} + .d2-3813038541 .background-color-AA2{background-color:#4A6FF3;} + .d2-3813038541 .background-color-AA4{background-color:#EDF0FD;} + .d2-3813038541 .background-color-AA5{background-color:#F7F8FE;} + .d2-3813038541 .background-color-AB4{background-color:#EDF0FD;} + .d2-3813038541 .background-color-AB5{background-color:#F7F8FE;} + .d2-3813038541 .color-N1{color:#0A0F25;} + .d2-3813038541 .color-N2{color:#676C7E;} + .d2-3813038541 .color-N3{color:#9499AB;} + .d2-3813038541 .color-N4{color:#CFD2DD;} + .d2-3813038541 .color-N5{color:#DEE1EB;} + .d2-3813038541 .color-N6{color:#EEF1F8;} + .d2-3813038541 .color-N7{color:#FFFFFF;} + .d2-3813038541 .color-B1{color:#0D32B2;} + .d2-3813038541 .color-B2{color:#0D32B2;} + .d2-3813038541 .color-B3{color:#E3E9FD;} + .d2-3813038541 .color-B4{color:#E3E9FD;} + .d2-3813038541 .color-B5{color:#EDF0FD;} + .d2-3813038541 .color-B6{color:#F7F8FE;} + .d2-3813038541 .color-AA2{color:#4A6FF3;} + .d2-3813038541 .color-AA4{color:#EDF0FD;} + .d2-3813038541 .color-AA5{color:#F7F8FE;} + .d2-3813038541 .color-AB4{color:#EDF0FD;} + .d2-3813038541 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>customerissuerstoreLike starbucks or somethingacquirerI'm not sure what this isnetworkcustomer bankstore bankinitial transactionpayment processor behind the scenessimplified 1 banana please$10 dollarsthinking: wow, inflationchecks bank accountSavings: $11I can do that, here's my cardRun this cardProcess to card issuerProcess this payment$10 debit$10 creditAn error in judgement is about to occurLike starbucks or something1I'm not sure what this is2 + +>>>>>>> cb2f2823c (Fix changes) <<<<<<< HEAD +<<<<<<< HEAD @@ -395,13 +669,27 @@ >>>>>>> 33280fed5 (fixed e2e tests) +||||||| parent of cb2f2823c (Fix changes) + + + + + +======= + + + + + +>>>>>>> cb2f2823c (Fix changes) - - + + <<<<<<< HEAD +<<<<<<< HEAD @@ -429,14 +717,39 @@ >>>>>>> 33280fed5 (fixed e2e tests) +||||||| parent of cb2f2823c (Fix changes) + + + + + + + + +======= + + + + + + + + +>>>>>>> cb2f2823c (Fix changes) <<<<<<< HEAD +<<<<<<< HEAD 1Like starbucks or something ||||||| parent of 33280fed5 (fixed e2e tests) 1Like starbucks or something ======= 1Like starbucks or something >>>>>>> 33280fed5 (fixed e2e tests) +||||||| parent of cb2f2823c (Fix changes) +1Like starbucks or something +======= +1Like starbucks or something +>>>>>>> cb2f2823c (Fix changes) 2I'm not sure what this is k +||||||| parent of cb2f2823c (Fix changes) + .d2-1573652205 .fill-N1{fill:#0A0F25;} + .d2-1573652205 .fill-N2{fill:#676C7E;} + .d2-1573652205 .fill-N3{fill:#9499AB;} + .d2-1573652205 .fill-N4{fill:#CFD2DD;} + .d2-1573652205 .fill-N5{fill:#DEE1EB;} + .d2-1573652205 .fill-N6{fill:#EEF1F8;} + .d2-1573652205 .fill-N7{fill:#FFFFFF;} + .d2-1573652205 .fill-B1{fill:#0D32B2;} + .d2-1573652205 .fill-B2{fill:#0D32B2;} + .d2-1573652205 .fill-B3{fill:#E3E9FD;} + .d2-1573652205 .fill-B4{fill:#E3E9FD;} + .d2-1573652205 .fill-B5{fill:#EDF0FD;} + .d2-1573652205 .fill-B6{fill:#F7F8FE;} + .d2-1573652205 .fill-AA2{fill:#4A6FF3;} + .d2-1573652205 .fill-AA4{fill:#EDF0FD;} + .d2-1573652205 .fill-AA5{fill:#F7F8FE;} + .d2-1573652205 .fill-AB4{fill:#EDF0FD;} + .d2-1573652205 .fill-AB5{fill:#F7F8FE;} + .d2-1573652205 .stroke-N1{stroke:#0A0F25;} + .d2-1573652205 .stroke-N2{stroke:#676C7E;} + .d2-1573652205 .stroke-N3{stroke:#9499AB;} + .d2-1573652205 .stroke-N4{stroke:#CFD2DD;} + .d2-1573652205 .stroke-N5{stroke:#DEE1EB;} + .d2-1573652205 .stroke-N6{stroke:#EEF1F8;} + .d2-1573652205 .stroke-N7{stroke:#FFFFFF;} + .d2-1573652205 .stroke-B1{stroke:#0D32B2;} + .d2-1573652205 .stroke-B2{stroke:#0D32B2;} + .d2-1573652205 .stroke-B3{stroke:#E3E9FD;} + .d2-1573652205 .stroke-B4{stroke:#E3E9FD;} + .d2-1573652205 .stroke-B5{stroke:#EDF0FD;} + .d2-1573652205 .stroke-B6{stroke:#F7F8FE;} + .d2-1573652205 .stroke-AA2{stroke:#4A6FF3;} + .d2-1573652205 .stroke-AA4{stroke:#EDF0FD;} + .d2-1573652205 .stroke-AA5{stroke:#F7F8FE;} + .d2-1573652205 .stroke-AB4{stroke:#EDF0FD;} + .d2-1573652205 .stroke-AB5{stroke:#F7F8FE;} + .d2-1573652205 .background-color-N1{background-color:#0A0F25;} + .d2-1573652205 .background-color-N2{background-color:#676C7E;} + .d2-1573652205 .background-color-N3{background-color:#9499AB;} + .d2-1573652205 .background-color-N4{background-color:#CFD2DD;} + .d2-1573652205 .background-color-N5{background-color:#DEE1EB;} + .d2-1573652205 .background-color-N6{background-color:#EEF1F8;} + .d2-1573652205 .background-color-N7{background-color:#FFFFFF;} + .d2-1573652205 .background-color-B1{background-color:#0D32B2;} + .d2-1573652205 .background-color-B2{background-color:#0D32B2;} + .d2-1573652205 .background-color-B3{background-color:#E3E9FD;} + .d2-1573652205 .background-color-B4{background-color:#E3E9FD;} + .d2-1573652205 .background-color-B5{background-color:#EDF0FD;} + .d2-1573652205 .background-color-B6{background-color:#F7F8FE;} + .d2-1573652205 .background-color-AA2{background-color:#4A6FF3;} + .d2-1573652205 .background-color-AA4{background-color:#EDF0FD;} + .d2-1573652205 .background-color-AA5{background-color:#F7F8FE;} + .d2-1573652205 .background-color-AB4{background-color:#EDF0FD;} + .d2-1573652205 .background-color-AB5{background-color:#F7F8FE;} + .d2-1573652205 .color-N1{color:#0A0F25;} + .d2-1573652205 .color-N2{color:#676C7E;} + .d2-1573652205 .color-N3{color:#9499AB;} + .d2-1573652205 .color-N4{color:#CFD2DD;} + .d2-1573652205 .color-N5{color:#DEE1EB;} + .d2-1573652205 .color-N6{color:#EEF1F8;} + .d2-1573652205 .color-N7{color:#FFFFFF;} + .d2-1573652205 .color-B1{color:#0D32B2;} + .d2-1573652205 .color-B2{color:#0D32B2;} + .d2-1573652205 .color-B3{color:#E3E9FD;} + .d2-1573652205 .color-B4{color:#E3E9FD;} + .d2-1573652205 .color-B5{color:#EDF0FD;} + .d2-1573652205 .color-B6{color:#F7F8FE;} + .d2-1573652205 .color-AA2{color:#4A6FF3;} + .d2-1573652205 .color-AA4{color:#EDF0FD;} + .d2-1573652205 .color-AA5{color:#F7F8FE;} + .d2-1573652205 .color-AB4{color:#EDF0FD;} + .d2-1573652205 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>k +======= + .d2-875883775 .fill-N1{fill:#0A0F25;} + .d2-875883775 .fill-N2{fill:#676C7E;} + .d2-875883775 .fill-N3{fill:#9499AB;} + .d2-875883775 .fill-N4{fill:#CFD2DD;} + .d2-875883775 .fill-N5{fill:#DEE1EB;} + .d2-875883775 .fill-N6{fill:#EEF1F8;} + .d2-875883775 .fill-N7{fill:#FFFFFF;} + .d2-875883775 .fill-B1{fill:#0D32B2;} + .d2-875883775 .fill-B2{fill:#0D32B2;} + .d2-875883775 .fill-B3{fill:#E3E9FD;} + .d2-875883775 .fill-B4{fill:#E3E9FD;} + .d2-875883775 .fill-B5{fill:#EDF0FD;} + .d2-875883775 .fill-B6{fill:#F7F8FE;} + .d2-875883775 .fill-AA2{fill:#4A6FF3;} + .d2-875883775 .fill-AA4{fill:#EDF0FD;} + .d2-875883775 .fill-AA5{fill:#F7F8FE;} + .d2-875883775 .fill-AB4{fill:#EDF0FD;} + .d2-875883775 .fill-AB5{fill:#F7F8FE;} + .d2-875883775 .stroke-N1{stroke:#0A0F25;} + .d2-875883775 .stroke-N2{stroke:#676C7E;} + .d2-875883775 .stroke-N3{stroke:#9499AB;} + .d2-875883775 .stroke-N4{stroke:#CFD2DD;} + .d2-875883775 .stroke-N5{stroke:#DEE1EB;} + .d2-875883775 .stroke-N6{stroke:#EEF1F8;} + .d2-875883775 .stroke-N7{stroke:#FFFFFF;} + .d2-875883775 .stroke-B1{stroke:#0D32B2;} + .d2-875883775 .stroke-B2{stroke:#0D32B2;} + .d2-875883775 .stroke-B3{stroke:#E3E9FD;} + .d2-875883775 .stroke-B4{stroke:#E3E9FD;} + .d2-875883775 .stroke-B5{stroke:#EDF0FD;} + .d2-875883775 .stroke-B6{stroke:#F7F8FE;} + .d2-875883775 .stroke-AA2{stroke:#4A6FF3;} + .d2-875883775 .stroke-AA4{stroke:#EDF0FD;} + .d2-875883775 .stroke-AA5{stroke:#F7F8FE;} + .d2-875883775 .stroke-AB4{stroke:#EDF0FD;} + .d2-875883775 .stroke-AB5{stroke:#F7F8FE;} + .d2-875883775 .background-color-N1{background-color:#0A0F25;} + .d2-875883775 .background-color-N2{background-color:#676C7E;} + .d2-875883775 .background-color-N3{background-color:#9499AB;} + .d2-875883775 .background-color-N4{background-color:#CFD2DD;} + .d2-875883775 .background-color-N5{background-color:#DEE1EB;} + .d2-875883775 .background-color-N6{background-color:#EEF1F8;} + .d2-875883775 .background-color-N7{background-color:#FFFFFF;} + .d2-875883775 .background-color-B1{background-color:#0D32B2;} + .d2-875883775 .background-color-B2{background-color:#0D32B2;} + .d2-875883775 .background-color-B3{background-color:#E3E9FD;} + .d2-875883775 .background-color-B4{background-color:#E3E9FD;} + .d2-875883775 .background-color-B5{background-color:#EDF0FD;} + .d2-875883775 .background-color-B6{background-color:#F7F8FE;} + .d2-875883775 .background-color-AA2{background-color:#4A6FF3;} + .d2-875883775 .background-color-AA4{background-color:#EDF0FD;} + .d2-875883775 .background-color-AA5{background-color:#F7F8FE;} + .d2-875883775 .background-color-AB4{background-color:#EDF0FD;} + .d2-875883775 .background-color-AB5{background-color:#F7F8FE;} + .d2-875883775 .color-N1{color:#0A0F25;} + .d2-875883775 .color-N2{color:#676C7E;} + .d2-875883775 .color-N3{color:#9499AB;} + .d2-875883775 .color-N4{color:#CFD2DD;} + .d2-875883775 .color-N5{color:#DEE1EB;} + .d2-875883775 .color-N6{color:#EEF1F8;} + .d2-875883775 .color-N7{color:#FFFFFF;} + .d2-875883775 .color-B1{color:#0D32B2;} + .d2-875883775 .color-B2{color:#0D32B2;} + .d2-875883775 .color-B3{color:#E3E9FD;} + .d2-875883775 .color-B4{color:#E3E9FD;} + .d2-875883775 .color-B5{color:#EDF0FD;} + .d2-875883775 .color-B6{color:#F7F8FE;} + .d2-875883775 .color-AA2{color:#4A6FF3;} + .d2-875883775 .color-AA4{color:#EDF0FD;} + .d2-875883775 .color-AA5{color:#F7F8FE;} + .d2-875883775 .color-AB4{color:#EDF0FD;} + .d2-875883775 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>k +>>>>>>> cb2f2823c (Fix changes) diff --git a/e2etests-cli/testdata/TestCLI_E2E/sequence-layer/seq.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/sequence-layer/seq.exp.svg index 70a6e7ba3..8a6ae6cce 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/sequence-layer/seq.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/sequence-layer/seq.exp.svg @@ -1,16 +1,26 @@ +<<<<<<< HEAD megithub.com/terrastruct/d2if i'm rightif i'm wrong fixnah, intended issue about a bugsome note about the bug +||||||| parent of cb2f2823c (Fix changes) + .d2-3774899592 .fill-N1{fill:#0A0F25;} + .d2-3774899592 .fill-N2{fill:#676C7E;} + .d2-3774899592 .fill-N3{fill:#9499AB;} + .d2-3774899592 .fill-N4{fill:#CFD2DD;} + .d2-3774899592 .fill-N5{fill:#DEE1EB;} + .d2-3774899592 .fill-N6{fill:#EEF1F8;} + .d2-3774899592 .fill-N7{fill:#FFFFFF;} + .d2-3774899592 .fill-B1{fill:#0D32B2;} + .d2-3774899592 .fill-B2{fill:#0D32B2;} + .d2-3774899592 .fill-B3{fill:#E3E9FD;} + .d2-3774899592 .fill-B4{fill:#E3E9FD;} + .d2-3774899592 .fill-B5{fill:#EDF0FD;} + .d2-3774899592 .fill-B6{fill:#F7F8FE;} + .d2-3774899592 .fill-AA2{fill:#4A6FF3;} + .d2-3774899592 .fill-AA4{fill:#EDF0FD;} + .d2-3774899592 .fill-AA5{fill:#F7F8FE;} + .d2-3774899592 .fill-AB4{fill:#EDF0FD;} + .d2-3774899592 .fill-AB5{fill:#F7F8FE;} + .d2-3774899592 .stroke-N1{stroke:#0A0F25;} + .d2-3774899592 .stroke-N2{stroke:#676C7E;} + .d2-3774899592 .stroke-N3{stroke:#9499AB;} + .d2-3774899592 .stroke-N4{stroke:#CFD2DD;} + .d2-3774899592 .stroke-N5{stroke:#DEE1EB;} + .d2-3774899592 .stroke-N6{stroke:#EEF1F8;} + .d2-3774899592 .stroke-N7{stroke:#FFFFFF;} + .d2-3774899592 .stroke-B1{stroke:#0D32B2;} + .d2-3774899592 .stroke-B2{stroke:#0D32B2;} + .d2-3774899592 .stroke-B3{stroke:#E3E9FD;} + .d2-3774899592 .stroke-B4{stroke:#E3E9FD;} + .d2-3774899592 .stroke-B5{stroke:#EDF0FD;} + .d2-3774899592 .stroke-B6{stroke:#F7F8FE;} + .d2-3774899592 .stroke-AA2{stroke:#4A6FF3;} + .d2-3774899592 .stroke-AA4{stroke:#EDF0FD;} + .d2-3774899592 .stroke-AA5{stroke:#F7F8FE;} + .d2-3774899592 .stroke-AB4{stroke:#EDF0FD;} + .d2-3774899592 .stroke-AB5{stroke:#F7F8FE;} + .d2-3774899592 .background-color-N1{background-color:#0A0F25;} + .d2-3774899592 .background-color-N2{background-color:#676C7E;} + .d2-3774899592 .background-color-N3{background-color:#9499AB;} + .d2-3774899592 .background-color-N4{background-color:#CFD2DD;} + .d2-3774899592 .background-color-N5{background-color:#DEE1EB;} + .d2-3774899592 .background-color-N6{background-color:#EEF1F8;} + .d2-3774899592 .background-color-N7{background-color:#FFFFFF;} + .d2-3774899592 .background-color-B1{background-color:#0D32B2;} + .d2-3774899592 .background-color-B2{background-color:#0D32B2;} + .d2-3774899592 .background-color-B3{background-color:#E3E9FD;} + .d2-3774899592 .background-color-B4{background-color:#E3E9FD;} + .d2-3774899592 .background-color-B5{background-color:#EDF0FD;} + .d2-3774899592 .background-color-B6{background-color:#F7F8FE;} + .d2-3774899592 .background-color-AA2{background-color:#4A6FF3;} + .d2-3774899592 .background-color-AA4{background-color:#EDF0FD;} + .d2-3774899592 .background-color-AA5{background-color:#F7F8FE;} + .d2-3774899592 .background-color-AB4{background-color:#EDF0FD;} + .d2-3774899592 .background-color-AB5{background-color:#F7F8FE;} + .d2-3774899592 .color-N1{color:#0A0F25;} + .d2-3774899592 .color-N2{color:#676C7E;} + .d2-3774899592 .color-N3{color:#9499AB;} + .d2-3774899592 .color-N4{color:#CFD2DD;} + .d2-3774899592 .color-N5{color:#DEE1EB;} + .d2-3774899592 .color-N6{color:#EEF1F8;} + .d2-3774899592 .color-N7{color:#FFFFFF;} + .d2-3774899592 .color-B1{color:#0D32B2;} + .d2-3774899592 .color-B2{color:#0D32B2;} + .d2-3774899592 .color-B3{color:#E3E9FD;} + .d2-3774899592 .color-B4{color:#E3E9FD;} + .d2-3774899592 .color-B5{color:#EDF0FD;} + .d2-3774899592 .color-B6{color:#F7F8FE;} + .d2-3774899592 .color-AA2{color:#4A6FF3;} + .d2-3774899592 .color-AA4{color:#EDF0FD;} + .d2-3774899592 .color-AA5{color:#F7F8FE;} + .d2-3774899592 .color-AB4{color:#EDF0FD;} + .d2-3774899592 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>megithub.com/terrastruct/d2if i'm rightif i'm wrong fixnah, intended issue about a bugsome note about the bug +======= + .d2-3070513530 .fill-N1{fill:#0A0F25;} + .d2-3070513530 .fill-N2{fill:#676C7E;} + .d2-3070513530 .fill-N3{fill:#9499AB;} + .d2-3070513530 .fill-N4{fill:#CFD2DD;} + .d2-3070513530 .fill-N5{fill:#DEE1EB;} + .d2-3070513530 .fill-N6{fill:#EEF1F8;} + .d2-3070513530 .fill-N7{fill:#FFFFFF;} + .d2-3070513530 .fill-B1{fill:#0D32B2;} + .d2-3070513530 .fill-B2{fill:#0D32B2;} + .d2-3070513530 .fill-B3{fill:#E3E9FD;} + .d2-3070513530 .fill-B4{fill:#E3E9FD;} + .d2-3070513530 .fill-B5{fill:#EDF0FD;} + .d2-3070513530 .fill-B6{fill:#F7F8FE;} + .d2-3070513530 .fill-AA2{fill:#4A6FF3;} + .d2-3070513530 .fill-AA4{fill:#EDF0FD;} + .d2-3070513530 .fill-AA5{fill:#F7F8FE;} + .d2-3070513530 .fill-AB4{fill:#EDF0FD;} + .d2-3070513530 .fill-AB5{fill:#F7F8FE;} + .d2-3070513530 .stroke-N1{stroke:#0A0F25;} + .d2-3070513530 .stroke-N2{stroke:#676C7E;} + .d2-3070513530 .stroke-N3{stroke:#9499AB;} + .d2-3070513530 .stroke-N4{stroke:#CFD2DD;} + .d2-3070513530 .stroke-N5{stroke:#DEE1EB;} + .d2-3070513530 .stroke-N6{stroke:#EEF1F8;} + .d2-3070513530 .stroke-N7{stroke:#FFFFFF;} + .d2-3070513530 .stroke-B1{stroke:#0D32B2;} + .d2-3070513530 .stroke-B2{stroke:#0D32B2;} + .d2-3070513530 .stroke-B3{stroke:#E3E9FD;} + .d2-3070513530 .stroke-B4{stroke:#E3E9FD;} + .d2-3070513530 .stroke-B5{stroke:#EDF0FD;} + .d2-3070513530 .stroke-B6{stroke:#F7F8FE;} + .d2-3070513530 .stroke-AA2{stroke:#4A6FF3;} + .d2-3070513530 .stroke-AA4{stroke:#EDF0FD;} + .d2-3070513530 .stroke-AA5{stroke:#F7F8FE;} + .d2-3070513530 .stroke-AB4{stroke:#EDF0FD;} + .d2-3070513530 .stroke-AB5{stroke:#F7F8FE;} + .d2-3070513530 .background-color-N1{background-color:#0A0F25;} + .d2-3070513530 .background-color-N2{background-color:#676C7E;} + .d2-3070513530 .background-color-N3{background-color:#9499AB;} + .d2-3070513530 .background-color-N4{background-color:#CFD2DD;} + .d2-3070513530 .background-color-N5{background-color:#DEE1EB;} + .d2-3070513530 .background-color-N6{background-color:#EEF1F8;} + .d2-3070513530 .background-color-N7{background-color:#FFFFFF;} + .d2-3070513530 .background-color-B1{background-color:#0D32B2;} + .d2-3070513530 .background-color-B2{background-color:#0D32B2;} + .d2-3070513530 .background-color-B3{background-color:#E3E9FD;} + .d2-3070513530 .background-color-B4{background-color:#E3E9FD;} + .d2-3070513530 .background-color-B5{background-color:#EDF0FD;} + .d2-3070513530 .background-color-B6{background-color:#F7F8FE;} + .d2-3070513530 .background-color-AA2{background-color:#4A6FF3;} + .d2-3070513530 .background-color-AA4{background-color:#EDF0FD;} + .d2-3070513530 .background-color-AA5{background-color:#F7F8FE;} + .d2-3070513530 .background-color-AB4{background-color:#EDF0FD;} + .d2-3070513530 .background-color-AB5{background-color:#F7F8FE;} + .d2-3070513530 .color-N1{color:#0A0F25;} + .d2-3070513530 .color-N2{color:#676C7E;} + .d2-3070513530 .color-N3{color:#9499AB;} + .d2-3070513530 .color-N4{color:#CFD2DD;} + .d2-3070513530 .color-N5{color:#DEE1EB;} + .d2-3070513530 .color-N6{color:#EEF1F8;} + .d2-3070513530 .color-N7{color:#FFFFFF;} + .d2-3070513530 .color-B1{color:#0D32B2;} + .d2-3070513530 .color-B2{color:#0D32B2;} + .d2-3070513530 .color-B3{color:#E3E9FD;} + .d2-3070513530 .color-B4{color:#E3E9FD;} + .d2-3070513530 .color-B5{color:#EDF0FD;} + .d2-3070513530 .color-B6{color:#F7F8FE;} + .d2-3070513530 .color-AA2{color:#4A6FF3;} + .d2-3070513530 .color-AA4{color:#EDF0FD;} + .d2-3070513530 .color-AA5{color:#F7F8FE;} + .d2-3070513530 .color-AB4{color:#EDF0FD;} + .d2-3070513530 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>megithub.com/terrastruct/d2if i'm rightif i'm wrong fixnah, intended issue about a bugsome note about the bug +>>>>>>> cb2f2823c (Fix changes) diff --git a/e2etests-cli/testdata/TestCLI_E2E/stdin.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/stdin.exp.svg index 9263b1cb9..5ae1566b6 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/stdin.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/stdin.exp.svg @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD a >>>>>>> 33280fed5 (fixed e2e tests) +||||||| parent of cb2f2823c (Fix changes) + .d2-4091838784 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>a +======= + .d2-4091838784 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>a +>>>>>>> cb2f2823c (Fix changes) \ No newline at end of file diff --git a/e2etests/testdata/regression/class_font_style_sequence/elk/sketch.exp.svg b/e2etests/testdata/regression/class_font_style_sequence/elk/sketch.exp.svg index 093881fce..e9b7cf056 100644 --- a/e2etests/testdata/regression/class_font_style_sequence/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/class_font_style_sequence/elk/sketch.exp.svg @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD a >>>>>>> 33280fed5 (fixed e2e tests) +||||||| parent of cb2f2823c (Fix changes) + .d2-4091838784 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>a +======= + .d2-4091838784 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>a +>>>>>>> cb2f2823c (Fix changes) \ No newline at end of file diff --git a/e2etests/testdata/regression/code_font_size/dagre/sketch.exp.svg b/e2etests/testdata/regression/code_font_size/dagre/sketch.exp.svg index 951e7d656..dc51640d3 100644 --- a/e2etests/testdata/regression/code_font_size/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/code_font_size/dagre/sketch.exp.svg @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD RefreshAuthorizationPolicyProtocolServerSideTranslatorProtocolBufferRefreshAuthorizationPolicyCacheRefreshAuthorizationPolicyCacheok >>>>>>> 33280fed5 (fixed e2e tests) +||||||| parent of cb2f2823c (Fix changes) + .d2-135452814 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>RefreshAuthorizationPolicyProtocolServerSideTranslatorProtocolBufferRefreshAuthorizationPolicyCacheRefreshAuthorizationPolicyCacheok +======= + .d2-135452814 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>RefreshAuthorizationPolicyProtocolServerSideTranslatorProtocolBufferRefreshAuthorizationPolicyCacheRefreshAuthorizationPolicyCacheok +>>>>>>> cb2f2823c (Fix changes) \ No newline at end of file diff --git a/e2etests/testdata/regression/only_header_class_table/elk/sketch.exp.svg b/e2etests/testdata/regression/only_header_class_table/elk/sketch.exp.svg index e07b45e85..0bcdb9e99 100644 --- a/e2etests/testdata/regression/only_header_class_table/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/only_header_class_table/elk/sketch.exp.svg @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD RefreshAuthorizationPolicyProtocolServerSideTranslatorProtocolBufferRefreshAuthorizationPolicyCacheRefreshAuthorizationPolicyCacheok >>>>>>> 33280fed5 (fixed e2e tests) +||||||| parent of cb2f2823c (Fix changes) + .d2-266917553 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>RefreshAuthorizationPolicyProtocolServerSideTranslatorProtocolBufferRefreshAuthorizationPolicyCacheRefreshAuthorizationPolicyCacheok +======= + .d2-266917553 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>RefreshAuthorizationPolicyProtocolServerSideTranslatorProtocolBufferRefreshAuthorizationPolicyCacheRefreshAuthorizationPolicyCacheok +>>>>>>> cb2f2823c (Fix changes) \ No newline at end of file diff --git a/e2etests/testdata/regression/opacity-on-label/dagre/sketch.exp.svg b/e2etests/testdata/regression/opacity-on-label/dagre/sketch.exp.svg index a9e07c511..c088b260a 100644 --- a/e2etests/testdata/regression/opacity-on-label/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/opacity-on-label/dagre/sketch.exp.svg @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD ab04:20,11:20loop through each table start_time = datetime.datetime.now >>>>>>> 33280fed5 (fixed e2e tests) +||||||| parent of cb2f2823c (Fix changes) + .d2-3756208236 .fill-N1{fill:#0A0F25;} + .d2-3756208236 .fill-N2{fill:#676C7E;} + .d2-3756208236 .fill-N3{fill:#9499AB;} + .d2-3756208236 .fill-N4{fill:#CFD2DD;} + .d2-3756208236 .fill-N5{fill:#DEE1EB;} + .d2-3756208236 .fill-N6{fill:#EEF1F8;} + .d2-3756208236 .fill-N7{fill:#FFFFFF;} + .d2-3756208236 .fill-B1{fill:#0D32B2;} + .d2-3756208236 .fill-B2{fill:#0D32B2;} + .d2-3756208236 .fill-B3{fill:#E3E9FD;} + .d2-3756208236 .fill-B4{fill:#E3E9FD;} + .d2-3756208236 .fill-B5{fill:#EDF0FD;} + .d2-3756208236 .fill-B6{fill:#F7F8FE;} + .d2-3756208236 .fill-AA2{fill:#4A6FF3;} + .d2-3756208236 .fill-AA4{fill:#EDF0FD;} + .d2-3756208236 .fill-AA5{fill:#F7F8FE;} + .d2-3756208236 .fill-AB4{fill:#EDF0FD;} + .d2-3756208236 .fill-AB5{fill:#F7F8FE;} + .d2-3756208236 .stroke-N1{stroke:#0A0F25;} + .d2-3756208236 .stroke-N2{stroke:#676C7E;} + .d2-3756208236 .stroke-N3{stroke:#9499AB;} + .d2-3756208236 .stroke-N4{stroke:#CFD2DD;} + .d2-3756208236 .stroke-N5{stroke:#DEE1EB;} + .d2-3756208236 .stroke-N6{stroke:#EEF1F8;} + .d2-3756208236 .stroke-N7{stroke:#FFFFFF;} + .d2-3756208236 .stroke-B1{stroke:#0D32B2;} + .d2-3756208236 .stroke-B2{stroke:#0D32B2;} + .d2-3756208236 .stroke-B3{stroke:#E3E9FD;} + .d2-3756208236 .stroke-B4{stroke:#E3E9FD;} + .d2-3756208236 .stroke-B5{stroke:#EDF0FD;} + .d2-3756208236 .stroke-B6{stroke:#F7F8FE;} + .d2-3756208236 .stroke-AA2{stroke:#4A6FF3;} + .d2-3756208236 .stroke-AA4{stroke:#EDF0FD;} + .d2-3756208236 .stroke-AA5{stroke:#F7F8FE;} + .d2-3756208236 .stroke-AB4{stroke:#EDF0FD;} + .d2-3756208236 .stroke-AB5{stroke:#F7F8FE;} + .d2-3756208236 .background-color-N1{background-color:#0A0F25;} + .d2-3756208236 .background-color-N2{background-color:#676C7E;} + .d2-3756208236 .background-color-N3{background-color:#9499AB;} + .d2-3756208236 .background-color-N4{background-color:#CFD2DD;} + .d2-3756208236 .background-color-N5{background-color:#DEE1EB;} + .d2-3756208236 .background-color-N6{background-color:#EEF1F8;} + .d2-3756208236 .background-color-N7{background-color:#FFFFFF;} + .d2-3756208236 .background-color-B1{background-color:#0D32B2;} + .d2-3756208236 .background-color-B2{background-color:#0D32B2;} + .d2-3756208236 .background-color-B3{background-color:#E3E9FD;} + .d2-3756208236 .background-color-B4{background-color:#E3E9FD;} + .d2-3756208236 .background-color-B5{background-color:#EDF0FD;} + .d2-3756208236 .background-color-B6{background-color:#F7F8FE;} + .d2-3756208236 .background-color-AA2{background-color:#4A6FF3;} + .d2-3756208236 .background-color-AA4{background-color:#EDF0FD;} + .d2-3756208236 .background-color-AA5{background-color:#F7F8FE;} + .d2-3756208236 .background-color-AB4{background-color:#EDF0FD;} + .d2-3756208236 .background-color-AB5{background-color:#F7F8FE;} + .d2-3756208236 .color-N1{color:#0A0F25;} + .d2-3756208236 .color-N2{color:#676C7E;} + .d2-3756208236 .color-N3{color:#9499AB;} + .d2-3756208236 .color-N4{color:#CFD2DD;} + .d2-3756208236 .color-N5{color:#DEE1EB;} + .d2-3756208236 .color-N6{color:#EEF1F8;} + .d2-3756208236 .color-N7{color:#FFFFFF;} + .d2-3756208236 .color-B1{color:#0D32B2;} + .d2-3756208236 .color-B2{color:#0D32B2;} + .d2-3756208236 .color-B3{color:#E3E9FD;} + .d2-3756208236 .color-B4{color:#E3E9FD;} + .d2-3756208236 .color-B5{color:#EDF0FD;} + .d2-3756208236 .color-B6{color:#F7F8FE;} + .d2-3756208236 .color-AA2{color:#4A6FF3;} + .d2-3756208236 .color-AA4{color:#EDF0FD;} + .d2-3756208236 .color-AA5{color:#F7F8FE;} + .d2-3756208236 .color-AB4{color:#EDF0FD;} + .d2-3756208236 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>ab04:20,11:20loop through each table start_time = datetime.datetime.now + +======= + .d2-4180404608 .fill-N1{fill:#0A0F25;} + .d2-4180404608 .fill-N2{fill:#676C7E;} + .d2-4180404608 .fill-N3{fill:#9499AB;} + .d2-4180404608 .fill-N4{fill:#CFD2DD;} + .d2-4180404608 .fill-N5{fill:#DEE1EB;} + .d2-4180404608 .fill-N6{fill:#EEF1F8;} + .d2-4180404608 .fill-N7{fill:#FFFFFF;} + .d2-4180404608 .fill-B1{fill:#0D32B2;} + .d2-4180404608 .fill-B2{fill:#0D32B2;} + .d2-4180404608 .fill-B3{fill:#E3E9FD;} + .d2-4180404608 .fill-B4{fill:#E3E9FD;} + .d2-4180404608 .fill-B5{fill:#EDF0FD;} + .d2-4180404608 .fill-B6{fill:#F7F8FE;} + .d2-4180404608 .fill-AA2{fill:#4A6FF3;} + .d2-4180404608 .fill-AA4{fill:#EDF0FD;} + .d2-4180404608 .fill-AA5{fill:#F7F8FE;} + .d2-4180404608 .fill-AB4{fill:#EDF0FD;} + .d2-4180404608 .fill-AB5{fill:#F7F8FE;} + .d2-4180404608 .stroke-N1{stroke:#0A0F25;} + .d2-4180404608 .stroke-N2{stroke:#676C7E;} + .d2-4180404608 .stroke-N3{stroke:#9499AB;} + .d2-4180404608 .stroke-N4{stroke:#CFD2DD;} + .d2-4180404608 .stroke-N5{stroke:#DEE1EB;} + .d2-4180404608 .stroke-N6{stroke:#EEF1F8;} + .d2-4180404608 .stroke-N7{stroke:#FFFFFF;} + .d2-4180404608 .stroke-B1{stroke:#0D32B2;} + .d2-4180404608 .stroke-B2{stroke:#0D32B2;} + .d2-4180404608 .stroke-B3{stroke:#E3E9FD;} + .d2-4180404608 .stroke-B4{stroke:#E3E9FD;} + .d2-4180404608 .stroke-B5{stroke:#EDF0FD;} + .d2-4180404608 .stroke-B6{stroke:#F7F8FE;} + .d2-4180404608 .stroke-AA2{stroke:#4A6FF3;} + .d2-4180404608 .stroke-AA4{stroke:#EDF0FD;} + .d2-4180404608 .stroke-AA5{stroke:#F7F8FE;} + .d2-4180404608 .stroke-AB4{stroke:#EDF0FD;} + .d2-4180404608 .stroke-AB5{stroke:#F7F8FE;} + .d2-4180404608 .background-color-N1{background-color:#0A0F25;} + .d2-4180404608 .background-color-N2{background-color:#676C7E;} + .d2-4180404608 .background-color-N3{background-color:#9499AB;} + .d2-4180404608 .background-color-N4{background-color:#CFD2DD;} + .d2-4180404608 .background-color-N5{background-color:#DEE1EB;} + .d2-4180404608 .background-color-N6{background-color:#EEF1F8;} + .d2-4180404608 .background-color-N7{background-color:#FFFFFF;} + .d2-4180404608 .background-color-B1{background-color:#0D32B2;} + .d2-4180404608 .background-color-B2{background-color:#0D32B2;} + .d2-4180404608 .background-color-B3{background-color:#E3E9FD;} + .d2-4180404608 .background-color-B4{background-color:#E3E9FD;} + .d2-4180404608 .background-color-B5{background-color:#EDF0FD;} + .d2-4180404608 .background-color-B6{background-color:#F7F8FE;} + .d2-4180404608 .background-color-AA2{background-color:#4A6FF3;} + .d2-4180404608 .background-color-AA4{background-color:#EDF0FD;} + .d2-4180404608 .background-color-AA5{background-color:#F7F8FE;} + .d2-4180404608 .background-color-AB4{background-color:#EDF0FD;} + .d2-4180404608 .background-color-AB5{background-color:#F7F8FE;} + .d2-4180404608 .color-N1{color:#0A0F25;} + .d2-4180404608 .color-N2{color:#676C7E;} + .d2-4180404608 .color-N3{color:#9499AB;} + .d2-4180404608 .color-N4{color:#CFD2DD;} + .d2-4180404608 .color-N5{color:#DEE1EB;} + .d2-4180404608 .color-N6{color:#EEF1F8;} + .d2-4180404608 .color-N7{color:#FFFFFF;} + .d2-4180404608 .color-B1{color:#0D32B2;} + .d2-4180404608 .color-B2{color:#0D32B2;} + .d2-4180404608 .color-B3{color:#E3E9FD;} + .d2-4180404608 .color-B4{color:#E3E9FD;} + .d2-4180404608 .color-B5{color:#EDF0FD;} + .d2-4180404608 .color-B6{color:#F7F8FE;} + .d2-4180404608 .color-AA2{color:#4A6FF3;} + .d2-4180404608 .color-AA4{color:#EDF0FD;} + .d2-4180404608 .color-AA5{color:#F7F8FE;} + .d2-4180404608 .color-AB4{color:#EDF0FD;} + .d2-4180404608 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>ab04:20,11:20loop through each table start_time = datetime.datetime.now + +>>>>>>> cb2f2823c (Fix changes) - - + + \ No newline at end of file diff --git a/e2etests/testdata/regression/sequence-note-escape-group/elk/sketch.exp.svg b/e2etests/testdata/regression/sequence-note-escape-group/elk/sketch.exp.svg index f2052b9d1..f56498c16 100644 --- a/e2etests/testdata/regression/sequence-note-escape-group/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/sequence-note-escape-group/elk/sketch.exp.svg @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD ab04:20,11:20loop through each table start_time = datetime.datetime.now >>>>>>> 33280fed5 (fixed e2e tests) +||||||| parent of cb2f2823c (Fix changes) + .d2-3756208236 .fill-N1{fill:#0A0F25;} + .d2-3756208236 .fill-N2{fill:#676C7E;} + .d2-3756208236 .fill-N3{fill:#9499AB;} + .d2-3756208236 .fill-N4{fill:#CFD2DD;} + .d2-3756208236 .fill-N5{fill:#DEE1EB;} + .d2-3756208236 .fill-N6{fill:#EEF1F8;} + .d2-3756208236 .fill-N7{fill:#FFFFFF;} + .d2-3756208236 .fill-B1{fill:#0D32B2;} + .d2-3756208236 .fill-B2{fill:#0D32B2;} + .d2-3756208236 .fill-B3{fill:#E3E9FD;} + .d2-3756208236 .fill-B4{fill:#E3E9FD;} + .d2-3756208236 .fill-B5{fill:#EDF0FD;} + .d2-3756208236 .fill-B6{fill:#F7F8FE;} + .d2-3756208236 .fill-AA2{fill:#4A6FF3;} + .d2-3756208236 .fill-AA4{fill:#EDF0FD;} + .d2-3756208236 .fill-AA5{fill:#F7F8FE;} + .d2-3756208236 .fill-AB4{fill:#EDF0FD;} + .d2-3756208236 .fill-AB5{fill:#F7F8FE;} + .d2-3756208236 .stroke-N1{stroke:#0A0F25;} + .d2-3756208236 .stroke-N2{stroke:#676C7E;} + .d2-3756208236 .stroke-N3{stroke:#9499AB;} + .d2-3756208236 .stroke-N4{stroke:#CFD2DD;} + .d2-3756208236 .stroke-N5{stroke:#DEE1EB;} + .d2-3756208236 .stroke-N6{stroke:#EEF1F8;} + .d2-3756208236 .stroke-N7{stroke:#FFFFFF;} + .d2-3756208236 .stroke-B1{stroke:#0D32B2;} + .d2-3756208236 .stroke-B2{stroke:#0D32B2;} + .d2-3756208236 .stroke-B3{stroke:#E3E9FD;} + .d2-3756208236 .stroke-B4{stroke:#E3E9FD;} + .d2-3756208236 .stroke-B5{stroke:#EDF0FD;} + .d2-3756208236 .stroke-B6{stroke:#F7F8FE;} + .d2-3756208236 .stroke-AA2{stroke:#4A6FF3;} + .d2-3756208236 .stroke-AA4{stroke:#EDF0FD;} + .d2-3756208236 .stroke-AA5{stroke:#F7F8FE;} + .d2-3756208236 .stroke-AB4{stroke:#EDF0FD;} + .d2-3756208236 .stroke-AB5{stroke:#F7F8FE;} + .d2-3756208236 .background-color-N1{background-color:#0A0F25;} + .d2-3756208236 .background-color-N2{background-color:#676C7E;} + .d2-3756208236 .background-color-N3{background-color:#9499AB;} + .d2-3756208236 .background-color-N4{background-color:#CFD2DD;} + .d2-3756208236 .background-color-N5{background-color:#DEE1EB;} + .d2-3756208236 .background-color-N6{background-color:#EEF1F8;} + .d2-3756208236 .background-color-N7{background-color:#FFFFFF;} + .d2-3756208236 .background-color-B1{background-color:#0D32B2;} + .d2-3756208236 .background-color-B2{background-color:#0D32B2;} + .d2-3756208236 .background-color-B3{background-color:#E3E9FD;} + .d2-3756208236 .background-color-B4{background-color:#E3E9FD;} + .d2-3756208236 .background-color-B5{background-color:#EDF0FD;} + .d2-3756208236 .background-color-B6{background-color:#F7F8FE;} + .d2-3756208236 .background-color-AA2{background-color:#4A6FF3;} + .d2-3756208236 .background-color-AA4{background-color:#EDF0FD;} + .d2-3756208236 .background-color-AA5{background-color:#F7F8FE;} + .d2-3756208236 .background-color-AB4{background-color:#EDF0FD;} + .d2-3756208236 .background-color-AB5{background-color:#F7F8FE;} + .d2-3756208236 .color-N1{color:#0A0F25;} + .d2-3756208236 .color-N2{color:#676C7E;} + .d2-3756208236 .color-N3{color:#9499AB;} + .d2-3756208236 .color-N4{color:#CFD2DD;} + .d2-3756208236 .color-N5{color:#DEE1EB;} + .d2-3756208236 .color-N6{color:#EEF1F8;} + .d2-3756208236 .color-N7{color:#FFFFFF;} + .d2-3756208236 .color-B1{color:#0D32B2;} + .d2-3756208236 .color-B2{color:#0D32B2;} + .d2-3756208236 .color-B3{color:#E3E9FD;} + .d2-3756208236 .color-B4{color:#E3E9FD;} + .d2-3756208236 .color-B5{color:#EDF0FD;} + .d2-3756208236 .color-B6{color:#F7F8FE;} + .d2-3756208236 .color-AA2{color:#4A6FF3;} + .d2-3756208236 .color-AA4{color:#EDF0FD;} + .d2-3756208236 .color-AA5{color:#F7F8FE;} + .d2-3756208236 .color-AB4{color:#EDF0FD;} + .d2-3756208236 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>ab04:20,11:20loop through each table start_time = datetime.datetime.now + +======= + .d2-4180404608 .fill-N1{fill:#0A0F25;} + .d2-4180404608 .fill-N2{fill:#676C7E;} + .d2-4180404608 .fill-N3{fill:#9499AB;} + .d2-4180404608 .fill-N4{fill:#CFD2DD;} + .d2-4180404608 .fill-N5{fill:#DEE1EB;} + .d2-4180404608 .fill-N6{fill:#EEF1F8;} + .d2-4180404608 .fill-N7{fill:#FFFFFF;} + .d2-4180404608 .fill-B1{fill:#0D32B2;} + .d2-4180404608 .fill-B2{fill:#0D32B2;} + .d2-4180404608 .fill-B3{fill:#E3E9FD;} + .d2-4180404608 .fill-B4{fill:#E3E9FD;} + .d2-4180404608 .fill-B5{fill:#EDF0FD;} + .d2-4180404608 .fill-B6{fill:#F7F8FE;} + .d2-4180404608 .fill-AA2{fill:#4A6FF3;} + .d2-4180404608 .fill-AA4{fill:#EDF0FD;} + .d2-4180404608 .fill-AA5{fill:#F7F8FE;} + .d2-4180404608 .fill-AB4{fill:#EDF0FD;} + .d2-4180404608 .fill-AB5{fill:#F7F8FE;} + .d2-4180404608 .stroke-N1{stroke:#0A0F25;} + .d2-4180404608 .stroke-N2{stroke:#676C7E;} + .d2-4180404608 .stroke-N3{stroke:#9499AB;} + .d2-4180404608 .stroke-N4{stroke:#CFD2DD;} + .d2-4180404608 .stroke-N5{stroke:#DEE1EB;} + .d2-4180404608 .stroke-N6{stroke:#EEF1F8;} + .d2-4180404608 .stroke-N7{stroke:#FFFFFF;} + .d2-4180404608 .stroke-B1{stroke:#0D32B2;} + .d2-4180404608 .stroke-B2{stroke:#0D32B2;} + .d2-4180404608 .stroke-B3{stroke:#E3E9FD;} + .d2-4180404608 .stroke-B4{stroke:#E3E9FD;} + .d2-4180404608 .stroke-B5{stroke:#EDF0FD;} + .d2-4180404608 .stroke-B6{stroke:#F7F8FE;} + .d2-4180404608 .stroke-AA2{stroke:#4A6FF3;} + .d2-4180404608 .stroke-AA4{stroke:#EDF0FD;} + .d2-4180404608 .stroke-AA5{stroke:#F7F8FE;} + .d2-4180404608 .stroke-AB4{stroke:#EDF0FD;} + .d2-4180404608 .stroke-AB5{stroke:#F7F8FE;} + .d2-4180404608 .background-color-N1{background-color:#0A0F25;} + .d2-4180404608 .background-color-N2{background-color:#676C7E;} + .d2-4180404608 .background-color-N3{background-color:#9499AB;} + .d2-4180404608 .background-color-N4{background-color:#CFD2DD;} + .d2-4180404608 .background-color-N5{background-color:#DEE1EB;} + .d2-4180404608 .background-color-N6{background-color:#EEF1F8;} + .d2-4180404608 .background-color-N7{background-color:#FFFFFF;} + .d2-4180404608 .background-color-B1{background-color:#0D32B2;} + .d2-4180404608 .background-color-B2{background-color:#0D32B2;} + .d2-4180404608 .background-color-B3{background-color:#E3E9FD;} + .d2-4180404608 .background-color-B4{background-color:#E3E9FD;} + .d2-4180404608 .background-color-B5{background-color:#EDF0FD;} + .d2-4180404608 .background-color-B6{background-color:#F7F8FE;} + .d2-4180404608 .background-color-AA2{background-color:#4A6FF3;} + .d2-4180404608 .background-color-AA4{background-color:#EDF0FD;} + .d2-4180404608 .background-color-AA5{background-color:#F7F8FE;} + .d2-4180404608 .background-color-AB4{background-color:#EDF0FD;} + .d2-4180404608 .background-color-AB5{background-color:#F7F8FE;} + .d2-4180404608 .color-N1{color:#0A0F25;} + .d2-4180404608 .color-N2{color:#676C7E;} + .d2-4180404608 .color-N3{color:#9499AB;} + .d2-4180404608 .color-N4{color:#CFD2DD;} + .d2-4180404608 .color-N5{color:#DEE1EB;} + .d2-4180404608 .color-N6{color:#EEF1F8;} + .d2-4180404608 .color-N7{color:#FFFFFF;} + .d2-4180404608 .color-B1{color:#0D32B2;} + .d2-4180404608 .color-B2{color:#0D32B2;} + .d2-4180404608 .color-B3{color:#E3E9FD;} + .d2-4180404608 .color-B4{color:#E3E9FD;} + .d2-4180404608 .color-B5{color:#EDF0FD;} + .d2-4180404608 .color-B6{color:#F7F8FE;} + .d2-4180404608 .color-AA2{color:#4A6FF3;} + .d2-4180404608 .color-AA4{color:#EDF0FD;} + .d2-4180404608 .color-AA5{color:#F7F8FE;} + .d2-4180404608 .color-AB4{color:#EDF0FD;} + .d2-4180404608 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>ab04:20,11:20loop through each table start_time = datetime.datetime.now + +>>>>>>> cb2f2823c (Fix changes) - - + + \ No newline at end of file diff --git a/e2etests/testdata/regression/sequence_diagram_name_crash/dagre/sketch.exp.svg b/e2etests/testdata/regression/sequence_diagram_name_crash/dagre/sketch.exp.svg index 51b10a745..61d0796e8 100644 --- a/e2etests/testdata/regression/sequence_diagram_name_crash/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/sequence_diagram_name_crash/dagre/sketch.exp.svg @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD ABCgroup 1group 2group 3group 4group 5group 6group 7group 8group 9group 10group 11 >>>>>>> 33280fed5 (fixed e2e tests) +||||||| parent of cb2f2823c (Fix changes) + .d2-1004463739 .fill-N1{fill:#0A0F25;} + .d2-1004463739 .fill-N2{fill:#676C7E;} + .d2-1004463739 .fill-N3{fill:#9499AB;} + .d2-1004463739 .fill-N4{fill:#CFD2DD;} + .d2-1004463739 .fill-N5{fill:#DEE1EB;} + .d2-1004463739 .fill-N6{fill:#EEF1F8;} + .d2-1004463739 .fill-N7{fill:#FFFFFF;} + .d2-1004463739 .fill-B1{fill:#0D32B2;} + .d2-1004463739 .fill-B2{fill:#0D32B2;} + .d2-1004463739 .fill-B3{fill:#E3E9FD;} + .d2-1004463739 .fill-B4{fill:#E3E9FD;} + .d2-1004463739 .fill-B5{fill:#EDF0FD;} + .d2-1004463739 .fill-B6{fill:#F7F8FE;} + .d2-1004463739 .fill-AA2{fill:#4A6FF3;} + .d2-1004463739 .fill-AA4{fill:#EDF0FD;} + .d2-1004463739 .fill-AA5{fill:#F7F8FE;} + .d2-1004463739 .fill-AB4{fill:#EDF0FD;} + .d2-1004463739 .fill-AB5{fill:#F7F8FE;} + .d2-1004463739 .stroke-N1{stroke:#0A0F25;} + .d2-1004463739 .stroke-N2{stroke:#676C7E;} + .d2-1004463739 .stroke-N3{stroke:#9499AB;} + .d2-1004463739 .stroke-N4{stroke:#CFD2DD;} + .d2-1004463739 .stroke-N5{stroke:#DEE1EB;} + .d2-1004463739 .stroke-N6{stroke:#EEF1F8;} + .d2-1004463739 .stroke-N7{stroke:#FFFFFF;} + .d2-1004463739 .stroke-B1{stroke:#0D32B2;} + .d2-1004463739 .stroke-B2{stroke:#0D32B2;} + .d2-1004463739 .stroke-B3{stroke:#E3E9FD;} + .d2-1004463739 .stroke-B4{stroke:#E3E9FD;} + .d2-1004463739 .stroke-B5{stroke:#EDF0FD;} + .d2-1004463739 .stroke-B6{stroke:#F7F8FE;} + .d2-1004463739 .stroke-AA2{stroke:#4A6FF3;} + .d2-1004463739 .stroke-AA4{stroke:#EDF0FD;} + .d2-1004463739 .stroke-AA5{stroke:#F7F8FE;} + .d2-1004463739 .stroke-AB4{stroke:#EDF0FD;} + .d2-1004463739 .stroke-AB5{stroke:#F7F8FE;} + .d2-1004463739 .background-color-N1{background-color:#0A0F25;} + .d2-1004463739 .background-color-N2{background-color:#676C7E;} + .d2-1004463739 .background-color-N3{background-color:#9499AB;} + .d2-1004463739 .background-color-N4{background-color:#CFD2DD;} + .d2-1004463739 .background-color-N5{background-color:#DEE1EB;} + .d2-1004463739 .background-color-N6{background-color:#EEF1F8;} + .d2-1004463739 .background-color-N7{background-color:#FFFFFF;} + .d2-1004463739 .background-color-B1{background-color:#0D32B2;} + .d2-1004463739 .background-color-B2{background-color:#0D32B2;} + .d2-1004463739 .background-color-B3{background-color:#E3E9FD;} + .d2-1004463739 .background-color-B4{background-color:#E3E9FD;} + .d2-1004463739 .background-color-B5{background-color:#EDF0FD;} + .d2-1004463739 .background-color-B6{background-color:#F7F8FE;} + .d2-1004463739 .background-color-AA2{background-color:#4A6FF3;} + .d2-1004463739 .background-color-AA4{background-color:#EDF0FD;} + .d2-1004463739 .background-color-AA5{background-color:#F7F8FE;} + .d2-1004463739 .background-color-AB4{background-color:#EDF0FD;} + .d2-1004463739 .background-color-AB5{background-color:#F7F8FE;} + .d2-1004463739 .color-N1{color:#0A0F25;} + .d2-1004463739 .color-N2{color:#676C7E;} + .d2-1004463739 .color-N3{color:#9499AB;} + .d2-1004463739 .color-N4{color:#CFD2DD;} + .d2-1004463739 .color-N5{color:#DEE1EB;} + .d2-1004463739 .color-N6{color:#EEF1F8;} + .d2-1004463739 .color-N7{color:#FFFFFF;} + .d2-1004463739 .color-B1{color:#0D32B2;} + .d2-1004463739 .color-B2{color:#0D32B2;} + .d2-1004463739 .color-B3{color:#E3E9FD;} + .d2-1004463739 .color-B4{color:#E3E9FD;} + .d2-1004463739 .color-B5{color:#EDF0FD;} + .d2-1004463739 .color-B6{color:#F7F8FE;} + .d2-1004463739 .color-AA2{color:#4A6FF3;} + .d2-1004463739 .color-AA4{color:#EDF0FD;} + .d2-1004463739 .color-AA5{color:#F7F8FE;} + .d2-1004463739 .color-AB4{color:#EDF0FD;} + .d2-1004463739 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>ABCgroup 1group 2group 3group 4group 5group 6group 7group 8group 9group 10group 11 + +======= + .d2-914740314 .fill-N1{fill:#0A0F25;} + .d2-914740314 .fill-N2{fill:#676C7E;} + .d2-914740314 .fill-N3{fill:#9499AB;} + .d2-914740314 .fill-N4{fill:#CFD2DD;} + .d2-914740314 .fill-N5{fill:#DEE1EB;} + .d2-914740314 .fill-N6{fill:#EEF1F8;} + .d2-914740314 .fill-N7{fill:#FFFFFF;} + .d2-914740314 .fill-B1{fill:#0D32B2;} + .d2-914740314 .fill-B2{fill:#0D32B2;} + .d2-914740314 .fill-B3{fill:#E3E9FD;} + .d2-914740314 .fill-B4{fill:#E3E9FD;} + .d2-914740314 .fill-B5{fill:#EDF0FD;} + .d2-914740314 .fill-B6{fill:#F7F8FE;} + .d2-914740314 .fill-AA2{fill:#4A6FF3;} + .d2-914740314 .fill-AA4{fill:#EDF0FD;} + .d2-914740314 .fill-AA5{fill:#F7F8FE;} + .d2-914740314 .fill-AB4{fill:#EDF0FD;} + .d2-914740314 .fill-AB5{fill:#F7F8FE;} + .d2-914740314 .stroke-N1{stroke:#0A0F25;} + .d2-914740314 .stroke-N2{stroke:#676C7E;} + .d2-914740314 .stroke-N3{stroke:#9499AB;} + .d2-914740314 .stroke-N4{stroke:#CFD2DD;} + .d2-914740314 .stroke-N5{stroke:#DEE1EB;} + .d2-914740314 .stroke-N6{stroke:#EEF1F8;} + .d2-914740314 .stroke-N7{stroke:#FFFFFF;} + .d2-914740314 .stroke-B1{stroke:#0D32B2;} + .d2-914740314 .stroke-B2{stroke:#0D32B2;} + .d2-914740314 .stroke-B3{stroke:#E3E9FD;} + .d2-914740314 .stroke-B4{stroke:#E3E9FD;} + .d2-914740314 .stroke-B5{stroke:#EDF0FD;} + .d2-914740314 .stroke-B6{stroke:#F7F8FE;} + .d2-914740314 .stroke-AA2{stroke:#4A6FF3;} + .d2-914740314 .stroke-AA4{stroke:#EDF0FD;} + .d2-914740314 .stroke-AA5{stroke:#F7F8FE;} + .d2-914740314 .stroke-AB4{stroke:#EDF0FD;} + .d2-914740314 .stroke-AB5{stroke:#F7F8FE;} + .d2-914740314 .background-color-N1{background-color:#0A0F25;} + .d2-914740314 .background-color-N2{background-color:#676C7E;} + .d2-914740314 .background-color-N3{background-color:#9499AB;} + .d2-914740314 .background-color-N4{background-color:#CFD2DD;} + .d2-914740314 .background-color-N5{background-color:#DEE1EB;} + .d2-914740314 .background-color-N6{background-color:#EEF1F8;} + .d2-914740314 .background-color-N7{background-color:#FFFFFF;} + .d2-914740314 .background-color-B1{background-color:#0D32B2;} + .d2-914740314 .background-color-B2{background-color:#0D32B2;} + .d2-914740314 .background-color-B3{background-color:#E3E9FD;} + .d2-914740314 .background-color-B4{background-color:#E3E9FD;} + .d2-914740314 .background-color-B5{background-color:#EDF0FD;} + .d2-914740314 .background-color-B6{background-color:#F7F8FE;} + .d2-914740314 .background-color-AA2{background-color:#4A6FF3;} + .d2-914740314 .background-color-AA4{background-color:#EDF0FD;} + .d2-914740314 .background-color-AA5{background-color:#F7F8FE;} + .d2-914740314 .background-color-AB4{background-color:#EDF0FD;} + .d2-914740314 .background-color-AB5{background-color:#F7F8FE;} + .d2-914740314 .color-N1{color:#0A0F25;} + .d2-914740314 .color-N2{color:#676C7E;} + .d2-914740314 .color-N3{color:#9499AB;} + .d2-914740314 .color-N4{color:#CFD2DD;} + .d2-914740314 .color-N5{color:#DEE1EB;} + .d2-914740314 .color-N6{color:#EEF1F8;} + .d2-914740314 .color-N7{color:#FFFFFF;} + .d2-914740314 .color-B1{color:#0D32B2;} + .d2-914740314 .color-B2{color:#0D32B2;} + .d2-914740314 .color-B3{color:#E3E9FD;} + .d2-914740314 .color-B4{color:#E3E9FD;} + .d2-914740314 .color-B5{color:#EDF0FD;} + .d2-914740314 .color-B6{color:#F7F8FE;} + .d2-914740314 .color-AA2{color:#4A6FF3;} + .d2-914740314 .color-AA4{color:#EDF0FD;} + .d2-914740314 .color-AA5{color:#F7F8FE;} + .d2-914740314 .color-AB4{color:#EDF0FD;} + .d2-914740314 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>ABCgroup 1group 2group 3group 4group 5group 6group 7group 8group 9group 10group 11 + +>>>>>>> cb2f2823c (Fix changes) - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/sequence_diagram_self_edge_group_overlap/elk/sketch.exp.svg b/e2etests/testdata/regression/sequence_diagram_self_edge_group_overlap/elk/sketch.exp.svg index e500ccfbb..01d85bd76 100644 --- a/e2etests/testdata/regression/sequence_diagram_self_edge_group_overlap/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/sequence_diagram_self_edge_group_overlap/elk/sketch.exp.svg @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD ABCgroup 1group 2group 3group 4group 5group 6group 7group 8group 9group 10group 11 >>>>>>> 33280fed5 (fixed e2e tests) +||||||| parent of cb2f2823c (Fix changes) + .d2-1004463739 .fill-N1{fill:#0A0F25;} + .d2-1004463739 .fill-N2{fill:#676C7E;} + .d2-1004463739 .fill-N3{fill:#9499AB;} + .d2-1004463739 .fill-N4{fill:#CFD2DD;} + .d2-1004463739 .fill-N5{fill:#DEE1EB;} + .d2-1004463739 .fill-N6{fill:#EEF1F8;} + .d2-1004463739 .fill-N7{fill:#FFFFFF;} + .d2-1004463739 .fill-B1{fill:#0D32B2;} + .d2-1004463739 .fill-B2{fill:#0D32B2;} + .d2-1004463739 .fill-B3{fill:#E3E9FD;} + .d2-1004463739 .fill-B4{fill:#E3E9FD;} + .d2-1004463739 .fill-B5{fill:#EDF0FD;} + .d2-1004463739 .fill-B6{fill:#F7F8FE;} + .d2-1004463739 .fill-AA2{fill:#4A6FF3;} + .d2-1004463739 .fill-AA4{fill:#EDF0FD;} + .d2-1004463739 .fill-AA5{fill:#F7F8FE;} + .d2-1004463739 .fill-AB4{fill:#EDF0FD;} + .d2-1004463739 .fill-AB5{fill:#F7F8FE;} + .d2-1004463739 .stroke-N1{stroke:#0A0F25;} + .d2-1004463739 .stroke-N2{stroke:#676C7E;} + .d2-1004463739 .stroke-N3{stroke:#9499AB;} + .d2-1004463739 .stroke-N4{stroke:#CFD2DD;} + .d2-1004463739 .stroke-N5{stroke:#DEE1EB;} + .d2-1004463739 .stroke-N6{stroke:#EEF1F8;} + .d2-1004463739 .stroke-N7{stroke:#FFFFFF;} + .d2-1004463739 .stroke-B1{stroke:#0D32B2;} + .d2-1004463739 .stroke-B2{stroke:#0D32B2;} + .d2-1004463739 .stroke-B3{stroke:#E3E9FD;} + .d2-1004463739 .stroke-B4{stroke:#E3E9FD;} + .d2-1004463739 .stroke-B5{stroke:#EDF0FD;} + .d2-1004463739 .stroke-B6{stroke:#F7F8FE;} + .d2-1004463739 .stroke-AA2{stroke:#4A6FF3;} + .d2-1004463739 .stroke-AA4{stroke:#EDF0FD;} + .d2-1004463739 .stroke-AA5{stroke:#F7F8FE;} + .d2-1004463739 .stroke-AB4{stroke:#EDF0FD;} + .d2-1004463739 .stroke-AB5{stroke:#F7F8FE;} + .d2-1004463739 .background-color-N1{background-color:#0A0F25;} + .d2-1004463739 .background-color-N2{background-color:#676C7E;} + .d2-1004463739 .background-color-N3{background-color:#9499AB;} + .d2-1004463739 .background-color-N4{background-color:#CFD2DD;} + .d2-1004463739 .background-color-N5{background-color:#DEE1EB;} + .d2-1004463739 .background-color-N6{background-color:#EEF1F8;} + .d2-1004463739 .background-color-N7{background-color:#FFFFFF;} + .d2-1004463739 .background-color-B1{background-color:#0D32B2;} + .d2-1004463739 .background-color-B2{background-color:#0D32B2;} + .d2-1004463739 .background-color-B3{background-color:#E3E9FD;} + .d2-1004463739 .background-color-B4{background-color:#E3E9FD;} + .d2-1004463739 .background-color-B5{background-color:#EDF0FD;} + .d2-1004463739 .background-color-B6{background-color:#F7F8FE;} + .d2-1004463739 .background-color-AA2{background-color:#4A6FF3;} + .d2-1004463739 .background-color-AA4{background-color:#EDF0FD;} + .d2-1004463739 .background-color-AA5{background-color:#F7F8FE;} + .d2-1004463739 .background-color-AB4{background-color:#EDF0FD;} + .d2-1004463739 .background-color-AB5{background-color:#F7F8FE;} + .d2-1004463739 .color-N1{color:#0A0F25;} + .d2-1004463739 .color-N2{color:#676C7E;} + .d2-1004463739 .color-N3{color:#9499AB;} + .d2-1004463739 .color-N4{color:#CFD2DD;} + .d2-1004463739 .color-N5{color:#DEE1EB;} + .d2-1004463739 .color-N6{color:#EEF1F8;} + .d2-1004463739 .color-N7{color:#FFFFFF;} + .d2-1004463739 .color-B1{color:#0D32B2;} + .d2-1004463739 .color-B2{color:#0D32B2;} + .d2-1004463739 .color-B3{color:#E3E9FD;} + .d2-1004463739 .color-B4{color:#E3E9FD;} + .d2-1004463739 .color-B5{color:#EDF0FD;} + .d2-1004463739 .color-B6{color:#F7F8FE;} + .d2-1004463739 .color-AA2{color:#4A6FF3;} + .d2-1004463739 .color-AA4{color:#EDF0FD;} + .d2-1004463739 .color-AA5{color:#F7F8FE;} + .d2-1004463739 .color-AB4{color:#EDF0FD;} + .d2-1004463739 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>ABCgroup 1group 2group 3group 4group 5group 6group 7group 8group 9group 10group 11 + +======= + .d2-914740314 .fill-N1{fill:#0A0F25;} + .d2-914740314 .fill-N2{fill:#676C7E;} + .d2-914740314 .fill-N3{fill:#9499AB;} + .d2-914740314 .fill-N4{fill:#CFD2DD;} + .d2-914740314 .fill-N5{fill:#DEE1EB;} + .d2-914740314 .fill-N6{fill:#EEF1F8;} + .d2-914740314 .fill-N7{fill:#FFFFFF;} + .d2-914740314 .fill-B1{fill:#0D32B2;} + .d2-914740314 .fill-B2{fill:#0D32B2;} + .d2-914740314 .fill-B3{fill:#E3E9FD;} + .d2-914740314 .fill-B4{fill:#E3E9FD;} + .d2-914740314 .fill-B5{fill:#EDF0FD;} + .d2-914740314 .fill-B6{fill:#F7F8FE;} + .d2-914740314 .fill-AA2{fill:#4A6FF3;} + .d2-914740314 .fill-AA4{fill:#EDF0FD;} + .d2-914740314 .fill-AA5{fill:#F7F8FE;} + .d2-914740314 .fill-AB4{fill:#EDF0FD;} + .d2-914740314 .fill-AB5{fill:#F7F8FE;} + .d2-914740314 .stroke-N1{stroke:#0A0F25;} + .d2-914740314 .stroke-N2{stroke:#676C7E;} + .d2-914740314 .stroke-N3{stroke:#9499AB;} + .d2-914740314 .stroke-N4{stroke:#CFD2DD;} + .d2-914740314 .stroke-N5{stroke:#DEE1EB;} + .d2-914740314 .stroke-N6{stroke:#EEF1F8;} + .d2-914740314 .stroke-N7{stroke:#FFFFFF;} + .d2-914740314 .stroke-B1{stroke:#0D32B2;} + .d2-914740314 .stroke-B2{stroke:#0D32B2;} + .d2-914740314 .stroke-B3{stroke:#E3E9FD;} + .d2-914740314 .stroke-B4{stroke:#E3E9FD;} + .d2-914740314 .stroke-B5{stroke:#EDF0FD;} + .d2-914740314 .stroke-B6{stroke:#F7F8FE;} + .d2-914740314 .stroke-AA2{stroke:#4A6FF3;} + .d2-914740314 .stroke-AA4{stroke:#EDF0FD;} + .d2-914740314 .stroke-AA5{stroke:#F7F8FE;} + .d2-914740314 .stroke-AB4{stroke:#EDF0FD;} + .d2-914740314 .stroke-AB5{stroke:#F7F8FE;} + .d2-914740314 .background-color-N1{background-color:#0A0F25;} + .d2-914740314 .background-color-N2{background-color:#676C7E;} + .d2-914740314 .background-color-N3{background-color:#9499AB;} + .d2-914740314 .background-color-N4{background-color:#CFD2DD;} + .d2-914740314 .background-color-N5{background-color:#DEE1EB;} + .d2-914740314 .background-color-N6{background-color:#EEF1F8;} + .d2-914740314 .background-color-N7{background-color:#FFFFFF;} + .d2-914740314 .background-color-B1{background-color:#0D32B2;} + .d2-914740314 .background-color-B2{background-color:#0D32B2;} + .d2-914740314 .background-color-B3{background-color:#E3E9FD;} + .d2-914740314 .background-color-B4{background-color:#E3E9FD;} + .d2-914740314 .background-color-B5{background-color:#EDF0FD;} + .d2-914740314 .background-color-B6{background-color:#F7F8FE;} + .d2-914740314 .background-color-AA2{background-color:#4A6FF3;} + .d2-914740314 .background-color-AA4{background-color:#EDF0FD;} + .d2-914740314 .background-color-AA5{background-color:#F7F8FE;} + .d2-914740314 .background-color-AB4{background-color:#EDF0FD;} + .d2-914740314 .background-color-AB5{background-color:#F7F8FE;} + .d2-914740314 .color-N1{color:#0A0F25;} + .d2-914740314 .color-N2{color:#676C7E;} + .d2-914740314 .color-N3{color:#9499AB;} + .d2-914740314 .color-N4{color:#CFD2DD;} + .d2-914740314 .color-N5{color:#DEE1EB;} + .d2-914740314 .color-N6{color:#EEF1F8;} + .d2-914740314 .color-N7{color:#FFFFFF;} + .d2-914740314 .color-B1{color:#0D32B2;} + .d2-914740314 .color-B2{color:#0D32B2;} + .d2-914740314 .color-B3{color:#E3E9FD;} + .d2-914740314 .color-B4{color:#E3E9FD;} + .d2-914740314 .color-B5{color:#EDF0FD;} + .d2-914740314 .color-B6{color:#F7F8FE;} + .d2-914740314 .color-AA2{color:#4A6FF3;} + .d2-914740314 .color-AA4{color:#EDF0FD;} + .d2-914740314 .color-AA5{color:#F7F8FE;} + .d2-914740314 .color-AB4{color:#EDF0FD;} + .d2-914740314 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>ABCgroup 1group 2group 3group 4group 5group 6group 7group 8group 9group 10group 11 + +>>>>>>> cb2f2823c (Fix changes) - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/sequence_diagram_span_cover/dagre/sketch.exp.svg b/e2etests/testdata/regression/sequence_diagram_span_cover/dagre/sketch.exp.svg index 9820161c6..fa53791b1 100644 --- a/e2etests/testdata/regression/sequence_diagram_span_cover/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/sequence_diagram_span_cover/dagre/sketch.exp.svg @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD b >>>>>>> 33280fed5 (fixed e2e tests) +||||||| parent of cb2f2823c (Fix changes) + .d2-2510897156 .fill-N1{fill:#0A0F25;} + .d2-2510897156 .fill-N2{fill:#676C7E;} + .d2-2510897156 .fill-N3{fill:#9499AB;} + .d2-2510897156 .fill-N4{fill:#CFD2DD;} + .d2-2510897156 .fill-N5{fill:#DEE1EB;} + .d2-2510897156 .fill-N6{fill:#EEF1F8;} + .d2-2510897156 .fill-N7{fill:#FFFFFF;} + .d2-2510897156 .fill-B1{fill:#0D32B2;} + .d2-2510897156 .fill-B2{fill:#0D32B2;} + .d2-2510897156 .fill-B3{fill:#E3E9FD;} + .d2-2510897156 .fill-B4{fill:#E3E9FD;} + .d2-2510897156 .fill-B5{fill:#EDF0FD;} + .d2-2510897156 .fill-B6{fill:#F7F8FE;} + .d2-2510897156 .fill-AA2{fill:#4A6FF3;} + .d2-2510897156 .fill-AA4{fill:#EDF0FD;} + .d2-2510897156 .fill-AA5{fill:#F7F8FE;} + .d2-2510897156 .fill-AB4{fill:#EDF0FD;} + .d2-2510897156 .fill-AB5{fill:#F7F8FE;} + .d2-2510897156 .stroke-N1{stroke:#0A0F25;} + .d2-2510897156 .stroke-N2{stroke:#676C7E;} + .d2-2510897156 .stroke-N3{stroke:#9499AB;} + .d2-2510897156 .stroke-N4{stroke:#CFD2DD;} + .d2-2510897156 .stroke-N5{stroke:#DEE1EB;} + .d2-2510897156 .stroke-N6{stroke:#EEF1F8;} + .d2-2510897156 .stroke-N7{stroke:#FFFFFF;} + .d2-2510897156 .stroke-B1{stroke:#0D32B2;} + .d2-2510897156 .stroke-B2{stroke:#0D32B2;} + .d2-2510897156 .stroke-B3{stroke:#E3E9FD;} + .d2-2510897156 .stroke-B4{stroke:#E3E9FD;} + .d2-2510897156 .stroke-B5{stroke:#EDF0FD;} + .d2-2510897156 .stroke-B6{stroke:#F7F8FE;} + .d2-2510897156 .stroke-AA2{stroke:#4A6FF3;} + .d2-2510897156 .stroke-AA4{stroke:#EDF0FD;} + .d2-2510897156 .stroke-AA5{stroke:#F7F8FE;} + .d2-2510897156 .stroke-AB4{stroke:#EDF0FD;} + .d2-2510897156 .stroke-AB5{stroke:#F7F8FE;} + .d2-2510897156 .background-color-N1{background-color:#0A0F25;} + .d2-2510897156 .background-color-N2{background-color:#676C7E;} + .d2-2510897156 .background-color-N3{background-color:#9499AB;} + .d2-2510897156 .background-color-N4{background-color:#CFD2DD;} + .d2-2510897156 .background-color-N5{background-color:#DEE1EB;} + .d2-2510897156 .background-color-N6{background-color:#EEF1F8;} + .d2-2510897156 .background-color-N7{background-color:#FFFFFF;} + .d2-2510897156 .background-color-B1{background-color:#0D32B2;} + .d2-2510897156 .background-color-B2{background-color:#0D32B2;} + .d2-2510897156 .background-color-B3{background-color:#E3E9FD;} + .d2-2510897156 .background-color-B4{background-color:#E3E9FD;} + .d2-2510897156 .background-color-B5{background-color:#EDF0FD;} + .d2-2510897156 .background-color-B6{background-color:#F7F8FE;} + .d2-2510897156 .background-color-AA2{background-color:#4A6FF3;} + .d2-2510897156 .background-color-AA4{background-color:#EDF0FD;} + .d2-2510897156 .background-color-AA5{background-color:#F7F8FE;} + .d2-2510897156 .background-color-AB4{background-color:#EDF0FD;} + .d2-2510897156 .background-color-AB5{background-color:#F7F8FE;} + .d2-2510897156 .color-N1{color:#0A0F25;} + .d2-2510897156 .color-N2{color:#676C7E;} + .d2-2510897156 .color-N3{color:#9499AB;} + .d2-2510897156 .color-N4{color:#CFD2DD;} + .d2-2510897156 .color-N5{color:#DEE1EB;} + .d2-2510897156 .color-N6{color:#EEF1F8;} + .d2-2510897156 .color-N7{color:#FFFFFF;} + .d2-2510897156 .color-B1{color:#0D32B2;} + .d2-2510897156 .color-B2{color:#0D32B2;} + .d2-2510897156 .color-B3{color:#E3E9FD;} + .d2-2510897156 .color-B4{color:#E3E9FD;} + .d2-2510897156 .color-B5{color:#EDF0FD;} + .d2-2510897156 .color-B6{color:#F7F8FE;} + .d2-2510897156 .color-AA2{color:#4A6FF3;} + .d2-2510897156 .color-AA4{color:#EDF0FD;} + .d2-2510897156 .color-AA5{color:#F7F8FE;} + .d2-2510897156 .color-AB4{color:#EDF0FD;} + .d2-2510897156 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>b + +======= + .d2-3555812628 .fill-N1{fill:#0A0F25;} + .d2-3555812628 .fill-N2{fill:#676C7E;} + .d2-3555812628 .fill-N3{fill:#9499AB;} + .d2-3555812628 .fill-N4{fill:#CFD2DD;} + .d2-3555812628 .fill-N5{fill:#DEE1EB;} + .d2-3555812628 .fill-N6{fill:#EEF1F8;} + .d2-3555812628 .fill-N7{fill:#FFFFFF;} + .d2-3555812628 .fill-B1{fill:#0D32B2;} + .d2-3555812628 .fill-B2{fill:#0D32B2;} + .d2-3555812628 .fill-B3{fill:#E3E9FD;} + .d2-3555812628 .fill-B4{fill:#E3E9FD;} + .d2-3555812628 .fill-B5{fill:#EDF0FD;} + .d2-3555812628 .fill-B6{fill:#F7F8FE;} + .d2-3555812628 .fill-AA2{fill:#4A6FF3;} + .d2-3555812628 .fill-AA4{fill:#EDF0FD;} + .d2-3555812628 .fill-AA5{fill:#F7F8FE;} + .d2-3555812628 .fill-AB4{fill:#EDF0FD;} + .d2-3555812628 .fill-AB5{fill:#F7F8FE;} + .d2-3555812628 .stroke-N1{stroke:#0A0F25;} + .d2-3555812628 .stroke-N2{stroke:#676C7E;} + .d2-3555812628 .stroke-N3{stroke:#9499AB;} + .d2-3555812628 .stroke-N4{stroke:#CFD2DD;} + .d2-3555812628 .stroke-N5{stroke:#DEE1EB;} + .d2-3555812628 .stroke-N6{stroke:#EEF1F8;} + .d2-3555812628 .stroke-N7{stroke:#FFFFFF;} + .d2-3555812628 .stroke-B1{stroke:#0D32B2;} + .d2-3555812628 .stroke-B2{stroke:#0D32B2;} + .d2-3555812628 .stroke-B3{stroke:#E3E9FD;} + .d2-3555812628 .stroke-B4{stroke:#E3E9FD;} + .d2-3555812628 .stroke-B5{stroke:#EDF0FD;} + .d2-3555812628 .stroke-B6{stroke:#F7F8FE;} + .d2-3555812628 .stroke-AA2{stroke:#4A6FF3;} + .d2-3555812628 .stroke-AA4{stroke:#EDF0FD;} + .d2-3555812628 .stroke-AA5{stroke:#F7F8FE;} + .d2-3555812628 .stroke-AB4{stroke:#EDF0FD;} + .d2-3555812628 .stroke-AB5{stroke:#F7F8FE;} + .d2-3555812628 .background-color-N1{background-color:#0A0F25;} + .d2-3555812628 .background-color-N2{background-color:#676C7E;} + .d2-3555812628 .background-color-N3{background-color:#9499AB;} + .d2-3555812628 .background-color-N4{background-color:#CFD2DD;} + .d2-3555812628 .background-color-N5{background-color:#DEE1EB;} + .d2-3555812628 .background-color-N6{background-color:#EEF1F8;} + .d2-3555812628 .background-color-N7{background-color:#FFFFFF;} + .d2-3555812628 .background-color-B1{background-color:#0D32B2;} + .d2-3555812628 .background-color-B2{background-color:#0D32B2;} + .d2-3555812628 .background-color-B3{background-color:#E3E9FD;} + .d2-3555812628 .background-color-B4{background-color:#E3E9FD;} + .d2-3555812628 .background-color-B5{background-color:#EDF0FD;} + .d2-3555812628 .background-color-B6{background-color:#F7F8FE;} + .d2-3555812628 .background-color-AA2{background-color:#4A6FF3;} + .d2-3555812628 .background-color-AA4{background-color:#EDF0FD;} + .d2-3555812628 .background-color-AA5{background-color:#F7F8FE;} + .d2-3555812628 .background-color-AB4{background-color:#EDF0FD;} + .d2-3555812628 .background-color-AB5{background-color:#F7F8FE;} + .d2-3555812628 .color-N1{color:#0A0F25;} + .d2-3555812628 .color-N2{color:#676C7E;} + .d2-3555812628 .color-N3{color:#9499AB;} + .d2-3555812628 .color-N4{color:#CFD2DD;} + .d2-3555812628 .color-N5{color:#DEE1EB;} + .d2-3555812628 .color-N6{color:#EEF1F8;} + .d2-3555812628 .color-N7{color:#FFFFFF;} + .d2-3555812628 .color-B1{color:#0D32B2;} + .d2-3555812628 .color-B2{color:#0D32B2;} + .d2-3555812628 .color-B3{color:#E3E9FD;} + .d2-3555812628 .color-B4{color:#E3E9FD;} + .d2-3555812628 .color-B5{color:#EDF0FD;} + .d2-3555812628 .color-B6{color:#F7F8FE;} + .d2-3555812628 .color-AA2{color:#4A6FF3;} + .d2-3555812628 .color-AA4{color:#EDF0FD;} + .d2-3555812628 .color-AA5{color:#F7F8FE;} + .d2-3555812628 .color-AB4{color:#EDF0FD;} + .d2-3555812628 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>b + +>>>>>>> cb2f2823c (Fix changes) \ No newline at end of file diff --git a/e2etests/testdata/regression/sequence_diagram_span_cover/elk/sketch.exp.svg b/e2etests/testdata/regression/sequence_diagram_span_cover/elk/sketch.exp.svg index 9820161c6..fa53791b1 100644 --- a/e2etests/testdata/regression/sequence_diagram_span_cover/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/sequence_diagram_span_cover/elk/sketch.exp.svg @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD b >>>>>>> 33280fed5 (fixed e2e tests) +||||||| parent of cb2f2823c (Fix changes) + .d2-2510897156 .fill-N1{fill:#0A0F25;} + .d2-2510897156 .fill-N2{fill:#676C7E;} + .d2-2510897156 .fill-N3{fill:#9499AB;} + .d2-2510897156 .fill-N4{fill:#CFD2DD;} + .d2-2510897156 .fill-N5{fill:#DEE1EB;} + .d2-2510897156 .fill-N6{fill:#EEF1F8;} + .d2-2510897156 .fill-N7{fill:#FFFFFF;} + .d2-2510897156 .fill-B1{fill:#0D32B2;} + .d2-2510897156 .fill-B2{fill:#0D32B2;} + .d2-2510897156 .fill-B3{fill:#E3E9FD;} + .d2-2510897156 .fill-B4{fill:#E3E9FD;} + .d2-2510897156 .fill-B5{fill:#EDF0FD;} + .d2-2510897156 .fill-B6{fill:#F7F8FE;} + .d2-2510897156 .fill-AA2{fill:#4A6FF3;} + .d2-2510897156 .fill-AA4{fill:#EDF0FD;} + .d2-2510897156 .fill-AA5{fill:#F7F8FE;} + .d2-2510897156 .fill-AB4{fill:#EDF0FD;} + .d2-2510897156 .fill-AB5{fill:#F7F8FE;} + .d2-2510897156 .stroke-N1{stroke:#0A0F25;} + .d2-2510897156 .stroke-N2{stroke:#676C7E;} + .d2-2510897156 .stroke-N3{stroke:#9499AB;} + .d2-2510897156 .stroke-N4{stroke:#CFD2DD;} + .d2-2510897156 .stroke-N5{stroke:#DEE1EB;} + .d2-2510897156 .stroke-N6{stroke:#EEF1F8;} + .d2-2510897156 .stroke-N7{stroke:#FFFFFF;} + .d2-2510897156 .stroke-B1{stroke:#0D32B2;} + .d2-2510897156 .stroke-B2{stroke:#0D32B2;} + .d2-2510897156 .stroke-B3{stroke:#E3E9FD;} + .d2-2510897156 .stroke-B4{stroke:#E3E9FD;} + .d2-2510897156 .stroke-B5{stroke:#EDF0FD;} + .d2-2510897156 .stroke-B6{stroke:#F7F8FE;} + .d2-2510897156 .stroke-AA2{stroke:#4A6FF3;} + .d2-2510897156 .stroke-AA4{stroke:#EDF0FD;} + .d2-2510897156 .stroke-AA5{stroke:#F7F8FE;} + .d2-2510897156 .stroke-AB4{stroke:#EDF0FD;} + .d2-2510897156 .stroke-AB5{stroke:#F7F8FE;} + .d2-2510897156 .background-color-N1{background-color:#0A0F25;} + .d2-2510897156 .background-color-N2{background-color:#676C7E;} + .d2-2510897156 .background-color-N3{background-color:#9499AB;} + .d2-2510897156 .background-color-N4{background-color:#CFD2DD;} + .d2-2510897156 .background-color-N5{background-color:#DEE1EB;} + .d2-2510897156 .background-color-N6{background-color:#EEF1F8;} + .d2-2510897156 .background-color-N7{background-color:#FFFFFF;} + .d2-2510897156 .background-color-B1{background-color:#0D32B2;} + .d2-2510897156 .background-color-B2{background-color:#0D32B2;} + .d2-2510897156 .background-color-B3{background-color:#E3E9FD;} + .d2-2510897156 .background-color-B4{background-color:#E3E9FD;} + .d2-2510897156 .background-color-B5{background-color:#EDF0FD;} + .d2-2510897156 .background-color-B6{background-color:#F7F8FE;} + .d2-2510897156 .background-color-AA2{background-color:#4A6FF3;} + .d2-2510897156 .background-color-AA4{background-color:#EDF0FD;} + .d2-2510897156 .background-color-AA5{background-color:#F7F8FE;} + .d2-2510897156 .background-color-AB4{background-color:#EDF0FD;} + .d2-2510897156 .background-color-AB5{background-color:#F7F8FE;} + .d2-2510897156 .color-N1{color:#0A0F25;} + .d2-2510897156 .color-N2{color:#676C7E;} + .d2-2510897156 .color-N3{color:#9499AB;} + .d2-2510897156 .color-N4{color:#CFD2DD;} + .d2-2510897156 .color-N5{color:#DEE1EB;} + .d2-2510897156 .color-N6{color:#EEF1F8;} + .d2-2510897156 .color-N7{color:#FFFFFF;} + .d2-2510897156 .color-B1{color:#0D32B2;} + .d2-2510897156 .color-B2{color:#0D32B2;} + .d2-2510897156 .color-B3{color:#E3E9FD;} + .d2-2510897156 .color-B4{color:#E3E9FD;} + .d2-2510897156 .color-B5{color:#EDF0FD;} + .d2-2510897156 .color-B6{color:#F7F8FE;} + .d2-2510897156 .color-AA2{color:#4A6FF3;} + .d2-2510897156 .color-AA4{color:#EDF0FD;} + .d2-2510897156 .color-AA5{color:#F7F8FE;} + .d2-2510897156 .color-AB4{color:#EDF0FD;} + .d2-2510897156 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>b + +======= + .d2-3555812628 .fill-N1{fill:#0A0F25;} + .d2-3555812628 .fill-N2{fill:#676C7E;} + .d2-3555812628 .fill-N3{fill:#9499AB;} + .d2-3555812628 .fill-N4{fill:#CFD2DD;} + .d2-3555812628 .fill-N5{fill:#DEE1EB;} + .d2-3555812628 .fill-N6{fill:#EEF1F8;} + .d2-3555812628 .fill-N7{fill:#FFFFFF;} + .d2-3555812628 .fill-B1{fill:#0D32B2;} + .d2-3555812628 .fill-B2{fill:#0D32B2;} + .d2-3555812628 .fill-B3{fill:#E3E9FD;} + .d2-3555812628 .fill-B4{fill:#E3E9FD;} + .d2-3555812628 .fill-B5{fill:#EDF0FD;} + .d2-3555812628 .fill-B6{fill:#F7F8FE;} + .d2-3555812628 .fill-AA2{fill:#4A6FF3;} + .d2-3555812628 .fill-AA4{fill:#EDF0FD;} + .d2-3555812628 .fill-AA5{fill:#F7F8FE;} + .d2-3555812628 .fill-AB4{fill:#EDF0FD;} + .d2-3555812628 .fill-AB5{fill:#F7F8FE;} + .d2-3555812628 .stroke-N1{stroke:#0A0F25;} + .d2-3555812628 .stroke-N2{stroke:#676C7E;} + .d2-3555812628 .stroke-N3{stroke:#9499AB;} + .d2-3555812628 .stroke-N4{stroke:#CFD2DD;} + .d2-3555812628 .stroke-N5{stroke:#DEE1EB;} + .d2-3555812628 .stroke-N6{stroke:#EEF1F8;} + .d2-3555812628 .stroke-N7{stroke:#FFFFFF;} + .d2-3555812628 .stroke-B1{stroke:#0D32B2;} + .d2-3555812628 .stroke-B2{stroke:#0D32B2;} + .d2-3555812628 .stroke-B3{stroke:#E3E9FD;} + .d2-3555812628 .stroke-B4{stroke:#E3E9FD;} + .d2-3555812628 .stroke-B5{stroke:#EDF0FD;} + .d2-3555812628 .stroke-B6{stroke:#F7F8FE;} + .d2-3555812628 .stroke-AA2{stroke:#4A6FF3;} + .d2-3555812628 .stroke-AA4{stroke:#EDF0FD;} + .d2-3555812628 .stroke-AA5{stroke:#F7F8FE;} + .d2-3555812628 .stroke-AB4{stroke:#EDF0FD;} + .d2-3555812628 .stroke-AB5{stroke:#F7F8FE;} + .d2-3555812628 .background-color-N1{background-color:#0A0F25;} + .d2-3555812628 .background-color-N2{background-color:#676C7E;} + .d2-3555812628 .background-color-N3{background-color:#9499AB;} + .d2-3555812628 .background-color-N4{background-color:#CFD2DD;} + .d2-3555812628 .background-color-N5{background-color:#DEE1EB;} + .d2-3555812628 .background-color-N6{background-color:#EEF1F8;} + .d2-3555812628 .background-color-N7{background-color:#FFFFFF;} + .d2-3555812628 .background-color-B1{background-color:#0D32B2;} + .d2-3555812628 .background-color-B2{background-color:#0D32B2;} + .d2-3555812628 .background-color-B3{background-color:#E3E9FD;} + .d2-3555812628 .background-color-B4{background-color:#E3E9FD;} + .d2-3555812628 .background-color-B5{background-color:#EDF0FD;} + .d2-3555812628 .background-color-B6{background-color:#F7F8FE;} + .d2-3555812628 .background-color-AA2{background-color:#4A6FF3;} + .d2-3555812628 .background-color-AA4{background-color:#EDF0FD;} + .d2-3555812628 .background-color-AA5{background-color:#F7F8FE;} + .d2-3555812628 .background-color-AB4{background-color:#EDF0FD;} + .d2-3555812628 .background-color-AB5{background-color:#F7F8FE;} + .d2-3555812628 .color-N1{color:#0A0F25;} + .d2-3555812628 .color-N2{color:#676C7E;} + .d2-3555812628 .color-N3{color:#9499AB;} + .d2-3555812628 .color-N4{color:#CFD2DD;} + .d2-3555812628 .color-N5{color:#DEE1EB;} + .d2-3555812628 .color-N6{color:#EEF1F8;} + .d2-3555812628 .color-N7{color:#FFFFFF;} + .d2-3555812628 .color-B1{color:#0D32B2;} + .d2-3555812628 .color-B2{color:#0D32B2;} + .d2-3555812628 .color-B3{color:#E3E9FD;} + .d2-3555812628 .color-B4{color:#E3E9FD;} + .d2-3555812628 .color-B5{color:#EDF0FD;} + .d2-3555812628 .color-B6{color:#F7F8FE;} + .d2-3555812628 .color-AA2{color:#4A6FF3;} + .d2-3555812628 .color-AA4{color:#EDF0FD;} + .d2-3555812628 .color-AA5{color:#F7F8FE;} + .d2-3555812628 .color-AB4{color:#EDF0FD;} + .d2-3555812628 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>b + +>>>>>>> cb2f2823c (Fix changes) \ No newline at end of file diff --git a/e2etests/testdata/regression/straight_hierarchy_container_direction_right/dagre/sketch.exp.svg b/e2etests/testdata/regression/straight_hierarchy_container_direction_right/dagre/sketch.exp.svg index 24ab62cbf..fd2b8fca1 100644 --- a/e2etests/testdata/regression/straight_hierarchy_container_direction_right/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/straight_hierarchy_container_direction_right/dagre/sketch.exp.svg @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD size XSsize Ssize Msize Lsize XLsize XXLsize XXXLcustom 8custom 12custom 18custom 21custom 64 custom 10custom 15custom 48 >>>>>>> 33280fed5 (fixed e2e tests) +||||||| parent of cb2f2823c (Fix changes) + .d2-2181559084 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>size XSsize Ssize Msize Lsize XLsize XXLsize XXXLcustom 8custom 12custom 18custom 21custom 64 custom 10custom 15custom 48 +======= + .d2-2181559084 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>size XSsize Ssize Msize Lsize XLsize XXLsize XXXLcustom 8custom 12custom 18custom 21custom 64 custom 10custom 15custom 48 +>>>>>>> cb2f2823c (Fix changes) diff --git a/e2etests/testdata/stable/font_sizes/elk/sketch.exp.svg b/e2etests/testdata/stable/font_sizes/elk/sketch.exp.svg index d1a7d4e0e..46f3e7fe7 100644 --- a/e2etests/testdata/stable/font_sizes/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/font_sizes/elk/sketch.exp.svg @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD size XSsize Ssize Msize Lsize XLsize XXLsize XXXLcustom 8custom 12custom 18custom 21custom 64 custom 10custom 15custom 48 >>>>>>> 33280fed5 (fixed e2e tests) +||||||| parent of cb2f2823c (Fix changes) + .d2-486037045 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>size XSsize Ssize Msize Lsize XLsize XXLsize XXXLcustom 8custom 12custom 18custom 21custom 64 custom 10custom 15custom 48 +======= + .d2-486037045 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>size XSsize Ssize Msize Lsize XLsize XXLsize XXXLcustom 8custom 12custom 18custom 21custom 64 custom 10custom 15custom 48 +>>>>>>> cb2f2823c (Fix changes) diff --git a/e2etests/testdata/stable/giant_markdown_test/dagre/sketch.exp.svg b/e2etests/testdata/stable/giant_markdown_test/dagre/sketch.exp.svg index 0089d5064..fae24fb33 100644 --- a/e2etests/testdata/stable/giant_markdown_test/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/giant_markdown_test/dagre/sketch.exp.svg @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD + .d2-2451180916 .fill-N1{fill:#0A0F25;} + .d2-2451180916 .fill-N2{fill:#676C7E;} + .d2-2451180916 .fill-N3{fill:#9499AB;} + .d2-2451180916 .fill-N4{fill:#CFD2DD;} + .d2-2451180916 .fill-N5{fill:#DEE1EB;} + .d2-2451180916 .fill-N6{fill:#EEF1F8;} + .d2-2451180916 .fill-N7{fill:#FFFFFF;} + .d2-2451180916 .fill-B1{fill:#0D32B2;} + .d2-2451180916 .fill-B2{fill:#0D32B2;} + .d2-2451180916 .fill-B3{fill:#E3E9FD;} + .d2-2451180916 .fill-B4{fill:#E3E9FD;} + .d2-2451180916 .fill-B5{fill:#EDF0FD;} + .d2-2451180916 .fill-B6{fill:#F7F8FE;} + .d2-2451180916 .fill-AA2{fill:#4A6FF3;} + .d2-2451180916 .fill-AA4{fill:#EDF0FD;} + .d2-2451180916 .fill-AA5{fill:#F7F8FE;} + .d2-2451180916 .fill-AB4{fill:#EDF0FD;} + .d2-2451180916 .fill-AB5{fill:#F7F8FE;} + .d2-2451180916 .stroke-N1{stroke:#0A0F25;} + .d2-2451180916 .stroke-N2{stroke:#676C7E;} + .d2-2451180916 .stroke-N3{stroke:#9499AB;} + .d2-2451180916 .stroke-N4{stroke:#CFD2DD;} + .d2-2451180916 .stroke-N5{stroke:#DEE1EB;} + .d2-2451180916 .stroke-N6{stroke:#EEF1F8;} + .d2-2451180916 .stroke-N7{stroke:#FFFFFF;} + .d2-2451180916 .stroke-B1{stroke:#0D32B2;} + .d2-2451180916 .stroke-B2{stroke:#0D32B2;} + .d2-2451180916 .stroke-B3{stroke:#E3E9FD;} + .d2-2451180916 .stroke-B4{stroke:#E3E9FD;} + .d2-2451180916 .stroke-B5{stroke:#EDF0FD;} + .d2-2451180916 .stroke-B6{stroke:#F7F8FE;} + .d2-2451180916 .stroke-AA2{stroke:#4A6FF3;} + .d2-2451180916 .stroke-AA4{stroke:#EDF0FD;} + .d2-2451180916 .stroke-AA5{stroke:#F7F8FE;} + .d2-2451180916 .stroke-AB4{stroke:#EDF0FD;} + .d2-2451180916 .stroke-AB5{stroke:#F7F8FE;} + .d2-2451180916 .background-color-N1{background-color:#0A0F25;} + .d2-2451180916 .background-color-N2{background-color:#676C7E;} + .d2-2451180916 .background-color-N3{background-color:#9499AB;} + .d2-2451180916 .background-color-N4{background-color:#CFD2DD;} + .d2-2451180916 .background-color-N5{background-color:#DEE1EB;} + .d2-2451180916 .background-color-N6{background-color:#EEF1F8;} + .d2-2451180916 .background-color-N7{background-color:#FFFFFF;} + .d2-2451180916 .background-color-B1{background-color:#0D32B2;} + .d2-2451180916 .background-color-B2{background-color:#0D32B2;} + .d2-2451180916 .background-color-B3{background-color:#E3E9FD;} + .d2-2451180916 .background-color-B4{background-color:#E3E9FD;} + .d2-2451180916 .background-color-B5{background-color:#EDF0FD;} + .d2-2451180916 .background-color-B6{background-color:#F7F8FE;} + .d2-2451180916 .background-color-AA2{background-color:#4A6FF3;} + .d2-2451180916 .background-color-AA4{background-color:#EDF0FD;} + .d2-2451180916 .background-color-AA5{background-color:#F7F8FE;} + .d2-2451180916 .background-color-AB4{background-color:#EDF0FD;} + .d2-2451180916 .background-color-AB5{background-color:#F7F8FE;} + .d2-2451180916 .color-N1{color:#0A0F25;} + .d2-2451180916 .color-N2{color:#676C7E;} + .d2-2451180916 .color-N3{color:#9499AB;} + .d2-2451180916 .color-N4{color:#CFD2DD;} + .d2-2451180916 .color-N5{color:#DEE1EB;} + .d2-2451180916 .color-N6{color:#EEF1F8;} + .d2-2451180916 .color-N7{color:#FFFFFF;} + .d2-2451180916 .color-B1{color:#0D32B2;} + .d2-2451180916 .color-B2{color:#0D32B2;} + .d2-2451180916 .color-B3{color:#E3E9FD;} + .d2-2451180916 .color-B4{color:#E3E9FD;} + .d2-2451180916 .color-B5{color:#EDF0FD;} + .d2-2451180916 .color-B6{color:#F7F8FE;} + .d2-2451180916 .color-AA2{color:#4A6FF3;} + .d2-2451180916 .color-AA4{color:#EDF0FD;} + .d2-2451180916 .color-AA5{color:#F7F8FE;} + .d2-2451180916 .color-AB4{color:#EDF0FD;} + .d2-2451180916 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> @@ -122,14 +132,21 @@ <<<<<<< HEAD +<<<<<<< HEAD Left Constant NearcenterdirectionsRight Constant NearseqmoreBottom Left Constant Neardefaultlayouthererectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloudrightleftisconstantandalsogridscoreritemResponseitemessayRubricconceptitemOutcomestylishcontaineradagreelktalathisisgrid12341234updownnearax ||||||| parent of 33280fed5 (fixed e2e tests) Left Constant NearcenterdirectionsRight Constant NearseqmoreBottom Left Constant Neardefaultlayouthererectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloudrightleftisconstantandalsogridscoreritemResponseitemessayRubricconceptitemOutcomestylishcontaineradagreelktalathisisgrid12341234updownnearax ======= Left Constant NearcenterdirectionsRight Constant NearseqmoreBottom Left Constant Neardefaultlayouthererectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloudrightleftisconstantandalsogridscoreritemResponseitemessayRubricconceptitemOutcomestylishcontaineradagreelktalathisisgrid12341234updownnearax >>>>>>> 33280fed5 (fixed e2e tests) +||||||| parent of cb2f2823c (Fix changes) +Left Constant NearcenterdirectionsRight Constant NearseqmoreBottom Left Constant Neardefaultlayouthererectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloudrightleftisconstantandalsogridscoreritemResponseitemessayRubricconceptitemOutcomestylishcontaineradagreelktalathisisgrid12341234updownnearax +======= +Left Constant NearcenterdirectionsRight Constant NearseqmoreBottom Left Constant Neardefaultlayouthererectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloudrightleftisconstantandalsogridscoreritemResponseitemessayRubricconceptitemOutcomestylishcontaineradagreelktalathisisgrid12341234updownnearax +>>>>>>> cb2f2823c (Fix changes) <<<<<<< HEAD +<<<<<<< HEAD ya_sequencea_shapesequencefinallybrow 1row 2row 3row 4row 5withasequence diagramyou canchild of is12341234scoreritemResponseitemessayRubricconceptsequencefrom one constant nearhaveanothergridhere andgrandchildscorerconceptessayRubricitemitemOutcomeitemResponse123continuenesting ororruns thisruns thisruns thisA straight edge across straight edge across nested typesdefault layoutdefault layoutdefault layout in styleto inside sequence diagramto inside sequence diagramto inside sequence diagramto constant nearfrom within constant nearto another getItem() itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)score @@ -169,6 +186,33 @@ >>>>>>> 33280fed5 (fixed e2e tests) +||||||| parent of cb2f2823c (Fix changes) +ya_sequencea_shapesequencefinallybrow 1row 2row 3row 4row 5withasequence diagramyou canchild of is12341234scoreritemResponseitemessayRubricconceptsequencefrom one constant nearhaveanothergridhere andgrandchildscorerconceptessayRubricitemitemOutcomeitemResponse123continuenesting ororruns thisruns thisruns thisA straight edge across straight edge across nested typesdefault layoutdefault layoutdefault layout in styleto inside sequence diagramto inside sequence diagramto inside sequence diagramto constant nearfrom within constant nearto another getItem() itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)score + + + + + + + + + + + +======= +ya_sequencea_shapesequencefinallybrow 1row 2row 3row 4row 5withasequence diagramyou canchild of is12341234scoreritemResponseitemessayRubricconceptsequencefrom one constant nearhaveanothergridhere andgrandchildscorerconceptessayRubricitemitemOutcomeitemResponse123continuenesting ororruns thisruns thisruns thisA straight edge across straight edge across nested typesdefault layoutdefault layoutdefault layout in styleto inside sequence diagramto inside sequence diagramto inside sequence diagramto constant nearfrom within constant nearto another getItem() itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)score + + + + + + + + + + + +>>>>>>> cb2f2823c (Fix changes) @@ -178,119 +222,119 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/nesting_power/elk/sketch.exp.svg b/e2etests/testdata/stable/nesting_power/elk/sketch.exp.svg index e49177bef..a15445033 100644 --- a/e2etests/testdata/stable/nesting_power/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/nesting_power/elk/sketch.exp.svg @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD + .d2-2835789743 .fill-N1{fill:#0A0F25;} + .d2-2835789743 .fill-N2{fill:#676C7E;} + .d2-2835789743 .fill-N3{fill:#9499AB;} + .d2-2835789743 .fill-N4{fill:#CFD2DD;} + .d2-2835789743 .fill-N5{fill:#DEE1EB;} + .d2-2835789743 .fill-N6{fill:#EEF1F8;} + .d2-2835789743 .fill-N7{fill:#FFFFFF;} + .d2-2835789743 .fill-B1{fill:#0D32B2;} + .d2-2835789743 .fill-B2{fill:#0D32B2;} + .d2-2835789743 .fill-B3{fill:#E3E9FD;} + .d2-2835789743 .fill-B4{fill:#E3E9FD;} + .d2-2835789743 .fill-B5{fill:#EDF0FD;} + .d2-2835789743 .fill-B6{fill:#F7F8FE;} + .d2-2835789743 .fill-AA2{fill:#4A6FF3;} + .d2-2835789743 .fill-AA4{fill:#EDF0FD;} + .d2-2835789743 .fill-AA5{fill:#F7F8FE;} + .d2-2835789743 .fill-AB4{fill:#EDF0FD;} + .d2-2835789743 .fill-AB5{fill:#F7F8FE;} + .d2-2835789743 .stroke-N1{stroke:#0A0F25;} + .d2-2835789743 .stroke-N2{stroke:#676C7E;} + .d2-2835789743 .stroke-N3{stroke:#9499AB;} + .d2-2835789743 .stroke-N4{stroke:#CFD2DD;} + .d2-2835789743 .stroke-N5{stroke:#DEE1EB;} + .d2-2835789743 .stroke-N6{stroke:#EEF1F8;} + .d2-2835789743 .stroke-N7{stroke:#FFFFFF;} + .d2-2835789743 .stroke-B1{stroke:#0D32B2;} + .d2-2835789743 .stroke-B2{stroke:#0D32B2;} + .d2-2835789743 .stroke-B3{stroke:#E3E9FD;} + .d2-2835789743 .stroke-B4{stroke:#E3E9FD;} + .d2-2835789743 .stroke-B5{stroke:#EDF0FD;} + .d2-2835789743 .stroke-B6{stroke:#F7F8FE;} + .d2-2835789743 .stroke-AA2{stroke:#4A6FF3;} + .d2-2835789743 .stroke-AA4{stroke:#EDF0FD;} + .d2-2835789743 .stroke-AA5{stroke:#F7F8FE;} + .d2-2835789743 .stroke-AB4{stroke:#EDF0FD;} + .d2-2835789743 .stroke-AB5{stroke:#F7F8FE;} + .d2-2835789743 .background-color-N1{background-color:#0A0F25;} + .d2-2835789743 .background-color-N2{background-color:#676C7E;} + .d2-2835789743 .background-color-N3{background-color:#9499AB;} + .d2-2835789743 .background-color-N4{background-color:#CFD2DD;} + .d2-2835789743 .background-color-N5{background-color:#DEE1EB;} + .d2-2835789743 .background-color-N6{background-color:#EEF1F8;} + .d2-2835789743 .background-color-N7{background-color:#FFFFFF;} + .d2-2835789743 .background-color-B1{background-color:#0D32B2;} + .d2-2835789743 .background-color-B2{background-color:#0D32B2;} + .d2-2835789743 .background-color-B3{background-color:#E3E9FD;} + .d2-2835789743 .background-color-B4{background-color:#E3E9FD;} + .d2-2835789743 .background-color-B5{background-color:#EDF0FD;} + .d2-2835789743 .background-color-B6{background-color:#F7F8FE;} + .d2-2835789743 .background-color-AA2{background-color:#4A6FF3;} + .d2-2835789743 .background-color-AA4{background-color:#EDF0FD;} + .d2-2835789743 .background-color-AA5{background-color:#F7F8FE;} + .d2-2835789743 .background-color-AB4{background-color:#EDF0FD;} + .d2-2835789743 .background-color-AB5{background-color:#F7F8FE;} + .d2-2835789743 .color-N1{color:#0A0F25;} + .d2-2835789743 .color-N2{color:#676C7E;} + .d2-2835789743 .color-N3{color:#9499AB;} + .d2-2835789743 .color-N4{color:#CFD2DD;} + .d2-2835789743 .color-N5{color:#DEE1EB;} + .d2-2835789743 .color-N6{color:#EEF1F8;} + .d2-2835789743 .color-N7{color:#FFFFFF;} + .d2-2835789743 .color-B1{color:#0D32B2;} + .d2-2835789743 .color-B2{color:#0D32B2;} + .d2-2835789743 .color-B3{color:#E3E9FD;} + .d2-2835789743 .color-B4{color:#E3E9FD;} + .d2-2835789743 .color-B5{color:#EDF0FD;} + .d2-2835789743 .color-B6{color:#F7F8FE;} + .d2-2835789743 .color-AA2{color:#4A6FF3;} + .d2-2835789743 .color-AA4{color:#EDF0FD;} + .d2-2835789743 .color-AA5{color:#F7F8FE;} + .d2-2835789743 .color-AB4{color:#EDF0FD;} + .d2-2835789743 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]> @@ -122,14 +132,21 @@ <<<<<<< HEAD +<<<<<<< HEAD Left Constant NearcenterdirectionsRight Constant NearseqmoreBottom Left Constant Neardefaultlayouthererectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloudrightleftisconstantandalsogridscoreritemResponseitemessayRubricconceptitemOutcomestylishcontaineradagreelktalathisisgrid12341234updownnearax ||||||| parent of 33280fed5 (fixed e2e tests) Left Constant NearcenterdirectionsRight Constant NearseqmoreBottom Left Constant Neardefaultlayouthererectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloudrightleftisconstantandalsogridscoreritemResponseitemessayRubricconceptitemOutcomestylishcontaineradagreelktalathisisgrid12341234updownnearax ======= Left Constant NearcenterdirectionsRight Constant NearseqmoreBottom Left Constant Neardefaultlayouthererectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloudrightleftisconstantandalsogridscoreritemResponseitemessayRubricconceptitemOutcomestylishcontaineradagreelktalathisisgrid12341234updownnearax >>>>>>> 33280fed5 (fixed e2e tests) +||||||| parent of cb2f2823c (Fix changes) +Left Constant NearcenterdirectionsRight Constant NearseqmoreBottom Left Constant Neardefaultlayouthererectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloudrightleftisconstantandalsogridscoreritemResponseitemessayRubricconceptitemOutcomestylishcontaineradagreelktalathisisgrid12341234updownnearax +======= +Left Constant NearcenterdirectionsRight Constant NearseqmoreBottom Left Constant Neardefaultlayouthererectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloudrightleftisconstantandalsogridscoreritemResponseitemessayRubricconceptitemOutcomestylishcontaineradagreelktalathisisgrid12341234updownnearax +>>>>>>> cb2f2823c (Fix changes) <<<<<<< HEAD +<<<<<<< HEAD ya_sequencea_shapesequencefinallybrow 1row 2row 3row 4row 5withasequence diagramyou canchild of is12341234scoreritemResponseitemessayRubricconceptsequencefrom one constant nearhaveanothergridhere andgrandchildscorerconceptessayRubricitemitemOutcomeitemResponse123continuenesting ororruns thisruns thisruns thisA straight edge across straight edge across nested typesdefault layoutdefault layoutdefault layout in styleto inside sequence diagramto inside sequence diagramto inside sequence diagramto constant nearfrom within constant nearto another getItem() itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)score @@ -142,15 +159,24 @@ >>>>>>> 33280fed5 (fixed e2e tests) +||||||| parent of cb2f2823c (Fix changes) +ya_sequencea_shapesequencefinallybrow 1row 2row 3row 4row 5withasequence diagramyou canchild of is12341234scoreritemResponseitemessayRubricconceptsequencefrom one constant nearhaveanothergridhere andgrandchildscorerconceptessayRubricitemitemOutcomeitemResponse123continuenesting ororruns thisruns thisruns thisA straight edge across straight edge across nested typesdefault layoutdefault layoutdefault layout in styleto inside sequence diagramto inside sequence diagramto inside sequence diagramto constant nearfrom within constant nearto another getItem() itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)score + + +======= +ya_sequencea_shapesequencefinallybrow 1row 2row 3row 4row 5withasequence diagramyou canchild of is12341234scoreritemResponseitemessayRubricconceptsequencefrom one constant nearhaveanothergridhere andgrandchildscorerconceptessayRubricitemitemOutcomeitemResponse123continuenesting ororruns thisruns thisruns thisA straight edge across straight edge across nested typesdefault layoutdefault layoutdefault layout in styleto inside sequence diagramto inside sequence diagramto inside sequence diagramto constant nearfrom within constant nearto another getItem() itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)score + + +>>>>>>> cb2f2823c (Fix changes) - + - - - - - + + + + + @@ -170,26 +196,26 @@ - - - - - + + + + + - - - - - - - - - + + + + + + + + + @@ -200,25 +226,25 @@ - - + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -227,52 +253,52 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/number_connections/dagre/sketch.exp.svg b/e2etests/testdata/stable/number_connections/dagre/sketch.exp.svg index 8150ed2cc..3e83dac87 100644 --- a/e2etests/testdata/stable/number_connections/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/number_connections/dagre/sketch.exp.svg @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD AB fooredirectbar >>>>>>> 33280fed5 (fixed e2e tests) +||||||| parent of cb2f2823c (Fix changes) + .d2-797770258 .fill-N1{fill:#0A0F25;} + .d2-797770258 .fill-N2{fill:#676C7E;} + .d2-797770258 .fill-N3{fill:#9499AB;} + .d2-797770258 .fill-N4{fill:#CFD2DD;} + .d2-797770258 .fill-N5{fill:#DEE1EB;} + .d2-797770258 .fill-N6{fill:#EEF1F8;} + .d2-797770258 .fill-N7{fill:#FFFFFF;} + .d2-797770258 .fill-B1{fill:#0D32B2;} + .d2-797770258 .fill-B2{fill:#0D32B2;} + .d2-797770258 .fill-B3{fill:#E3E9FD;} + .d2-797770258 .fill-B4{fill:#E3E9FD;} + .d2-797770258 .fill-B5{fill:#EDF0FD;} + .d2-797770258 .fill-B6{fill:#F7F8FE;} + .d2-797770258 .fill-AA2{fill:#4A6FF3;} + .d2-797770258 .fill-AA4{fill:#EDF0FD;} + .d2-797770258 .fill-AA5{fill:#F7F8FE;} + .d2-797770258 .fill-AB4{fill:#EDF0FD;} + .d2-797770258 .fill-AB5{fill:#F7F8FE;} + .d2-797770258 .stroke-N1{stroke:#0A0F25;} + .d2-797770258 .stroke-N2{stroke:#676C7E;} + .d2-797770258 .stroke-N3{stroke:#9499AB;} + .d2-797770258 .stroke-N4{stroke:#CFD2DD;} + .d2-797770258 .stroke-N5{stroke:#DEE1EB;} + .d2-797770258 .stroke-N6{stroke:#EEF1F8;} + .d2-797770258 .stroke-N7{stroke:#FFFFFF;} + .d2-797770258 .stroke-B1{stroke:#0D32B2;} + .d2-797770258 .stroke-B2{stroke:#0D32B2;} + .d2-797770258 .stroke-B3{stroke:#E3E9FD;} + .d2-797770258 .stroke-B4{stroke:#E3E9FD;} + .d2-797770258 .stroke-B5{stroke:#EDF0FD;} + .d2-797770258 .stroke-B6{stroke:#F7F8FE;} + .d2-797770258 .stroke-AA2{stroke:#4A6FF3;} + .d2-797770258 .stroke-AA4{stroke:#EDF0FD;} + .d2-797770258 .stroke-AA5{stroke:#F7F8FE;} + .d2-797770258 .stroke-AB4{stroke:#EDF0FD;} + .d2-797770258 .stroke-AB5{stroke:#F7F8FE;} + .d2-797770258 .background-color-N1{background-color:#0A0F25;} + .d2-797770258 .background-color-N2{background-color:#676C7E;} + .d2-797770258 .background-color-N3{background-color:#9499AB;} + .d2-797770258 .background-color-N4{background-color:#CFD2DD;} + .d2-797770258 .background-color-N5{background-color:#DEE1EB;} + .d2-797770258 .background-color-N6{background-color:#EEF1F8;} + .d2-797770258 .background-color-N7{background-color:#FFFFFF;} + .d2-797770258 .background-color-B1{background-color:#0D32B2;} + .d2-797770258 .background-color-B2{background-color:#0D32B2;} + .d2-797770258 .background-color-B3{background-color:#E3E9FD;} + .d2-797770258 .background-color-B4{background-color:#E3E9FD;} + .d2-797770258 .background-color-B5{background-color:#EDF0FD;} + .d2-797770258 .background-color-B6{background-color:#F7F8FE;} + .d2-797770258 .background-color-AA2{background-color:#4A6FF3;} + .d2-797770258 .background-color-AA4{background-color:#EDF0FD;} + .d2-797770258 .background-color-AA5{background-color:#F7F8FE;} + .d2-797770258 .background-color-AB4{background-color:#EDF0FD;} + .d2-797770258 .background-color-AB5{background-color:#F7F8FE;} + .d2-797770258 .color-N1{color:#0A0F25;} + .d2-797770258 .color-N2{color:#676C7E;} + .d2-797770258 .color-N3{color:#9499AB;} + .d2-797770258 .color-N4{color:#CFD2DD;} + .d2-797770258 .color-N5{color:#DEE1EB;} + .d2-797770258 .color-N6{color:#EEF1F8;} + .d2-797770258 .color-N7{color:#FFFFFF;} + .d2-797770258 .color-B1{color:#0D32B2;} + .d2-797770258 .color-B2{color:#0D32B2;} + .d2-797770258 .color-B3{color:#E3E9FD;} + .d2-797770258 .color-B4{color:#E3E9FD;} + .d2-797770258 .color-B5{color:#EDF0FD;} + .d2-797770258 .color-B6{color:#F7F8FE;} + .d2-797770258 .color-AA2{color:#4A6FF3;} + .d2-797770258 .color-AA4{color:#EDF0FD;} + .d2-797770258 .color-AA5{color:#F7F8FE;} + .d2-797770258 .color-AB4{color:#EDF0FD;} + .d2-797770258 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>AB fooredirectbar + +======= + .d2-270751666 .fill-N1{fill:#0A0F25;} + .d2-270751666 .fill-N2{fill:#676C7E;} + .d2-270751666 .fill-N3{fill:#9499AB;} + .d2-270751666 .fill-N4{fill:#CFD2DD;} + .d2-270751666 .fill-N5{fill:#DEE1EB;} + .d2-270751666 .fill-N6{fill:#EEF1F8;} + .d2-270751666 .fill-N7{fill:#FFFFFF;} + .d2-270751666 .fill-B1{fill:#0D32B2;} + .d2-270751666 .fill-B2{fill:#0D32B2;} + .d2-270751666 .fill-B3{fill:#E3E9FD;} + .d2-270751666 .fill-B4{fill:#E3E9FD;} + .d2-270751666 .fill-B5{fill:#EDF0FD;} + .d2-270751666 .fill-B6{fill:#F7F8FE;} + .d2-270751666 .fill-AA2{fill:#4A6FF3;} + .d2-270751666 .fill-AA4{fill:#EDF0FD;} + .d2-270751666 .fill-AA5{fill:#F7F8FE;} + .d2-270751666 .fill-AB4{fill:#EDF0FD;} + .d2-270751666 .fill-AB5{fill:#F7F8FE;} + .d2-270751666 .stroke-N1{stroke:#0A0F25;} + .d2-270751666 .stroke-N2{stroke:#676C7E;} + .d2-270751666 .stroke-N3{stroke:#9499AB;} + .d2-270751666 .stroke-N4{stroke:#CFD2DD;} + .d2-270751666 .stroke-N5{stroke:#DEE1EB;} + .d2-270751666 .stroke-N6{stroke:#EEF1F8;} + .d2-270751666 .stroke-N7{stroke:#FFFFFF;} + .d2-270751666 .stroke-B1{stroke:#0D32B2;} + .d2-270751666 .stroke-B2{stroke:#0D32B2;} + .d2-270751666 .stroke-B3{stroke:#E3E9FD;} + .d2-270751666 .stroke-B4{stroke:#E3E9FD;} + .d2-270751666 .stroke-B5{stroke:#EDF0FD;} + .d2-270751666 .stroke-B6{stroke:#F7F8FE;} + .d2-270751666 .stroke-AA2{stroke:#4A6FF3;} + .d2-270751666 .stroke-AA4{stroke:#EDF0FD;} + .d2-270751666 .stroke-AA5{stroke:#F7F8FE;} + .d2-270751666 .stroke-AB4{stroke:#EDF0FD;} + .d2-270751666 .stroke-AB5{stroke:#F7F8FE;} + .d2-270751666 .background-color-N1{background-color:#0A0F25;} + .d2-270751666 .background-color-N2{background-color:#676C7E;} + .d2-270751666 .background-color-N3{background-color:#9499AB;} + .d2-270751666 .background-color-N4{background-color:#CFD2DD;} + .d2-270751666 .background-color-N5{background-color:#DEE1EB;} + .d2-270751666 .background-color-N6{background-color:#EEF1F8;} + .d2-270751666 .background-color-N7{background-color:#FFFFFF;} + .d2-270751666 .background-color-B1{background-color:#0D32B2;} + .d2-270751666 .background-color-B2{background-color:#0D32B2;} + .d2-270751666 .background-color-B3{background-color:#E3E9FD;} + .d2-270751666 .background-color-B4{background-color:#E3E9FD;} + .d2-270751666 .background-color-B5{background-color:#EDF0FD;} + .d2-270751666 .background-color-B6{background-color:#F7F8FE;} + .d2-270751666 .background-color-AA2{background-color:#4A6FF3;} + .d2-270751666 .background-color-AA4{background-color:#EDF0FD;} + .d2-270751666 .background-color-AA5{background-color:#F7F8FE;} + .d2-270751666 .background-color-AB4{background-color:#EDF0FD;} + .d2-270751666 .background-color-AB5{background-color:#F7F8FE;} + .d2-270751666 .color-N1{color:#0A0F25;} + .d2-270751666 .color-N2{color:#676C7E;} + .d2-270751666 .color-N3{color:#9499AB;} + .d2-270751666 .color-N4{color:#CFD2DD;} + .d2-270751666 .color-N5{color:#DEE1EB;} + .d2-270751666 .color-N6{color:#EEF1F8;} + .d2-270751666 .color-N7{color:#FFFFFF;} + .d2-270751666 .color-B1{color:#0D32B2;} + .d2-270751666 .color-B2{color:#0D32B2;} + .d2-270751666 .color-B3{color:#E3E9FD;} + .d2-270751666 .color-B4{color:#E3E9FD;} + .d2-270751666 .color-B5{color:#EDF0FD;} + .d2-270751666 .color-B6{color:#F7F8FE;} + .d2-270751666 .color-AA2{color:#4A6FF3;} + .d2-270751666 .color-AA4{color:#EDF0FD;} + .d2-270751666 .color-AA5{color:#F7F8FE;} + .d2-270751666 .color-AB4{color:#EDF0FD;} + .d2-270751666 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>AB fooredirectbar + +>>>>>>> cb2f2823c (Fix changes) - - - + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence-inter-span-self/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence-inter-span-self/elk/sketch.exp.svg index 1e2eaa117..929d42027 100644 --- a/e2etests/testdata/stable/sequence-inter-span-self/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence-inter-span-self/elk/sketch.exp.svg @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD AB fooredirectbar >>>>>>> 33280fed5 (fixed e2e tests) +||||||| parent of cb2f2823c (Fix changes) + .d2-797770258 .fill-N1{fill:#0A0F25;} + .d2-797770258 .fill-N2{fill:#676C7E;} + .d2-797770258 .fill-N3{fill:#9499AB;} + .d2-797770258 .fill-N4{fill:#CFD2DD;} + .d2-797770258 .fill-N5{fill:#DEE1EB;} + .d2-797770258 .fill-N6{fill:#EEF1F8;} + .d2-797770258 .fill-N7{fill:#FFFFFF;} + .d2-797770258 .fill-B1{fill:#0D32B2;} + .d2-797770258 .fill-B2{fill:#0D32B2;} + .d2-797770258 .fill-B3{fill:#E3E9FD;} + .d2-797770258 .fill-B4{fill:#E3E9FD;} + .d2-797770258 .fill-B5{fill:#EDF0FD;} + .d2-797770258 .fill-B6{fill:#F7F8FE;} + .d2-797770258 .fill-AA2{fill:#4A6FF3;} + .d2-797770258 .fill-AA4{fill:#EDF0FD;} + .d2-797770258 .fill-AA5{fill:#F7F8FE;} + .d2-797770258 .fill-AB4{fill:#EDF0FD;} + .d2-797770258 .fill-AB5{fill:#F7F8FE;} + .d2-797770258 .stroke-N1{stroke:#0A0F25;} + .d2-797770258 .stroke-N2{stroke:#676C7E;} + .d2-797770258 .stroke-N3{stroke:#9499AB;} + .d2-797770258 .stroke-N4{stroke:#CFD2DD;} + .d2-797770258 .stroke-N5{stroke:#DEE1EB;} + .d2-797770258 .stroke-N6{stroke:#EEF1F8;} + .d2-797770258 .stroke-N7{stroke:#FFFFFF;} + .d2-797770258 .stroke-B1{stroke:#0D32B2;} + .d2-797770258 .stroke-B2{stroke:#0D32B2;} + .d2-797770258 .stroke-B3{stroke:#E3E9FD;} + .d2-797770258 .stroke-B4{stroke:#E3E9FD;} + .d2-797770258 .stroke-B5{stroke:#EDF0FD;} + .d2-797770258 .stroke-B6{stroke:#F7F8FE;} + .d2-797770258 .stroke-AA2{stroke:#4A6FF3;} + .d2-797770258 .stroke-AA4{stroke:#EDF0FD;} + .d2-797770258 .stroke-AA5{stroke:#F7F8FE;} + .d2-797770258 .stroke-AB4{stroke:#EDF0FD;} + .d2-797770258 .stroke-AB5{stroke:#F7F8FE;} + .d2-797770258 .background-color-N1{background-color:#0A0F25;} + .d2-797770258 .background-color-N2{background-color:#676C7E;} + .d2-797770258 .background-color-N3{background-color:#9499AB;} + .d2-797770258 .background-color-N4{background-color:#CFD2DD;} + .d2-797770258 .background-color-N5{background-color:#DEE1EB;} + .d2-797770258 .background-color-N6{background-color:#EEF1F8;} + .d2-797770258 .background-color-N7{background-color:#FFFFFF;} + .d2-797770258 .background-color-B1{background-color:#0D32B2;} + .d2-797770258 .background-color-B2{background-color:#0D32B2;} + .d2-797770258 .background-color-B3{background-color:#E3E9FD;} + .d2-797770258 .background-color-B4{background-color:#E3E9FD;} + .d2-797770258 .background-color-B5{background-color:#EDF0FD;} + .d2-797770258 .background-color-B6{background-color:#F7F8FE;} + .d2-797770258 .background-color-AA2{background-color:#4A6FF3;} + .d2-797770258 .background-color-AA4{background-color:#EDF0FD;} + .d2-797770258 .background-color-AA5{background-color:#F7F8FE;} + .d2-797770258 .background-color-AB4{background-color:#EDF0FD;} + .d2-797770258 .background-color-AB5{background-color:#F7F8FE;} + .d2-797770258 .color-N1{color:#0A0F25;} + .d2-797770258 .color-N2{color:#676C7E;} + .d2-797770258 .color-N3{color:#9499AB;} + .d2-797770258 .color-N4{color:#CFD2DD;} + .d2-797770258 .color-N5{color:#DEE1EB;} + .d2-797770258 .color-N6{color:#EEF1F8;} + .d2-797770258 .color-N7{color:#FFFFFF;} + .d2-797770258 .color-B1{color:#0D32B2;} + .d2-797770258 .color-B2{color:#0D32B2;} + .d2-797770258 .color-B3{color:#E3E9FD;} + .d2-797770258 .color-B4{color:#E3E9FD;} + .d2-797770258 .color-B5{color:#EDF0FD;} + .d2-797770258 .color-B6{color:#F7F8FE;} + .d2-797770258 .color-AA2{color:#4A6FF3;} + .d2-797770258 .color-AA4{color:#EDF0FD;} + .d2-797770258 .color-AA5{color:#F7F8FE;} + .d2-797770258 .color-AB4{color:#EDF0FD;} + .d2-797770258 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>AB fooredirectbar + +======= + .d2-270751666 .fill-N1{fill:#0A0F25;} + .d2-270751666 .fill-N2{fill:#676C7E;} + .d2-270751666 .fill-N3{fill:#9499AB;} + .d2-270751666 .fill-N4{fill:#CFD2DD;} + .d2-270751666 .fill-N5{fill:#DEE1EB;} + .d2-270751666 .fill-N6{fill:#EEF1F8;} + .d2-270751666 .fill-N7{fill:#FFFFFF;} + .d2-270751666 .fill-B1{fill:#0D32B2;} + .d2-270751666 .fill-B2{fill:#0D32B2;} + .d2-270751666 .fill-B3{fill:#E3E9FD;} + .d2-270751666 .fill-B4{fill:#E3E9FD;} + .d2-270751666 .fill-B5{fill:#EDF0FD;} + .d2-270751666 .fill-B6{fill:#F7F8FE;} + .d2-270751666 .fill-AA2{fill:#4A6FF3;} + .d2-270751666 .fill-AA4{fill:#EDF0FD;} + .d2-270751666 .fill-AA5{fill:#F7F8FE;} + .d2-270751666 .fill-AB4{fill:#EDF0FD;} + .d2-270751666 .fill-AB5{fill:#F7F8FE;} + .d2-270751666 .stroke-N1{stroke:#0A0F25;} + .d2-270751666 .stroke-N2{stroke:#676C7E;} + .d2-270751666 .stroke-N3{stroke:#9499AB;} + .d2-270751666 .stroke-N4{stroke:#CFD2DD;} + .d2-270751666 .stroke-N5{stroke:#DEE1EB;} + .d2-270751666 .stroke-N6{stroke:#EEF1F8;} + .d2-270751666 .stroke-N7{stroke:#FFFFFF;} + .d2-270751666 .stroke-B1{stroke:#0D32B2;} + .d2-270751666 .stroke-B2{stroke:#0D32B2;} + .d2-270751666 .stroke-B3{stroke:#E3E9FD;} + .d2-270751666 .stroke-B4{stroke:#E3E9FD;} + .d2-270751666 .stroke-B5{stroke:#EDF0FD;} + .d2-270751666 .stroke-B6{stroke:#F7F8FE;} + .d2-270751666 .stroke-AA2{stroke:#4A6FF3;} + .d2-270751666 .stroke-AA4{stroke:#EDF0FD;} + .d2-270751666 .stroke-AA5{stroke:#F7F8FE;} + .d2-270751666 .stroke-AB4{stroke:#EDF0FD;} + .d2-270751666 .stroke-AB5{stroke:#F7F8FE;} + .d2-270751666 .background-color-N1{background-color:#0A0F25;} + .d2-270751666 .background-color-N2{background-color:#676C7E;} + .d2-270751666 .background-color-N3{background-color:#9499AB;} + .d2-270751666 .background-color-N4{background-color:#CFD2DD;} + .d2-270751666 .background-color-N5{background-color:#DEE1EB;} + .d2-270751666 .background-color-N6{background-color:#EEF1F8;} + .d2-270751666 .background-color-N7{background-color:#FFFFFF;} + .d2-270751666 .background-color-B1{background-color:#0D32B2;} + .d2-270751666 .background-color-B2{background-color:#0D32B2;} + .d2-270751666 .background-color-B3{background-color:#E3E9FD;} + .d2-270751666 .background-color-B4{background-color:#E3E9FD;} + .d2-270751666 .background-color-B5{background-color:#EDF0FD;} + .d2-270751666 .background-color-B6{background-color:#F7F8FE;} + .d2-270751666 .background-color-AA2{background-color:#4A6FF3;} + .d2-270751666 .background-color-AA4{background-color:#EDF0FD;} + .d2-270751666 .background-color-AA5{background-color:#F7F8FE;} + .d2-270751666 .background-color-AB4{background-color:#EDF0FD;} + .d2-270751666 .background-color-AB5{background-color:#F7F8FE;} + .d2-270751666 .color-N1{color:#0A0F25;} + .d2-270751666 .color-N2{color:#676C7E;} + .d2-270751666 .color-N3{color:#9499AB;} + .d2-270751666 .color-N4{color:#CFD2DD;} + .d2-270751666 .color-N5{color:#DEE1EB;} + .d2-270751666 .color-N6{color:#EEF1F8;} + .d2-270751666 .color-N7{color:#FFFFFF;} + .d2-270751666 .color-B1{color:#0D32B2;} + .d2-270751666 .color-B2{color:#0D32B2;} + .d2-270751666 .color-B3{color:#E3E9FD;} + .d2-270751666 .color-B4{color:#E3E9FD;} + .d2-270751666 .color-B5{color:#EDF0FD;} + .d2-270751666 .color-B6{color:#F7F8FE;} + .d2-270751666 .color-AA2{color:#4A6FF3;} + .d2-270751666 .color-AA4{color:#EDF0FD;} + .d2-270751666 .color-AA5{color:#F7F8FE;} + .d2-270751666 .color-AB4{color:#EDF0FD;} + .d2-270751666 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>AB fooredirectbar + +>>>>>>> cb2f2823c (Fix changes) - - - + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence_diagram_actor_distance/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_actor_distance/dagre/sketch.exp.svg index 4c9a83905..b91ddee18 100644 --- a/e2etests/testdata/stable/sequence_diagram_actor_distance/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_actor_distance/dagre/sketch.exp.svg @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD an actor with a really long label that will break everythinganactorwithareallylonglabelthatwillbreakeverythingsimplea short onefar awaywhat if there were no labels between this actor and the previous one shortlong label for testing purposes and it must be really, really longshortthis should span many actors lifelines so we know how it will look like when redering a long label over many actorslong label for testing purposes and it must be really, really long >>>>>>> 33280fed5 (fixed e2e tests) +||||||| parent of cb2f2823c (Fix changes) + .d2-4287344408 .fill-N1{fill:#0A0F25;} + .d2-4287344408 .fill-N2{fill:#676C7E;} + .d2-4287344408 .fill-N3{fill:#9499AB;} + .d2-4287344408 .fill-N4{fill:#CFD2DD;} + .d2-4287344408 .fill-N5{fill:#DEE1EB;} + .d2-4287344408 .fill-N6{fill:#EEF1F8;} + .d2-4287344408 .fill-N7{fill:#FFFFFF;} + .d2-4287344408 .fill-B1{fill:#0D32B2;} + .d2-4287344408 .fill-B2{fill:#0D32B2;} + .d2-4287344408 .fill-B3{fill:#E3E9FD;} + .d2-4287344408 .fill-B4{fill:#E3E9FD;} + .d2-4287344408 .fill-B5{fill:#EDF0FD;} + .d2-4287344408 .fill-B6{fill:#F7F8FE;} + .d2-4287344408 .fill-AA2{fill:#4A6FF3;} + .d2-4287344408 .fill-AA4{fill:#EDF0FD;} + .d2-4287344408 .fill-AA5{fill:#F7F8FE;} + .d2-4287344408 .fill-AB4{fill:#EDF0FD;} + .d2-4287344408 .fill-AB5{fill:#F7F8FE;} + .d2-4287344408 .stroke-N1{stroke:#0A0F25;} + .d2-4287344408 .stroke-N2{stroke:#676C7E;} + .d2-4287344408 .stroke-N3{stroke:#9499AB;} + .d2-4287344408 .stroke-N4{stroke:#CFD2DD;} + .d2-4287344408 .stroke-N5{stroke:#DEE1EB;} + .d2-4287344408 .stroke-N6{stroke:#EEF1F8;} + .d2-4287344408 .stroke-N7{stroke:#FFFFFF;} + .d2-4287344408 .stroke-B1{stroke:#0D32B2;} + .d2-4287344408 .stroke-B2{stroke:#0D32B2;} + .d2-4287344408 .stroke-B3{stroke:#E3E9FD;} + .d2-4287344408 .stroke-B4{stroke:#E3E9FD;} + .d2-4287344408 .stroke-B5{stroke:#EDF0FD;} + .d2-4287344408 .stroke-B6{stroke:#F7F8FE;} + .d2-4287344408 .stroke-AA2{stroke:#4A6FF3;} + .d2-4287344408 .stroke-AA4{stroke:#EDF0FD;} + .d2-4287344408 .stroke-AA5{stroke:#F7F8FE;} + .d2-4287344408 .stroke-AB4{stroke:#EDF0FD;} + .d2-4287344408 .stroke-AB5{stroke:#F7F8FE;} + .d2-4287344408 .background-color-N1{background-color:#0A0F25;} + .d2-4287344408 .background-color-N2{background-color:#676C7E;} + .d2-4287344408 .background-color-N3{background-color:#9499AB;} + .d2-4287344408 .background-color-N4{background-color:#CFD2DD;} + .d2-4287344408 .background-color-N5{background-color:#DEE1EB;} + .d2-4287344408 .background-color-N6{background-color:#EEF1F8;} + .d2-4287344408 .background-color-N7{background-color:#FFFFFF;} + .d2-4287344408 .background-color-B1{background-color:#0D32B2;} + .d2-4287344408 .background-color-B2{background-color:#0D32B2;} + .d2-4287344408 .background-color-B3{background-color:#E3E9FD;} + .d2-4287344408 .background-color-B4{background-color:#E3E9FD;} + .d2-4287344408 .background-color-B5{background-color:#EDF0FD;} + .d2-4287344408 .background-color-B6{background-color:#F7F8FE;} + .d2-4287344408 .background-color-AA2{background-color:#4A6FF3;} + .d2-4287344408 .background-color-AA4{background-color:#EDF0FD;} + .d2-4287344408 .background-color-AA5{background-color:#F7F8FE;} + .d2-4287344408 .background-color-AB4{background-color:#EDF0FD;} + .d2-4287344408 .background-color-AB5{background-color:#F7F8FE;} + .d2-4287344408 .color-N1{color:#0A0F25;} + .d2-4287344408 .color-N2{color:#676C7E;} + .d2-4287344408 .color-N3{color:#9499AB;} + .d2-4287344408 .color-N4{color:#CFD2DD;} + .d2-4287344408 .color-N5{color:#DEE1EB;} + .d2-4287344408 .color-N6{color:#EEF1F8;} + .d2-4287344408 .color-N7{color:#FFFFFF;} + .d2-4287344408 .color-B1{color:#0D32B2;} + .d2-4287344408 .color-B2{color:#0D32B2;} + .d2-4287344408 .color-B3{color:#E3E9FD;} + .d2-4287344408 .color-B4{color:#E3E9FD;} + .d2-4287344408 .color-B5{color:#EDF0FD;} + .d2-4287344408 .color-B6{color:#F7F8FE;} + .d2-4287344408 .color-AA2{color:#4A6FF3;} + .d2-4287344408 .color-AA4{color:#EDF0FD;} + .d2-4287344408 .color-AA5{color:#F7F8FE;} + .d2-4287344408 .color-AB4{color:#EDF0FD;} + .d2-4287344408 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>an actor with a really long label that will break everythinganactorwithareallylonglabelthatwillbreakeverythingsimplea short onefar awaywhat if there were no labels between this actor and the previous one shortlong label for testing purposes and it must be really, really longshortthis should span many actors lifelines so we know how it will look like when redering a long label over many actorslong label for testing purposes and it must be really, really long + +======= + .d2-1893158035 .fill-N1{fill:#0A0F25;} + .d2-1893158035 .fill-N2{fill:#676C7E;} + .d2-1893158035 .fill-N3{fill:#9499AB;} + .d2-1893158035 .fill-N4{fill:#CFD2DD;} + .d2-1893158035 .fill-N5{fill:#DEE1EB;} + .d2-1893158035 .fill-N6{fill:#EEF1F8;} + .d2-1893158035 .fill-N7{fill:#FFFFFF;} + .d2-1893158035 .fill-B1{fill:#0D32B2;} + .d2-1893158035 .fill-B2{fill:#0D32B2;} + .d2-1893158035 .fill-B3{fill:#E3E9FD;} + .d2-1893158035 .fill-B4{fill:#E3E9FD;} + .d2-1893158035 .fill-B5{fill:#EDF0FD;} + .d2-1893158035 .fill-B6{fill:#F7F8FE;} + .d2-1893158035 .fill-AA2{fill:#4A6FF3;} + .d2-1893158035 .fill-AA4{fill:#EDF0FD;} + .d2-1893158035 .fill-AA5{fill:#F7F8FE;} + .d2-1893158035 .fill-AB4{fill:#EDF0FD;} + .d2-1893158035 .fill-AB5{fill:#F7F8FE;} + .d2-1893158035 .stroke-N1{stroke:#0A0F25;} + .d2-1893158035 .stroke-N2{stroke:#676C7E;} + .d2-1893158035 .stroke-N3{stroke:#9499AB;} + .d2-1893158035 .stroke-N4{stroke:#CFD2DD;} + .d2-1893158035 .stroke-N5{stroke:#DEE1EB;} + .d2-1893158035 .stroke-N6{stroke:#EEF1F8;} + .d2-1893158035 .stroke-N7{stroke:#FFFFFF;} + .d2-1893158035 .stroke-B1{stroke:#0D32B2;} + .d2-1893158035 .stroke-B2{stroke:#0D32B2;} + .d2-1893158035 .stroke-B3{stroke:#E3E9FD;} + .d2-1893158035 .stroke-B4{stroke:#E3E9FD;} + .d2-1893158035 .stroke-B5{stroke:#EDF0FD;} + .d2-1893158035 .stroke-B6{stroke:#F7F8FE;} + .d2-1893158035 .stroke-AA2{stroke:#4A6FF3;} + .d2-1893158035 .stroke-AA4{stroke:#EDF0FD;} + .d2-1893158035 .stroke-AA5{stroke:#F7F8FE;} + .d2-1893158035 .stroke-AB4{stroke:#EDF0FD;} + .d2-1893158035 .stroke-AB5{stroke:#F7F8FE;} + .d2-1893158035 .background-color-N1{background-color:#0A0F25;} + .d2-1893158035 .background-color-N2{background-color:#676C7E;} + .d2-1893158035 .background-color-N3{background-color:#9499AB;} + .d2-1893158035 .background-color-N4{background-color:#CFD2DD;} + .d2-1893158035 .background-color-N5{background-color:#DEE1EB;} + .d2-1893158035 .background-color-N6{background-color:#EEF1F8;} + .d2-1893158035 .background-color-N7{background-color:#FFFFFF;} + .d2-1893158035 .background-color-B1{background-color:#0D32B2;} + .d2-1893158035 .background-color-B2{background-color:#0D32B2;} + .d2-1893158035 .background-color-B3{background-color:#E3E9FD;} + .d2-1893158035 .background-color-B4{background-color:#E3E9FD;} + .d2-1893158035 .background-color-B5{background-color:#EDF0FD;} + .d2-1893158035 .background-color-B6{background-color:#F7F8FE;} + .d2-1893158035 .background-color-AA2{background-color:#4A6FF3;} + .d2-1893158035 .background-color-AA4{background-color:#EDF0FD;} + .d2-1893158035 .background-color-AA5{background-color:#F7F8FE;} + .d2-1893158035 .background-color-AB4{background-color:#EDF0FD;} + .d2-1893158035 .background-color-AB5{background-color:#F7F8FE;} + .d2-1893158035 .color-N1{color:#0A0F25;} + .d2-1893158035 .color-N2{color:#676C7E;} + .d2-1893158035 .color-N3{color:#9499AB;} + .d2-1893158035 .color-N4{color:#CFD2DD;} + .d2-1893158035 .color-N5{color:#DEE1EB;} + .d2-1893158035 .color-N6{color:#EEF1F8;} + .d2-1893158035 .color-N7{color:#FFFFFF;} + .d2-1893158035 .color-B1{color:#0D32B2;} + .d2-1893158035 .color-B2{color:#0D32B2;} + .d2-1893158035 .color-B3{color:#E3E9FD;} + .d2-1893158035 .color-B4{color:#E3E9FD;} + .d2-1893158035 .color-B5{color:#EDF0FD;} + .d2-1893158035 .color-B6{color:#F7F8FE;} + .d2-1893158035 .color-AA2{color:#4A6FF3;} + .d2-1893158035 .color-AA4{color:#EDF0FD;} + .d2-1893158035 .color-AA5{color:#F7F8FE;} + .d2-1893158035 .color-AB4{color:#EDF0FD;} + .d2-1893158035 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>an actor with a really long label that will break everythinganactorwithareallylonglabelthatwillbreakeverythingsimplea short onefar awaywhat if there were no labels between this actor and the previous one shortlong label for testing purposes and it must be really, really longshortthis should span many actors lifelines so we know how it will look like when redering a long label over many actorslong label for testing purposes and it must be really, really long + +>>>>>>> cb2f2823c (Fix changes) - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence_diagram_actor_distance/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_actor_distance/elk/sketch.exp.svg index 4c9a83905..b91ddee18 100644 --- a/e2etests/testdata/stable/sequence_diagram_actor_distance/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_actor_distance/elk/sketch.exp.svg @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD an actor with a really long label that will break everythinganactorwithareallylonglabelthatwillbreakeverythingsimplea short onefar awaywhat if there were no labels between this actor and the previous one shortlong label for testing purposes and it must be really, really longshortthis should span many actors lifelines so we know how it will look like when redering a long label over many actorslong label for testing purposes and it must be really, really long >>>>>>> 33280fed5 (fixed e2e tests) +||||||| parent of cb2f2823c (Fix changes) + .d2-4287344408 .fill-N1{fill:#0A0F25;} + .d2-4287344408 .fill-N2{fill:#676C7E;} + .d2-4287344408 .fill-N3{fill:#9499AB;} + .d2-4287344408 .fill-N4{fill:#CFD2DD;} + .d2-4287344408 .fill-N5{fill:#DEE1EB;} + .d2-4287344408 .fill-N6{fill:#EEF1F8;} + .d2-4287344408 .fill-N7{fill:#FFFFFF;} + .d2-4287344408 .fill-B1{fill:#0D32B2;} + .d2-4287344408 .fill-B2{fill:#0D32B2;} + .d2-4287344408 .fill-B3{fill:#E3E9FD;} + .d2-4287344408 .fill-B4{fill:#E3E9FD;} + .d2-4287344408 .fill-B5{fill:#EDF0FD;} + .d2-4287344408 .fill-B6{fill:#F7F8FE;} + .d2-4287344408 .fill-AA2{fill:#4A6FF3;} + .d2-4287344408 .fill-AA4{fill:#EDF0FD;} + .d2-4287344408 .fill-AA5{fill:#F7F8FE;} + .d2-4287344408 .fill-AB4{fill:#EDF0FD;} + .d2-4287344408 .fill-AB5{fill:#F7F8FE;} + .d2-4287344408 .stroke-N1{stroke:#0A0F25;} + .d2-4287344408 .stroke-N2{stroke:#676C7E;} + .d2-4287344408 .stroke-N3{stroke:#9499AB;} + .d2-4287344408 .stroke-N4{stroke:#CFD2DD;} + .d2-4287344408 .stroke-N5{stroke:#DEE1EB;} + .d2-4287344408 .stroke-N6{stroke:#EEF1F8;} + .d2-4287344408 .stroke-N7{stroke:#FFFFFF;} + .d2-4287344408 .stroke-B1{stroke:#0D32B2;} + .d2-4287344408 .stroke-B2{stroke:#0D32B2;} + .d2-4287344408 .stroke-B3{stroke:#E3E9FD;} + .d2-4287344408 .stroke-B4{stroke:#E3E9FD;} + .d2-4287344408 .stroke-B5{stroke:#EDF0FD;} + .d2-4287344408 .stroke-B6{stroke:#F7F8FE;} + .d2-4287344408 .stroke-AA2{stroke:#4A6FF3;} + .d2-4287344408 .stroke-AA4{stroke:#EDF0FD;} + .d2-4287344408 .stroke-AA5{stroke:#F7F8FE;} + .d2-4287344408 .stroke-AB4{stroke:#EDF0FD;} + .d2-4287344408 .stroke-AB5{stroke:#F7F8FE;} + .d2-4287344408 .background-color-N1{background-color:#0A0F25;} + .d2-4287344408 .background-color-N2{background-color:#676C7E;} + .d2-4287344408 .background-color-N3{background-color:#9499AB;} + .d2-4287344408 .background-color-N4{background-color:#CFD2DD;} + .d2-4287344408 .background-color-N5{background-color:#DEE1EB;} + .d2-4287344408 .background-color-N6{background-color:#EEF1F8;} + .d2-4287344408 .background-color-N7{background-color:#FFFFFF;} + .d2-4287344408 .background-color-B1{background-color:#0D32B2;} + .d2-4287344408 .background-color-B2{background-color:#0D32B2;} + .d2-4287344408 .background-color-B3{background-color:#E3E9FD;} + .d2-4287344408 .background-color-B4{background-color:#E3E9FD;} + .d2-4287344408 .background-color-B5{background-color:#EDF0FD;} + .d2-4287344408 .background-color-B6{background-color:#F7F8FE;} + .d2-4287344408 .background-color-AA2{background-color:#4A6FF3;} + .d2-4287344408 .background-color-AA4{background-color:#EDF0FD;} + .d2-4287344408 .background-color-AA5{background-color:#F7F8FE;} + .d2-4287344408 .background-color-AB4{background-color:#EDF0FD;} + .d2-4287344408 .background-color-AB5{background-color:#F7F8FE;} + .d2-4287344408 .color-N1{color:#0A0F25;} + .d2-4287344408 .color-N2{color:#676C7E;} + .d2-4287344408 .color-N3{color:#9499AB;} + .d2-4287344408 .color-N4{color:#CFD2DD;} + .d2-4287344408 .color-N5{color:#DEE1EB;} + .d2-4287344408 .color-N6{color:#EEF1F8;} + .d2-4287344408 .color-N7{color:#FFFFFF;} + .d2-4287344408 .color-B1{color:#0D32B2;} + .d2-4287344408 .color-B2{color:#0D32B2;} + .d2-4287344408 .color-B3{color:#E3E9FD;} + .d2-4287344408 .color-B4{color:#E3E9FD;} + .d2-4287344408 .color-B5{color:#EDF0FD;} + .d2-4287344408 .color-B6{color:#F7F8FE;} + .d2-4287344408 .color-AA2{color:#4A6FF3;} + .d2-4287344408 .color-AA4{color:#EDF0FD;} + .d2-4287344408 .color-AA5{color:#F7F8FE;} + .d2-4287344408 .color-AB4{color:#EDF0FD;} + .d2-4287344408 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>an actor with a really long label that will break everythinganactorwithareallylonglabelthatwillbreakeverythingsimplea short onefar awaywhat if there were no labels between this actor and the previous one shortlong label for testing purposes and it must be really, really longshortthis should span many actors lifelines so we know how it will look like when redering a long label over many actorslong label for testing purposes and it must be really, really long + +======= + .d2-1893158035 .fill-N1{fill:#0A0F25;} + .d2-1893158035 .fill-N2{fill:#676C7E;} + .d2-1893158035 .fill-N3{fill:#9499AB;} + .d2-1893158035 .fill-N4{fill:#CFD2DD;} + .d2-1893158035 .fill-N5{fill:#DEE1EB;} + .d2-1893158035 .fill-N6{fill:#EEF1F8;} + .d2-1893158035 .fill-N7{fill:#FFFFFF;} + .d2-1893158035 .fill-B1{fill:#0D32B2;} + .d2-1893158035 .fill-B2{fill:#0D32B2;} + .d2-1893158035 .fill-B3{fill:#E3E9FD;} + .d2-1893158035 .fill-B4{fill:#E3E9FD;} + .d2-1893158035 .fill-B5{fill:#EDF0FD;} + .d2-1893158035 .fill-B6{fill:#F7F8FE;} + .d2-1893158035 .fill-AA2{fill:#4A6FF3;} + .d2-1893158035 .fill-AA4{fill:#EDF0FD;} + .d2-1893158035 .fill-AA5{fill:#F7F8FE;} + .d2-1893158035 .fill-AB4{fill:#EDF0FD;} + .d2-1893158035 .fill-AB5{fill:#F7F8FE;} + .d2-1893158035 .stroke-N1{stroke:#0A0F25;} + .d2-1893158035 .stroke-N2{stroke:#676C7E;} + .d2-1893158035 .stroke-N3{stroke:#9499AB;} + .d2-1893158035 .stroke-N4{stroke:#CFD2DD;} + .d2-1893158035 .stroke-N5{stroke:#DEE1EB;} + .d2-1893158035 .stroke-N6{stroke:#EEF1F8;} + .d2-1893158035 .stroke-N7{stroke:#FFFFFF;} + .d2-1893158035 .stroke-B1{stroke:#0D32B2;} + .d2-1893158035 .stroke-B2{stroke:#0D32B2;} + .d2-1893158035 .stroke-B3{stroke:#E3E9FD;} + .d2-1893158035 .stroke-B4{stroke:#E3E9FD;} + .d2-1893158035 .stroke-B5{stroke:#EDF0FD;} + .d2-1893158035 .stroke-B6{stroke:#F7F8FE;} + .d2-1893158035 .stroke-AA2{stroke:#4A6FF3;} + .d2-1893158035 .stroke-AA4{stroke:#EDF0FD;} + .d2-1893158035 .stroke-AA5{stroke:#F7F8FE;} + .d2-1893158035 .stroke-AB4{stroke:#EDF0FD;} + .d2-1893158035 .stroke-AB5{stroke:#F7F8FE;} + .d2-1893158035 .background-color-N1{background-color:#0A0F25;} + .d2-1893158035 .background-color-N2{background-color:#676C7E;} + .d2-1893158035 .background-color-N3{background-color:#9499AB;} + .d2-1893158035 .background-color-N4{background-color:#CFD2DD;} + .d2-1893158035 .background-color-N5{background-color:#DEE1EB;} + .d2-1893158035 .background-color-N6{background-color:#EEF1F8;} + .d2-1893158035 .background-color-N7{background-color:#FFFFFF;} + .d2-1893158035 .background-color-B1{background-color:#0D32B2;} + .d2-1893158035 .background-color-B2{background-color:#0D32B2;} + .d2-1893158035 .background-color-B3{background-color:#E3E9FD;} + .d2-1893158035 .background-color-B4{background-color:#E3E9FD;} + .d2-1893158035 .background-color-B5{background-color:#EDF0FD;} + .d2-1893158035 .background-color-B6{background-color:#F7F8FE;} + .d2-1893158035 .background-color-AA2{background-color:#4A6FF3;} + .d2-1893158035 .background-color-AA4{background-color:#EDF0FD;} + .d2-1893158035 .background-color-AA5{background-color:#F7F8FE;} + .d2-1893158035 .background-color-AB4{background-color:#EDF0FD;} + .d2-1893158035 .background-color-AB5{background-color:#F7F8FE;} + .d2-1893158035 .color-N1{color:#0A0F25;} + .d2-1893158035 .color-N2{color:#676C7E;} + .d2-1893158035 .color-N3{color:#9499AB;} + .d2-1893158035 .color-N4{color:#CFD2DD;} + .d2-1893158035 .color-N5{color:#DEE1EB;} + .d2-1893158035 .color-N6{color:#EEF1F8;} + .d2-1893158035 .color-N7{color:#FFFFFF;} + .d2-1893158035 .color-B1{color:#0D32B2;} + .d2-1893158035 .color-B2{color:#0D32B2;} + .d2-1893158035 .color-B3{color:#E3E9FD;} + .d2-1893158035 .color-B4{color:#E3E9FD;} + .d2-1893158035 .color-B5{color:#EDF0FD;} + .d2-1893158035 .color-B6{color:#F7F8FE;} + .d2-1893158035 .color-AA2{color:#4A6FF3;} + .d2-1893158035 .color-AA4{color:#EDF0FD;} + .d2-1893158035 .color-AA5{color:#F7F8FE;} + .d2-1893158035 .color-AB4{color:#EDF0FD;} + .d2-1893158035 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>an actor with a really long label that will break everythinganactorwithareallylonglabelthatwillbreakeverythingsimplea short onefar awaywhat if there were no labels between this actor and the previous one shortlong label for testing purposes and it must be really, really longshortthis should span many actors lifelines so we know how it will look like when redering a long label over many actorslong label for testing purposes and it must be really, really long + +>>>>>>> cb2f2823c (Fix changes) - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/sketch.exp.svg index d7a47bc60..4dc38587b 100644 --- a/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_all_shapes/dagre/sketch.exp.svg @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD a labelblabelsa class+public() boolvoid-private() intvoidcloudyyyya := 5 >>>>>>> 33280fed5 (fixed e2e tests) +||||||| parent of cb2f2823c (Fix changes) + .d2-2490829050 .fill-N1{fill:#0A0F25;} + .d2-2490829050 .fill-N2{fill:#676C7E;} + .d2-2490829050 .fill-N3{fill:#9499AB;} + .d2-2490829050 .fill-N4{fill:#CFD2DD;} + .d2-2490829050 .fill-N5{fill:#DEE1EB;} + .d2-2490829050 .fill-N6{fill:#EEF1F8;} + .d2-2490829050 .fill-N7{fill:#FFFFFF;} + .d2-2490829050 .fill-B1{fill:#0D32B2;} + .d2-2490829050 .fill-B2{fill:#0D32B2;} + .d2-2490829050 .fill-B3{fill:#E3E9FD;} + .d2-2490829050 .fill-B4{fill:#E3E9FD;} + .d2-2490829050 .fill-B5{fill:#EDF0FD;} + .d2-2490829050 .fill-B6{fill:#F7F8FE;} + .d2-2490829050 .fill-AA2{fill:#4A6FF3;} + .d2-2490829050 .fill-AA4{fill:#EDF0FD;} + .d2-2490829050 .fill-AA5{fill:#F7F8FE;} + .d2-2490829050 .fill-AB4{fill:#EDF0FD;} + .d2-2490829050 .fill-AB5{fill:#F7F8FE;} + .d2-2490829050 .stroke-N1{stroke:#0A0F25;} + .d2-2490829050 .stroke-N2{stroke:#676C7E;} + .d2-2490829050 .stroke-N3{stroke:#9499AB;} + .d2-2490829050 .stroke-N4{stroke:#CFD2DD;} + .d2-2490829050 .stroke-N5{stroke:#DEE1EB;} + .d2-2490829050 .stroke-N6{stroke:#EEF1F8;} + .d2-2490829050 .stroke-N7{stroke:#FFFFFF;} + .d2-2490829050 .stroke-B1{stroke:#0D32B2;} + .d2-2490829050 .stroke-B2{stroke:#0D32B2;} + .d2-2490829050 .stroke-B3{stroke:#E3E9FD;} + .d2-2490829050 .stroke-B4{stroke:#E3E9FD;} + .d2-2490829050 .stroke-B5{stroke:#EDF0FD;} + .d2-2490829050 .stroke-B6{stroke:#F7F8FE;} + .d2-2490829050 .stroke-AA2{stroke:#4A6FF3;} + .d2-2490829050 .stroke-AA4{stroke:#EDF0FD;} + .d2-2490829050 .stroke-AA5{stroke:#F7F8FE;} + .d2-2490829050 .stroke-AB4{stroke:#EDF0FD;} + .d2-2490829050 .stroke-AB5{stroke:#F7F8FE;} + .d2-2490829050 .background-color-N1{background-color:#0A0F25;} + .d2-2490829050 .background-color-N2{background-color:#676C7E;} + .d2-2490829050 .background-color-N3{background-color:#9499AB;} + .d2-2490829050 .background-color-N4{background-color:#CFD2DD;} + .d2-2490829050 .background-color-N5{background-color:#DEE1EB;} + .d2-2490829050 .background-color-N6{background-color:#EEF1F8;} + .d2-2490829050 .background-color-N7{background-color:#FFFFFF;} + .d2-2490829050 .background-color-B1{background-color:#0D32B2;} + .d2-2490829050 .background-color-B2{background-color:#0D32B2;} + .d2-2490829050 .background-color-B3{background-color:#E3E9FD;} + .d2-2490829050 .background-color-B4{background-color:#E3E9FD;} + .d2-2490829050 .background-color-B5{background-color:#EDF0FD;} + .d2-2490829050 .background-color-B6{background-color:#F7F8FE;} + .d2-2490829050 .background-color-AA2{background-color:#4A6FF3;} + .d2-2490829050 .background-color-AA4{background-color:#EDF0FD;} + .d2-2490829050 .background-color-AA5{background-color:#F7F8FE;} + .d2-2490829050 .background-color-AB4{background-color:#EDF0FD;} + .d2-2490829050 .background-color-AB5{background-color:#F7F8FE;} + .d2-2490829050 .color-N1{color:#0A0F25;} + .d2-2490829050 .color-N2{color:#676C7E;} + .d2-2490829050 .color-N3{color:#9499AB;} + .d2-2490829050 .color-N4{color:#CFD2DD;} + .d2-2490829050 .color-N5{color:#DEE1EB;} + .d2-2490829050 .color-N6{color:#EEF1F8;} + .d2-2490829050 .color-N7{color:#FFFFFF;} + .d2-2490829050 .color-B1{color:#0D32B2;} + .d2-2490829050 .color-B2{color:#0D32B2;} + .d2-2490829050 .color-B3{color:#E3E9FD;} + .d2-2490829050 .color-B4{color:#E3E9FD;} + .d2-2490829050 .color-B5{color:#EDF0FD;} + .d2-2490829050 .color-B6{color:#F7F8FE;} + .d2-2490829050 .color-AA2{color:#4A6FF3;} + .d2-2490829050 .color-AA4{color:#EDF0FD;} + .d2-2490829050 .color-AA5{color:#F7F8FE;} + .d2-2490829050 .color-AB4{color:#EDF0FD;} + .d2-2490829050 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>a labelblabelsa class+public() boolvoid-private() intvoidcloudyyyya := 5 +======= + .d2-3769254545 .fill-N1{fill:#0A0F25;} + .d2-3769254545 .fill-N2{fill:#676C7E;} + .d2-3769254545 .fill-N3{fill:#9499AB;} + .d2-3769254545 .fill-N4{fill:#CFD2DD;} + .d2-3769254545 .fill-N5{fill:#DEE1EB;} + .d2-3769254545 .fill-N6{fill:#EEF1F8;} + .d2-3769254545 .fill-N7{fill:#FFFFFF;} + .d2-3769254545 .fill-B1{fill:#0D32B2;} + .d2-3769254545 .fill-B2{fill:#0D32B2;} + .d2-3769254545 .fill-B3{fill:#E3E9FD;} + .d2-3769254545 .fill-B4{fill:#E3E9FD;} + .d2-3769254545 .fill-B5{fill:#EDF0FD;} + .d2-3769254545 .fill-B6{fill:#F7F8FE;} + .d2-3769254545 .fill-AA2{fill:#4A6FF3;} + .d2-3769254545 .fill-AA4{fill:#EDF0FD;} + .d2-3769254545 .fill-AA5{fill:#F7F8FE;} + .d2-3769254545 .fill-AB4{fill:#EDF0FD;} + .d2-3769254545 .fill-AB5{fill:#F7F8FE;} + .d2-3769254545 .stroke-N1{stroke:#0A0F25;} + .d2-3769254545 .stroke-N2{stroke:#676C7E;} + .d2-3769254545 .stroke-N3{stroke:#9499AB;} + .d2-3769254545 .stroke-N4{stroke:#CFD2DD;} + .d2-3769254545 .stroke-N5{stroke:#DEE1EB;} + .d2-3769254545 .stroke-N6{stroke:#EEF1F8;} + .d2-3769254545 .stroke-N7{stroke:#FFFFFF;} + .d2-3769254545 .stroke-B1{stroke:#0D32B2;} + .d2-3769254545 .stroke-B2{stroke:#0D32B2;} + .d2-3769254545 .stroke-B3{stroke:#E3E9FD;} + .d2-3769254545 .stroke-B4{stroke:#E3E9FD;} + .d2-3769254545 .stroke-B5{stroke:#EDF0FD;} + .d2-3769254545 .stroke-B6{stroke:#F7F8FE;} + .d2-3769254545 .stroke-AA2{stroke:#4A6FF3;} + .d2-3769254545 .stroke-AA4{stroke:#EDF0FD;} + .d2-3769254545 .stroke-AA5{stroke:#F7F8FE;} + .d2-3769254545 .stroke-AB4{stroke:#EDF0FD;} + .d2-3769254545 .stroke-AB5{stroke:#F7F8FE;} + .d2-3769254545 .background-color-N1{background-color:#0A0F25;} + .d2-3769254545 .background-color-N2{background-color:#676C7E;} + .d2-3769254545 .background-color-N3{background-color:#9499AB;} + .d2-3769254545 .background-color-N4{background-color:#CFD2DD;} + .d2-3769254545 .background-color-N5{background-color:#DEE1EB;} + .d2-3769254545 .background-color-N6{background-color:#EEF1F8;} + .d2-3769254545 .background-color-N7{background-color:#FFFFFF;} + .d2-3769254545 .background-color-B1{background-color:#0D32B2;} + .d2-3769254545 .background-color-B2{background-color:#0D32B2;} + .d2-3769254545 .background-color-B3{background-color:#E3E9FD;} + .d2-3769254545 .background-color-B4{background-color:#E3E9FD;} + .d2-3769254545 .background-color-B5{background-color:#EDF0FD;} + .d2-3769254545 .background-color-B6{background-color:#F7F8FE;} + .d2-3769254545 .background-color-AA2{background-color:#4A6FF3;} + .d2-3769254545 .background-color-AA4{background-color:#EDF0FD;} + .d2-3769254545 .background-color-AA5{background-color:#F7F8FE;} + .d2-3769254545 .background-color-AB4{background-color:#EDF0FD;} + .d2-3769254545 .background-color-AB5{background-color:#F7F8FE;} + .d2-3769254545 .color-N1{color:#0A0F25;} + .d2-3769254545 .color-N2{color:#676C7E;} + .d2-3769254545 .color-N3{color:#9499AB;} + .d2-3769254545 .color-N4{color:#CFD2DD;} + .d2-3769254545 .color-N5{color:#DEE1EB;} + .d2-3769254545 .color-N6{color:#EEF1F8;} + .d2-3769254545 .color-N7{color:#FFFFFF;} + .d2-3769254545 .color-B1{color:#0D32B2;} + .d2-3769254545 .color-B2{color:#0D32B2;} + .d2-3769254545 .color-B3{color:#E3E9FD;} + .d2-3769254545 .color-B4{color:#E3E9FD;} + .d2-3769254545 .color-B5{color:#EDF0FD;} + .d2-3769254545 .color-B6{color:#F7F8FE;} + .d2-3769254545 .color-AA2{color:#4A6FF3;} + .d2-3769254545 .color-AA4{color:#EDF0FD;} + .d2-3769254545 .color-AA5{color:#F7F8FE;} + .d2-3769254545 .color-AB4{color:#EDF0FD;} + .d2-3769254545 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>a labelblabelsa class+public() boolvoid-private() intvoidcloudyyyya := 5 +>>>>>>> cb2f2823c (Fix changes) b := a + 7 <<<<<<< HEAD +<<<<<<< HEAD fmt.Printf("%d", b)a := 5 b := a + 7 fmt.Printf("%d", b)cyldiadocssix cornersa random iconoverpackdocs pagetoohard o saysinglepersona queuea squarea step at a timedatausersidintnamevarchar result := callThisFunction(obj, 5) midthis sideother side @@ -282,28 +441,41 @@ ======= fmt.Printf("%d", b)a := 5 +||||||| parent of cb2f2823c (Fix changes) +fmt.Printf("%d", b)a := 5 +======= +fmt.Printf("%d", b)a := 5 +>>>>>>> cb2f2823c (Fix changes) b := a + 7 +<<<<<<< HEAD fmt.Printf("%d", b)cyldiadocssix cornersa random iconoverpackdocs pagetoohard o saysinglepersona queuea squarea step at a timedatausersidintnamevarchar result := callThisFunction(obj, 5) midthis sideother side >>>>>>> 33280fed5 (fixed e2e tests) +||||||| parent of cb2f2823c (Fix changes) +fmt.Printf("%d", b)cyldiadocssix cornersa random iconoverpackdocs pagetoohard o saysinglepersona queuea squarea step at a timedatausersidintnamevarchar result := callThisFunction(obj, 5) midthis sideother side + +======= +fmt.Printf("%d", b)cyldiadocssix cornersa random iconoverpackdocs pagetoohard o saysinglepersona queuea squarea step at a timedatausersidintnamevarchar result := callThisFunction(obj, 5) midthis sideother side + +>>>>>>> cb2f2823c (Fix changes) - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/sketch.exp.svg index d7a47bc60..4dc38587b 100644 --- a/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_all_shapes/elk/sketch.exp.svg @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD a labelblabelsa class+public() boolvoid-private() intvoidcloudyyyya := 5 >>>>>>> 33280fed5 (fixed e2e tests) +||||||| parent of cb2f2823c (Fix changes) + .d2-2490829050 .fill-N1{fill:#0A0F25;} + .d2-2490829050 .fill-N2{fill:#676C7E;} + .d2-2490829050 .fill-N3{fill:#9499AB;} + .d2-2490829050 .fill-N4{fill:#CFD2DD;} + .d2-2490829050 .fill-N5{fill:#DEE1EB;} + .d2-2490829050 .fill-N6{fill:#EEF1F8;} + .d2-2490829050 .fill-N7{fill:#FFFFFF;} + .d2-2490829050 .fill-B1{fill:#0D32B2;} + .d2-2490829050 .fill-B2{fill:#0D32B2;} + .d2-2490829050 .fill-B3{fill:#E3E9FD;} + .d2-2490829050 .fill-B4{fill:#E3E9FD;} + .d2-2490829050 .fill-B5{fill:#EDF0FD;} + .d2-2490829050 .fill-B6{fill:#F7F8FE;} + .d2-2490829050 .fill-AA2{fill:#4A6FF3;} + .d2-2490829050 .fill-AA4{fill:#EDF0FD;} + .d2-2490829050 .fill-AA5{fill:#F7F8FE;} + .d2-2490829050 .fill-AB4{fill:#EDF0FD;} + .d2-2490829050 .fill-AB5{fill:#F7F8FE;} + .d2-2490829050 .stroke-N1{stroke:#0A0F25;} + .d2-2490829050 .stroke-N2{stroke:#676C7E;} + .d2-2490829050 .stroke-N3{stroke:#9499AB;} + .d2-2490829050 .stroke-N4{stroke:#CFD2DD;} + .d2-2490829050 .stroke-N5{stroke:#DEE1EB;} + .d2-2490829050 .stroke-N6{stroke:#EEF1F8;} + .d2-2490829050 .stroke-N7{stroke:#FFFFFF;} + .d2-2490829050 .stroke-B1{stroke:#0D32B2;} + .d2-2490829050 .stroke-B2{stroke:#0D32B2;} + .d2-2490829050 .stroke-B3{stroke:#E3E9FD;} + .d2-2490829050 .stroke-B4{stroke:#E3E9FD;} + .d2-2490829050 .stroke-B5{stroke:#EDF0FD;} + .d2-2490829050 .stroke-B6{stroke:#F7F8FE;} + .d2-2490829050 .stroke-AA2{stroke:#4A6FF3;} + .d2-2490829050 .stroke-AA4{stroke:#EDF0FD;} + .d2-2490829050 .stroke-AA5{stroke:#F7F8FE;} + .d2-2490829050 .stroke-AB4{stroke:#EDF0FD;} + .d2-2490829050 .stroke-AB5{stroke:#F7F8FE;} + .d2-2490829050 .background-color-N1{background-color:#0A0F25;} + .d2-2490829050 .background-color-N2{background-color:#676C7E;} + .d2-2490829050 .background-color-N3{background-color:#9499AB;} + .d2-2490829050 .background-color-N4{background-color:#CFD2DD;} + .d2-2490829050 .background-color-N5{background-color:#DEE1EB;} + .d2-2490829050 .background-color-N6{background-color:#EEF1F8;} + .d2-2490829050 .background-color-N7{background-color:#FFFFFF;} + .d2-2490829050 .background-color-B1{background-color:#0D32B2;} + .d2-2490829050 .background-color-B2{background-color:#0D32B2;} + .d2-2490829050 .background-color-B3{background-color:#E3E9FD;} + .d2-2490829050 .background-color-B4{background-color:#E3E9FD;} + .d2-2490829050 .background-color-B5{background-color:#EDF0FD;} + .d2-2490829050 .background-color-B6{background-color:#F7F8FE;} + .d2-2490829050 .background-color-AA2{background-color:#4A6FF3;} + .d2-2490829050 .background-color-AA4{background-color:#EDF0FD;} + .d2-2490829050 .background-color-AA5{background-color:#F7F8FE;} + .d2-2490829050 .background-color-AB4{background-color:#EDF0FD;} + .d2-2490829050 .background-color-AB5{background-color:#F7F8FE;} + .d2-2490829050 .color-N1{color:#0A0F25;} + .d2-2490829050 .color-N2{color:#676C7E;} + .d2-2490829050 .color-N3{color:#9499AB;} + .d2-2490829050 .color-N4{color:#CFD2DD;} + .d2-2490829050 .color-N5{color:#DEE1EB;} + .d2-2490829050 .color-N6{color:#EEF1F8;} + .d2-2490829050 .color-N7{color:#FFFFFF;} + .d2-2490829050 .color-B1{color:#0D32B2;} + .d2-2490829050 .color-B2{color:#0D32B2;} + .d2-2490829050 .color-B3{color:#E3E9FD;} + .d2-2490829050 .color-B4{color:#E3E9FD;} + .d2-2490829050 .color-B5{color:#EDF0FD;} + .d2-2490829050 .color-B6{color:#F7F8FE;} + .d2-2490829050 .color-AA2{color:#4A6FF3;} + .d2-2490829050 .color-AA4{color:#EDF0FD;} + .d2-2490829050 .color-AA5{color:#F7F8FE;} + .d2-2490829050 .color-AB4{color:#EDF0FD;} + .d2-2490829050 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>a labelblabelsa class+public() boolvoid-private() intvoidcloudyyyya := 5 +======= + .d2-3769254545 .fill-N1{fill:#0A0F25;} + .d2-3769254545 .fill-N2{fill:#676C7E;} + .d2-3769254545 .fill-N3{fill:#9499AB;} + .d2-3769254545 .fill-N4{fill:#CFD2DD;} + .d2-3769254545 .fill-N5{fill:#DEE1EB;} + .d2-3769254545 .fill-N6{fill:#EEF1F8;} + .d2-3769254545 .fill-N7{fill:#FFFFFF;} + .d2-3769254545 .fill-B1{fill:#0D32B2;} + .d2-3769254545 .fill-B2{fill:#0D32B2;} + .d2-3769254545 .fill-B3{fill:#E3E9FD;} + .d2-3769254545 .fill-B4{fill:#E3E9FD;} + .d2-3769254545 .fill-B5{fill:#EDF0FD;} + .d2-3769254545 .fill-B6{fill:#F7F8FE;} + .d2-3769254545 .fill-AA2{fill:#4A6FF3;} + .d2-3769254545 .fill-AA4{fill:#EDF0FD;} + .d2-3769254545 .fill-AA5{fill:#F7F8FE;} + .d2-3769254545 .fill-AB4{fill:#EDF0FD;} + .d2-3769254545 .fill-AB5{fill:#F7F8FE;} + .d2-3769254545 .stroke-N1{stroke:#0A0F25;} + .d2-3769254545 .stroke-N2{stroke:#676C7E;} + .d2-3769254545 .stroke-N3{stroke:#9499AB;} + .d2-3769254545 .stroke-N4{stroke:#CFD2DD;} + .d2-3769254545 .stroke-N5{stroke:#DEE1EB;} + .d2-3769254545 .stroke-N6{stroke:#EEF1F8;} + .d2-3769254545 .stroke-N7{stroke:#FFFFFF;} + .d2-3769254545 .stroke-B1{stroke:#0D32B2;} + .d2-3769254545 .stroke-B2{stroke:#0D32B2;} + .d2-3769254545 .stroke-B3{stroke:#E3E9FD;} + .d2-3769254545 .stroke-B4{stroke:#E3E9FD;} + .d2-3769254545 .stroke-B5{stroke:#EDF0FD;} + .d2-3769254545 .stroke-B6{stroke:#F7F8FE;} + .d2-3769254545 .stroke-AA2{stroke:#4A6FF3;} + .d2-3769254545 .stroke-AA4{stroke:#EDF0FD;} + .d2-3769254545 .stroke-AA5{stroke:#F7F8FE;} + .d2-3769254545 .stroke-AB4{stroke:#EDF0FD;} + .d2-3769254545 .stroke-AB5{stroke:#F7F8FE;} + .d2-3769254545 .background-color-N1{background-color:#0A0F25;} + .d2-3769254545 .background-color-N2{background-color:#676C7E;} + .d2-3769254545 .background-color-N3{background-color:#9499AB;} + .d2-3769254545 .background-color-N4{background-color:#CFD2DD;} + .d2-3769254545 .background-color-N5{background-color:#DEE1EB;} + .d2-3769254545 .background-color-N6{background-color:#EEF1F8;} + .d2-3769254545 .background-color-N7{background-color:#FFFFFF;} + .d2-3769254545 .background-color-B1{background-color:#0D32B2;} + .d2-3769254545 .background-color-B2{background-color:#0D32B2;} + .d2-3769254545 .background-color-B3{background-color:#E3E9FD;} + .d2-3769254545 .background-color-B4{background-color:#E3E9FD;} + .d2-3769254545 .background-color-B5{background-color:#EDF0FD;} + .d2-3769254545 .background-color-B6{background-color:#F7F8FE;} + .d2-3769254545 .background-color-AA2{background-color:#4A6FF3;} + .d2-3769254545 .background-color-AA4{background-color:#EDF0FD;} + .d2-3769254545 .background-color-AA5{background-color:#F7F8FE;} + .d2-3769254545 .background-color-AB4{background-color:#EDF0FD;} + .d2-3769254545 .background-color-AB5{background-color:#F7F8FE;} + .d2-3769254545 .color-N1{color:#0A0F25;} + .d2-3769254545 .color-N2{color:#676C7E;} + .d2-3769254545 .color-N3{color:#9499AB;} + .d2-3769254545 .color-N4{color:#CFD2DD;} + .d2-3769254545 .color-N5{color:#DEE1EB;} + .d2-3769254545 .color-N6{color:#EEF1F8;} + .d2-3769254545 .color-N7{color:#FFFFFF;} + .d2-3769254545 .color-B1{color:#0D32B2;} + .d2-3769254545 .color-B2{color:#0D32B2;} + .d2-3769254545 .color-B3{color:#E3E9FD;} + .d2-3769254545 .color-B4{color:#E3E9FD;} + .d2-3769254545 .color-B5{color:#EDF0FD;} + .d2-3769254545 .color-B6{color:#F7F8FE;} + .d2-3769254545 .color-AA2{color:#4A6FF3;} + .d2-3769254545 .color-AA4{color:#EDF0FD;} + .d2-3769254545 .color-AA5{color:#F7F8FE;} + .d2-3769254545 .color-AB4{color:#EDF0FD;} + .d2-3769254545 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>a labelblabelsa class+public() boolvoid-private() intvoidcloudyyyya := 5 +>>>>>>> cb2f2823c (Fix changes) b := a + 7 <<<<<<< HEAD +<<<<<<< HEAD fmt.Printf("%d", b)a := 5 b := a + 7 fmt.Printf("%d", b)cyldiadocssix cornersa random iconoverpackdocs pagetoohard o saysinglepersona queuea squarea step at a timedatausersidintnamevarchar result := callThisFunction(obj, 5) midthis sideother side @@ -282,28 +441,41 @@ ======= fmt.Printf("%d", b)a := 5 +||||||| parent of cb2f2823c (Fix changes) +fmt.Printf("%d", b)a := 5 +======= +fmt.Printf("%d", b)a := 5 +>>>>>>> cb2f2823c (Fix changes) b := a + 7 +<<<<<<< HEAD fmt.Printf("%d", b)cyldiadocssix cornersa random iconoverpackdocs pagetoohard o saysinglepersona queuea squarea step at a timedatausersidintnamevarchar result := callThisFunction(obj, 5) midthis sideother side >>>>>>> 33280fed5 (fixed e2e tests) +||||||| parent of cb2f2823c (Fix changes) +fmt.Printf("%d", b)cyldiadocssix cornersa random iconoverpackdocs pagetoohard o saysinglepersona queuea squarea step at a timedatausersidintnamevarchar result := callThisFunction(obj, 5) midthis sideother side + +======= +fmt.Printf("%d", b)cyldiadocssix cornersa random iconoverpackdocs pagetoohard o saysinglepersona queuea squarea step at a timedatausersidintnamevarchar result := callThisFunction(obj, 5) midthis sideother side + +>>>>>>> cb2f2823c (Fix changes) - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence_diagram_distance/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_distance/dagre/sketch.exp.svg index 51fc14b71..2c6c8e009 100644 --- a/e2etests/testdata/stable/sequence_diagram_distance/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_distance/dagre/sketch.exp.svg @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD alicebob what does it mean to be well-adjustedThe ability to play bridge or golf as if they were games >>>>>>> 33280fed5 (fixed e2e tests) +||||||| parent of cb2f2823c (Fix changes) + .d2-2079144140 .fill-N1{fill:#0A0F25;} + .d2-2079144140 .fill-N2{fill:#676C7E;} + .d2-2079144140 .fill-N3{fill:#9499AB;} + .d2-2079144140 .fill-N4{fill:#CFD2DD;} + .d2-2079144140 .fill-N5{fill:#DEE1EB;} + .d2-2079144140 .fill-N6{fill:#EEF1F8;} + .d2-2079144140 .fill-N7{fill:#FFFFFF;} + .d2-2079144140 .fill-B1{fill:#0D32B2;} + .d2-2079144140 .fill-B2{fill:#0D32B2;} + .d2-2079144140 .fill-B3{fill:#E3E9FD;} + .d2-2079144140 .fill-B4{fill:#E3E9FD;} + .d2-2079144140 .fill-B5{fill:#EDF0FD;} + .d2-2079144140 .fill-B6{fill:#F7F8FE;} + .d2-2079144140 .fill-AA2{fill:#4A6FF3;} + .d2-2079144140 .fill-AA4{fill:#EDF0FD;} + .d2-2079144140 .fill-AA5{fill:#F7F8FE;} + .d2-2079144140 .fill-AB4{fill:#EDF0FD;} + .d2-2079144140 .fill-AB5{fill:#F7F8FE;} + .d2-2079144140 .stroke-N1{stroke:#0A0F25;} + .d2-2079144140 .stroke-N2{stroke:#676C7E;} + .d2-2079144140 .stroke-N3{stroke:#9499AB;} + .d2-2079144140 .stroke-N4{stroke:#CFD2DD;} + .d2-2079144140 .stroke-N5{stroke:#DEE1EB;} + .d2-2079144140 .stroke-N6{stroke:#EEF1F8;} + .d2-2079144140 .stroke-N7{stroke:#FFFFFF;} + .d2-2079144140 .stroke-B1{stroke:#0D32B2;} + .d2-2079144140 .stroke-B2{stroke:#0D32B2;} + .d2-2079144140 .stroke-B3{stroke:#E3E9FD;} + .d2-2079144140 .stroke-B4{stroke:#E3E9FD;} + .d2-2079144140 .stroke-B5{stroke:#EDF0FD;} + .d2-2079144140 .stroke-B6{stroke:#F7F8FE;} + .d2-2079144140 .stroke-AA2{stroke:#4A6FF3;} + .d2-2079144140 .stroke-AA4{stroke:#EDF0FD;} + .d2-2079144140 .stroke-AA5{stroke:#F7F8FE;} + .d2-2079144140 .stroke-AB4{stroke:#EDF0FD;} + .d2-2079144140 .stroke-AB5{stroke:#F7F8FE;} + .d2-2079144140 .background-color-N1{background-color:#0A0F25;} + .d2-2079144140 .background-color-N2{background-color:#676C7E;} + .d2-2079144140 .background-color-N3{background-color:#9499AB;} + .d2-2079144140 .background-color-N4{background-color:#CFD2DD;} + .d2-2079144140 .background-color-N5{background-color:#DEE1EB;} + .d2-2079144140 .background-color-N6{background-color:#EEF1F8;} + .d2-2079144140 .background-color-N7{background-color:#FFFFFF;} + .d2-2079144140 .background-color-B1{background-color:#0D32B2;} + .d2-2079144140 .background-color-B2{background-color:#0D32B2;} + .d2-2079144140 .background-color-B3{background-color:#E3E9FD;} + .d2-2079144140 .background-color-B4{background-color:#E3E9FD;} + .d2-2079144140 .background-color-B5{background-color:#EDF0FD;} + .d2-2079144140 .background-color-B6{background-color:#F7F8FE;} + .d2-2079144140 .background-color-AA2{background-color:#4A6FF3;} + .d2-2079144140 .background-color-AA4{background-color:#EDF0FD;} + .d2-2079144140 .background-color-AA5{background-color:#F7F8FE;} + .d2-2079144140 .background-color-AB4{background-color:#EDF0FD;} + .d2-2079144140 .background-color-AB5{background-color:#F7F8FE;} + .d2-2079144140 .color-N1{color:#0A0F25;} + .d2-2079144140 .color-N2{color:#676C7E;} + .d2-2079144140 .color-N3{color:#9499AB;} + .d2-2079144140 .color-N4{color:#CFD2DD;} + .d2-2079144140 .color-N5{color:#DEE1EB;} + .d2-2079144140 .color-N6{color:#EEF1F8;} + .d2-2079144140 .color-N7{color:#FFFFFF;} + .d2-2079144140 .color-B1{color:#0D32B2;} + .d2-2079144140 .color-B2{color:#0D32B2;} + .d2-2079144140 .color-B3{color:#E3E9FD;} + .d2-2079144140 .color-B4{color:#E3E9FD;} + .d2-2079144140 .color-B5{color:#EDF0FD;} + .d2-2079144140 .color-B6{color:#F7F8FE;} + .d2-2079144140 .color-AA2{color:#4A6FF3;} + .d2-2079144140 .color-AA4{color:#EDF0FD;} + .d2-2079144140 .color-AA5{color:#F7F8FE;} + .d2-2079144140 .color-AB4{color:#EDF0FD;} + .d2-2079144140 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>alicebob what does it mean to be well-adjustedThe ability to play bridge or golf as if they were games + +======= + .d2-2307968324 .fill-N1{fill:#0A0F25;} + .d2-2307968324 .fill-N2{fill:#676C7E;} + .d2-2307968324 .fill-N3{fill:#9499AB;} + .d2-2307968324 .fill-N4{fill:#CFD2DD;} + .d2-2307968324 .fill-N5{fill:#DEE1EB;} + .d2-2307968324 .fill-N6{fill:#EEF1F8;} + .d2-2307968324 .fill-N7{fill:#FFFFFF;} + .d2-2307968324 .fill-B1{fill:#0D32B2;} + .d2-2307968324 .fill-B2{fill:#0D32B2;} + .d2-2307968324 .fill-B3{fill:#E3E9FD;} + .d2-2307968324 .fill-B4{fill:#E3E9FD;} + .d2-2307968324 .fill-B5{fill:#EDF0FD;} + .d2-2307968324 .fill-B6{fill:#F7F8FE;} + .d2-2307968324 .fill-AA2{fill:#4A6FF3;} + .d2-2307968324 .fill-AA4{fill:#EDF0FD;} + .d2-2307968324 .fill-AA5{fill:#F7F8FE;} + .d2-2307968324 .fill-AB4{fill:#EDF0FD;} + .d2-2307968324 .fill-AB5{fill:#F7F8FE;} + .d2-2307968324 .stroke-N1{stroke:#0A0F25;} + .d2-2307968324 .stroke-N2{stroke:#676C7E;} + .d2-2307968324 .stroke-N3{stroke:#9499AB;} + .d2-2307968324 .stroke-N4{stroke:#CFD2DD;} + .d2-2307968324 .stroke-N5{stroke:#DEE1EB;} + .d2-2307968324 .stroke-N6{stroke:#EEF1F8;} + .d2-2307968324 .stroke-N7{stroke:#FFFFFF;} + .d2-2307968324 .stroke-B1{stroke:#0D32B2;} + .d2-2307968324 .stroke-B2{stroke:#0D32B2;} + .d2-2307968324 .stroke-B3{stroke:#E3E9FD;} + .d2-2307968324 .stroke-B4{stroke:#E3E9FD;} + .d2-2307968324 .stroke-B5{stroke:#EDF0FD;} + .d2-2307968324 .stroke-B6{stroke:#F7F8FE;} + .d2-2307968324 .stroke-AA2{stroke:#4A6FF3;} + .d2-2307968324 .stroke-AA4{stroke:#EDF0FD;} + .d2-2307968324 .stroke-AA5{stroke:#F7F8FE;} + .d2-2307968324 .stroke-AB4{stroke:#EDF0FD;} + .d2-2307968324 .stroke-AB5{stroke:#F7F8FE;} + .d2-2307968324 .background-color-N1{background-color:#0A0F25;} + .d2-2307968324 .background-color-N2{background-color:#676C7E;} + .d2-2307968324 .background-color-N3{background-color:#9499AB;} + .d2-2307968324 .background-color-N4{background-color:#CFD2DD;} + .d2-2307968324 .background-color-N5{background-color:#DEE1EB;} + .d2-2307968324 .background-color-N6{background-color:#EEF1F8;} + .d2-2307968324 .background-color-N7{background-color:#FFFFFF;} + .d2-2307968324 .background-color-B1{background-color:#0D32B2;} + .d2-2307968324 .background-color-B2{background-color:#0D32B2;} + .d2-2307968324 .background-color-B3{background-color:#E3E9FD;} + .d2-2307968324 .background-color-B4{background-color:#E3E9FD;} + .d2-2307968324 .background-color-B5{background-color:#EDF0FD;} + .d2-2307968324 .background-color-B6{background-color:#F7F8FE;} + .d2-2307968324 .background-color-AA2{background-color:#4A6FF3;} + .d2-2307968324 .background-color-AA4{background-color:#EDF0FD;} + .d2-2307968324 .background-color-AA5{background-color:#F7F8FE;} + .d2-2307968324 .background-color-AB4{background-color:#EDF0FD;} + .d2-2307968324 .background-color-AB5{background-color:#F7F8FE;} + .d2-2307968324 .color-N1{color:#0A0F25;} + .d2-2307968324 .color-N2{color:#676C7E;} + .d2-2307968324 .color-N3{color:#9499AB;} + .d2-2307968324 .color-N4{color:#CFD2DD;} + .d2-2307968324 .color-N5{color:#DEE1EB;} + .d2-2307968324 .color-N6{color:#EEF1F8;} + .d2-2307968324 .color-N7{color:#FFFFFF;} + .d2-2307968324 .color-B1{color:#0D32B2;} + .d2-2307968324 .color-B2{color:#0D32B2;} + .d2-2307968324 .color-B3{color:#E3E9FD;} + .d2-2307968324 .color-B4{color:#E3E9FD;} + .d2-2307968324 .color-B5{color:#EDF0FD;} + .d2-2307968324 .color-B6{color:#F7F8FE;} + .d2-2307968324 .color-AA2{color:#4A6FF3;} + .d2-2307968324 .color-AA4{color:#EDF0FD;} + .d2-2307968324 .color-AA5{color:#F7F8FE;} + .d2-2307968324 .color-AB4{color:#EDF0FD;} + .d2-2307968324 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>alicebob what does it mean to be well-adjustedThe ability to play bridge or golf as if they were games + +>>>>>>> cb2f2823c (Fix changes) - - - + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence_diagram_distance/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_distance/elk/sketch.exp.svg index 51fc14b71..2c6c8e009 100644 --- a/e2etests/testdata/stable/sequence_diagram_distance/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_distance/elk/sketch.exp.svg @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD alicebob what does it mean to be well-adjustedThe ability to play bridge or golf as if they were games >>>>>>> 33280fed5 (fixed e2e tests) +||||||| parent of cb2f2823c (Fix changes) + .d2-2079144140 .fill-N1{fill:#0A0F25;} + .d2-2079144140 .fill-N2{fill:#676C7E;} + .d2-2079144140 .fill-N3{fill:#9499AB;} + .d2-2079144140 .fill-N4{fill:#CFD2DD;} + .d2-2079144140 .fill-N5{fill:#DEE1EB;} + .d2-2079144140 .fill-N6{fill:#EEF1F8;} + .d2-2079144140 .fill-N7{fill:#FFFFFF;} + .d2-2079144140 .fill-B1{fill:#0D32B2;} + .d2-2079144140 .fill-B2{fill:#0D32B2;} + .d2-2079144140 .fill-B3{fill:#E3E9FD;} + .d2-2079144140 .fill-B4{fill:#E3E9FD;} + .d2-2079144140 .fill-B5{fill:#EDF0FD;} + .d2-2079144140 .fill-B6{fill:#F7F8FE;} + .d2-2079144140 .fill-AA2{fill:#4A6FF3;} + .d2-2079144140 .fill-AA4{fill:#EDF0FD;} + .d2-2079144140 .fill-AA5{fill:#F7F8FE;} + .d2-2079144140 .fill-AB4{fill:#EDF0FD;} + .d2-2079144140 .fill-AB5{fill:#F7F8FE;} + .d2-2079144140 .stroke-N1{stroke:#0A0F25;} + .d2-2079144140 .stroke-N2{stroke:#676C7E;} + .d2-2079144140 .stroke-N3{stroke:#9499AB;} + .d2-2079144140 .stroke-N4{stroke:#CFD2DD;} + .d2-2079144140 .stroke-N5{stroke:#DEE1EB;} + .d2-2079144140 .stroke-N6{stroke:#EEF1F8;} + .d2-2079144140 .stroke-N7{stroke:#FFFFFF;} + .d2-2079144140 .stroke-B1{stroke:#0D32B2;} + .d2-2079144140 .stroke-B2{stroke:#0D32B2;} + .d2-2079144140 .stroke-B3{stroke:#E3E9FD;} + .d2-2079144140 .stroke-B4{stroke:#E3E9FD;} + .d2-2079144140 .stroke-B5{stroke:#EDF0FD;} + .d2-2079144140 .stroke-B6{stroke:#F7F8FE;} + .d2-2079144140 .stroke-AA2{stroke:#4A6FF3;} + .d2-2079144140 .stroke-AA4{stroke:#EDF0FD;} + .d2-2079144140 .stroke-AA5{stroke:#F7F8FE;} + .d2-2079144140 .stroke-AB4{stroke:#EDF0FD;} + .d2-2079144140 .stroke-AB5{stroke:#F7F8FE;} + .d2-2079144140 .background-color-N1{background-color:#0A0F25;} + .d2-2079144140 .background-color-N2{background-color:#676C7E;} + .d2-2079144140 .background-color-N3{background-color:#9499AB;} + .d2-2079144140 .background-color-N4{background-color:#CFD2DD;} + .d2-2079144140 .background-color-N5{background-color:#DEE1EB;} + .d2-2079144140 .background-color-N6{background-color:#EEF1F8;} + .d2-2079144140 .background-color-N7{background-color:#FFFFFF;} + .d2-2079144140 .background-color-B1{background-color:#0D32B2;} + .d2-2079144140 .background-color-B2{background-color:#0D32B2;} + .d2-2079144140 .background-color-B3{background-color:#E3E9FD;} + .d2-2079144140 .background-color-B4{background-color:#E3E9FD;} + .d2-2079144140 .background-color-B5{background-color:#EDF0FD;} + .d2-2079144140 .background-color-B6{background-color:#F7F8FE;} + .d2-2079144140 .background-color-AA2{background-color:#4A6FF3;} + .d2-2079144140 .background-color-AA4{background-color:#EDF0FD;} + .d2-2079144140 .background-color-AA5{background-color:#F7F8FE;} + .d2-2079144140 .background-color-AB4{background-color:#EDF0FD;} + .d2-2079144140 .background-color-AB5{background-color:#F7F8FE;} + .d2-2079144140 .color-N1{color:#0A0F25;} + .d2-2079144140 .color-N2{color:#676C7E;} + .d2-2079144140 .color-N3{color:#9499AB;} + .d2-2079144140 .color-N4{color:#CFD2DD;} + .d2-2079144140 .color-N5{color:#DEE1EB;} + .d2-2079144140 .color-N6{color:#EEF1F8;} + .d2-2079144140 .color-N7{color:#FFFFFF;} + .d2-2079144140 .color-B1{color:#0D32B2;} + .d2-2079144140 .color-B2{color:#0D32B2;} + .d2-2079144140 .color-B3{color:#E3E9FD;} + .d2-2079144140 .color-B4{color:#E3E9FD;} + .d2-2079144140 .color-B5{color:#EDF0FD;} + .d2-2079144140 .color-B6{color:#F7F8FE;} + .d2-2079144140 .color-AA2{color:#4A6FF3;} + .d2-2079144140 .color-AA4{color:#EDF0FD;} + .d2-2079144140 .color-AA5{color:#F7F8FE;} + .d2-2079144140 .color-AB4{color:#EDF0FD;} + .d2-2079144140 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>alicebob what does it mean to be well-adjustedThe ability to play bridge or golf as if they were games + +======= + .d2-2307968324 .fill-N1{fill:#0A0F25;} + .d2-2307968324 .fill-N2{fill:#676C7E;} + .d2-2307968324 .fill-N3{fill:#9499AB;} + .d2-2307968324 .fill-N4{fill:#CFD2DD;} + .d2-2307968324 .fill-N5{fill:#DEE1EB;} + .d2-2307968324 .fill-N6{fill:#EEF1F8;} + .d2-2307968324 .fill-N7{fill:#FFFFFF;} + .d2-2307968324 .fill-B1{fill:#0D32B2;} + .d2-2307968324 .fill-B2{fill:#0D32B2;} + .d2-2307968324 .fill-B3{fill:#E3E9FD;} + .d2-2307968324 .fill-B4{fill:#E3E9FD;} + .d2-2307968324 .fill-B5{fill:#EDF0FD;} + .d2-2307968324 .fill-B6{fill:#F7F8FE;} + .d2-2307968324 .fill-AA2{fill:#4A6FF3;} + .d2-2307968324 .fill-AA4{fill:#EDF0FD;} + .d2-2307968324 .fill-AA5{fill:#F7F8FE;} + .d2-2307968324 .fill-AB4{fill:#EDF0FD;} + .d2-2307968324 .fill-AB5{fill:#F7F8FE;} + .d2-2307968324 .stroke-N1{stroke:#0A0F25;} + .d2-2307968324 .stroke-N2{stroke:#676C7E;} + .d2-2307968324 .stroke-N3{stroke:#9499AB;} + .d2-2307968324 .stroke-N4{stroke:#CFD2DD;} + .d2-2307968324 .stroke-N5{stroke:#DEE1EB;} + .d2-2307968324 .stroke-N6{stroke:#EEF1F8;} + .d2-2307968324 .stroke-N7{stroke:#FFFFFF;} + .d2-2307968324 .stroke-B1{stroke:#0D32B2;} + .d2-2307968324 .stroke-B2{stroke:#0D32B2;} + .d2-2307968324 .stroke-B3{stroke:#E3E9FD;} + .d2-2307968324 .stroke-B4{stroke:#E3E9FD;} + .d2-2307968324 .stroke-B5{stroke:#EDF0FD;} + .d2-2307968324 .stroke-B6{stroke:#F7F8FE;} + .d2-2307968324 .stroke-AA2{stroke:#4A6FF3;} + .d2-2307968324 .stroke-AA4{stroke:#EDF0FD;} + .d2-2307968324 .stroke-AA5{stroke:#F7F8FE;} + .d2-2307968324 .stroke-AB4{stroke:#EDF0FD;} + .d2-2307968324 .stroke-AB5{stroke:#F7F8FE;} + .d2-2307968324 .background-color-N1{background-color:#0A0F25;} + .d2-2307968324 .background-color-N2{background-color:#676C7E;} + .d2-2307968324 .background-color-N3{background-color:#9499AB;} + .d2-2307968324 .background-color-N4{background-color:#CFD2DD;} + .d2-2307968324 .background-color-N5{background-color:#DEE1EB;} + .d2-2307968324 .background-color-N6{background-color:#EEF1F8;} + .d2-2307968324 .background-color-N7{background-color:#FFFFFF;} + .d2-2307968324 .background-color-B1{background-color:#0D32B2;} + .d2-2307968324 .background-color-B2{background-color:#0D32B2;} + .d2-2307968324 .background-color-B3{background-color:#E3E9FD;} + .d2-2307968324 .background-color-B4{background-color:#E3E9FD;} + .d2-2307968324 .background-color-B5{background-color:#EDF0FD;} + .d2-2307968324 .background-color-B6{background-color:#F7F8FE;} + .d2-2307968324 .background-color-AA2{background-color:#4A6FF3;} + .d2-2307968324 .background-color-AA4{background-color:#EDF0FD;} + .d2-2307968324 .background-color-AA5{background-color:#F7F8FE;} + .d2-2307968324 .background-color-AB4{background-color:#EDF0FD;} + .d2-2307968324 .background-color-AB5{background-color:#F7F8FE;} + .d2-2307968324 .color-N1{color:#0A0F25;} + .d2-2307968324 .color-N2{color:#676C7E;} + .d2-2307968324 .color-N3{color:#9499AB;} + .d2-2307968324 .color-N4{color:#CFD2DD;} + .d2-2307968324 .color-N5{color:#DEE1EB;} + .d2-2307968324 .color-N6{color:#EEF1F8;} + .d2-2307968324 .color-N7{color:#FFFFFF;} + .d2-2307968324 .color-B1{color:#0D32B2;} + .d2-2307968324 .color-B2{color:#0D32B2;} + .d2-2307968324 .color-B3{color:#E3E9FD;} + .d2-2307968324 .color-B4{color:#E3E9FD;} + .d2-2307968324 .color-B5{color:#EDF0FD;} + .d2-2307968324 .color-B6{color:#F7F8FE;} + .d2-2307968324 .color-AA2{color:#4A6FF3;} + .d2-2307968324 .color-AA4{color:#EDF0FD;} + .d2-2307968324 .color-AA5{color:#F7F8FE;} + .d2-2307968324 .color-AB4{color:#EDF0FD;} + .d2-2307968324 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>alicebob what does it mean to be well-adjustedThe ability to play bridge or golf as if they were games + +>>>>>>> cb2f2823c (Fix changes) - - - + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence_diagram_groups/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_groups/dagre/sketch.exp.svg index 305412f4a..ea3731630 100644 --- a/e2etests/testdata/stable/sequence_diagram_groups/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_groups/dagre/sketch.exp.svg @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD abcdggggroup 1group bchoonested guy lalaeyokayokaywhat would arnold saythis note >>>>>>> 33280fed5 (fixed e2e tests) +||||||| parent of cb2f2823c (Fix changes) + .d2-2824516462 .fill-N1{fill:#0A0F25;} + .d2-2824516462 .fill-N2{fill:#676C7E;} + .d2-2824516462 .fill-N3{fill:#9499AB;} + .d2-2824516462 .fill-N4{fill:#CFD2DD;} + .d2-2824516462 .fill-N5{fill:#DEE1EB;} + .d2-2824516462 .fill-N6{fill:#EEF1F8;} + .d2-2824516462 .fill-N7{fill:#FFFFFF;} + .d2-2824516462 .fill-B1{fill:#0D32B2;} + .d2-2824516462 .fill-B2{fill:#0D32B2;} + .d2-2824516462 .fill-B3{fill:#E3E9FD;} + .d2-2824516462 .fill-B4{fill:#E3E9FD;} + .d2-2824516462 .fill-B5{fill:#EDF0FD;} + .d2-2824516462 .fill-B6{fill:#F7F8FE;} + .d2-2824516462 .fill-AA2{fill:#4A6FF3;} + .d2-2824516462 .fill-AA4{fill:#EDF0FD;} + .d2-2824516462 .fill-AA5{fill:#F7F8FE;} + .d2-2824516462 .fill-AB4{fill:#EDF0FD;} + .d2-2824516462 .fill-AB5{fill:#F7F8FE;} + .d2-2824516462 .stroke-N1{stroke:#0A0F25;} + .d2-2824516462 .stroke-N2{stroke:#676C7E;} + .d2-2824516462 .stroke-N3{stroke:#9499AB;} + .d2-2824516462 .stroke-N4{stroke:#CFD2DD;} + .d2-2824516462 .stroke-N5{stroke:#DEE1EB;} + .d2-2824516462 .stroke-N6{stroke:#EEF1F8;} + .d2-2824516462 .stroke-N7{stroke:#FFFFFF;} + .d2-2824516462 .stroke-B1{stroke:#0D32B2;} + .d2-2824516462 .stroke-B2{stroke:#0D32B2;} + .d2-2824516462 .stroke-B3{stroke:#E3E9FD;} + .d2-2824516462 .stroke-B4{stroke:#E3E9FD;} + .d2-2824516462 .stroke-B5{stroke:#EDF0FD;} + .d2-2824516462 .stroke-B6{stroke:#F7F8FE;} + .d2-2824516462 .stroke-AA2{stroke:#4A6FF3;} + .d2-2824516462 .stroke-AA4{stroke:#EDF0FD;} + .d2-2824516462 .stroke-AA5{stroke:#F7F8FE;} + .d2-2824516462 .stroke-AB4{stroke:#EDF0FD;} + .d2-2824516462 .stroke-AB5{stroke:#F7F8FE;} + .d2-2824516462 .background-color-N1{background-color:#0A0F25;} + .d2-2824516462 .background-color-N2{background-color:#676C7E;} + .d2-2824516462 .background-color-N3{background-color:#9499AB;} + .d2-2824516462 .background-color-N4{background-color:#CFD2DD;} + .d2-2824516462 .background-color-N5{background-color:#DEE1EB;} + .d2-2824516462 .background-color-N6{background-color:#EEF1F8;} + .d2-2824516462 .background-color-N7{background-color:#FFFFFF;} + .d2-2824516462 .background-color-B1{background-color:#0D32B2;} + .d2-2824516462 .background-color-B2{background-color:#0D32B2;} + .d2-2824516462 .background-color-B3{background-color:#E3E9FD;} + .d2-2824516462 .background-color-B4{background-color:#E3E9FD;} + .d2-2824516462 .background-color-B5{background-color:#EDF0FD;} + .d2-2824516462 .background-color-B6{background-color:#F7F8FE;} + .d2-2824516462 .background-color-AA2{background-color:#4A6FF3;} + .d2-2824516462 .background-color-AA4{background-color:#EDF0FD;} + .d2-2824516462 .background-color-AA5{background-color:#F7F8FE;} + .d2-2824516462 .background-color-AB4{background-color:#EDF0FD;} + .d2-2824516462 .background-color-AB5{background-color:#F7F8FE;} + .d2-2824516462 .color-N1{color:#0A0F25;} + .d2-2824516462 .color-N2{color:#676C7E;} + .d2-2824516462 .color-N3{color:#9499AB;} + .d2-2824516462 .color-N4{color:#CFD2DD;} + .d2-2824516462 .color-N5{color:#DEE1EB;} + .d2-2824516462 .color-N6{color:#EEF1F8;} + .d2-2824516462 .color-N7{color:#FFFFFF;} + .d2-2824516462 .color-B1{color:#0D32B2;} + .d2-2824516462 .color-B2{color:#0D32B2;} + .d2-2824516462 .color-B3{color:#E3E9FD;} + .d2-2824516462 .color-B4{color:#E3E9FD;} + .d2-2824516462 .color-B5{color:#EDF0FD;} + .d2-2824516462 .color-B6{color:#F7F8FE;} + .d2-2824516462 .color-AA2{color:#4A6FF3;} + .d2-2824516462 .color-AA4{color:#EDF0FD;} + .d2-2824516462 .color-AA5{color:#F7F8FE;} + .d2-2824516462 .color-AB4{color:#EDF0FD;} + .d2-2824516462 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdggggroup 1group bchoonested guy lalaeyokayokaywhat would arnold saythis note + +======= + .d2-2699818541 .fill-N1{fill:#0A0F25;} + .d2-2699818541 .fill-N2{fill:#676C7E;} + .d2-2699818541 .fill-N3{fill:#9499AB;} + .d2-2699818541 .fill-N4{fill:#CFD2DD;} + .d2-2699818541 .fill-N5{fill:#DEE1EB;} + .d2-2699818541 .fill-N6{fill:#EEF1F8;} + .d2-2699818541 .fill-N7{fill:#FFFFFF;} + .d2-2699818541 .fill-B1{fill:#0D32B2;} + .d2-2699818541 .fill-B2{fill:#0D32B2;} + .d2-2699818541 .fill-B3{fill:#E3E9FD;} + .d2-2699818541 .fill-B4{fill:#E3E9FD;} + .d2-2699818541 .fill-B5{fill:#EDF0FD;} + .d2-2699818541 .fill-B6{fill:#F7F8FE;} + .d2-2699818541 .fill-AA2{fill:#4A6FF3;} + .d2-2699818541 .fill-AA4{fill:#EDF0FD;} + .d2-2699818541 .fill-AA5{fill:#F7F8FE;} + .d2-2699818541 .fill-AB4{fill:#EDF0FD;} + .d2-2699818541 .fill-AB5{fill:#F7F8FE;} + .d2-2699818541 .stroke-N1{stroke:#0A0F25;} + .d2-2699818541 .stroke-N2{stroke:#676C7E;} + .d2-2699818541 .stroke-N3{stroke:#9499AB;} + .d2-2699818541 .stroke-N4{stroke:#CFD2DD;} + .d2-2699818541 .stroke-N5{stroke:#DEE1EB;} + .d2-2699818541 .stroke-N6{stroke:#EEF1F8;} + .d2-2699818541 .stroke-N7{stroke:#FFFFFF;} + .d2-2699818541 .stroke-B1{stroke:#0D32B2;} + .d2-2699818541 .stroke-B2{stroke:#0D32B2;} + .d2-2699818541 .stroke-B3{stroke:#E3E9FD;} + .d2-2699818541 .stroke-B4{stroke:#E3E9FD;} + .d2-2699818541 .stroke-B5{stroke:#EDF0FD;} + .d2-2699818541 .stroke-B6{stroke:#F7F8FE;} + .d2-2699818541 .stroke-AA2{stroke:#4A6FF3;} + .d2-2699818541 .stroke-AA4{stroke:#EDF0FD;} + .d2-2699818541 .stroke-AA5{stroke:#F7F8FE;} + .d2-2699818541 .stroke-AB4{stroke:#EDF0FD;} + .d2-2699818541 .stroke-AB5{stroke:#F7F8FE;} + .d2-2699818541 .background-color-N1{background-color:#0A0F25;} + .d2-2699818541 .background-color-N2{background-color:#676C7E;} + .d2-2699818541 .background-color-N3{background-color:#9499AB;} + .d2-2699818541 .background-color-N4{background-color:#CFD2DD;} + .d2-2699818541 .background-color-N5{background-color:#DEE1EB;} + .d2-2699818541 .background-color-N6{background-color:#EEF1F8;} + .d2-2699818541 .background-color-N7{background-color:#FFFFFF;} + .d2-2699818541 .background-color-B1{background-color:#0D32B2;} + .d2-2699818541 .background-color-B2{background-color:#0D32B2;} + .d2-2699818541 .background-color-B3{background-color:#E3E9FD;} + .d2-2699818541 .background-color-B4{background-color:#E3E9FD;} + .d2-2699818541 .background-color-B5{background-color:#EDF0FD;} + .d2-2699818541 .background-color-B6{background-color:#F7F8FE;} + .d2-2699818541 .background-color-AA2{background-color:#4A6FF3;} + .d2-2699818541 .background-color-AA4{background-color:#EDF0FD;} + .d2-2699818541 .background-color-AA5{background-color:#F7F8FE;} + .d2-2699818541 .background-color-AB4{background-color:#EDF0FD;} + .d2-2699818541 .background-color-AB5{background-color:#F7F8FE;} + .d2-2699818541 .color-N1{color:#0A0F25;} + .d2-2699818541 .color-N2{color:#676C7E;} + .d2-2699818541 .color-N3{color:#9499AB;} + .d2-2699818541 .color-N4{color:#CFD2DD;} + .d2-2699818541 .color-N5{color:#DEE1EB;} + .d2-2699818541 .color-N6{color:#EEF1F8;} + .d2-2699818541 .color-N7{color:#FFFFFF;} + .d2-2699818541 .color-B1{color:#0D32B2;} + .d2-2699818541 .color-B2{color:#0D32B2;} + .d2-2699818541 .color-B3{color:#E3E9FD;} + .d2-2699818541 .color-B4{color:#E3E9FD;} + .d2-2699818541 .color-B5{color:#EDF0FD;} + .d2-2699818541 .color-B6{color:#F7F8FE;} + .d2-2699818541 .color-AA2{color:#4A6FF3;} + .d2-2699818541 .color-AA4{color:#EDF0FD;} + .d2-2699818541 .color-AA5{color:#F7F8FE;} + .d2-2699818541 .color-AB4{color:#EDF0FD;} + .d2-2699818541 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdggggroup 1group bchoonested guy lalaeyokayokaywhat would arnold saythis note + +>>>>>>> cb2f2823c (Fix changes) - - - - - - - - - - - + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence_diagram_groups/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_groups/elk/sketch.exp.svg index 305412f4a..ea3731630 100644 --- a/e2etests/testdata/stable/sequence_diagram_groups/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_groups/elk/sketch.exp.svg @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD abcdggggroup 1group bchoonested guy lalaeyokayokaywhat would arnold saythis note >>>>>>> 33280fed5 (fixed e2e tests) +||||||| parent of cb2f2823c (Fix changes) + .d2-2824516462 .fill-N1{fill:#0A0F25;} + .d2-2824516462 .fill-N2{fill:#676C7E;} + .d2-2824516462 .fill-N3{fill:#9499AB;} + .d2-2824516462 .fill-N4{fill:#CFD2DD;} + .d2-2824516462 .fill-N5{fill:#DEE1EB;} + .d2-2824516462 .fill-N6{fill:#EEF1F8;} + .d2-2824516462 .fill-N7{fill:#FFFFFF;} + .d2-2824516462 .fill-B1{fill:#0D32B2;} + .d2-2824516462 .fill-B2{fill:#0D32B2;} + .d2-2824516462 .fill-B3{fill:#E3E9FD;} + .d2-2824516462 .fill-B4{fill:#E3E9FD;} + .d2-2824516462 .fill-B5{fill:#EDF0FD;} + .d2-2824516462 .fill-B6{fill:#F7F8FE;} + .d2-2824516462 .fill-AA2{fill:#4A6FF3;} + .d2-2824516462 .fill-AA4{fill:#EDF0FD;} + .d2-2824516462 .fill-AA5{fill:#F7F8FE;} + .d2-2824516462 .fill-AB4{fill:#EDF0FD;} + .d2-2824516462 .fill-AB5{fill:#F7F8FE;} + .d2-2824516462 .stroke-N1{stroke:#0A0F25;} + .d2-2824516462 .stroke-N2{stroke:#676C7E;} + .d2-2824516462 .stroke-N3{stroke:#9499AB;} + .d2-2824516462 .stroke-N4{stroke:#CFD2DD;} + .d2-2824516462 .stroke-N5{stroke:#DEE1EB;} + .d2-2824516462 .stroke-N6{stroke:#EEF1F8;} + .d2-2824516462 .stroke-N7{stroke:#FFFFFF;} + .d2-2824516462 .stroke-B1{stroke:#0D32B2;} + .d2-2824516462 .stroke-B2{stroke:#0D32B2;} + .d2-2824516462 .stroke-B3{stroke:#E3E9FD;} + .d2-2824516462 .stroke-B4{stroke:#E3E9FD;} + .d2-2824516462 .stroke-B5{stroke:#EDF0FD;} + .d2-2824516462 .stroke-B6{stroke:#F7F8FE;} + .d2-2824516462 .stroke-AA2{stroke:#4A6FF3;} + .d2-2824516462 .stroke-AA4{stroke:#EDF0FD;} + .d2-2824516462 .stroke-AA5{stroke:#F7F8FE;} + .d2-2824516462 .stroke-AB4{stroke:#EDF0FD;} + .d2-2824516462 .stroke-AB5{stroke:#F7F8FE;} + .d2-2824516462 .background-color-N1{background-color:#0A0F25;} + .d2-2824516462 .background-color-N2{background-color:#676C7E;} + .d2-2824516462 .background-color-N3{background-color:#9499AB;} + .d2-2824516462 .background-color-N4{background-color:#CFD2DD;} + .d2-2824516462 .background-color-N5{background-color:#DEE1EB;} + .d2-2824516462 .background-color-N6{background-color:#EEF1F8;} + .d2-2824516462 .background-color-N7{background-color:#FFFFFF;} + .d2-2824516462 .background-color-B1{background-color:#0D32B2;} + .d2-2824516462 .background-color-B2{background-color:#0D32B2;} + .d2-2824516462 .background-color-B3{background-color:#E3E9FD;} + .d2-2824516462 .background-color-B4{background-color:#E3E9FD;} + .d2-2824516462 .background-color-B5{background-color:#EDF0FD;} + .d2-2824516462 .background-color-B6{background-color:#F7F8FE;} + .d2-2824516462 .background-color-AA2{background-color:#4A6FF3;} + .d2-2824516462 .background-color-AA4{background-color:#EDF0FD;} + .d2-2824516462 .background-color-AA5{background-color:#F7F8FE;} + .d2-2824516462 .background-color-AB4{background-color:#EDF0FD;} + .d2-2824516462 .background-color-AB5{background-color:#F7F8FE;} + .d2-2824516462 .color-N1{color:#0A0F25;} + .d2-2824516462 .color-N2{color:#676C7E;} + .d2-2824516462 .color-N3{color:#9499AB;} + .d2-2824516462 .color-N4{color:#CFD2DD;} + .d2-2824516462 .color-N5{color:#DEE1EB;} + .d2-2824516462 .color-N6{color:#EEF1F8;} + .d2-2824516462 .color-N7{color:#FFFFFF;} + .d2-2824516462 .color-B1{color:#0D32B2;} + .d2-2824516462 .color-B2{color:#0D32B2;} + .d2-2824516462 .color-B3{color:#E3E9FD;} + .d2-2824516462 .color-B4{color:#E3E9FD;} + .d2-2824516462 .color-B5{color:#EDF0FD;} + .d2-2824516462 .color-B6{color:#F7F8FE;} + .d2-2824516462 .color-AA2{color:#4A6FF3;} + .d2-2824516462 .color-AA4{color:#EDF0FD;} + .d2-2824516462 .color-AA5{color:#F7F8FE;} + .d2-2824516462 .color-AB4{color:#EDF0FD;} + .d2-2824516462 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdggggroup 1group bchoonested guy lalaeyokayokaywhat would arnold saythis note + +======= + .d2-2699818541 .fill-N1{fill:#0A0F25;} + .d2-2699818541 .fill-N2{fill:#676C7E;} + .d2-2699818541 .fill-N3{fill:#9499AB;} + .d2-2699818541 .fill-N4{fill:#CFD2DD;} + .d2-2699818541 .fill-N5{fill:#DEE1EB;} + .d2-2699818541 .fill-N6{fill:#EEF1F8;} + .d2-2699818541 .fill-N7{fill:#FFFFFF;} + .d2-2699818541 .fill-B1{fill:#0D32B2;} + .d2-2699818541 .fill-B2{fill:#0D32B2;} + .d2-2699818541 .fill-B3{fill:#E3E9FD;} + .d2-2699818541 .fill-B4{fill:#E3E9FD;} + .d2-2699818541 .fill-B5{fill:#EDF0FD;} + .d2-2699818541 .fill-B6{fill:#F7F8FE;} + .d2-2699818541 .fill-AA2{fill:#4A6FF3;} + .d2-2699818541 .fill-AA4{fill:#EDF0FD;} + .d2-2699818541 .fill-AA5{fill:#F7F8FE;} + .d2-2699818541 .fill-AB4{fill:#EDF0FD;} + .d2-2699818541 .fill-AB5{fill:#F7F8FE;} + .d2-2699818541 .stroke-N1{stroke:#0A0F25;} + .d2-2699818541 .stroke-N2{stroke:#676C7E;} + .d2-2699818541 .stroke-N3{stroke:#9499AB;} + .d2-2699818541 .stroke-N4{stroke:#CFD2DD;} + .d2-2699818541 .stroke-N5{stroke:#DEE1EB;} + .d2-2699818541 .stroke-N6{stroke:#EEF1F8;} + .d2-2699818541 .stroke-N7{stroke:#FFFFFF;} + .d2-2699818541 .stroke-B1{stroke:#0D32B2;} + .d2-2699818541 .stroke-B2{stroke:#0D32B2;} + .d2-2699818541 .stroke-B3{stroke:#E3E9FD;} + .d2-2699818541 .stroke-B4{stroke:#E3E9FD;} + .d2-2699818541 .stroke-B5{stroke:#EDF0FD;} + .d2-2699818541 .stroke-B6{stroke:#F7F8FE;} + .d2-2699818541 .stroke-AA2{stroke:#4A6FF3;} + .d2-2699818541 .stroke-AA4{stroke:#EDF0FD;} + .d2-2699818541 .stroke-AA5{stroke:#F7F8FE;} + .d2-2699818541 .stroke-AB4{stroke:#EDF0FD;} + .d2-2699818541 .stroke-AB5{stroke:#F7F8FE;} + .d2-2699818541 .background-color-N1{background-color:#0A0F25;} + .d2-2699818541 .background-color-N2{background-color:#676C7E;} + .d2-2699818541 .background-color-N3{background-color:#9499AB;} + .d2-2699818541 .background-color-N4{background-color:#CFD2DD;} + .d2-2699818541 .background-color-N5{background-color:#DEE1EB;} + .d2-2699818541 .background-color-N6{background-color:#EEF1F8;} + .d2-2699818541 .background-color-N7{background-color:#FFFFFF;} + .d2-2699818541 .background-color-B1{background-color:#0D32B2;} + .d2-2699818541 .background-color-B2{background-color:#0D32B2;} + .d2-2699818541 .background-color-B3{background-color:#E3E9FD;} + .d2-2699818541 .background-color-B4{background-color:#E3E9FD;} + .d2-2699818541 .background-color-B5{background-color:#EDF0FD;} + .d2-2699818541 .background-color-B6{background-color:#F7F8FE;} + .d2-2699818541 .background-color-AA2{background-color:#4A6FF3;} + .d2-2699818541 .background-color-AA4{background-color:#EDF0FD;} + .d2-2699818541 .background-color-AA5{background-color:#F7F8FE;} + .d2-2699818541 .background-color-AB4{background-color:#EDF0FD;} + .d2-2699818541 .background-color-AB5{background-color:#F7F8FE;} + .d2-2699818541 .color-N1{color:#0A0F25;} + .d2-2699818541 .color-N2{color:#676C7E;} + .d2-2699818541 .color-N3{color:#9499AB;} + .d2-2699818541 .color-N4{color:#CFD2DD;} + .d2-2699818541 .color-N5{color:#DEE1EB;} + .d2-2699818541 .color-N6{color:#EEF1F8;} + .d2-2699818541 .color-N7{color:#FFFFFF;} + .d2-2699818541 .color-B1{color:#0D32B2;} + .d2-2699818541 .color-B2{color:#0D32B2;} + .d2-2699818541 .color-B3{color:#E3E9FD;} + .d2-2699818541 .color-B4{color:#E3E9FD;} + .d2-2699818541 .color-B5{color:#EDF0FD;} + .d2-2699818541 .color-B6{color:#F7F8FE;} + .d2-2699818541 .color-AA2{color:#4A6FF3;} + .d2-2699818541 .color-AA4{color:#EDF0FD;} + .d2-2699818541 .color-AA5{color:#F7F8FE;} + .d2-2699818541 .color-AB4{color:#EDF0FD;} + .d2-2699818541 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcdggggroup 1group bchoonested guy lalaeyokayokaywhat would arnold saythis note + +>>>>>>> cb2f2823c (Fix changes) - - - - - - - - - - - + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence_diagram_long_note/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_long_note/dagre/sketch.exp.svg index 04584e839..377f8cfeb 100644 --- a/e2etests/testdata/stable/sequence_diagram_long_note/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_long_note/dagre/sketch.exp.svg @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD abjust an actorthis is a message groupaltand this is a nested message groupcase 1case 2case 3case 4what about more nestingcrazy townwhoa a notea note here to remember that padding must consider notes toojustalongnotehere >>>>>>> 33280fed5 (fixed e2e tests) +||||||| parent of cb2f2823c (Fix changes) + .d2-3502295243 .fill-N1{fill:#0A0F25;} + .d2-3502295243 .fill-N2{fill:#676C7E;} + .d2-3502295243 .fill-N3{fill:#9499AB;} + .d2-3502295243 .fill-N4{fill:#CFD2DD;} + .d2-3502295243 .fill-N5{fill:#DEE1EB;} + .d2-3502295243 .fill-N6{fill:#EEF1F8;} + .d2-3502295243 .fill-N7{fill:#FFFFFF;} + .d2-3502295243 .fill-B1{fill:#0D32B2;} + .d2-3502295243 .fill-B2{fill:#0D32B2;} + .d2-3502295243 .fill-B3{fill:#E3E9FD;} + .d2-3502295243 .fill-B4{fill:#E3E9FD;} + .d2-3502295243 .fill-B5{fill:#EDF0FD;} + .d2-3502295243 .fill-B6{fill:#F7F8FE;} + .d2-3502295243 .fill-AA2{fill:#4A6FF3;} + .d2-3502295243 .fill-AA4{fill:#EDF0FD;} + .d2-3502295243 .fill-AA5{fill:#F7F8FE;} + .d2-3502295243 .fill-AB4{fill:#EDF0FD;} + .d2-3502295243 .fill-AB5{fill:#F7F8FE;} + .d2-3502295243 .stroke-N1{stroke:#0A0F25;} + .d2-3502295243 .stroke-N2{stroke:#676C7E;} + .d2-3502295243 .stroke-N3{stroke:#9499AB;} + .d2-3502295243 .stroke-N4{stroke:#CFD2DD;} + .d2-3502295243 .stroke-N5{stroke:#DEE1EB;} + .d2-3502295243 .stroke-N6{stroke:#EEF1F8;} + .d2-3502295243 .stroke-N7{stroke:#FFFFFF;} + .d2-3502295243 .stroke-B1{stroke:#0D32B2;} + .d2-3502295243 .stroke-B2{stroke:#0D32B2;} + .d2-3502295243 .stroke-B3{stroke:#E3E9FD;} + .d2-3502295243 .stroke-B4{stroke:#E3E9FD;} + .d2-3502295243 .stroke-B5{stroke:#EDF0FD;} + .d2-3502295243 .stroke-B6{stroke:#F7F8FE;} + .d2-3502295243 .stroke-AA2{stroke:#4A6FF3;} + .d2-3502295243 .stroke-AA4{stroke:#EDF0FD;} + .d2-3502295243 .stroke-AA5{stroke:#F7F8FE;} + .d2-3502295243 .stroke-AB4{stroke:#EDF0FD;} + .d2-3502295243 .stroke-AB5{stroke:#F7F8FE;} + .d2-3502295243 .background-color-N1{background-color:#0A0F25;} + .d2-3502295243 .background-color-N2{background-color:#676C7E;} + .d2-3502295243 .background-color-N3{background-color:#9499AB;} + .d2-3502295243 .background-color-N4{background-color:#CFD2DD;} + .d2-3502295243 .background-color-N5{background-color:#DEE1EB;} + .d2-3502295243 .background-color-N6{background-color:#EEF1F8;} + .d2-3502295243 .background-color-N7{background-color:#FFFFFF;} + .d2-3502295243 .background-color-B1{background-color:#0D32B2;} + .d2-3502295243 .background-color-B2{background-color:#0D32B2;} + .d2-3502295243 .background-color-B3{background-color:#E3E9FD;} + .d2-3502295243 .background-color-B4{background-color:#E3E9FD;} + .d2-3502295243 .background-color-B5{background-color:#EDF0FD;} + .d2-3502295243 .background-color-B6{background-color:#F7F8FE;} + .d2-3502295243 .background-color-AA2{background-color:#4A6FF3;} + .d2-3502295243 .background-color-AA4{background-color:#EDF0FD;} + .d2-3502295243 .background-color-AA5{background-color:#F7F8FE;} + .d2-3502295243 .background-color-AB4{background-color:#EDF0FD;} + .d2-3502295243 .background-color-AB5{background-color:#F7F8FE;} + .d2-3502295243 .color-N1{color:#0A0F25;} + .d2-3502295243 .color-N2{color:#676C7E;} + .d2-3502295243 .color-N3{color:#9499AB;} + .d2-3502295243 .color-N4{color:#CFD2DD;} + .d2-3502295243 .color-N5{color:#DEE1EB;} + .d2-3502295243 .color-N6{color:#EEF1F8;} + .d2-3502295243 .color-N7{color:#FFFFFF;} + .d2-3502295243 .color-B1{color:#0D32B2;} + .d2-3502295243 .color-B2{color:#0D32B2;} + .d2-3502295243 .color-B3{color:#E3E9FD;} + .d2-3502295243 .color-B4{color:#E3E9FD;} + .d2-3502295243 .color-B5{color:#EDF0FD;} + .d2-3502295243 .color-B6{color:#F7F8FE;} + .d2-3502295243 .color-AA2{color:#4A6FF3;} + .d2-3502295243 .color-AA4{color:#EDF0FD;} + .d2-3502295243 .color-AA5{color:#F7F8FE;} + .d2-3502295243 .color-AB4{color:#EDF0FD;} + .d2-3502295243 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abjust an actorthis is a message groupaltand this is a nested message groupcase 1case 2case 3case 4what about more nestingcrazy townwhoa a notea note here to remember that padding must consider notes toojustalongnotehere + +======= + .d2-2433413595 .fill-N1{fill:#0A0F25;} + .d2-2433413595 .fill-N2{fill:#676C7E;} + .d2-2433413595 .fill-N3{fill:#9499AB;} + .d2-2433413595 .fill-N4{fill:#CFD2DD;} + .d2-2433413595 .fill-N5{fill:#DEE1EB;} + .d2-2433413595 .fill-N6{fill:#EEF1F8;} + .d2-2433413595 .fill-N7{fill:#FFFFFF;} + .d2-2433413595 .fill-B1{fill:#0D32B2;} + .d2-2433413595 .fill-B2{fill:#0D32B2;} + .d2-2433413595 .fill-B3{fill:#E3E9FD;} + .d2-2433413595 .fill-B4{fill:#E3E9FD;} + .d2-2433413595 .fill-B5{fill:#EDF0FD;} + .d2-2433413595 .fill-B6{fill:#F7F8FE;} + .d2-2433413595 .fill-AA2{fill:#4A6FF3;} + .d2-2433413595 .fill-AA4{fill:#EDF0FD;} + .d2-2433413595 .fill-AA5{fill:#F7F8FE;} + .d2-2433413595 .fill-AB4{fill:#EDF0FD;} + .d2-2433413595 .fill-AB5{fill:#F7F8FE;} + .d2-2433413595 .stroke-N1{stroke:#0A0F25;} + .d2-2433413595 .stroke-N2{stroke:#676C7E;} + .d2-2433413595 .stroke-N3{stroke:#9499AB;} + .d2-2433413595 .stroke-N4{stroke:#CFD2DD;} + .d2-2433413595 .stroke-N5{stroke:#DEE1EB;} + .d2-2433413595 .stroke-N6{stroke:#EEF1F8;} + .d2-2433413595 .stroke-N7{stroke:#FFFFFF;} + .d2-2433413595 .stroke-B1{stroke:#0D32B2;} + .d2-2433413595 .stroke-B2{stroke:#0D32B2;} + .d2-2433413595 .stroke-B3{stroke:#E3E9FD;} + .d2-2433413595 .stroke-B4{stroke:#E3E9FD;} + .d2-2433413595 .stroke-B5{stroke:#EDF0FD;} + .d2-2433413595 .stroke-B6{stroke:#F7F8FE;} + .d2-2433413595 .stroke-AA2{stroke:#4A6FF3;} + .d2-2433413595 .stroke-AA4{stroke:#EDF0FD;} + .d2-2433413595 .stroke-AA5{stroke:#F7F8FE;} + .d2-2433413595 .stroke-AB4{stroke:#EDF0FD;} + .d2-2433413595 .stroke-AB5{stroke:#F7F8FE;} + .d2-2433413595 .background-color-N1{background-color:#0A0F25;} + .d2-2433413595 .background-color-N2{background-color:#676C7E;} + .d2-2433413595 .background-color-N3{background-color:#9499AB;} + .d2-2433413595 .background-color-N4{background-color:#CFD2DD;} + .d2-2433413595 .background-color-N5{background-color:#DEE1EB;} + .d2-2433413595 .background-color-N6{background-color:#EEF1F8;} + .d2-2433413595 .background-color-N7{background-color:#FFFFFF;} + .d2-2433413595 .background-color-B1{background-color:#0D32B2;} + .d2-2433413595 .background-color-B2{background-color:#0D32B2;} + .d2-2433413595 .background-color-B3{background-color:#E3E9FD;} + .d2-2433413595 .background-color-B4{background-color:#E3E9FD;} + .d2-2433413595 .background-color-B5{background-color:#EDF0FD;} + .d2-2433413595 .background-color-B6{background-color:#F7F8FE;} + .d2-2433413595 .background-color-AA2{background-color:#4A6FF3;} + .d2-2433413595 .background-color-AA4{background-color:#EDF0FD;} + .d2-2433413595 .background-color-AA5{background-color:#F7F8FE;} + .d2-2433413595 .background-color-AB4{background-color:#EDF0FD;} + .d2-2433413595 .background-color-AB5{background-color:#F7F8FE;} + .d2-2433413595 .color-N1{color:#0A0F25;} + .d2-2433413595 .color-N2{color:#676C7E;} + .d2-2433413595 .color-N3{color:#9499AB;} + .d2-2433413595 .color-N4{color:#CFD2DD;} + .d2-2433413595 .color-N5{color:#DEE1EB;} + .d2-2433413595 .color-N6{color:#EEF1F8;} + .d2-2433413595 .color-N7{color:#FFFFFF;} + .d2-2433413595 .color-B1{color:#0D32B2;} + .d2-2433413595 .color-B2{color:#0D32B2;} + .d2-2433413595 .color-B3{color:#E3E9FD;} + .d2-2433413595 .color-B4{color:#E3E9FD;} + .d2-2433413595 .color-B5{color:#EDF0FD;} + .d2-2433413595 .color-B6{color:#F7F8FE;} + .d2-2433413595 .color-AA2{color:#4A6FF3;} + .d2-2433413595 .color-AA4{color:#EDF0FD;} + .d2-2433413595 .color-AA5{color:#F7F8FE;} + .d2-2433413595 .color-AB4{color:#EDF0FD;} + .d2-2433413595 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abjust an actorthis is a message groupaltand this is a nested message groupcase 1case 2case 3case 4what about more nestingcrazy townwhoa a notea note here to remember that padding must consider notes toojustalongnotehere + +>>>>>>> cb2f2823c (Fix changes) - - - - - - - - - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence_diagram_nested_groups/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_nested_groups/elk/sketch.exp.svg index 24332131d..1f9c4bb9d 100644 --- a/e2etests/testdata/stable/sequence_diagram_nested_groups/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_nested_groups/elk/sketch.exp.svg @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD abjust an actorthis is a message groupaltand this is a nested message groupcase 1case 2case 3case 4what about more nestingcrazy townwhoa a notea note here to remember that padding must consider notes toojustalongnotehere >>>>>>> 33280fed5 (fixed e2e tests) +||||||| parent of cb2f2823c (Fix changes) + .d2-3502295243 .fill-N1{fill:#0A0F25;} + .d2-3502295243 .fill-N2{fill:#676C7E;} + .d2-3502295243 .fill-N3{fill:#9499AB;} + .d2-3502295243 .fill-N4{fill:#CFD2DD;} + .d2-3502295243 .fill-N5{fill:#DEE1EB;} + .d2-3502295243 .fill-N6{fill:#EEF1F8;} + .d2-3502295243 .fill-N7{fill:#FFFFFF;} + .d2-3502295243 .fill-B1{fill:#0D32B2;} + .d2-3502295243 .fill-B2{fill:#0D32B2;} + .d2-3502295243 .fill-B3{fill:#E3E9FD;} + .d2-3502295243 .fill-B4{fill:#E3E9FD;} + .d2-3502295243 .fill-B5{fill:#EDF0FD;} + .d2-3502295243 .fill-B6{fill:#F7F8FE;} + .d2-3502295243 .fill-AA2{fill:#4A6FF3;} + .d2-3502295243 .fill-AA4{fill:#EDF0FD;} + .d2-3502295243 .fill-AA5{fill:#F7F8FE;} + .d2-3502295243 .fill-AB4{fill:#EDF0FD;} + .d2-3502295243 .fill-AB5{fill:#F7F8FE;} + .d2-3502295243 .stroke-N1{stroke:#0A0F25;} + .d2-3502295243 .stroke-N2{stroke:#676C7E;} + .d2-3502295243 .stroke-N3{stroke:#9499AB;} + .d2-3502295243 .stroke-N4{stroke:#CFD2DD;} + .d2-3502295243 .stroke-N5{stroke:#DEE1EB;} + .d2-3502295243 .stroke-N6{stroke:#EEF1F8;} + .d2-3502295243 .stroke-N7{stroke:#FFFFFF;} + .d2-3502295243 .stroke-B1{stroke:#0D32B2;} + .d2-3502295243 .stroke-B2{stroke:#0D32B2;} + .d2-3502295243 .stroke-B3{stroke:#E3E9FD;} + .d2-3502295243 .stroke-B4{stroke:#E3E9FD;} + .d2-3502295243 .stroke-B5{stroke:#EDF0FD;} + .d2-3502295243 .stroke-B6{stroke:#F7F8FE;} + .d2-3502295243 .stroke-AA2{stroke:#4A6FF3;} + .d2-3502295243 .stroke-AA4{stroke:#EDF0FD;} + .d2-3502295243 .stroke-AA5{stroke:#F7F8FE;} + .d2-3502295243 .stroke-AB4{stroke:#EDF0FD;} + .d2-3502295243 .stroke-AB5{stroke:#F7F8FE;} + .d2-3502295243 .background-color-N1{background-color:#0A0F25;} + .d2-3502295243 .background-color-N2{background-color:#676C7E;} + .d2-3502295243 .background-color-N3{background-color:#9499AB;} + .d2-3502295243 .background-color-N4{background-color:#CFD2DD;} + .d2-3502295243 .background-color-N5{background-color:#DEE1EB;} + .d2-3502295243 .background-color-N6{background-color:#EEF1F8;} + .d2-3502295243 .background-color-N7{background-color:#FFFFFF;} + .d2-3502295243 .background-color-B1{background-color:#0D32B2;} + .d2-3502295243 .background-color-B2{background-color:#0D32B2;} + .d2-3502295243 .background-color-B3{background-color:#E3E9FD;} + .d2-3502295243 .background-color-B4{background-color:#E3E9FD;} + .d2-3502295243 .background-color-B5{background-color:#EDF0FD;} + .d2-3502295243 .background-color-B6{background-color:#F7F8FE;} + .d2-3502295243 .background-color-AA2{background-color:#4A6FF3;} + .d2-3502295243 .background-color-AA4{background-color:#EDF0FD;} + .d2-3502295243 .background-color-AA5{background-color:#F7F8FE;} + .d2-3502295243 .background-color-AB4{background-color:#EDF0FD;} + .d2-3502295243 .background-color-AB5{background-color:#F7F8FE;} + .d2-3502295243 .color-N1{color:#0A0F25;} + .d2-3502295243 .color-N2{color:#676C7E;} + .d2-3502295243 .color-N3{color:#9499AB;} + .d2-3502295243 .color-N4{color:#CFD2DD;} + .d2-3502295243 .color-N5{color:#DEE1EB;} + .d2-3502295243 .color-N6{color:#EEF1F8;} + .d2-3502295243 .color-N7{color:#FFFFFF;} + .d2-3502295243 .color-B1{color:#0D32B2;} + .d2-3502295243 .color-B2{color:#0D32B2;} + .d2-3502295243 .color-B3{color:#E3E9FD;} + .d2-3502295243 .color-B4{color:#E3E9FD;} + .d2-3502295243 .color-B5{color:#EDF0FD;} + .d2-3502295243 .color-B6{color:#F7F8FE;} + .d2-3502295243 .color-AA2{color:#4A6FF3;} + .d2-3502295243 .color-AA4{color:#EDF0FD;} + .d2-3502295243 .color-AA5{color:#F7F8FE;} + .d2-3502295243 .color-AB4{color:#EDF0FD;} + .d2-3502295243 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abjust an actorthis is a message groupaltand this is a nested message groupcase 1case 2case 3case 4what about more nestingcrazy townwhoa a notea note here to remember that padding must consider notes toojustalongnotehere + +======= + .d2-2433413595 .fill-N1{fill:#0A0F25;} + .d2-2433413595 .fill-N2{fill:#676C7E;} + .d2-2433413595 .fill-N3{fill:#9499AB;} + .d2-2433413595 .fill-N4{fill:#CFD2DD;} + .d2-2433413595 .fill-N5{fill:#DEE1EB;} + .d2-2433413595 .fill-N6{fill:#EEF1F8;} + .d2-2433413595 .fill-N7{fill:#FFFFFF;} + .d2-2433413595 .fill-B1{fill:#0D32B2;} + .d2-2433413595 .fill-B2{fill:#0D32B2;} + .d2-2433413595 .fill-B3{fill:#E3E9FD;} + .d2-2433413595 .fill-B4{fill:#E3E9FD;} + .d2-2433413595 .fill-B5{fill:#EDF0FD;} + .d2-2433413595 .fill-B6{fill:#F7F8FE;} + .d2-2433413595 .fill-AA2{fill:#4A6FF3;} + .d2-2433413595 .fill-AA4{fill:#EDF0FD;} + .d2-2433413595 .fill-AA5{fill:#F7F8FE;} + .d2-2433413595 .fill-AB4{fill:#EDF0FD;} + .d2-2433413595 .fill-AB5{fill:#F7F8FE;} + .d2-2433413595 .stroke-N1{stroke:#0A0F25;} + .d2-2433413595 .stroke-N2{stroke:#676C7E;} + .d2-2433413595 .stroke-N3{stroke:#9499AB;} + .d2-2433413595 .stroke-N4{stroke:#CFD2DD;} + .d2-2433413595 .stroke-N5{stroke:#DEE1EB;} + .d2-2433413595 .stroke-N6{stroke:#EEF1F8;} + .d2-2433413595 .stroke-N7{stroke:#FFFFFF;} + .d2-2433413595 .stroke-B1{stroke:#0D32B2;} + .d2-2433413595 .stroke-B2{stroke:#0D32B2;} + .d2-2433413595 .stroke-B3{stroke:#E3E9FD;} + .d2-2433413595 .stroke-B4{stroke:#E3E9FD;} + .d2-2433413595 .stroke-B5{stroke:#EDF0FD;} + .d2-2433413595 .stroke-B6{stroke:#F7F8FE;} + .d2-2433413595 .stroke-AA2{stroke:#4A6FF3;} + .d2-2433413595 .stroke-AA4{stroke:#EDF0FD;} + .d2-2433413595 .stroke-AA5{stroke:#F7F8FE;} + .d2-2433413595 .stroke-AB4{stroke:#EDF0FD;} + .d2-2433413595 .stroke-AB5{stroke:#F7F8FE;} + .d2-2433413595 .background-color-N1{background-color:#0A0F25;} + .d2-2433413595 .background-color-N2{background-color:#676C7E;} + .d2-2433413595 .background-color-N3{background-color:#9499AB;} + .d2-2433413595 .background-color-N4{background-color:#CFD2DD;} + .d2-2433413595 .background-color-N5{background-color:#DEE1EB;} + .d2-2433413595 .background-color-N6{background-color:#EEF1F8;} + .d2-2433413595 .background-color-N7{background-color:#FFFFFF;} + .d2-2433413595 .background-color-B1{background-color:#0D32B2;} + .d2-2433413595 .background-color-B2{background-color:#0D32B2;} + .d2-2433413595 .background-color-B3{background-color:#E3E9FD;} + .d2-2433413595 .background-color-B4{background-color:#E3E9FD;} + .d2-2433413595 .background-color-B5{background-color:#EDF0FD;} + .d2-2433413595 .background-color-B6{background-color:#F7F8FE;} + .d2-2433413595 .background-color-AA2{background-color:#4A6FF3;} + .d2-2433413595 .background-color-AA4{background-color:#EDF0FD;} + .d2-2433413595 .background-color-AA5{background-color:#F7F8FE;} + .d2-2433413595 .background-color-AB4{background-color:#EDF0FD;} + .d2-2433413595 .background-color-AB5{background-color:#F7F8FE;} + .d2-2433413595 .color-N1{color:#0A0F25;} + .d2-2433413595 .color-N2{color:#676C7E;} + .d2-2433413595 .color-N3{color:#9499AB;} + .d2-2433413595 .color-N4{color:#CFD2DD;} + .d2-2433413595 .color-N5{color:#DEE1EB;} + .d2-2433413595 .color-N6{color:#EEF1F8;} + .d2-2433413595 .color-N7{color:#FFFFFF;} + .d2-2433413595 .color-B1{color:#0D32B2;} + .d2-2433413595 .color-B2{color:#0D32B2;} + .d2-2433413595 .color-B3{color:#E3E9FD;} + .d2-2433413595 .color-B4{color:#E3E9FD;} + .d2-2433413595 .color-B5{color:#EDF0FD;} + .d2-2433413595 .color-B6{color:#F7F8FE;} + .d2-2433413595 .color-AA2{color:#4A6FF3;} + .d2-2433413595 .color-AA4{color:#EDF0FD;} + .d2-2433413595 .color-AA5{color:#F7F8FE;} + .d2-2433413595 .color-AB4{color:#EDF0FD;} + .d2-2433413595 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abjust an actorthis is a message groupaltand this is a nested message groupcase 1case 2case 3case 4what about more nestingcrazy townwhoa a notea note here to remember that padding must consider notes toojustalongnotehere + +>>>>>>> cb2f2823c (Fix changes) - - - - - - - - - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence_diagram_nested_span/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_nested_span/dagre/sketch.exp.svg index 26316d2fb..8f3e3574f 100644 --- a/e2etests/testdata/stable/sequence_diagram_nested_span/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_nested_span/dagre/sketch.exp.svg @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD abcd okayexplanationanother explanationSome one who believes imaginary things appear right before your i's.The earth is like a tiny grain of sand, only much, much heavier >>>>>>> 33280fed5 (fixed e2e tests) +||||||| parent of cb2f2823c (Fix changes) + .d2-3971129269 .fill-N1{fill:#0A0F25;} + .d2-3971129269 .fill-N2{fill:#676C7E;} + .d2-3971129269 .fill-N3{fill:#9499AB;} + .d2-3971129269 .fill-N4{fill:#CFD2DD;} + .d2-3971129269 .fill-N5{fill:#DEE1EB;} + .d2-3971129269 .fill-N6{fill:#EEF1F8;} + .d2-3971129269 .fill-N7{fill:#FFFFFF;} + .d2-3971129269 .fill-B1{fill:#0D32B2;} + .d2-3971129269 .fill-B2{fill:#0D32B2;} + .d2-3971129269 .fill-B3{fill:#E3E9FD;} + .d2-3971129269 .fill-B4{fill:#E3E9FD;} + .d2-3971129269 .fill-B5{fill:#EDF0FD;} + .d2-3971129269 .fill-B6{fill:#F7F8FE;} + .d2-3971129269 .fill-AA2{fill:#4A6FF3;} + .d2-3971129269 .fill-AA4{fill:#EDF0FD;} + .d2-3971129269 .fill-AA5{fill:#F7F8FE;} + .d2-3971129269 .fill-AB4{fill:#EDF0FD;} + .d2-3971129269 .fill-AB5{fill:#F7F8FE;} + .d2-3971129269 .stroke-N1{stroke:#0A0F25;} + .d2-3971129269 .stroke-N2{stroke:#676C7E;} + .d2-3971129269 .stroke-N3{stroke:#9499AB;} + .d2-3971129269 .stroke-N4{stroke:#CFD2DD;} + .d2-3971129269 .stroke-N5{stroke:#DEE1EB;} + .d2-3971129269 .stroke-N6{stroke:#EEF1F8;} + .d2-3971129269 .stroke-N7{stroke:#FFFFFF;} + .d2-3971129269 .stroke-B1{stroke:#0D32B2;} + .d2-3971129269 .stroke-B2{stroke:#0D32B2;} + .d2-3971129269 .stroke-B3{stroke:#E3E9FD;} + .d2-3971129269 .stroke-B4{stroke:#E3E9FD;} + .d2-3971129269 .stroke-B5{stroke:#EDF0FD;} + .d2-3971129269 .stroke-B6{stroke:#F7F8FE;} + .d2-3971129269 .stroke-AA2{stroke:#4A6FF3;} + .d2-3971129269 .stroke-AA4{stroke:#EDF0FD;} + .d2-3971129269 .stroke-AA5{stroke:#F7F8FE;} + .d2-3971129269 .stroke-AB4{stroke:#EDF0FD;} + .d2-3971129269 .stroke-AB5{stroke:#F7F8FE;} + .d2-3971129269 .background-color-N1{background-color:#0A0F25;} + .d2-3971129269 .background-color-N2{background-color:#676C7E;} + .d2-3971129269 .background-color-N3{background-color:#9499AB;} + .d2-3971129269 .background-color-N4{background-color:#CFD2DD;} + .d2-3971129269 .background-color-N5{background-color:#DEE1EB;} + .d2-3971129269 .background-color-N6{background-color:#EEF1F8;} + .d2-3971129269 .background-color-N7{background-color:#FFFFFF;} + .d2-3971129269 .background-color-B1{background-color:#0D32B2;} + .d2-3971129269 .background-color-B2{background-color:#0D32B2;} + .d2-3971129269 .background-color-B3{background-color:#E3E9FD;} + .d2-3971129269 .background-color-B4{background-color:#E3E9FD;} + .d2-3971129269 .background-color-B5{background-color:#EDF0FD;} + .d2-3971129269 .background-color-B6{background-color:#F7F8FE;} + .d2-3971129269 .background-color-AA2{background-color:#4A6FF3;} + .d2-3971129269 .background-color-AA4{background-color:#EDF0FD;} + .d2-3971129269 .background-color-AA5{background-color:#F7F8FE;} + .d2-3971129269 .background-color-AB4{background-color:#EDF0FD;} + .d2-3971129269 .background-color-AB5{background-color:#F7F8FE;} + .d2-3971129269 .color-N1{color:#0A0F25;} + .d2-3971129269 .color-N2{color:#676C7E;} + .d2-3971129269 .color-N3{color:#9499AB;} + .d2-3971129269 .color-N4{color:#CFD2DD;} + .d2-3971129269 .color-N5{color:#DEE1EB;} + .d2-3971129269 .color-N6{color:#EEF1F8;} + .d2-3971129269 .color-N7{color:#FFFFFF;} + .d2-3971129269 .color-B1{color:#0D32B2;} + .d2-3971129269 .color-B2{color:#0D32B2;} + .d2-3971129269 .color-B3{color:#E3E9FD;} + .d2-3971129269 .color-B4{color:#E3E9FD;} + .d2-3971129269 .color-B5{color:#EDF0FD;} + .d2-3971129269 .color-B6{color:#F7F8FE;} + .d2-3971129269 .color-AA2{color:#4A6FF3;} + .d2-3971129269 .color-AA4{color:#EDF0FD;} + .d2-3971129269 .color-AA5{color:#F7F8FE;} + .d2-3971129269 .color-AB4{color:#EDF0FD;} + .d2-3971129269 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcd okayexplanationanother explanationSome one who believes imaginary things appear right before your i's.The earth is like a tiny grain of sand, only much, much heavier + +======= + .d2-4247551926 .fill-N1{fill:#0A0F25;} + .d2-4247551926 .fill-N2{fill:#676C7E;} + .d2-4247551926 .fill-N3{fill:#9499AB;} + .d2-4247551926 .fill-N4{fill:#CFD2DD;} + .d2-4247551926 .fill-N5{fill:#DEE1EB;} + .d2-4247551926 .fill-N6{fill:#EEF1F8;} + .d2-4247551926 .fill-N7{fill:#FFFFFF;} + .d2-4247551926 .fill-B1{fill:#0D32B2;} + .d2-4247551926 .fill-B2{fill:#0D32B2;} + .d2-4247551926 .fill-B3{fill:#E3E9FD;} + .d2-4247551926 .fill-B4{fill:#E3E9FD;} + .d2-4247551926 .fill-B5{fill:#EDF0FD;} + .d2-4247551926 .fill-B6{fill:#F7F8FE;} + .d2-4247551926 .fill-AA2{fill:#4A6FF3;} + .d2-4247551926 .fill-AA4{fill:#EDF0FD;} + .d2-4247551926 .fill-AA5{fill:#F7F8FE;} + .d2-4247551926 .fill-AB4{fill:#EDF0FD;} + .d2-4247551926 .fill-AB5{fill:#F7F8FE;} + .d2-4247551926 .stroke-N1{stroke:#0A0F25;} + .d2-4247551926 .stroke-N2{stroke:#676C7E;} + .d2-4247551926 .stroke-N3{stroke:#9499AB;} + .d2-4247551926 .stroke-N4{stroke:#CFD2DD;} + .d2-4247551926 .stroke-N5{stroke:#DEE1EB;} + .d2-4247551926 .stroke-N6{stroke:#EEF1F8;} + .d2-4247551926 .stroke-N7{stroke:#FFFFFF;} + .d2-4247551926 .stroke-B1{stroke:#0D32B2;} + .d2-4247551926 .stroke-B2{stroke:#0D32B2;} + .d2-4247551926 .stroke-B3{stroke:#E3E9FD;} + .d2-4247551926 .stroke-B4{stroke:#E3E9FD;} + .d2-4247551926 .stroke-B5{stroke:#EDF0FD;} + .d2-4247551926 .stroke-B6{stroke:#F7F8FE;} + .d2-4247551926 .stroke-AA2{stroke:#4A6FF3;} + .d2-4247551926 .stroke-AA4{stroke:#EDF0FD;} + .d2-4247551926 .stroke-AA5{stroke:#F7F8FE;} + .d2-4247551926 .stroke-AB4{stroke:#EDF0FD;} + .d2-4247551926 .stroke-AB5{stroke:#F7F8FE;} + .d2-4247551926 .background-color-N1{background-color:#0A0F25;} + .d2-4247551926 .background-color-N2{background-color:#676C7E;} + .d2-4247551926 .background-color-N3{background-color:#9499AB;} + .d2-4247551926 .background-color-N4{background-color:#CFD2DD;} + .d2-4247551926 .background-color-N5{background-color:#DEE1EB;} + .d2-4247551926 .background-color-N6{background-color:#EEF1F8;} + .d2-4247551926 .background-color-N7{background-color:#FFFFFF;} + .d2-4247551926 .background-color-B1{background-color:#0D32B2;} + .d2-4247551926 .background-color-B2{background-color:#0D32B2;} + .d2-4247551926 .background-color-B3{background-color:#E3E9FD;} + .d2-4247551926 .background-color-B4{background-color:#E3E9FD;} + .d2-4247551926 .background-color-B5{background-color:#EDF0FD;} + .d2-4247551926 .background-color-B6{background-color:#F7F8FE;} + .d2-4247551926 .background-color-AA2{background-color:#4A6FF3;} + .d2-4247551926 .background-color-AA4{background-color:#EDF0FD;} + .d2-4247551926 .background-color-AA5{background-color:#F7F8FE;} + .d2-4247551926 .background-color-AB4{background-color:#EDF0FD;} + .d2-4247551926 .background-color-AB5{background-color:#F7F8FE;} + .d2-4247551926 .color-N1{color:#0A0F25;} + .d2-4247551926 .color-N2{color:#676C7E;} + .d2-4247551926 .color-N3{color:#9499AB;} + .d2-4247551926 .color-N4{color:#CFD2DD;} + .d2-4247551926 .color-N5{color:#DEE1EB;} + .d2-4247551926 .color-N6{color:#EEF1F8;} + .d2-4247551926 .color-N7{color:#FFFFFF;} + .d2-4247551926 .color-B1{color:#0D32B2;} + .d2-4247551926 .color-B2{color:#0D32B2;} + .d2-4247551926 .color-B3{color:#E3E9FD;} + .d2-4247551926 .color-B4{color:#E3E9FD;} + .d2-4247551926 .color-B5{color:#EDF0FD;} + .d2-4247551926 .color-B6{color:#F7F8FE;} + .d2-4247551926 .color-AA2{color:#4A6FF3;} + .d2-4247551926 .color-AA4{color:#EDF0FD;} + .d2-4247551926 .color-AA5{color:#F7F8FE;} + .d2-4247551926 .color-AB4{color:#EDF0FD;} + .d2-4247551926 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcd okayexplanationanother explanationSome one who believes imaginary things appear right before your i's.The earth is like a tiny grain of sand, only much, much heavier + +>>>>>>> cb2f2823c (Fix changes) - + - + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence_diagram_note/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_note/elk/sketch.exp.svg index 1313b3b71..1db900d17 100644 --- a/e2etests/testdata/stable/sequence_diagram_note/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_note/elk/sketch.exp.svg @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD abcd okayexplanationanother explanationSome one who believes imaginary things appear right before your i's.The earth is like a tiny grain of sand, only much, much heavier >>>>>>> 33280fed5 (fixed e2e tests) +||||||| parent of cb2f2823c (Fix changes) + .d2-3971129269 .fill-N1{fill:#0A0F25;} + .d2-3971129269 .fill-N2{fill:#676C7E;} + .d2-3971129269 .fill-N3{fill:#9499AB;} + .d2-3971129269 .fill-N4{fill:#CFD2DD;} + .d2-3971129269 .fill-N5{fill:#DEE1EB;} + .d2-3971129269 .fill-N6{fill:#EEF1F8;} + .d2-3971129269 .fill-N7{fill:#FFFFFF;} + .d2-3971129269 .fill-B1{fill:#0D32B2;} + .d2-3971129269 .fill-B2{fill:#0D32B2;} + .d2-3971129269 .fill-B3{fill:#E3E9FD;} + .d2-3971129269 .fill-B4{fill:#E3E9FD;} + .d2-3971129269 .fill-B5{fill:#EDF0FD;} + .d2-3971129269 .fill-B6{fill:#F7F8FE;} + .d2-3971129269 .fill-AA2{fill:#4A6FF3;} + .d2-3971129269 .fill-AA4{fill:#EDF0FD;} + .d2-3971129269 .fill-AA5{fill:#F7F8FE;} + .d2-3971129269 .fill-AB4{fill:#EDF0FD;} + .d2-3971129269 .fill-AB5{fill:#F7F8FE;} + .d2-3971129269 .stroke-N1{stroke:#0A0F25;} + .d2-3971129269 .stroke-N2{stroke:#676C7E;} + .d2-3971129269 .stroke-N3{stroke:#9499AB;} + .d2-3971129269 .stroke-N4{stroke:#CFD2DD;} + .d2-3971129269 .stroke-N5{stroke:#DEE1EB;} + .d2-3971129269 .stroke-N6{stroke:#EEF1F8;} + .d2-3971129269 .stroke-N7{stroke:#FFFFFF;} + .d2-3971129269 .stroke-B1{stroke:#0D32B2;} + .d2-3971129269 .stroke-B2{stroke:#0D32B2;} + .d2-3971129269 .stroke-B3{stroke:#E3E9FD;} + .d2-3971129269 .stroke-B4{stroke:#E3E9FD;} + .d2-3971129269 .stroke-B5{stroke:#EDF0FD;} + .d2-3971129269 .stroke-B6{stroke:#F7F8FE;} + .d2-3971129269 .stroke-AA2{stroke:#4A6FF3;} + .d2-3971129269 .stroke-AA4{stroke:#EDF0FD;} + .d2-3971129269 .stroke-AA5{stroke:#F7F8FE;} + .d2-3971129269 .stroke-AB4{stroke:#EDF0FD;} + .d2-3971129269 .stroke-AB5{stroke:#F7F8FE;} + .d2-3971129269 .background-color-N1{background-color:#0A0F25;} + .d2-3971129269 .background-color-N2{background-color:#676C7E;} + .d2-3971129269 .background-color-N3{background-color:#9499AB;} + .d2-3971129269 .background-color-N4{background-color:#CFD2DD;} + .d2-3971129269 .background-color-N5{background-color:#DEE1EB;} + .d2-3971129269 .background-color-N6{background-color:#EEF1F8;} + .d2-3971129269 .background-color-N7{background-color:#FFFFFF;} + .d2-3971129269 .background-color-B1{background-color:#0D32B2;} + .d2-3971129269 .background-color-B2{background-color:#0D32B2;} + .d2-3971129269 .background-color-B3{background-color:#E3E9FD;} + .d2-3971129269 .background-color-B4{background-color:#E3E9FD;} + .d2-3971129269 .background-color-B5{background-color:#EDF0FD;} + .d2-3971129269 .background-color-B6{background-color:#F7F8FE;} + .d2-3971129269 .background-color-AA2{background-color:#4A6FF3;} + .d2-3971129269 .background-color-AA4{background-color:#EDF0FD;} + .d2-3971129269 .background-color-AA5{background-color:#F7F8FE;} + .d2-3971129269 .background-color-AB4{background-color:#EDF0FD;} + .d2-3971129269 .background-color-AB5{background-color:#F7F8FE;} + .d2-3971129269 .color-N1{color:#0A0F25;} + .d2-3971129269 .color-N2{color:#676C7E;} + .d2-3971129269 .color-N3{color:#9499AB;} + .d2-3971129269 .color-N4{color:#CFD2DD;} + .d2-3971129269 .color-N5{color:#DEE1EB;} + .d2-3971129269 .color-N6{color:#EEF1F8;} + .d2-3971129269 .color-N7{color:#FFFFFF;} + .d2-3971129269 .color-B1{color:#0D32B2;} + .d2-3971129269 .color-B2{color:#0D32B2;} + .d2-3971129269 .color-B3{color:#E3E9FD;} + .d2-3971129269 .color-B4{color:#E3E9FD;} + .d2-3971129269 .color-B5{color:#EDF0FD;} + .d2-3971129269 .color-B6{color:#F7F8FE;} + .d2-3971129269 .color-AA2{color:#4A6FF3;} + .d2-3971129269 .color-AA4{color:#EDF0FD;} + .d2-3971129269 .color-AA5{color:#F7F8FE;} + .d2-3971129269 .color-AB4{color:#EDF0FD;} + .d2-3971129269 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcd okayexplanationanother explanationSome one who believes imaginary things appear right before your i's.The earth is like a tiny grain of sand, only much, much heavier + +======= + .d2-4247551926 .fill-N1{fill:#0A0F25;} + .d2-4247551926 .fill-N2{fill:#676C7E;} + .d2-4247551926 .fill-N3{fill:#9499AB;} + .d2-4247551926 .fill-N4{fill:#CFD2DD;} + .d2-4247551926 .fill-N5{fill:#DEE1EB;} + .d2-4247551926 .fill-N6{fill:#EEF1F8;} + .d2-4247551926 .fill-N7{fill:#FFFFFF;} + .d2-4247551926 .fill-B1{fill:#0D32B2;} + .d2-4247551926 .fill-B2{fill:#0D32B2;} + .d2-4247551926 .fill-B3{fill:#E3E9FD;} + .d2-4247551926 .fill-B4{fill:#E3E9FD;} + .d2-4247551926 .fill-B5{fill:#EDF0FD;} + .d2-4247551926 .fill-B6{fill:#F7F8FE;} + .d2-4247551926 .fill-AA2{fill:#4A6FF3;} + .d2-4247551926 .fill-AA4{fill:#EDF0FD;} + .d2-4247551926 .fill-AA5{fill:#F7F8FE;} + .d2-4247551926 .fill-AB4{fill:#EDF0FD;} + .d2-4247551926 .fill-AB5{fill:#F7F8FE;} + .d2-4247551926 .stroke-N1{stroke:#0A0F25;} + .d2-4247551926 .stroke-N2{stroke:#676C7E;} + .d2-4247551926 .stroke-N3{stroke:#9499AB;} + .d2-4247551926 .stroke-N4{stroke:#CFD2DD;} + .d2-4247551926 .stroke-N5{stroke:#DEE1EB;} + .d2-4247551926 .stroke-N6{stroke:#EEF1F8;} + .d2-4247551926 .stroke-N7{stroke:#FFFFFF;} + .d2-4247551926 .stroke-B1{stroke:#0D32B2;} + .d2-4247551926 .stroke-B2{stroke:#0D32B2;} + .d2-4247551926 .stroke-B3{stroke:#E3E9FD;} + .d2-4247551926 .stroke-B4{stroke:#E3E9FD;} + .d2-4247551926 .stroke-B5{stroke:#EDF0FD;} + .d2-4247551926 .stroke-B6{stroke:#F7F8FE;} + .d2-4247551926 .stroke-AA2{stroke:#4A6FF3;} + .d2-4247551926 .stroke-AA4{stroke:#EDF0FD;} + .d2-4247551926 .stroke-AA5{stroke:#F7F8FE;} + .d2-4247551926 .stroke-AB4{stroke:#EDF0FD;} + .d2-4247551926 .stroke-AB5{stroke:#F7F8FE;} + .d2-4247551926 .background-color-N1{background-color:#0A0F25;} + .d2-4247551926 .background-color-N2{background-color:#676C7E;} + .d2-4247551926 .background-color-N3{background-color:#9499AB;} + .d2-4247551926 .background-color-N4{background-color:#CFD2DD;} + .d2-4247551926 .background-color-N5{background-color:#DEE1EB;} + .d2-4247551926 .background-color-N6{background-color:#EEF1F8;} + .d2-4247551926 .background-color-N7{background-color:#FFFFFF;} + .d2-4247551926 .background-color-B1{background-color:#0D32B2;} + .d2-4247551926 .background-color-B2{background-color:#0D32B2;} + .d2-4247551926 .background-color-B3{background-color:#E3E9FD;} + .d2-4247551926 .background-color-B4{background-color:#E3E9FD;} + .d2-4247551926 .background-color-B5{background-color:#EDF0FD;} + .d2-4247551926 .background-color-B6{background-color:#F7F8FE;} + .d2-4247551926 .background-color-AA2{background-color:#4A6FF3;} + .d2-4247551926 .background-color-AA4{background-color:#EDF0FD;} + .d2-4247551926 .background-color-AA5{background-color:#F7F8FE;} + .d2-4247551926 .background-color-AB4{background-color:#EDF0FD;} + .d2-4247551926 .background-color-AB5{background-color:#F7F8FE;} + .d2-4247551926 .color-N1{color:#0A0F25;} + .d2-4247551926 .color-N2{color:#676C7E;} + .d2-4247551926 .color-N3{color:#9499AB;} + .d2-4247551926 .color-N4{color:#CFD2DD;} + .d2-4247551926 .color-N5{color:#DEE1EB;} + .d2-4247551926 .color-N6{color:#EEF1F8;} + .d2-4247551926 .color-N7{color:#FFFFFF;} + .d2-4247551926 .color-B1{color:#0D32B2;} + .d2-4247551926 .color-B2{color:#0D32B2;} + .d2-4247551926 .color-B3{color:#E3E9FD;} + .d2-4247551926 .color-B4{color:#E3E9FD;} + .d2-4247551926 .color-B5{color:#EDF0FD;} + .d2-4247551926 .color-B6{color:#F7F8FE;} + .d2-4247551926 .color-AA2{color:#4A6FF3;} + .d2-4247551926 .color-AA4{color:#EDF0FD;} + .d2-4247551926 .color-AA5{color:#F7F8FE;} + .d2-4247551926 .color-AB4{color:#EDF0FD;} + .d2-4247551926 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>abcd okayexplanationanother explanationSome one who believes imaginary things appear right before your i's.The earth is like a tiny grain of sand, only much, much heavier + +>>>>>>> cb2f2823c (Fix changes) - + - + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence_diagram_real/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_real/dagre/sketch.exp.svg index 3f0fa37d6..5dcd5ade9 100644 --- a/e2etests/testdata/stable/sequence_diagram_real/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_real/dagre/sketch.exp.svg @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD How this is renderedCLId2astd2compilerd2layoutd2exporterd2themesd2rendererd2sequencelayoutd2dagrelayoutonly if root is not sequence 'How this is rendered: {...}'tokenized ASTcompile ASTobjects and edgesrun layout enginesrun engine on shape: sequence_diagram, temporarily removerun core engine on rest add back in sequence diagramsdiagram with correct positions and dimensionsexport diagram with chosen theme and rendererget theme stylesrender to SVGresulting SVGmeasurements also take place + + +======= + .d2-3964001802 .fill-N1{fill:#0A0F25;} + .d2-3964001802 .fill-N2{fill:#676C7E;} + .d2-3964001802 .fill-N3{fill:#9499AB;} + .d2-3964001802 .fill-N4{fill:#CFD2DD;} + .d2-3964001802 .fill-N5{fill:#DEE1EB;} + .d2-3964001802 .fill-N6{fill:#EEF1F8;} + .d2-3964001802 .fill-N7{fill:#FFFFFF;} + .d2-3964001802 .fill-B1{fill:#0D32B2;} + .d2-3964001802 .fill-B2{fill:#0D32B2;} + .d2-3964001802 .fill-B3{fill:#E3E9FD;} + .d2-3964001802 .fill-B4{fill:#E3E9FD;} + .d2-3964001802 .fill-B5{fill:#EDF0FD;} + .d2-3964001802 .fill-B6{fill:#F7F8FE;} + .d2-3964001802 .fill-AA2{fill:#4A6FF3;} + .d2-3964001802 .fill-AA4{fill:#EDF0FD;} + .d2-3964001802 .fill-AA5{fill:#F7F8FE;} + .d2-3964001802 .fill-AB4{fill:#EDF0FD;} + .d2-3964001802 .fill-AB5{fill:#F7F8FE;} + .d2-3964001802 .stroke-N1{stroke:#0A0F25;} + .d2-3964001802 .stroke-N2{stroke:#676C7E;} + .d2-3964001802 .stroke-N3{stroke:#9499AB;} + .d2-3964001802 .stroke-N4{stroke:#CFD2DD;} + .d2-3964001802 .stroke-N5{stroke:#DEE1EB;} + .d2-3964001802 .stroke-N6{stroke:#EEF1F8;} + .d2-3964001802 .stroke-N7{stroke:#FFFFFF;} + .d2-3964001802 .stroke-B1{stroke:#0D32B2;} + .d2-3964001802 .stroke-B2{stroke:#0D32B2;} + .d2-3964001802 .stroke-B3{stroke:#E3E9FD;} + .d2-3964001802 .stroke-B4{stroke:#E3E9FD;} + .d2-3964001802 .stroke-B5{stroke:#EDF0FD;} + .d2-3964001802 .stroke-B6{stroke:#F7F8FE;} + .d2-3964001802 .stroke-AA2{stroke:#4A6FF3;} + .d2-3964001802 .stroke-AA4{stroke:#EDF0FD;} + .d2-3964001802 .stroke-AA5{stroke:#F7F8FE;} + .d2-3964001802 .stroke-AB4{stroke:#EDF0FD;} + .d2-3964001802 .stroke-AB5{stroke:#F7F8FE;} + .d2-3964001802 .background-color-N1{background-color:#0A0F25;} + .d2-3964001802 .background-color-N2{background-color:#676C7E;} + .d2-3964001802 .background-color-N3{background-color:#9499AB;} + .d2-3964001802 .background-color-N4{background-color:#CFD2DD;} + .d2-3964001802 .background-color-N5{background-color:#DEE1EB;} + .d2-3964001802 .background-color-N6{background-color:#EEF1F8;} + .d2-3964001802 .background-color-N7{background-color:#FFFFFF;} + .d2-3964001802 .background-color-B1{background-color:#0D32B2;} + .d2-3964001802 .background-color-B2{background-color:#0D32B2;} + .d2-3964001802 .background-color-B3{background-color:#E3E9FD;} + .d2-3964001802 .background-color-B4{background-color:#E3E9FD;} + .d2-3964001802 .background-color-B5{background-color:#EDF0FD;} + .d2-3964001802 .background-color-B6{background-color:#F7F8FE;} + .d2-3964001802 .background-color-AA2{background-color:#4A6FF3;} + .d2-3964001802 .background-color-AA4{background-color:#EDF0FD;} + .d2-3964001802 .background-color-AA5{background-color:#F7F8FE;} + .d2-3964001802 .background-color-AB4{background-color:#EDF0FD;} + .d2-3964001802 .background-color-AB5{background-color:#F7F8FE;} + .d2-3964001802 .color-N1{color:#0A0F25;} + .d2-3964001802 .color-N2{color:#676C7E;} + .d2-3964001802 .color-N3{color:#9499AB;} + .d2-3964001802 .color-N4{color:#CFD2DD;} + .d2-3964001802 .color-N5{color:#DEE1EB;} + .d2-3964001802 .color-N6{color:#EEF1F8;} + .d2-3964001802 .color-N7{color:#FFFFFF;} + .d2-3964001802 .color-B1{color:#0D32B2;} + .d2-3964001802 .color-B2{color:#0D32B2;} + .d2-3964001802 .color-B3{color:#E3E9FD;} + .d2-3964001802 .color-B4{color:#E3E9FD;} + .d2-3964001802 .color-B5{color:#EDF0FD;} + .d2-3964001802 .color-B6{color:#F7F8FE;} + .d2-3964001802 .color-AA2{color:#4A6FF3;} + .d2-3964001802 .color-AA4{color:#EDF0FD;} + .d2-3964001802 .color-AA5{color:#F7F8FE;} + .d2-3964001802 .color-AB4{color:#EDF0FD;} + .d2-3964001802 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>How this is renderedCLId2astd2compilerd2layoutd2exporterd2themesd2rendererd2sequencelayoutd2dagrelayoutonly if root is not sequence 'How this is rendered: {...}'tokenized ASTcompile ASTobjects and edgesrun layout enginesrun engine on shape: sequence_diagram, temporarily removerun core engine on rest add back in sequence diagramsdiagram with correct positions and dimensionsexport diagram with chosen theme and rendererget theme stylesrender to SVGresulting SVGmeasurements also take place + + +>>>>>>> cb2f2823c (Fix changes) - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence_diagram_real/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_real/elk/sketch.exp.svg index deb0f4939..48db56be8 100644 --- a/e2etests/testdata/stable/sequence_diagram_real/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_real/elk/sketch.exp.svg @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD How this is renderedCLId2astd2compilerd2layoutd2exporterd2themesd2rendererd2sequencelayoutd2dagrelayoutonly if root is not sequence 'How this is rendered: {...}'tokenized ASTcompile ASTobjects and edgesrun layout enginesrun engine on shape: sequence_diagram, temporarily removerun core engine on rest add back in sequence diagramsdiagram with correct positions and dimensionsexport diagram with chosen theme and rendererget theme stylesrender to SVGresulting SVGmeasurements also take place + + +======= + .d2-2840663315 .fill-N1{fill:#0A0F25;} + .d2-2840663315 .fill-N2{fill:#676C7E;} + .d2-2840663315 .fill-N3{fill:#9499AB;} + .d2-2840663315 .fill-N4{fill:#CFD2DD;} + .d2-2840663315 .fill-N5{fill:#DEE1EB;} + .d2-2840663315 .fill-N6{fill:#EEF1F8;} + .d2-2840663315 .fill-N7{fill:#FFFFFF;} + .d2-2840663315 .fill-B1{fill:#0D32B2;} + .d2-2840663315 .fill-B2{fill:#0D32B2;} + .d2-2840663315 .fill-B3{fill:#E3E9FD;} + .d2-2840663315 .fill-B4{fill:#E3E9FD;} + .d2-2840663315 .fill-B5{fill:#EDF0FD;} + .d2-2840663315 .fill-B6{fill:#F7F8FE;} + .d2-2840663315 .fill-AA2{fill:#4A6FF3;} + .d2-2840663315 .fill-AA4{fill:#EDF0FD;} + .d2-2840663315 .fill-AA5{fill:#F7F8FE;} + .d2-2840663315 .fill-AB4{fill:#EDF0FD;} + .d2-2840663315 .fill-AB5{fill:#F7F8FE;} + .d2-2840663315 .stroke-N1{stroke:#0A0F25;} + .d2-2840663315 .stroke-N2{stroke:#676C7E;} + .d2-2840663315 .stroke-N3{stroke:#9499AB;} + .d2-2840663315 .stroke-N4{stroke:#CFD2DD;} + .d2-2840663315 .stroke-N5{stroke:#DEE1EB;} + .d2-2840663315 .stroke-N6{stroke:#EEF1F8;} + .d2-2840663315 .stroke-N7{stroke:#FFFFFF;} + .d2-2840663315 .stroke-B1{stroke:#0D32B2;} + .d2-2840663315 .stroke-B2{stroke:#0D32B2;} + .d2-2840663315 .stroke-B3{stroke:#E3E9FD;} + .d2-2840663315 .stroke-B4{stroke:#E3E9FD;} + .d2-2840663315 .stroke-B5{stroke:#EDF0FD;} + .d2-2840663315 .stroke-B6{stroke:#F7F8FE;} + .d2-2840663315 .stroke-AA2{stroke:#4A6FF3;} + .d2-2840663315 .stroke-AA4{stroke:#EDF0FD;} + .d2-2840663315 .stroke-AA5{stroke:#F7F8FE;} + .d2-2840663315 .stroke-AB4{stroke:#EDF0FD;} + .d2-2840663315 .stroke-AB5{stroke:#F7F8FE;} + .d2-2840663315 .background-color-N1{background-color:#0A0F25;} + .d2-2840663315 .background-color-N2{background-color:#676C7E;} + .d2-2840663315 .background-color-N3{background-color:#9499AB;} + .d2-2840663315 .background-color-N4{background-color:#CFD2DD;} + .d2-2840663315 .background-color-N5{background-color:#DEE1EB;} + .d2-2840663315 .background-color-N6{background-color:#EEF1F8;} + .d2-2840663315 .background-color-N7{background-color:#FFFFFF;} + .d2-2840663315 .background-color-B1{background-color:#0D32B2;} + .d2-2840663315 .background-color-B2{background-color:#0D32B2;} + .d2-2840663315 .background-color-B3{background-color:#E3E9FD;} + .d2-2840663315 .background-color-B4{background-color:#E3E9FD;} + .d2-2840663315 .background-color-B5{background-color:#EDF0FD;} + .d2-2840663315 .background-color-B6{background-color:#F7F8FE;} + .d2-2840663315 .background-color-AA2{background-color:#4A6FF3;} + .d2-2840663315 .background-color-AA4{background-color:#EDF0FD;} + .d2-2840663315 .background-color-AA5{background-color:#F7F8FE;} + .d2-2840663315 .background-color-AB4{background-color:#EDF0FD;} + .d2-2840663315 .background-color-AB5{background-color:#F7F8FE;} + .d2-2840663315 .color-N1{color:#0A0F25;} + .d2-2840663315 .color-N2{color:#676C7E;} + .d2-2840663315 .color-N3{color:#9499AB;} + .d2-2840663315 .color-N4{color:#CFD2DD;} + .d2-2840663315 .color-N5{color:#DEE1EB;} + .d2-2840663315 .color-N6{color:#EEF1F8;} + .d2-2840663315 .color-N7{color:#FFFFFF;} + .d2-2840663315 .color-B1{color:#0D32B2;} + .d2-2840663315 .color-B2{color:#0D32B2;} + .d2-2840663315 .color-B3{color:#E3E9FD;} + .d2-2840663315 .color-B4{color:#E3E9FD;} + .d2-2840663315 .color-B5{color:#EDF0FD;} + .d2-2840663315 .color-B6{color:#F7F8FE;} + .d2-2840663315 .color-AA2{color:#4A6FF3;} + .d2-2840663315 .color-AA4{color:#EDF0FD;} + .d2-2840663315 .color-AA5{color:#F7F8FE;} + .d2-2840663315 .color-AB4{color:#EDF0FD;} + .d2-2840663315 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>How this is renderedCLId2astd2compilerd2layoutd2exporterd2themesd2rendererd2sequencelayoutd2dagrelayoutonly if root is not sequence 'How this is rendered: {...}'tokenized ASTcompile ASTobjects and edgesrun layout enginesrun engine on shape: sequence_diagram, temporarily removerun core engine on rest add back in sequence diagramsdiagram with correct positions and dimensionsexport diagram with chosen theme and rendererget theme stylesrender to SVGresulting SVGmeasurements also take place + + +>>>>>>> cb2f2823c (Fix changes) - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence_diagram_self_edges/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_self_edges/dagre/sketch.exp.svg index 59fd3f390..19ddb13af 100644 --- a/e2etests/testdata/stable/sequence_diagram_self_edges/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_self_edges/dagre/sketch.exp.svg @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD ab a self edge herebetween actorsto descendantto deeper descendantto parentactor >>>>>>> 33280fed5 (fixed e2e tests) +||||||| parent of cb2f2823c (Fix changes) + .d2-3301810641 .fill-N1{fill:#0A0F25;} + .d2-3301810641 .fill-N2{fill:#676C7E;} + .d2-3301810641 .fill-N3{fill:#9499AB;} + .d2-3301810641 .fill-N4{fill:#CFD2DD;} + .d2-3301810641 .fill-N5{fill:#DEE1EB;} + .d2-3301810641 .fill-N6{fill:#EEF1F8;} + .d2-3301810641 .fill-N7{fill:#FFFFFF;} + .d2-3301810641 .fill-B1{fill:#0D32B2;} + .d2-3301810641 .fill-B2{fill:#0D32B2;} + .d2-3301810641 .fill-B3{fill:#E3E9FD;} + .d2-3301810641 .fill-B4{fill:#E3E9FD;} + .d2-3301810641 .fill-B5{fill:#EDF0FD;} + .d2-3301810641 .fill-B6{fill:#F7F8FE;} + .d2-3301810641 .fill-AA2{fill:#4A6FF3;} + .d2-3301810641 .fill-AA4{fill:#EDF0FD;} + .d2-3301810641 .fill-AA5{fill:#F7F8FE;} + .d2-3301810641 .fill-AB4{fill:#EDF0FD;} + .d2-3301810641 .fill-AB5{fill:#F7F8FE;} + .d2-3301810641 .stroke-N1{stroke:#0A0F25;} + .d2-3301810641 .stroke-N2{stroke:#676C7E;} + .d2-3301810641 .stroke-N3{stroke:#9499AB;} + .d2-3301810641 .stroke-N4{stroke:#CFD2DD;} + .d2-3301810641 .stroke-N5{stroke:#DEE1EB;} + .d2-3301810641 .stroke-N6{stroke:#EEF1F8;} + .d2-3301810641 .stroke-N7{stroke:#FFFFFF;} + .d2-3301810641 .stroke-B1{stroke:#0D32B2;} + .d2-3301810641 .stroke-B2{stroke:#0D32B2;} + .d2-3301810641 .stroke-B3{stroke:#E3E9FD;} + .d2-3301810641 .stroke-B4{stroke:#E3E9FD;} + .d2-3301810641 .stroke-B5{stroke:#EDF0FD;} + .d2-3301810641 .stroke-B6{stroke:#F7F8FE;} + .d2-3301810641 .stroke-AA2{stroke:#4A6FF3;} + .d2-3301810641 .stroke-AA4{stroke:#EDF0FD;} + .d2-3301810641 .stroke-AA5{stroke:#F7F8FE;} + .d2-3301810641 .stroke-AB4{stroke:#EDF0FD;} + .d2-3301810641 .stroke-AB5{stroke:#F7F8FE;} + .d2-3301810641 .background-color-N1{background-color:#0A0F25;} + .d2-3301810641 .background-color-N2{background-color:#676C7E;} + .d2-3301810641 .background-color-N3{background-color:#9499AB;} + .d2-3301810641 .background-color-N4{background-color:#CFD2DD;} + .d2-3301810641 .background-color-N5{background-color:#DEE1EB;} + .d2-3301810641 .background-color-N6{background-color:#EEF1F8;} + .d2-3301810641 .background-color-N7{background-color:#FFFFFF;} + .d2-3301810641 .background-color-B1{background-color:#0D32B2;} + .d2-3301810641 .background-color-B2{background-color:#0D32B2;} + .d2-3301810641 .background-color-B3{background-color:#E3E9FD;} + .d2-3301810641 .background-color-B4{background-color:#E3E9FD;} + .d2-3301810641 .background-color-B5{background-color:#EDF0FD;} + .d2-3301810641 .background-color-B6{background-color:#F7F8FE;} + .d2-3301810641 .background-color-AA2{background-color:#4A6FF3;} + .d2-3301810641 .background-color-AA4{background-color:#EDF0FD;} + .d2-3301810641 .background-color-AA5{background-color:#F7F8FE;} + .d2-3301810641 .background-color-AB4{background-color:#EDF0FD;} + .d2-3301810641 .background-color-AB5{background-color:#F7F8FE;} + .d2-3301810641 .color-N1{color:#0A0F25;} + .d2-3301810641 .color-N2{color:#676C7E;} + .d2-3301810641 .color-N3{color:#9499AB;} + .d2-3301810641 .color-N4{color:#CFD2DD;} + .d2-3301810641 .color-N5{color:#DEE1EB;} + .d2-3301810641 .color-N6{color:#EEF1F8;} + .d2-3301810641 .color-N7{color:#FFFFFF;} + .d2-3301810641 .color-B1{color:#0D32B2;} + .d2-3301810641 .color-B2{color:#0D32B2;} + .d2-3301810641 .color-B3{color:#E3E9FD;} + .d2-3301810641 .color-B4{color:#E3E9FD;} + .d2-3301810641 .color-B5{color:#EDF0FD;} + .d2-3301810641 .color-B6{color:#F7F8FE;} + .d2-3301810641 .color-AA2{color:#4A6FF3;} + .d2-3301810641 .color-AA4{color:#EDF0FD;} + .d2-3301810641 .color-AA5{color:#F7F8FE;} + .d2-3301810641 .color-AB4{color:#EDF0FD;} + .d2-3301810641 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>ab a self edge herebetween actorsto descendantto deeper descendantto parentactor + +======= + .d2-3429764782 .fill-N1{fill:#0A0F25;} + .d2-3429764782 .fill-N2{fill:#676C7E;} + .d2-3429764782 .fill-N3{fill:#9499AB;} + .d2-3429764782 .fill-N4{fill:#CFD2DD;} + .d2-3429764782 .fill-N5{fill:#DEE1EB;} + .d2-3429764782 .fill-N6{fill:#EEF1F8;} + .d2-3429764782 .fill-N7{fill:#FFFFFF;} + .d2-3429764782 .fill-B1{fill:#0D32B2;} + .d2-3429764782 .fill-B2{fill:#0D32B2;} + .d2-3429764782 .fill-B3{fill:#E3E9FD;} + .d2-3429764782 .fill-B4{fill:#E3E9FD;} + .d2-3429764782 .fill-B5{fill:#EDF0FD;} + .d2-3429764782 .fill-B6{fill:#F7F8FE;} + .d2-3429764782 .fill-AA2{fill:#4A6FF3;} + .d2-3429764782 .fill-AA4{fill:#EDF0FD;} + .d2-3429764782 .fill-AA5{fill:#F7F8FE;} + .d2-3429764782 .fill-AB4{fill:#EDF0FD;} + .d2-3429764782 .fill-AB5{fill:#F7F8FE;} + .d2-3429764782 .stroke-N1{stroke:#0A0F25;} + .d2-3429764782 .stroke-N2{stroke:#676C7E;} + .d2-3429764782 .stroke-N3{stroke:#9499AB;} + .d2-3429764782 .stroke-N4{stroke:#CFD2DD;} + .d2-3429764782 .stroke-N5{stroke:#DEE1EB;} + .d2-3429764782 .stroke-N6{stroke:#EEF1F8;} + .d2-3429764782 .stroke-N7{stroke:#FFFFFF;} + .d2-3429764782 .stroke-B1{stroke:#0D32B2;} + .d2-3429764782 .stroke-B2{stroke:#0D32B2;} + .d2-3429764782 .stroke-B3{stroke:#E3E9FD;} + .d2-3429764782 .stroke-B4{stroke:#E3E9FD;} + .d2-3429764782 .stroke-B5{stroke:#EDF0FD;} + .d2-3429764782 .stroke-B6{stroke:#F7F8FE;} + .d2-3429764782 .stroke-AA2{stroke:#4A6FF3;} + .d2-3429764782 .stroke-AA4{stroke:#EDF0FD;} + .d2-3429764782 .stroke-AA5{stroke:#F7F8FE;} + .d2-3429764782 .stroke-AB4{stroke:#EDF0FD;} + .d2-3429764782 .stroke-AB5{stroke:#F7F8FE;} + .d2-3429764782 .background-color-N1{background-color:#0A0F25;} + .d2-3429764782 .background-color-N2{background-color:#676C7E;} + .d2-3429764782 .background-color-N3{background-color:#9499AB;} + .d2-3429764782 .background-color-N4{background-color:#CFD2DD;} + .d2-3429764782 .background-color-N5{background-color:#DEE1EB;} + .d2-3429764782 .background-color-N6{background-color:#EEF1F8;} + .d2-3429764782 .background-color-N7{background-color:#FFFFFF;} + .d2-3429764782 .background-color-B1{background-color:#0D32B2;} + .d2-3429764782 .background-color-B2{background-color:#0D32B2;} + .d2-3429764782 .background-color-B3{background-color:#E3E9FD;} + .d2-3429764782 .background-color-B4{background-color:#E3E9FD;} + .d2-3429764782 .background-color-B5{background-color:#EDF0FD;} + .d2-3429764782 .background-color-B6{background-color:#F7F8FE;} + .d2-3429764782 .background-color-AA2{background-color:#4A6FF3;} + .d2-3429764782 .background-color-AA4{background-color:#EDF0FD;} + .d2-3429764782 .background-color-AA5{background-color:#F7F8FE;} + .d2-3429764782 .background-color-AB4{background-color:#EDF0FD;} + .d2-3429764782 .background-color-AB5{background-color:#F7F8FE;} + .d2-3429764782 .color-N1{color:#0A0F25;} + .d2-3429764782 .color-N2{color:#676C7E;} + .d2-3429764782 .color-N3{color:#9499AB;} + .d2-3429764782 .color-N4{color:#CFD2DD;} + .d2-3429764782 .color-N5{color:#DEE1EB;} + .d2-3429764782 .color-N6{color:#EEF1F8;} + .d2-3429764782 .color-N7{color:#FFFFFF;} + .d2-3429764782 .color-B1{color:#0D32B2;} + .d2-3429764782 .color-B2{color:#0D32B2;} + .d2-3429764782 .color-B3{color:#E3E9FD;} + .d2-3429764782 .color-B4{color:#E3E9FD;} + .d2-3429764782 .color-B5{color:#EDF0FD;} + .d2-3429764782 .color-B6{color:#F7F8FE;} + .d2-3429764782 .color-AA2{color:#4A6FF3;} + .d2-3429764782 .color-AA4{color:#EDF0FD;} + .d2-3429764782 .color-AA5{color:#F7F8FE;} + .d2-3429764782 .color-AB4{color:#EDF0FD;} + .d2-3429764782 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>ab a self edge herebetween actorsto descendantto deeper descendantto parentactor + +>>>>>>> cb2f2823c (Fix changes) - + - - - - - + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence_diagram_self_edges/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_self_edges/elk/sketch.exp.svg index 59fd3f390..19ddb13af 100644 --- a/e2etests/testdata/stable/sequence_diagram_self_edges/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_self_edges/elk/sketch.exp.svg @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD ab a self edge herebetween actorsto descendantto deeper descendantto parentactor >>>>>>> 33280fed5 (fixed e2e tests) +||||||| parent of cb2f2823c (Fix changes) + .d2-3301810641 .fill-N1{fill:#0A0F25;} + .d2-3301810641 .fill-N2{fill:#676C7E;} + .d2-3301810641 .fill-N3{fill:#9499AB;} + .d2-3301810641 .fill-N4{fill:#CFD2DD;} + .d2-3301810641 .fill-N5{fill:#DEE1EB;} + .d2-3301810641 .fill-N6{fill:#EEF1F8;} + .d2-3301810641 .fill-N7{fill:#FFFFFF;} + .d2-3301810641 .fill-B1{fill:#0D32B2;} + .d2-3301810641 .fill-B2{fill:#0D32B2;} + .d2-3301810641 .fill-B3{fill:#E3E9FD;} + .d2-3301810641 .fill-B4{fill:#E3E9FD;} + .d2-3301810641 .fill-B5{fill:#EDF0FD;} + .d2-3301810641 .fill-B6{fill:#F7F8FE;} + .d2-3301810641 .fill-AA2{fill:#4A6FF3;} + .d2-3301810641 .fill-AA4{fill:#EDF0FD;} + .d2-3301810641 .fill-AA5{fill:#F7F8FE;} + .d2-3301810641 .fill-AB4{fill:#EDF0FD;} + .d2-3301810641 .fill-AB5{fill:#F7F8FE;} + .d2-3301810641 .stroke-N1{stroke:#0A0F25;} + .d2-3301810641 .stroke-N2{stroke:#676C7E;} + .d2-3301810641 .stroke-N3{stroke:#9499AB;} + .d2-3301810641 .stroke-N4{stroke:#CFD2DD;} + .d2-3301810641 .stroke-N5{stroke:#DEE1EB;} + .d2-3301810641 .stroke-N6{stroke:#EEF1F8;} + .d2-3301810641 .stroke-N7{stroke:#FFFFFF;} + .d2-3301810641 .stroke-B1{stroke:#0D32B2;} + .d2-3301810641 .stroke-B2{stroke:#0D32B2;} + .d2-3301810641 .stroke-B3{stroke:#E3E9FD;} + .d2-3301810641 .stroke-B4{stroke:#E3E9FD;} + .d2-3301810641 .stroke-B5{stroke:#EDF0FD;} + .d2-3301810641 .stroke-B6{stroke:#F7F8FE;} + .d2-3301810641 .stroke-AA2{stroke:#4A6FF3;} + .d2-3301810641 .stroke-AA4{stroke:#EDF0FD;} + .d2-3301810641 .stroke-AA5{stroke:#F7F8FE;} + .d2-3301810641 .stroke-AB4{stroke:#EDF0FD;} + .d2-3301810641 .stroke-AB5{stroke:#F7F8FE;} + .d2-3301810641 .background-color-N1{background-color:#0A0F25;} + .d2-3301810641 .background-color-N2{background-color:#676C7E;} + .d2-3301810641 .background-color-N3{background-color:#9499AB;} + .d2-3301810641 .background-color-N4{background-color:#CFD2DD;} + .d2-3301810641 .background-color-N5{background-color:#DEE1EB;} + .d2-3301810641 .background-color-N6{background-color:#EEF1F8;} + .d2-3301810641 .background-color-N7{background-color:#FFFFFF;} + .d2-3301810641 .background-color-B1{background-color:#0D32B2;} + .d2-3301810641 .background-color-B2{background-color:#0D32B2;} + .d2-3301810641 .background-color-B3{background-color:#E3E9FD;} + .d2-3301810641 .background-color-B4{background-color:#E3E9FD;} + .d2-3301810641 .background-color-B5{background-color:#EDF0FD;} + .d2-3301810641 .background-color-B6{background-color:#F7F8FE;} + .d2-3301810641 .background-color-AA2{background-color:#4A6FF3;} + .d2-3301810641 .background-color-AA4{background-color:#EDF0FD;} + .d2-3301810641 .background-color-AA5{background-color:#F7F8FE;} + .d2-3301810641 .background-color-AB4{background-color:#EDF0FD;} + .d2-3301810641 .background-color-AB5{background-color:#F7F8FE;} + .d2-3301810641 .color-N1{color:#0A0F25;} + .d2-3301810641 .color-N2{color:#676C7E;} + .d2-3301810641 .color-N3{color:#9499AB;} + .d2-3301810641 .color-N4{color:#CFD2DD;} + .d2-3301810641 .color-N5{color:#DEE1EB;} + .d2-3301810641 .color-N6{color:#EEF1F8;} + .d2-3301810641 .color-N7{color:#FFFFFF;} + .d2-3301810641 .color-B1{color:#0D32B2;} + .d2-3301810641 .color-B2{color:#0D32B2;} + .d2-3301810641 .color-B3{color:#E3E9FD;} + .d2-3301810641 .color-B4{color:#E3E9FD;} + .d2-3301810641 .color-B5{color:#EDF0FD;} + .d2-3301810641 .color-B6{color:#F7F8FE;} + .d2-3301810641 .color-AA2{color:#4A6FF3;} + .d2-3301810641 .color-AA4{color:#EDF0FD;} + .d2-3301810641 .color-AA5{color:#F7F8FE;} + .d2-3301810641 .color-AB4{color:#EDF0FD;} + .d2-3301810641 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>ab a self edge herebetween actorsto descendantto deeper descendantto parentactor + +======= + .d2-3429764782 .fill-N1{fill:#0A0F25;} + .d2-3429764782 .fill-N2{fill:#676C7E;} + .d2-3429764782 .fill-N3{fill:#9499AB;} + .d2-3429764782 .fill-N4{fill:#CFD2DD;} + .d2-3429764782 .fill-N5{fill:#DEE1EB;} + .d2-3429764782 .fill-N6{fill:#EEF1F8;} + .d2-3429764782 .fill-N7{fill:#FFFFFF;} + .d2-3429764782 .fill-B1{fill:#0D32B2;} + .d2-3429764782 .fill-B2{fill:#0D32B2;} + .d2-3429764782 .fill-B3{fill:#E3E9FD;} + .d2-3429764782 .fill-B4{fill:#E3E9FD;} + .d2-3429764782 .fill-B5{fill:#EDF0FD;} + .d2-3429764782 .fill-B6{fill:#F7F8FE;} + .d2-3429764782 .fill-AA2{fill:#4A6FF3;} + .d2-3429764782 .fill-AA4{fill:#EDF0FD;} + .d2-3429764782 .fill-AA5{fill:#F7F8FE;} + .d2-3429764782 .fill-AB4{fill:#EDF0FD;} + .d2-3429764782 .fill-AB5{fill:#F7F8FE;} + .d2-3429764782 .stroke-N1{stroke:#0A0F25;} + .d2-3429764782 .stroke-N2{stroke:#676C7E;} + .d2-3429764782 .stroke-N3{stroke:#9499AB;} + .d2-3429764782 .stroke-N4{stroke:#CFD2DD;} + .d2-3429764782 .stroke-N5{stroke:#DEE1EB;} + .d2-3429764782 .stroke-N6{stroke:#EEF1F8;} + .d2-3429764782 .stroke-N7{stroke:#FFFFFF;} + .d2-3429764782 .stroke-B1{stroke:#0D32B2;} + .d2-3429764782 .stroke-B2{stroke:#0D32B2;} + .d2-3429764782 .stroke-B3{stroke:#E3E9FD;} + .d2-3429764782 .stroke-B4{stroke:#E3E9FD;} + .d2-3429764782 .stroke-B5{stroke:#EDF0FD;} + .d2-3429764782 .stroke-B6{stroke:#F7F8FE;} + .d2-3429764782 .stroke-AA2{stroke:#4A6FF3;} + .d2-3429764782 .stroke-AA4{stroke:#EDF0FD;} + .d2-3429764782 .stroke-AA5{stroke:#F7F8FE;} + .d2-3429764782 .stroke-AB4{stroke:#EDF0FD;} + .d2-3429764782 .stroke-AB5{stroke:#F7F8FE;} + .d2-3429764782 .background-color-N1{background-color:#0A0F25;} + .d2-3429764782 .background-color-N2{background-color:#676C7E;} + .d2-3429764782 .background-color-N3{background-color:#9499AB;} + .d2-3429764782 .background-color-N4{background-color:#CFD2DD;} + .d2-3429764782 .background-color-N5{background-color:#DEE1EB;} + .d2-3429764782 .background-color-N6{background-color:#EEF1F8;} + .d2-3429764782 .background-color-N7{background-color:#FFFFFF;} + .d2-3429764782 .background-color-B1{background-color:#0D32B2;} + .d2-3429764782 .background-color-B2{background-color:#0D32B2;} + .d2-3429764782 .background-color-B3{background-color:#E3E9FD;} + .d2-3429764782 .background-color-B4{background-color:#E3E9FD;} + .d2-3429764782 .background-color-B5{background-color:#EDF0FD;} + .d2-3429764782 .background-color-B6{background-color:#F7F8FE;} + .d2-3429764782 .background-color-AA2{background-color:#4A6FF3;} + .d2-3429764782 .background-color-AA4{background-color:#EDF0FD;} + .d2-3429764782 .background-color-AA5{background-color:#F7F8FE;} + .d2-3429764782 .background-color-AB4{background-color:#EDF0FD;} + .d2-3429764782 .background-color-AB5{background-color:#F7F8FE;} + .d2-3429764782 .color-N1{color:#0A0F25;} + .d2-3429764782 .color-N2{color:#676C7E;} + .d2-3429764782 .color-N3{color:#9499AB;} + .d2-3429764782 .color-N4{color:#CFD2DD;} + .d2-3429764782 .color-N5{color:#DEE1EB;} + .d2-3429764782 .color-N6{color:#EEF1F8;} + .d2-3429764782 .color-N7{color:#FFFFFF;} + .d2-3429764782 .color-B1{color:#0D32B2;} + .d2-3429764782 .color-B2{color:#0D32B2;} + .d2-3429764782 .color-B3{color:#E3E9FD;} + .d2-3429764782 .color-B4{color:#E3E9FD;} + .d2-3429764782 .color-B5{color:#EDF0FD;} + .d2-3429764782 .color-B6{color:#F7F8FE;} + .d2-3429764782 .color-AA2{color:#4A6FF3;} + .d2-3429764782 .color-AA4{color:#EDF0FD;} + .d2-3429764782 .color-AA5{color:#F7F8FE;} + .d2-3429764782 .color-AB4{color:#EDF0FD;} + .d2-3429764782 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>ab a self edge herebetween actorsto descendantto deeper descendantto parentactor + +>>>>>>> cb2f2823c (Fix changes) - + - - - - - + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence_diagram_simple/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_simple/dagre/sketch.exp.svg index 4f9b93d0d..d1cdfbf45 100644 --- a/e2etests/testdata/stable/sequence_diagram_simple/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_simple/dagre/sketch.exp.svg @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD AlicelinebreakerBobdbqueueanoddservicewithanameinmultiple lines Authentication Requestmake request for something that is quite far away and requires a really long label to take all the space between the objectsvalidate credentials Authentication ResponseAnother authentication Requestdo it later storedAnother authentication Response >>>>>>> 33280fed5 (fixed e2e tests) +||||||| parent of cb2f2823c (Fix changes) + .d2-263630260 .fill-N1{fill:#0A0F25;} + .d2-263630260 .fill-N2{fill:#676C7E;} + .d2-263630260 .fill-N3{fill:#9499AB;} + .d2-263630260 .fill-N4{fill:#CFD2DD;} + .d2-263630260 .fill-N5{fill:#DEE1EB;} + .d2-263630260 .fill-N6{fill:#EEF1F8;} + .d2-263630260 .fill-N7{fill:#FFFFFF;} + .d2-263630260 .fill-B1{fill:#0D32B2;} + .d2-263630260 .fill-B2{fill:#0D32B2;} + .d2-263630260 .fill-B3{fill:#E3E9FD;} + .d2-263630260 .fill-B4{fill:#E3E9FD;} + .d2-263630260 .fill-B5{fill:#EDF0FD;} + .d2-263630260 .fill-B6{fill:#F7F8FE;} + .d2-263630260 .fill-AA2{fill:#4A6FF3;} + .d2-263630260 .fill-AA4{fill:#EDF0FD;} + .d2-263630260 .fill-AA5{fill:#F7F8FE;} + .d2-263630260 .fill-AB4{fill:#EDF0FD;} + .d2-263630260 .fill-AB5{fill:#F7F8FE;} + .d2-263630260 .stroke-N1{stroke:#0A0F25;} + .d2-263630260 .stroke-N2{stroke:#676C7E;} + .d2-263630260 .stroke-N3{stroke:#9499AB;} + .d2-263630260 .stroke-N4{stroke:#CFD2DD;} + .d2-263630260 .stroke-N5{stroke:#DEE1EB;} + .d2-263630260 .stroke-N6{stroke:#EEF1F8;} + .d2-263630260 .stroke-N7{stroke:#FFFFFF;} + .d2-263630260 .stroke-B1{stroke:#0D32B2;} + .d2-263630260 .stroke-B2{stroke:#0D32B2;} + .d2-263630260 .stroke-B3{stroke:#E3E9FD;} + .d2-263630260 .stroke-B4{stroke:#E3E9FD;} + .d2-263630260 .stroke-B5{stroke:#EDF0FD;} + .d2-263630260 .stroke-B6{stroke:#F7F8FE;} + .d2-263630260 .stroke-AA2{stroke:#4A6FF3;} + .d2-263630260 .stroke-AA4{stroke:#EDF0FD;} + .d2-263630260 .stroke-AA5{stroke:#F7F8FE;} + .d2-263630260 .stroke-AB4{stroke:#EDF0FD;} + .d2-263630260 .stroke-AB5{stroke:#F7F8FE;} + .d2-263630260 .background-color-N1{background-color:#0A0F25;} + .d2-263630260 .background-color-N2{background-color:#676C7E;} + .d2-263630260 .background-color-N3{background-color:#9499AB;} + .d2-263630260 .background-color-N4{background-color:#CFD2DD;} + .d2-263630260 .background-color-N5{background-color:#DEE1EB;} + .d2-263630260 .background-color-N6{background-color:#EEF1F8;} + .d2-263630260 .background-color-N7{background-color:#FFFFFF;} + .d2-263630260 .background-color-B1{background-color:#0D32B2;} + .d2-263630260 .background-color-B2{background-color:#0D32B2;} + .d2-263630260 .background-color-B3{background-color:#E3E9FD;} + .d2-263630260 .background-color-B4{background-color:#E3E9FD;} + .d2-263630260 .background-color-B5{background-color:#EDF0FD;} + .d2-263630260 .background-color-B6{background-color:#F7F8FE;} + .d2-263630260 .background-color-AA2{background-color:#4A6FF3;} + .d2-263630260 .background-color-AA4{background-color:#EDF0FD;} + .d2-263630260 .background-color-AA5{background-color:#F7F8FE;} + .d2-263630260 .background-color-AB4{background-color:#EDF0FD;} + .d2-263630260 .background-color-AB5{background-color:#F7F8FE;} + .d2-263630260 .color-N1{color:#0A0F25;} + .d2-263630260 .color-N2{color:#676C7E;} + .d2-263630260 .color-N3{color:#9499AB;} + .d2-263630260 .color-N4{color:#CFD2DD;} + .d2-263630260 .color-N5{color:#DEE1EB;} + .d2-263630260 .color-N6{color:#EEF1F8;} + .d2-263630260 .color-N7{color:#FFFFFF;} + .d2-263630260 .color-B1{color:#0D32B2;} + .d2-263630260 .color-B2{color:#0D32B2;} + .d2-263630260 .color-B3{color:#E3E9FD;} + .d2-263630260 .color-B4{color:#E3E9FD;} + .d2-263630260 .color-B5{color:#EDF0FD;} + .d2-263630260 .color-B6{color:#F7F8FE;} + .d2-263630260 .color-AA2{color:#4A6FF3;} + .d2-263630260 .color-AA4{color:#EDF0FD;} + .d2-263630260 .color-AA5{color:#F7F8FE;} + .d2-263630260 .color-AB4{color:#EDF0FD;} + .d2-263630260 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>AlicelinebreakerBobdbqueueanoddservicewithanameinmultiple lines Authentication Requestmake request for something that is quite far away and requires a really long label to take all the space between the objectsvalidate credentials Authentication ResponseAnother authentication Requestdo it later storedAnother authentication Response + +======= + .d2-1872540771 .fill-N1{fill:#0A0F25;} + .d2-1872540771 .fill-N2{fill:#676C7E;} + .d2-1872540771 .fill-N3{fill:#9499AB;} + .d2-1872540771 .fill-N4{fill:#CFD2DD;} + .d2-1872540771 .fill-N5{fill:#DEE1EB;} + .d2-1872540771 .fill-N6{fill:#EEF1F8;} + .d2-1872540771 .fill-N7{fill:#FFFFFF;} + .d2-1872540771 .fill-B1{fill:#0D32B2;} + .d2-1872540771 .fill-B2{fill:#0D32B2;} + .d2-1872540771 .fill-B3{fill:#E3E9FD;} + .d2-1872540771 .fill-B4{fill:#E3E9FD;} + .d2-1872540771 .fill-B5{fill:#EDF0FD;} + .d2-1872540771 .fill-B6{fill:#F7F8FE;} + .d2-1872540771 .fill-AA2{fill:#4A6FF3;} + .d2-1872540771 .fill-AA4{fill:#EDF0FD;} + .d2-1872540771 .fill-AA5{fill:#F7F8FE;} + .d2-1872540771 .fill-AB4{fill:#EDF0FD;} + .d2-1872540771 .fill-AB5{fill:#F7F8FE;} + .d2-1872540771 .stroke-N1{stroke:#0A0F25;} + .d2-1872540771 .stroke-N2{stroke:#676C7E;} + .d2-1872540771 .stroke-N3{stroke:#9499AB;} + .d2-1872540771 .stroke-N4{stroke:#CFD2DD;} + .d2-1872540771 .stroke-N5{stroke:#DEE1EB;} + .d2-1872540771 .stroke-N6{stroke:#EEF1F8;} + .d2-1872540771 .stroke-N7{stroke:#FFFFFF;} + .d2-1872540771 .stroke-B1{stroke:#0D32B2;} + .d2-1872540771 .stroke-B2{stroke:#0D32B2;} + .d2-1872540771 .stroke-B3{stroke:#E3E9FD;} + .d2-1872540771 .stroke-B4{stroke:#E3E9FD;} + .d2-1872540771 .stroke-B5{stroke:#EDF0FD;} + .d2-1872540771 .stroke-B6{stroke:#F7F8FE;} + .d2-1872540771 .stroke-AA2{stroke:#4A6FF3;} + .d2-1872540771 .stroke-AA4{stroke:#EDF0FD;} + .d2-1872540771 .stroke-AA5{stroke:#F7F8FE;} + .d2-1872540771 .stroke-AB4{stroke:#EDF0FD;} + .d2-1872540771 .stroke-AB5{stroke:#F7F8FE;} + .d2-1872540771 .background-color-N1{background-color:#0A0F25;} + .d2-1872540771 .background-color-N2{background-color:#676C7E;} + .d2-1872540771 .background-color-N3{background-color:#9499AB;} + .d2-1872540771 .background-color-N4{background-color:#CFD2DD;} + .d2-1872540771 .background-color-N5{background-color:#DEE1EB;} + .d2-1872540771 .background-color-N6{background-color:#EEF1F8;} + .d2-1872540771 .background-color-N7{background-color:#FFFFFF;} + .d2-1872540771 .background-color-B1{background-color:#0D32B2;} + .d2-1872540771 .background-color-B2{background-color:#0D32B2;} + .d2-1872540771 .background-color-B3{background-color:#E3E9FD;} + .d2-1872540771 .background-color-B4{background-color:#E3E9FD;} + .d2-1872540771 .background-color-B5{background-color:#EDF0FD;} + .d2-1872540771 .background-color-B6{background-color:#F7F8FE;} + .d2-1872540771 .background-color-AA2{background-color:#4A6FF3;} + .d2-1872540771 .background-color-AA4{background-color:#EDF0FD;} + .d2-1872540771 .background-color-AA5{background-color:#F7F8FE;} + .d2-1872540771 .background-color-AB4{background-color:#EDF0FD;} + .d2-1872540771 .background-color-AB5{background-color:#F7F8FE;} + .d2-1872540771 .color-N1{color:#0A0F25;} + .d2-1872540771 .color-N2{color:#676C7E;} + .d2-1872540771 .color-N3{color:#9499AB;} + .d2-1872540771 .color-N4{color:#CFD2DD;} + .d2-1872540771 .color-N5{color:#DEE1EB;} + .d2-1872540771 .color-N6{color:#EEF1F8;} + .d2-1872540771 .color-N7{color:#FFFFFF;} + .d2-1872540771 .color-B1{color:#0D32B2;} + .d2-1872540771 .color-B2{color:#0D32B2;} + .d2-1872540771 .color-B3{color:#E3E9FD;} + .d2-1872540771 .color-B4{color:#E3E9FD;} + .d2-1872540771 .color-B5{color:#EDF0FD;} + .d2-1872540771 .color-B6{color:#F7F8FE;} + .d2-1872540771 .color-AA2{color:#4A6FF3;} + .d2-1872540771 .color-AA4{color:#EDF0FD;} + .d2-1872540771 .color-AA5{color:#F7F8FE;} + .d2-1872540771 .color-AB4{color:#EDF0FD;} + .d2-1872540771 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>AlicelinebreakerBobdbqueueanoddservicewithanameinmultiple lines Authentication Requestmake request for something that is quite far away and requires a really long label to take all the space between the objectsvalidate credentials Authentication ResponseAnother authentication Requestdo it later storedAnother authentication Response + +>>>>>>> cb2f2823c (Fix changes) - - - - - - - - - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence_diagram_simple/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_simple/elk/sketch.exp.svg index 4f9b93d0d..d1cdfbf45 100644 --- a/e2etests/testdata/stable/sequence_diagram_simple/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_simple/elk/sketch.exp.svg @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD AlicelinebreakerBobdbqueueanoddservicewithanameinmultiple lines Authentication Requestmake request for something that is quite far away and requires a really long label to take all the space between the objectsvalidate credentials Authentication ResponseAnother authentication Requestdo it later storedAnother authentication Response >>>>>>> 33280fed5 (fixed e2e tests) +||||||| parent of cb2f2823c (Fix changes) + .d2-263630260 .fill-N1{fill:#0A0F25;} + .d2-263630260 .fill-N2{fill:#676C7E;} + .d2-263630260 .fill-N3{fill:#9499AB;} + .d2-263630260 .fill-N4{fill:#CFD2DD;} + .d2-263630260 .fill-N5{fill:#DEE1EB;} + .d2-263630260 .fill-N6{fill:#EEF1F8;} + .d2-263630260 .fill-N7{fill:#FFFFFF;} + .d2-263630260 .fill-B1{fill:#0D32B2;} + .d2-263630260 .fill-B2{fill:#0D32B2;} + .d2-263630260 .fill-B3{fill:#E3E9FD;} + .d2-263630260 .fill-B4{fill:#E3E9FD;} + .d2-263630260 .fill-B5{fill:#EDF0FD;} + .d2-263630260 .fill-B6{fill:#F7F8FE;} + .d2-263630260 .fill-AA2{fill:#4A6FF3;} + .d2-263630260 .fill-AA4{fill:#EDF0FD;} + .d2-263630260 .fill-AA5{fill:#F7F8FE;} + .d2-263630260 .fill-AB4{fill:#EDF0FD;} + .d2-263630260 .fill-AB5{fill:#F7F8FE;} + .d2-263630260 .stroke-N1{stroke:#0A0F25;} + .d2-263630260 .stroke-N2{stroke:#676C7E;} + .d2-263630260 .stroke-N3{stroke:#9499AB;} + .d2-263630260 .stroke-N4{stroke:#CFD2DD;} + .d2-263630260 .stroke-N5{stroke:#DEE1EB;} + .d2-263630260 .stroke-N6{stroke:#EEF1F8;} + .d2-263630260 .stroke-N7{stroke:#FFFFFF;} + .d2-263630260 .stroke-B1{stroke:#0D32B2;} + .d2-263630260 .stroke-B2{stroke:#0D32B2;} + .d2-263630260 .stroke-B3{stroke:#E3E9FD;} + .d2-263630260 .stroke-B4{stroke:#E3E9FD;} + .d2-263630260 .stroke-B5{stroke:#EDF0FD;} + .d2-263630260 .stroke-B6{stroke:#F7F8FE;} + .d2-263630260 .stroke-AA2{stroke:#4A6FF3;} + .d2-263630260 .stroke-AA4{stroke:#EDF0FD;} + .d2-263630260 .stroke-AA5{stroke:#F7F8FE;} + .d2-263630260 .stroke-AB4{stroke:#EDF0FD;} + .d2-263630260 .stroke-AB5{stroke:#F7F8FE;} + .d2-263630260 .background-color-N1{background-color:#0A0F25;} + .d2-263630260 .background-color-N2{background-color:#676C7E;} + .d2-263630260 .background-color-N3{background-color:#9499AB;} + .d2-263630260 .background-color-N4{background-color:#CFD2DD;} + .d2-263630260 .background-color-N5{background-color:#DEE1EB;} + .d2-263630260 .background-color-N6{background-color:#EEF1F8;} + .d2-263630260 .background-color-N7{background-color:#FFFFFF;} + .d2-263630260 .background-color-B1{background-color:#0D32B2;} + .d2-263630260 .background-color-B2{background-color:#0D32B2;} + .d2-263630260 .background-color-B3{background-color:#E3E9FD;} + .d2-263630260 .background-color-B4{background-color:#E3E9FD;} + .d2-263630260 .background-color-B5{background-color:#EDF0FD;} + .d2-263630260 .background-color-B6{background-color:#F7F8FE;} + .d2-263630260 .background-color-AA2{background-color:#4A6FF3;} + .d2-263630260 .background-color-AA4{background-color:#EDF0FD;} + .d2-263630260 .background-color-AA5{background-color:#F7F8FE;} + .d2-263630260 .background-color-AB4{background-color:#EDF0FD;} + .d2-263630260 .background-color-AB5{background-color:#F7F8FE;} + .d2-263630260 .color-N1{color:#0A0F25;} + .d2-263630260 .color-N2{color:#676C7E;} + .d2-263630260 .color-N3{color:#9499AB;} + .d2-263630260 .color-N4{color:#CFD2DD;} + .d2-263630260 .color-N5{color:#DEE1EB;} + .d2-263630260 .color-N6{color:#EEF1F8;} + .d2-263630260 .color-N7{color:#FFFFFF;} + .d2-263630260 .color-B1{color:#0D32B2;} + .d2-263630260 .color-B2{color:#0D32B2;} + .d2-263630260 .color-B3{color:#E3E9FD;} + .d2-263630260 .color-B4{color:#E3E9FD;} + .d2-263630260 .color-B5{color:#EDF0FD;} + .d2-263630260 .color-B6{color:#F7F8FE;} + .d2-263630260 .color-AA2{color:#4A6FF3;} + .d2-263630260 .color-AA4{color:#EDF0FD;} + .d2-263630260 .color-AA5{color:#F7F8FE;} + .d2-263630260 .color-AB4{color:#EDF0FD;} + .d2-263630260 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>AlicelinebreakerBobdbqueueanoddservicewithanameinmultiple lines Authentication Requestmake request for something that is quite far away and requires a really long label to take all the space between the objectsvalidate credentials Authentication ResponseAnother authentication Requestdo it later storedAnother authentication Response + +======= + .d2-1872540771 .fill-N1{fill:#0A0F25;} + .d2-1872540771 .fill-N2{fill:#676C7E;} + .d2-1872540771 .fill-N3{fill:#9499AB;} + .d2-1872540771 .fill-N4{fill:#CFD2DD;} + .d2-1872540771 .fill-N5{fill:#DEE1EB;} + .d2-1872540771 .fill-N6{fill:#EEF1F8;} + .d2-1872540771 .fill-N7{fill:#FFFFFF;} + .d2-1872540771 .fill-B1{fill:#0D32B2;} + .d2-1872540771 .fill-B2{fill:#0D32B2;} + .d2-1872540771 .fill-B3{fill:#E3E9FD;} + .d2-1872540771 .fill-B4{fill:#E3E9FD;} + .d2-1872540771 .fill-B5{fill:#EDF0FD;} + .d2-1872540771 .fill-B6{fill:#F7F8FE;} + .d2-1872540771 .fill-AA2{fill:#4A6FF3;} + .d2-1872540771 .fill-AA4{fill:#EDF0FD;} + .d2-1872540771 .fill-AA5{fill:#F7F8FE;} + .d2-1872540771 .fill-AB4{fill:#EDF0FD;} + .d2-1872540771 .fill-AB5{fill:#F7F8FE;} + .d2-1872540771 .stroke-N1{stroke:#0A0F25;} + .d2-1872540771 .stroke-N2{stroke:#676C7E;} + .d2-1872540771 .stroke-N3{stroke:#9499AB;} + .d2-1872540771 .stroke-N4{stroke:#CFD2DD;} + .d2-1872540771 .stroke-N5{stroke:#DEE1EB;} + .d2-1872540771 .stroke-N6{stroke:#EEF1F8;} + .d2-1872540771 .stroke-N7{stroke:#FFFFFF;} + .d2-1872540771 .stroke-B1{stroke:#0D32B2;} + .d2-1872540771 .stroke-B2{stroke:#0D32B2;} + .d2-1872540771 .stroke-B3{stroke:#E3E9FD;} + .d2-1872540771 .stroke-B4{stroke:#E3E9FD;} + .d2-1872540771 .stroke-B5{stroke:#EDF0FD;} + .d2-1872540771 .stroke-B6{stroke:#F7F8FE;} + .d2-1872540771 .stroke-AA2{stroke:#4A6FF3;} + .d2-1872540771 .stroke-AA4{stroke:#EDF0FD;} + .d2-1872540771 .stroke-AA5{stroke:#F7F8FE;} + .d2-1872540771 .stroke-AB4{stroke:#EDF0FD;} + .d2-1872540771 .stroke-AB5{stroke:#F7F8FE;} + .d2-1872540771 .background-color-N1{background-color:#0A0F25;} + .d2-1872540771 .background-color-N2{background-color:#676C7E;} + .d2-1872540771 .background-color-N3{background-color:#9499AB;} + .d2-1872540771 .background-color-N4{background-color:#CFD2DD;} + .d2-1872540771 .background-color-N5{background-color:#DEE1EB;} + .d2-1872540771 .background-color-N6{background-color:#EEF1F8;} + .d2-1872540771 .background-color-N7{background-color:#FFFFFF;} + .d2-1872540771 .background-color-B1{background-color:#0D32B2;} + .d2-1872540771 .background-color-B2{background-color:#0D32B2;} + .d2-1872540771 .background-color-B3{background-color:#E3E9FD;} + .d2-1872540771 .background-color-B4{background-color:#E3E9FD;} + .d2-1872540771 .background-color-B5{background-color:#EDF0FD;} + .d2-1872540771 .background-color-B6{background-color:#F7F8FE;} + .d2-1872540771 .background-color-AA2{background-color:#4A6FF3;} + .d2-1872540771 .background-color-AA4{background-color:#EDF0FD;} + .d2-1872540771 .background-color-AA5{background-color:#F7F8FE;} + .d2-1872540771 .background-color-AB4{background-color:#EDF0FD;} + .d2-1872540771 .background-color-AB5{background-color:#F7F8FE;} + .d2-1872540771 .color-N1{color:#0A0F25;} + .d2-1872540771 .color-N2{color:#676C7E;} + .d2-1872540771 .color-N3{color:#9499AB;} + .d2-1872540771 .color-N4{color:#CFD2DD;} + .d2-1872540771 .color-N5{color:#DEE1EB;} + .d2-1872540771 .color-N6{color:#EEF1F8;} + .d2-1872540771 .color-N7{color:#FFFFFF;} + .d2-1872540771 .color-B1{color:#0D32B2;} + .d2-1872540771 .color-B2{color:#0D32B2;} + .d2-1872540771 .color-B3{color:#E3E9FD;} + .d2-1872540771 .color-B4{color:#E3E9FD;} + .d2-1872540771 .color-B5{color:#EDF0FD;} + .d2-1872540771 .color-B6{color:#F7F8FE;} + .d2-1872540771 .color-AA2{color:#4A6FF3;} + .d2-1872540771 .color-AA4{color:#EDF0FD;} + .d2-1872540771 .color-AA5{color:#F7F8FE;} + .d2-1872540771 .color-AB4{color:#EDF0FD;} + .d2-1872540771 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>AlicelinebreakerBobdbqueueanoddservicewithanameinmultiple lines Authentication Requestmake request for something that is quite far away and requires a really long label to take all the space between the objectsvalidate credentials Authentication ResponseAnother authentication Requestdo it later storedAnother authentication Response + +>>>>>>> cb2f2823c (Fix changes) - - - - - - - - - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence_diagram_span/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_span/dagre/sketch.exp.svg index 9d4af1b71..2a94cfc5c 100644 --- a/e2etests/testdata/stable/sequence_diagram_span/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_span/dagre/sketch.exp.svg @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD scoreritemResponseitemessayRubricconceptitemOutcome getItem() itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts) >>>>>>> 33280fed5 (fixed e2e tests) +||||||| parent of cb2f2823c (Fix changes) + .d2-831162182 .fill-N1{fill:#0A0F25;} + .d2-831162182 .fill-N2{fill:#676C7E;} + .d2-831162182 .fill-N3{fill:#9499AB;} + .d2-831162182 .fill-N4{fill:#CFD2DD;} + .d2-831162182 .fill-N5{fill:#DEE1EB;} + .d2-831162182 .fill-N6{fill:#EEF1F8;} + .d2-831162182 .fill-N7{fill:#FFFFFF;} + .d2-831162182 .fill-B1{fill:#0D32B2;} + .d2-831162182 .fill-B2{fill:#0D32B2;} + .d2-831162182 .fill-B3{fill:#E3E9FD;} + .d2-831162182 .fill-B4{fill:#E3E9FD;} + .d2-831162182 .fill-B5{fill:#EDF0FD;} + .d2-831162182 .fill-B6{fill:#F7F8FE;} + .d2-831162182 .fill-AA2{fill:#4A6FF3;} + .d2-831162182 .fill-AA4{fill:#EDF0FD;} + .d2-831162182 .fill-AA5{fill:#F7F8FE;} + .d2-831162182 .fill-AB4{fill:#EDF0FD;} + .d2-831162182 .fill-AB5{fill:#F7F8FE;} + .d2-831162182 .stroke-N1{stroke:#0A0F25;} + .d2-831162182 .stroke-N2{stroke:#676C7E;} + .d2-831162182 .stroke-N3{stroke:#9499AB;} + .d2-831162182 .stroke-N4{stroke:#CFD2DD;} + .d2-831162182 .stroke-N5{stroke:#DEE1EB;} + .d2-831162182 .stroke-N6{stroke:#EEF1F8;} + .d2-831162182 .stroke-N7{stroke:#FFFFFF;} + .d2-831162182 .stroke-B1{stroke:#0D32B2;} + .d2-831162182 .stroke-B2{stroke:#0D32B2;} + .d2-831162182 .stroke-B3{stroke:#E3E9FD;} + .d2-831162182 .stroke-B4{stroke:#E3E9FD;} + .d2-831162182 .stroke-B5{stroke:#EDF0FD;} + .d2-831162182 .stroke-B6{stroke:#F7F8FE;} + .d2-831162182 .stroke-AA2{stroke:#4A6FF3;} + .d2-831162182 .stroke-AA4{stroke:#EDF0FD;} + .d2-831162182 .stroke-AA5{stroke:#F7F8FE;} + .d2-831162182 .stroke-AB4{stroke:#EDF0FD;} + .d2-831162182 .stroke-AB5{stroke:#F7F8FE;} + .d2-831162182 .background-color-N1{background-color:#0A0F25;} + .d2-831162182 .background-color-N2{background-color:#676C7E;} + .d2-831162182 .background-color-N3{background-color:#9499AB;} + .d2-831162182 .background-color-N4{background-color:#CFD2DD;} + .d2-831162182 .background-color-N5{background-color:#DEE1EB;} + .d2-831162182 .background-color-N6{background-color:#EEF1F8;} + .d2-831162182 .background-color-N7{background-color:#FFFFFF;} + .d2-831162182 .background-color-B1{background-color:#0D32B2;} + .d2-831162182 .background-color-B2{background-color:#0D32B2;} + .d2-831162182 .background-color-B3{background-color:#E3E9FD;} + .d2-831162182 .background-color-B4{background-color:#E3E9FD;} + .d2-831162182 .background-color-B5{background-color:#EDF0FD;} + .d2-831162182 .background-color-B6{background-color:#F7F8FE;} + .d2-831162182 .background-color-AA2{background-color:#4A6FF3;} + .d2-831162182 .background-color-AA4{background-color:#EDF0FD;} + .d2-831162182 .background-color-AA5{background-color:#F7F8FE;} + .d2-831162182 .background-color-AB4{background-color:#EDF0FD;} + .d2-831162182 .background-color-AB5{background-color:#F7F8FE;} + .d2-831162182 .color-N1{color:#0A0F25;} + .d2-831162182 .color-N2{color:#676C7E;} + .d2-831162182 .color-N3{color:#9499AB;} + .d2-831162182 .color-N4{color:#CFD2DD;} + .d2-831162182 .color-N5{color:#DEE1EB;} + .d2-831162182 .color-N6{color:#EEF1F8;} + .d2-831162182 .color-N7{color:#FFFFFF;} + .d2-831162182 .color-B1{color:#0D32B2;} + .d2-831162182 .color-B2{color:#0D32B2;} + .d2-831162182 .color-B3{color:#E3E9FD;} + .d2-831162182 .color-B4{color:#E3E9FD;} + .d2-831162182 .color-B5{color:#EDF0FD;} + .d2-831162182 .color-B6{color:#F7F8FE;} + .d2-831162182 .color-AA2{color:#4A6FF3;} + .d2-831162182 .color-AA4{color:#EDF0FD;} + .d2-831162182 .color-AA5{color:#F7F8FE;} + .d2-831162182 .color-AB4{color:#EDF0FD;} + .d2-831162182 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>scoreritemResponseitemessayRubricconceptitemOutcome getItem() itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts) + +======= + .d2-2094605573 .fill-N1{fill:#0A0F25;} + .d2-2094605573 .fill-N2{fill:#676C7E;} + .d2-2094605573 .fill-N3{fill:#9499AB;} + .d2-2094605573 .fill-N4{fill:#CFD2DD;} + .d2-2094605573 .fill-N5{fill:#DEE1EB;} + .d2-2094605573 .fill-N6{fill:#EEF1F8;} + .d2-2094605573 .fill-N7{fill:#FFFFFF;} + .d2-2094605573 .fill-B1{fill:#0D32B2;} + .d2-2094605573 .fill-B2{fill:#0D32B2;} + .d2-2094605573 .fill-B3{fill:#E3E9FD;} + .d2-2094605573 .fill-B4{fill:#E3E9FD;} + .d2-2094605573 .fill-B5{fill:#EDF0FD;} + .d2-2094605573 .fill-B6{fill:#F7F8FE;} + .d2-2094605573 .fill-AA2{fill:#4A6FF3;} + .d2-2094605573 .fill-AA4{fill:#EDF0FD;} + .d2-2094605573 .fill-AA5{fill:#F7F8FE;} + .d2-2094605573 .fill-AB4{fill:#EDF0FD;} + .d2-2094605573 .fill-AB5{fill:#F7F8FE;} + .d2-2094605573 .stroke-N1{stroke:#0A0F25;} + .d2-2094605573 .stroke-N2{stroke:#676C7E;} + .d2-2094605573 .stroke-N3{stroke:#9499AB;} + .d2-2094605573 .stroke-N4{stroke:#CFD2DD;} + .d2-2094605573 .stroke-N5{stroke:#DEE1EB;} + .d2-2094605573 .stroke-N6{stroke:#EEF1F8;} + .d2-2094605573 .stroke-N7{stroke:#FFFFFF;} + .d2-2094605573 .stroke-B1{stroke:#0D32B2;} + .d2-2094605573 .stroke-B2{stroke:#0D32B2;} + .d2-2094605573 .stroke-B3{stroke:#E3E9FD;} + .d2-2094605573 .stroke-B4{stroke:#E3E9FD;} + .d2-2094605573 .stroke-B5{stroke:#EDF0FD;} + .d2-2094605573 .stroke-B6{stroke:#F7F8FE;} + .d2-2094605573 .stroke-AA2{stroke:#4A6FF3;} + .d2-2094605573 .stroke-AA4{stroke:#EDF0FD;} + .d2-2094605573 .stroke-AA5{stroke:#F7F8FE;} + .d2-2094605573 .stroke-AB4{stroke:#EDF0FD;} + .d2-2094605573 .stroke-AB5{stroke:#F7F8FE;} + .d2-2094605573 .background-color-N1{background-color:#0A0F25;} + .d2-2094605573 .background-color-N2{background-color:#676C7E;} + .d2-2094605573 .background-color-N3{background-color:#9499AB;} + .d2-2094605573 .background-color-N4{background-color:#CFD2DD;} + .d2-2094605573 .background-color-N5{background-color:#DEE1EB;} + .d2-2094605573 .background-color-N6{background-color:#EEF1F8;} + .d2-2094605573 .background-color-N7{background-color:#FFFFFF;} + .d2-2094605573 .background-color-B1{background-color:#0D32B2;} + .d2-2094605573 .background-color-B2{background-color:#0D32B2;} + .d2-2094605573 .background-color-B3{background-color:#E3E9FD;} + .d2-2094605573 .background-color-B4{background-color:#E3E9FD;} + .d2-2094605573 .background-color-B5{background-color:#EDF0FD;} + .d2-2094605573 .background-color-B6{background-color:#F7F8FE;} + .d2-2094605573 .background-color-AA2{background-color:#4A6FF3;} + .d2-2094605573 .background-color-AA4{background-color:#EDF0FD;} + .d2-2094605573 .background-color-AA5{background-color:#F7F8FE;} + .d2-2094605573 .background-color-AB4{background-color:#EDF0FD;} + .d2-2094605573 .background-color-AB5{background-color:#F7F8FE;} + .d2-2094605573 .color-N1{color:#0A0F25;} + .d2-2094605573 .color-N2{color:#676C7E;} + .d2-2094605573 .color-N3{color:#9499AB;} + .d2-2094605573 .color-N4{color:#CFD2DD;} + .d2-2094605573 .color-N5{color:#DEE1EB;} + .d2-2094605573 .color-N6{color:#EEF1F8;} + .d2-2094605573 .color-N7{color:#FFFFFF;} + .d2-2094605573 .color-B1{color:#0D32B2;} + .d2-2094605573 .color-B2{color:#0D32B2;} + .d2-2094605573 .color-B3{color:#E3E9FD;} + .d2-2094605573 .color-B4{color:#E3E9FD;} + .d2-2094605573 .color-B5{color:#EDF0FD;} + .d2-2094605573 .color-B6{color:#F7F8FE;} + .d2-2094605573 .color-AA2{color:#4A6FF3;} + .d2-2094605573 .color-AA4{color:#EDF0FD;} + .d2-2094605573 .color-AA5{color:#F7F8FE;} + .d2-2094605573 .color-AB4{color:#EDF0FD;} + .d2-2094605573 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>scoreritemResponseitemessayRubricconceptitemOutcome getItem() itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts) + +>>>>>>> cb2f2823c (Fix changes) - - - - - - - - - - - - - - + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence_diagram_span/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_span/elk/sketch.exp.svg index 9d4af1b71..2a94cfc5c 100644 --- a/e2etests/testdata/stable/sequence_diagram_span/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_span/elk/sketch.exp.svg @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD scoreritemResponseitemessayRubricconceptitemOutcome getItem() itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts) >>>>>>> 33280fed5 (fixed e2e tests) +||||||| parent of cb2f2823c (Fix changes) + .d2-831162182 .fill-N1{fill:#0A0F25;} + .d2-831162182 .fill-N2{fill:#676C7E;} + .d2-831162182 .fill-N3{fill:#9499AB;} + .d2-831162182 .fill-N4{fill:#CFD2DD;} + .d2-831162182 .fill-N5{fill:#DEE1EB;} + .d2-831162182 .fill-N6{fill:#EEF1F8;} + .d2-831162182 .fill-N7{fill:#FFFFFF;} + .d2-831162182 .fill-B1{fill:#0D32B2;} + .d2-831162182 .fill-B2{fill:#0D32B2;} + .d2-831162182 .fill-B3{fill:#E3E9FD;} + .d2-831162182 .fill-B4{fill:#E3E9FD;} + .d2-831162182 .fill-B5{fill:#EDF0FD;} + .d2-831162182 .fill-B6{fill:#F7F8FE;} + .d2-831162182 .fill-AA2{fill:#4A6FF3;} + .d2-831162182 .fill-AA4{fill:#EDF0FD;} + .d2-831162182 .fill-AA5{fill:#F7F8FE;} + .d2-831162182 .fill-AB4{fill:#EDF0FD;} + .d2-831162182 .fill-AB5{fill:#F7F8FE;} + .d2-831162182 .stroke-N1{stroke:#0A0F25;} + .d2-831162182 .stroke-N2{stroke:#676C7E;} + .d2-831162182 .stroke-N3{stroke:#9499AB;} + .d2-831162182 .stroke-N4{stroke:#CFD2DD;} + .d2-831162182 .stroke-N5{stroke:#DEE1EB;} + .d2-831162182 .stroke-N6{stroke:#EEF1F8;} + .d2-831162182 .stroke-N7{stroke:#FFFFFF;} + .d2-831162182 .stroke-B1{stroke:#0D32B2;} + .d2-831162182 .stroke-B2{stroke:#0D32B2;} + .d2-831162182 .stroke-B3{stroke:#E3E9FD;} + .d2-831162182 .stroke-B4{stroke:#E3E9FD;} + .d2-831162182 .stroke-B5{stroke:#EDF0FD;} + .d2-831162182 .stroke-B6{stroke:#F7F8FE;} + .d2-831162182 .stroke-AA2{stroke:#4A6FF3;} + .d2-831162182 .stroke-AA4{stroke:#EDF0FD;} + .d2-831162182 .stroke-AA5{stroke:#F7F8FE;} + .d2-831162182 .stroke-AB4{stroke:#EDF0FD;} + .d2-831162182 .stroke-AB5{stroke:#F7F8FE;} + .d2-831162182 .background-color-N1{background-color:#0A0F25;} + .d2-831162182 .background-color-N2{background-color:#676C7E;} + .d2-831162182 .background-color-N3{background-color:#9499AB;} + .d2-831162182 .background-color-N4{background-color:#CFD2DD;} + .d2-831162182 .background-color-N5{background-color:#DEE1EB;} + .d2-831162182 .background-color-N6{background-color:#EEF1F8;} + .d2-831162182 .background-color-N7{background-color:#FFFFFF;} + .d2-831162182 .background-color-B1{background-color:#0D32B2;} + .d2-831162182 .background-color-B2{background-color:#0D32B2;} + .d2-831162182 .background-color-B3{background-color:#E3E9FD;} + .d2-831162182 .background-color-B4{background-color:#E3E9FD;} + .d2-831162182 .background-color-B5{background-color:#EDF0FD;} + .d2-831162182 .background-color-B6{background-color:#F7F8FE;} + .d2-831162182 .background-color-AA2{background-color:#4A6FF3;} + .d2-831162182 .background-color-AA4{background-color:#EDF0FD;} + .d2-831162182 .background-color-AA5{background-color:#F7F8FE;} + .d2-831162182 .background-color-AB4{background-color:#EDF0FD;} + .d2-831162182 .background-color-AB5{background-color:#F7F8FE;} + .d2-831162182 .color-N1{color:#0A0F25;} + .d2-831162182 .color-N2{color:#676C7E;} + .d2-831162182 .color-N3{color:#9499AB;} + .d2-831162182 .color-N4{color:#CFD2DD;} + .d2-831162182 .color-N5{color:#DEE1EB;} + .d2-831162182 .color-N6{color:#EEF1F8;} + .d2-831162182 .color-N7{color:#FFFFFF;} + .d2-831162182 .color-B1{color:#0D32B2;} + .d2-831162182 .color-B2{color:#0D32B2;} + .d2-831162182 .color-B3{color:#E3E9FD;} + .d2-831162182 .color-B4{color:#E3E9FD;} + .d2-831162182 .color-B5{color:#EDF0FD;} + .d2-831162182 .color-B6{color:#F7F8FE;} + .d2-831162182 .color-AA2{color:#4A6FF3;} + .d2-831162182 .color-AA4{color:#EDF0FD;} + .d2-831162182 .color-AA5{color:#F7F8FE;} + .d2-831162182 .color-AB4{color:#EDF0FD;} + .d2-831162182 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>scoreritemResponseitemessayRubricconceptitemOutcome getItem() itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts) + +======= + .d2-2094605573 .fill-N1{fill:#0A0F25;} + .d2-2094605573 .fill-N2{fill:#676C7E;} + .d2-2094605573 .fill-N3{fill:#9499AB;} + .d2-2094605573 .fill-N4{fill:#CFD2DD;} + .d2-2094605573 .fill-N5{fill:#DEE1EB;} + .d2-2094605573 .fill-N6{fill:#EEF1F8;} + .d2-2094605573 .fill-N7{fill:#FFFFFF;} + .d2-2094605573 .fill-B1{fill:#0D32B2;} + .d2-2094605573 .fill-B2{fill:#0D32B2;} + .d2-2094605573 .fill-B3{fill:#E3E9FD;} + .d2-2094605573 .fill-B4{fill:#E3E9FD;} + .d2-2094605573 .fill-B5{fill:#EDF0FD;} + .d2-2094605573 .fill-B6{fill:#F7F8FE;} + .d2-2094605573 .fill-AA2{fill:#4A6FF3;} + .d2-2094605573 .fill-AA4{fill:#EDF0FD;} + .d2-2094605573 .fill-AA5{fill:#F7F8FE;} + .d2-2094605573 .fill-AB4{fill:#EDF0FD;} + .d2-2094605573 .fill-AB5{fill:#F7F8FE;} + .d2-2094605573 .stroke-N1{stroke:#0A0F25;} + .d2-2094605573 .stroke-N2{stroke:#676C7E;} + .d2-2094605573 .stroke-N3{stroke:#9499AB;} + .d2-2094605573 .stroke-N4{stroke:#CFD2DD;} + .d2-2094605573 .stroke-N5{stroke:#DEE1EB;} + .d2-2094605573 .stroke-N6{stroke:#EEF1F8;} + .d2-2094605573 .stroke-N7{stroke:#FFFFFF;} + .d2-2094605573 .stroke-B1{stroke:#0D32B2;} + .d2-2094605573 .stroke-B2{stroke:#0D32B2;} + .d2-2094605573 .stroke-B3{stroke:#E3E9FD;} + .d2-2094605573 .stroke-B4{stroke:#E3E9FD;} + .d2-2094605573 .stroke-B5{stroke:#EDF0FD;} + .d2-2094605573 .stroke-B6{stroke:#F7F8FE;} + .d2-2094605573 .stroke-AA2{stroke:#4A6FF3;} + .d2-2094605573 .stroke-AA4{stroke:#EDF0FD;} + .d2-2094605573 .stroke-AA5{stroke:#F7F8FE;} + .d2-2094605573 .stroke-AB4{stroke:#EDF0FD;} + .d2-2094605573 .stroke-AB5{stroke:#F7F8FE;} + .d2-2094605573 .background-color-N1{background-color:#0A0F25;} + .d2-2094605573 .background-color-N2{background-color:#676C7E;} + .d2-2094605573 .background-color-N3{background-color:#9499AB;} + .d2-2094605573 .background-color-N4{background-color:#CFD2DD;} + .d2-2094605573 .background-color-N5{background-color:#DEE1EB;} + .d2-2094605573 .background-color-N6{background-color:#EEF1F8;} + .d2-2094605573 .background-color-N7{background-color:#FFFFFF;} + .d2-2094605573 .background-color-B1{background-color:#0D32B2;} + .d2-2094605573 .background-color-B2{background-color:#0D32B2;} + .d2-2094605573 .background-color-B3{background-color:#E3E9FD;} + .d2-2094605573 .background-color-B4{background-color:#E3E9FD;} + .d2-2094605573 .background-color-B5{background-color:#EDF0FD;} + .d2-2094605573 .background-color-B6{background-color:#F7F8FE;} + .d2-2094605573 .background-color-AA2{background-color:#4A6FF3;} + .d2-2094605573 .background-color-AA4{background-color:#EDF0FD;} + .d2-2094605573 .background-color-AA5{background-color:#F7F8FE;} + .d2-2094605573 .background-color-AB4{background-color:#EDF0FD;} + .d2-2094605573 .background-color-AB5{background-color:#F7F8FE;} + .d2-2094605573 .color-N1{color:#0A0F25;} + .d2-2094605573 .color-N2{color:#676C7E;} + .d2-2094605573 .color-N3{color:#9499AB;} + .d2-2094605573 .color-N4{color:#CFD2DD;} + .d2-2094605573 .color-N5{color:#DEE1EB;} + .d2-2094605573 .color-N6{color:#EEF1F8;} + .d2-2094605573 .color-N7{color:#FFFFFF;} + .d2-2094605573 .color-B1{color:#0D32B2;} + .d2-2094605573 .color-B2{color:#0D32B2;} + .d2-2094605573 .color-B3{color:#E3E9FD;} + .d2-2094605573 .color-B4{color:#E3E9FD;} + .d2-2094605573 .color-B5{color:#EDF0FD;} + .d2-2094605573 .color-B6{color:#F7F8FE;} + .d2-2094605573 .color-AA2{color:#4A6FF3;} + .d2-2094605573 .color-AA4{color:#EDF0FD;} + .d2-2094605573 .color-AA5{color:#F7F8FE;} + .d2-2094605573 .color-AB4{color:#EDF0FD;} + .d2-2094605573 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>scoreritemResponseitemessayRubricconceptitemOutcome getItem() itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts) + +>>>>>>> cb2f2823c (Fix changes) - - - - - - - - - - - - - - + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence_diagrams/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagrams/dagre/sketch.exp.svg index 446016226..e9f1ff5bd 100644 --- a/e2etests/testdata/stable/sequence_diagrams/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagrams/dagre/sketch.exp.svg @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD a_shapea_sequenceanothersequencefinallyscoreritemResponseitemessayRubricconceptitemOutcomesequencesequencescoreritemResponseitemessayRubricconceptitemOutcomescorerconceptessayRubricitemitemOutcomeitemResponse getItem()itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts)getItem()itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts) + + + + + + +======= + .d2-1481716508 .fill-N1{fill:#0A0F25;} + .d2-1481716508 .fill-N2{fill:#676C7E;} + .d2-1481716508 .fill-N3{fill:#9499AB;} + .d2-1481716508 .fill-N4{fill:#CFD2DD;} + .d2-1481716508 .fill-N5{fill:#DEE1EB;} + .d2-1481716508 .fill-N6{fill:#EEF1F8;} + .d2-1481716508 .fill-N7{fill:#FFFFFF;} + .d2-1481716508 .fill-B1{fill:#0D32B2;} + .d2-1481716508 .fill-B2{fill:#0D32B2;} + .d2-1481716508 .fill-B3{fill:#E3E9FD;} + .d2-1481716508 .fill-B4{fill:#E3E9FD;} + .d2-1481716508 .fill-B5{fill:#EDF0FD;} + .d2-1481716508 .fill-B6{fill:#F7F8FE;} + .d2-1481716508 .fill-AA2{fill:#4A6FF3;} + .d2-1481716508 .fill-AA4{fill:#EDF0FD;} + .d2-1481716508 .fill-AA5{fill:#F7F8FE;} + .d2-1481716508 .fill-AB4{fill:#EDF0FD;} + .d2-1481716508 .fill-AB5{fill:#F7F8FE;} + .d2-1481716508 .stroke-N1{stroke:#0A0F25;} + .d2-1481716508 .stroke-N2{stroke:#676C7E;} + .d2-1481716508 .stroke-N3{stroke:#9499AB;} + .d2-1481716508 .stroke-N4{stroke:#CFD2DD;} + .d2-1481716508 .stroke-N5{stroke:#DEE1EB;} + .d2-1481716508 .stroke-N6{stroke:#EEF1F8;} + .d2-1481716508 .stroke-N7{stroke:#FFFFFF;} + .d2-1481716508 .stroke-B1{stroke:#0D32B2;} + .d2-1481716508 .stroke-B2{stroke:#0D32B2;} + .d2-1481716508 .stroke-B3{stroke:#E3E9FD;} + .d2-1481716508 .stroke-B4{stroke:#E3E9FD;} + .d2-1481716508 .stroke-B5{stroke:#EDF0FD;} + .d2-1481716508 .stroke-B6{stroke:#F7F8FE;} + .d2-1481716508 .stroke-AA2{stroke:#4A6FF3;} + .d2-1481716508 .stroke-AA4{stroke:#EDF0FD;} + .d2-1481716508 .stroke-AA5{stroke:#F7F8FE;} + .d2-1481716508 .stroke-AB4{stroke:#EDF0FD;} + .d2-1481716508 .stroke-AB5{stroke:#F7F8FE;} + .d2-1481716508 .background-color-N1{background-color:#0A0F25;} + .d2-1481716508 .background-color-N2{background-color:#676C7E;} + .d2-1481716508 .background-color-N3{background-color:#9499AB;} + .d2-1481716508 .background-color-N4{background-color:#CFD2DD;} + .d2-1481716508 .background-color-N5{background-color:#DEE1EB;} + .d2-1481716508 .background-color-N6{background-color:#EEF1F8;} + .d2-1481716508 .background-color-N7{background-color:#FFFFFF;} + .d2-1481716508 .background-color-B1{background-color:#0D32B2;} + .d2-1481716508 .background-color-B2{background-color:#0D32B2;} + .d2-1481716508 .background-color-B3{background-color:#E3E9FD;} + .d2-1481716508 .background-color-B4{background-color:#E3E9FD;} + .d2-1481716508 .background-color-B5{background-color:#EDF0FD;} + .d2-1481716508 .background-color-B6{background-color:#F7F8FE;} + .d2-1481716508 .background-color-AA2{background-color:#4A6FF3;} + .d2-1481716508 .background-color-AA4{background-color:#EDF0FD;} + .d2-1481716508 .background-color-AA5{background-color:#F7F8FE;} + .d2-1481716508 .background-color-AB4{background-color:#EDF0FD;} + .d2-1481716508 .background-color-AB5{background-color:#F7F8FE;} + .d2-1481716508 .color-N1{color:#0A0F25;} + .d2-1481716508 .color-N2{color:#676C7E;} + .d2-1481716508 .color-N3{color:#9499AB;} + .d2-1481716508 .color-N4{color:#CFD2DD;} + .d2-1481716508 .color-N5{color:#DEE1EB;} + .d2-1481716508 .color-N6{color:#EEF1F8;} + .d2-1481716508 .color-N7{color:#FFFFFF;} + .d2-1481716508 .color-B1{color:#0D32B2;} + .d2-1481716508 .color-B2{color:#0D32B2;} + .d2-1481716508 .color-B3{color:#E3E9FD;} + .d2-1481716508 .color-B4{color:#E3E9FD;} + .d2-1481716508 .color-B5{color:#EDF0FD;} + .d2-1481716508 .color-B6{color:#F7F8FE;} + .d2-1481716508 .color-AA2{color:#4A6FF3;} + .d2-1481716508 .color-AA4{color:#EDF0FD;} + .d2-1481716508 .color-AA5{color:#F7F8FE;} + .d2-1481716508 .color-AB4{color:#EDF0FD;} + .d2-1481716508 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>a_shapea_sequenceanothersequencefinallyscoreritemResponseitemessayRubricconceptitemOutcomesequencesequencescoreritemResponseitemessayRubricconceptitemOutcomescorerconceptessayRubricitemitemOutcomeitemResponse getItem()itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts)getItem()itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts) + + + + + + +>>>>>>> cb2f2823c (Fix changes) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/sequence_diagrams/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagrams/elk/sketch.exp.svg index c46d0fec9..6dd294db6 100644 --- a/e2etests/testdata/stable/sequence_diagrams/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagrams/elk/sketch.exp.svg @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD a_shapea_sequenceanothersequencefinallyscoreritemResponseitemessayRubricconceptitemOutcomesequencesequencescoreritemResponseitemessayRubricconceptitemOutcomescorerconceptessayRubricitemitemOutcomeitemResponse getItem()itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts)getItem()itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts) + + + + + + +======= + .d2-4197222062 .fill-N1{fill:#0A0F25;} + .d2-4197222062 .fill-N2{fill:#676C7E;} + .d2-4197222062 .fill-N3{fill:#9499AB;} + .d2-4197222062 .fill-N4{fill:#CFD2DD;} + .d2-4197222062 .fill-N5{fill:#DEE1EB;} + .d2-4197222062 .fill-N6{fill:#EEF1F8;} + .d2-4197222062 .fill-N7{fill:#FFFFFF;} + .d2-4197222062 .fill-B1{fill:#0D32B2;} + .d2-4197222062 .fill-B2{fill:#0D32B2;} + .d2-4197222062 .fill-B3{fill:#E3E9FD;} + .d2-4197222062 .fill-B4{fill:#E3E9FD;} + .d2-4197222062 .fill-B5{fill:#EDF0FD;} + .d2-4197222062 .fill-B6{fill:#F7F8FE;} + .d2-4197222062 .fill-AA2{fill:#4A6FF3;} + .d2-4197222062 .fill-AA4{fill:#EDF0FD;} + .d2-4197222062 .fill-AA5{fill:#F7F8FE;} + .d2-4197222062 .fill-AB4{fill:#EDF0FD;} + .d2-4197222062 .fill-AB5{fill:#F7F8FE;} + .d2-4197222062 .stroke-N1{stroke:#0A0F25;} + .d2-4197222062 .stroke-N2{stroke:#676C7E;} + .d2-4197222062 .stroke-N3{stroke:#9499AB;} + .d2-4197222062 .stroke-N4{stroke:#CFD2DD;} + .d2-4197222062 .stroke-N5{stroke:#DEE1EB;} + .d2-4197222062 .stroke-N6{stroke:#EEF1F8;} + .d2-4197222062 .stroke-N7{stroke:#FFFFFF;} + .d2-4197222062 .stroke-B1{stroke:#0D32B2;} + .d2-4197222062 .stroke-B2{stroke:#0D32B2;} + .d2-4197222062 .stroke-B3{stroke:#E3E9FD;} + .d2-4197222062 .stroke-B4{stroke:#E3E9FD;} + .d2-4197222062 .stroke-B5{stroke:#EDF0FD;} + .d2-4197222062 .stroke-B6{stroke:#F7F8FE;} + .d2-4197222062 .stroke-AA2{stroke:#4A6FF3;} + .d2-4197222062 .stroke-AA4{stroke:#EDF0FD;} + .d2-4197222062 .stroke-AA5{stroke:#F7F8FE;} + .d2-4197222062 .stroke-AB4{stroke:#EDF0FD;} + .d2-4197222062 .stroke-AB5{stroke:#F7F8FE;} + .d2-4197222062 .background-color-N1{background-color:#0A0F25;} + .d2-4197222062 .background-color-N2{background-color:#676C7E;} + .d2-4197222062 .background-color-N3{background-color:#9499AB;} + .d2-4197222062 .background-color-N4{background-color:#CFD2DD;} + .d2-4197222062 .background-color-N5{background-color:#DEE1EB;} + .d2-4197222062 .background-color-N6{background-color:#EEF1F8;} + .d2-4197222062 .background-color-N7{background-color:#FFFFFF;} + .d2-4197222062 .background-color-B1{background-color:#0D32B2;} + .d2-4197222062 .background-color-B2{background-color:#0D32B2;} + .d2-4197222062 .background-color-B3{background-color:#E3E9FD;} + .d2-4197222062 .background-color-B4{background-color:#E3E9FD;} + .d2-4197222062 .background-color-B5{background-color:#EDF0FD;} + .d2-4197222062 .background-color-B6{background-color:#F7F8FE;} + .d2-4197222062 .background-color-AA2{background-color:#4A6FF3;} + .d2-4197222062 .background-color-AA4{background-color:#EDF0FD;} + .d2-4197222062 .background-color-AA5{background-color:#F7F8FE;} + .d2-4197222062 .background-color-AB4{background-color:#EDF0FD;} + .d2-4197222062 .background-color-AB5{background-color:#F7F8FE;} + .d2-4197222062 .color-N1{color:#0A0F25;} + .d2-4197222062 .color-N2{color:#676C7E;} + .d2-4197222062 .color-N3{color:#9499AB;} + .d2-4197222062 .color-N4{color:#CFD2DD;} + .d2-4197222062 .color-N5{color:#DEE1EB;} + .d2-4197222062 .color-N6{color:#EEF1F8;} + .d2-4197222062 .color-N7{color:#FFFFFF;} + .d2-4197222062 .color-B1{color:#0D32B2;} + .d2-4197222062 .color-B2{color:#0D32B2;} + .d2-4197222062 .color-B3{color:#E3E9FD;} + .d2-4197222062 .color-B4{color:#E3E9FD;} + .d2-4197222062 .color-B5{color:#EDF0FD;} + .d2-4197222062 .color-B6{color:#F7F8FE;} + .d2-4197222062 .color-AA2{color:#4A6FF3;} + .d2-4197222062 .color-AA4{color:#EDF0FD;} + .d2-4197222062 .color-AA5{color:#F7F8FE;} + .d2-4197222062 .color-AB4{color:#EDF0FD;} + .d2-4197222062 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>a_shapea_sequenceanothersequencefinallyscoreritemResponseitemessayRubricconceptitemOutcomesequencesequencescoreritemResponseitemessayRubricconceptitemOutcomescorerconceptessayRubricitemitemOutcomeitemResponse getItem()itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts)getItem()itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts) + + + + + + +>>>>>>> cb2f2823c (Fix changes) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/stable/simple_grid_edges/dagre/sketch.exp.svg b/e2etests/testdata/stable/simple_grid_edges/dagre/sketch.exp.svg index 9378627d0..bf79042d8 100644 --- a/e2etests/testdata/stable/simple_grid_edges/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/simple_grid_edges/dagre/sketch.exp.svg @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD bacthis is a message groupand this is a nested message groupwhat about more nestingyoyo >>>>>>> 33280fed5 (fixed e2e tests) +||||||| parent of cb2f2823c (Fix changes) + .d2-4111779322 .fill-N1{fill:#0A0F25;} + .d2-4111779322 .fill-N2{fill:#676C7E;} + .d2-4111779322 .fill-N3{fill:#9499AB;} + .d2-4111779322 .fill-N4{fill:#CFD2DD;} + .d2-4111779322 .fill-N5{fill:#DEE1EB;} + .d2-4111779322 .fill-N6{fill:#EEF1F8;} + .d2-4111779322 .fill-N7{fill:#FFFFFF;} + .d2-4111779322 .fill-B1{fill:#0D32B2;} + .d2-4111779322 .fill-B2{fill:#0D32B2;} + .d2-4111779322 .fill-B3{fill:#E3E9FD;} + .d2-4111779322 .fill-B4{fill:#E3E9FD;} + .d2-4111779322 .fill-B5{fill:#EDF0FD;} + .d2-4111779322 .fill-B6{fill:#F7F8FE;} + .d2-4111779322 .fill-AA2{fill:#4A6FF3;} + .d2-4111779322 .fill-AA4{fill:#EDF0FD;} + .d2-4111779322 .fill-AA5{fill:#F7F8FE;} + .d2-4111779322 .fill-AB4{fill:#EDF0FD;} + .d2-4111779322 .fill-AB5{fill:#F7F8FE;} + .d2-4111779322 .stroke-N1{stroke:#0A0F25;} + .d2-4111779322 .stroke-N2{stroke:#676C7E;} + .d2-4111779322 .stroke-N3{stroke:#9499AB;} + .d2-4111779322 .stroke-N4{stroke:#CFD2DD;} + .d2-4111779322 .stroke-N5{stroke:#DEE1EB;} + .d2-4111779322 .stroke-N6{stroke:#EEF1F8;} + .d2-4111779322 .stroke-N7{stroke:#FFFFFF;} + .d2-4111779322 .stroke-B1{stroke:#0D32B2;} + .d2-4111779322 .stroke-B2{stroke:#0D32B2;} + .d2-4111779322 .stroke-B3{stroke:#E3E9FD;} + .d2-4111779322 .stroke-B4{stroke:#E3E9FD;} + .d2-4111779322 .stroke-B5{stroke:#EDF0FD;} + .d2-4111779322 .stroke-B6{stroke:#F7F8FE;} + .d2-4111779322 .stroke-AA2{stroke:#4A6FF3;} + .d2-4111779322 .stroke-AA4{stroke:#EDF0FD;} + .d2-4111779322 .stroke-AA5{stroke:#F7F8FE;} + .d2-4111779322 .stroke-AB4{stroke:#EDF0FD;} + .d2-4111779322 .stroke-AB5{stroke:#F7F8FE;} + .d2-4111779322 .background-color-N1{background-color:#0A0F25;} + .d2-4111779322 .background-color-N2{background-color:#676C7E;} + .d2-4111779322 .background-color-N3{background-color:#9499AB;} + .d2-4111779322 .background-color-N4{background-color:#CFD2DD;} + .d2-4111779322 .background-color-N5{background-color:#DEE1EB;} + .d2-4111779322 .background-color-N6{background-color:#EEF1F8;} + .d2-4111779322 .background-color-N7{background-color:#FFFFFF;} + .d2-4111779322 .background-color-B1{background-color:#0D32B2;} + .d2-4111779322 .background-color-B2{background-color:#0D32B2;} + .d2-4111779322 .background-color-B3{background-color:#E3E9FD;} + .d2-4111779322 .background-color-B4{background-color:#E3E9FD;} + .d2-4111779322 .background-color-B5{background-color:#EDF0FD;} + .d2-4111779322 .background-color-B6{background-color:#F7F8FE;} + .d2-4111779322 .background-color-AA2{background-color:#4A6FF3;} + .d2-4111779322 .background-color-AA4{background-color:#EDF0FD;} + .d2-4111779322 .background-color-AA5{background-color:#F7F8FE;} + .d2-4111779322 .background-color-AB4{background-color:#EDF0FD;} + .d2-4111779322 .background-color-AB5{background-color:#F7F8FE;} + .d2-4111779322 .color-N1{color:#0A0F25;} + .d2-4111779322 .color-N2{color:#676C7E;} + .d2-4111779322 .color-N3{color:#9499AB;} + .d2-4111779322 .color-N4{color:#CFD2DD;} + .d2-4111779322 .color-N5{color:#DEE1EB;} + .d2-4111779322 .color-N6{color:#EEF1F8;} + .d2-4111779322 .color-N7{color:#FFFFFF;} + .d2-4111779322 .color-B1{color:#0D32B2;} + .d2-4111779322 .color-B2{color:#0D32B2;} + .d2-4111779322 .color-B3{color:#E3E9FD;} + .d2-4111779322 .color-B4{color:#E3E9FD;} + .d2-4111779322 .color-B5{color:#EDF0FD;} + .d2-4111779322 .color-B6{color:#F7F8FE;} + .d2-4111779322 .color-AA2{color:#4A6FF3;} + .d2-4111779322 .color-AA4{color:#EDF0FD;} + .d2-4111779322 .color-AA5{color:#F7F8FE;} + .d2-4111779322 .color-AB4{color:#EDF0FD;} + .d2-4111779322 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>bacthis is a message groupand this is a nested message groupwhat about more nestingyoyo + +======= + .d2-2822857998 .fill-N1{fill:#0A0F25;} + .d2-2822857998 .fill-N2{fill:#676C7E;} + .d2-2822857998 .fill-N3{fill:#9499AB;} + .d2-2822857998 .fill-N4{fill:#CFD2DD;} + .d2-2822857998 .fill-N5{fill:#DEE1EB;} + .d2-2822857998 .fill-N6{fill:#EEF1F8;} + .d2-2822857998 .fill-N7{fill:#FFFFFF;} + .d2-2822857998 .fill-B1{fill:#0D32B2;} + .d2-2822857998 .fill-B2{fill:#0D32B2;} + .d2-2822857998 .fill-B3{fill:#E3E9FD;} + .d2-2822857998 .fill-B4{fill:#E3E9FD;} + .d2-2822857998 .fill-B5{fill:#EDF0FD;} + .d2-2822857998 .fill-B6{fill:#F7F8FE;} + .d2-2822857998 .fill-AA2{fill:#4A6FF3;} + .d2-2822857998 .fill-AA4{fill:#EDF0FD;} + .d2-2822857998 .fill-AA5{fill:#F7F8FE;} + .d2-2822857998 .fill-AB4{fill:#EDF0FD;} + .d2-2822857998 .fill-AB5{fill:#F7F8FE;} + .d2-2822857998 .stroke-N1{stroke:#0A0F25;} + .d2-2822857998 .stroke-N2{stroke:#676C7E;} + .d2-2822857998 .stroke-N3{stroke:#9499AB;} + .d2-2822857998 .stroke-N4{stroke:#CFD2DD;} + .d2-2822857998 .stroke-N5{stroke:#DEE1EB;} + .d2-2822857998 .stroke-N6{stroke:#EEF1F8;} + .d2-2822857998 .stroke-N7{stroke:#FFFFFF;} + .d2-2822857998 .stroke-B1{stroke:#0D32B2;} + .d2-2822857998 .stroke-B2{stroke:#0D32B2;} + .d2-2822857998 .stroke-B3{stroke:#E3E9FD;} + .d2-2822857998 .stroke-B4{stroke:#E3E9FD;} + .d2-2822857998 .stroke-B5{stroke:#EDF0FD;} + .d2-2822857998 .stroke-B6{stroke:#F7F8FE;} + .d2-2822857998 .stroke-AA2{stroke:#4A6FF3;} + .d2-2822857998 .stroke-AA4{stroke:#EDF0FD;} + .d2-2822857998 .stroke-AA5{stroke:#F7F8FE;} + .d2-2822857998 .stroke-AB4{stroke:#EDF0FD;} + .d2-2822857998 .stroke-AB5{stroke:#F7F8FE;} + .d2-2822857998 .background-color-N1{background-color:#0A0F25;} + .d2-2822857998 .background-color-N2{background-color:#676C7E;} + .d2-2822857998 .background-color-N3{background-color:#9499AB;} + .d2-2822857998 .background-color-N4{background-color:#CFD2DD;} + .d2-2822857998 .background-color-N5{background-color:#DEE1EB;} + .d2-2822857998 .background-color-N6{background-color:#EEF1F8;} + .d2-2822857998 .background-color-N7{background-color:#FFFFFF;} + .d2-2822857998 .background-color-B1{background-color:#0D32B2;} + .d2-2822857998 .background-color-B2{background-color:#0D32B2;} + .d2-2822857998 .background-color-B3{background-color:#E3E9FD;} + .d2-2822857998 .background-color-B4{background-color:#E3E9FD;} + .d2-2822857998 .background-color-B5{background-color:#EDF0FD;} + .d2-2822857998 .background-color-B6{background-color:#F7F8FE;} + .d2-2822857998 .background-color-AA2{background-color:#4A6FF3;} + .d2-2822857998 .background-color-AA4{background-color:#EDF0FD;} + .d2-2822857998 .background-color-AA5{background-color:#F7F8FE;} + .d2-2822857998 .background-color-AB4{background-color:#EDF0FD;} + .d2-2822857998 .background-color-AB5{background-color:#F7F8FE;} + .d2-2822857998 .color-N1{color:#0A0F25;} + .d2-2822857998 .color-N2{color:#676C7E;} + .d2-2822857998 .color-N3{color:#9499AB;} + .d2-2822857998 .color-N4{color:#CFD2DD;} + .d2-2822857998 .color-N5{color:#DEE1EB;} + .d2-2822857998 .color-N6{color:#EEF1F8;} + .d2-2822857998 .color-N7{color:#FFFFFF;} + .d2-2822857998 .color-B1{color:#0D32B2;} + .d2-2822857998 .color-B2{color:#0D32B2;} + .d2-2822857998 .color-B3{color:#E3E9FD;} + .d2-2822857998 .color-B4{color:#E3E9FD;} + .d2-2822857998 .color-B5{color:#EDF0FD;} + .d2-2822857998 .color-B6{color:#F7F8FE;} + .d2-2822857998 .color-AA2{color:#4A6FF3;} + .d2-2822857998 .color-AA4{color:#EDF0FD;} + .d2-2822857998 .color-AA5{color:#F7F8FE;} + .d2-2822857998 .color-AB4{color:#EDF0FD;} + .d2-2822857998 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>bacthis is a message groupand this is a nested message groupwhat about more nestingyoyo + +>>>>>>> cb2f2823c (Fix changes) - - - - + + + + \ No newline at end of file diff --git a/e2etests/testdata/todo/sequence_diagram_actor_padding_nested_groups/elk/sketch.exp.svg b/e2etests/testdata/todo/sequence_diagram_actor_padding_nested_groups/elk/sketch.exp.svg index a75d747fc..e899790be 100644 --- a/e2etests/testdata/todo/sequence_diagram_actor_padding_nested_groups/elk/sketch.exp.svg +++ b/e2etests/testdata/todo/sequence_diagram_actor_padding_nested_groups/elk/sketch.exp.svg @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD bacthis is a message groupand this is a nested message groupwhat about more nestingyoyo >>>>>>> 33280fed5 (fixed e2e tests) +||||||| parent of cb2f2823c (Fix changes) + .d2-4111779322 .fill-N1{fill:#0A0F25;} + .d2-4111779322 .fill-N2{fill:#676C7E;} + .d2-4111779322 .fill-N3{fill:#9499AB;} + .d2-4111779322 .fill-N4{fill:#CFD2DD;} + .d2-4111779322 .fill-N5{fill:#DEE1EB;} + .d2-4111779322 .fill-N6{fill:#EEF1F8;} + .d2-4111779322 .fill-N7{fill:#FFFFFF;} + .d2-4111779322 .fill-B1{fill:#0D32B2;} + .d2-4111779322 .fill-B2{fill:#0D32B2;} + .d2-4111779322 .fill-B3{fill:#E3E9FD;} + .d2-4111779322 .fill-B4{fill:#E3E9FD;} + .d2-4111779322 .fill-B5{fill:#EDF0FD;} + .d2-4111779322 .fill-B6{fill:#F7F8FE;} + .d2-4111779322 .fill-AA2{fill:#4A6FF3;} + .d2-4111779322 .fill-AA4{fill:#EDF0FD;} + .d2-4111779322 .fill-AA5{fill:#F7F8FE;} + .d2-4111779322 .fill-AB4{fill:#EDF0FD;} + .d2-4111779322 .fill-AB5{fill:#F7F8FE;} + .d2-4111779322 .stroke-N1{stroke:#0A0F25;} + .d2-4111779322 .stroke-N2{stroke:#676C7E;} + .d2-4111779322 .stroke-N3{stroke:#9499AB;} + .d2-4111779322 .stroke-N4{stroke:#CFD2DD;} + .d2-4111779322 .stroke-N5{stroke:#DEE1EB;} + .d2-4111779322 .stroke-N6{stroke:#EEF1F8;} + .d2-4111779322 .stroke-N7{stroke:#FFFFFF;} + .d2-4111779322 .stroke-B1{stroke:#0D32B2;} + .d2-4111779322 .stroke-B2{stroke:#0D32B2;} + .d2-4111779322 .stroke-B3{stroke:#E3E9FD;} + .d2-4111779322 .stroke-B4{stroke:#E3E9FD;} + .d2-4111779322 .stroke-B5{stroke:#EDF0FD;} + .d2-4111779322 .stroke-B6{stroke:#F7F8FE;} + .d2-4111779322 .stroke-AA2{stroke:#4A6FF3;} + .d2-4111779322 .stroke-AA4{stroke:#EDF0FD;} + .d2-4111779322 .stroke-AA5{stroke:#F7F8FE;} + .d2-4111779322 .stroke-AB4{stroke:#EDF0FD;} + .d2-4111779322 .stroke-AB5{stroke:#F7F8FE;} + .d2-4111779322 .background-color-N1{background-color:#0A0F25;} + .d2-4111779322 .background-color-N2{background-color:#676C7E;} + .d2-4111779322 .background-color-N3{background-color:#9499AB;} + .d2-4111779322 .background-color-N4{background-color:#CFD2DD;} + .d2-4111779322 .background-color-N5{background-color:#DEE1EB;} + .d2-4111779322 .background-color-N6{background-color:#EEF1F8;} + .d2-4111779322 .background-color-N7{background-color:#FFFFFF;} + .d2-4111779322 .background-color-B1{background-color:#0D32B2;} + .d2-4111779322 .background-color-B2{background-color:#0D32B2;} + .d2-4111779322 .background-color-B3{background-color:#E3E9FD;} + .d2-4111779322 .background-color-B4{background-color:#E3E9FD;} + .d2-4111779322 .background-color-B5{background-color:#EDF0FD;} + .d2-4111779322 .background-color-B6{background-color:#F7F8FE;} + .d2-4111779322 .background-color-AA2{background-color:#4A6FF3;} + .d2-4111779322 .background-color-AA4{background-color:#EDF0FD;} + .d2-4111779322 .background-color-AA5{background-color:#F7F8FE;} + .d2-4111779322 .background-color-AB4{background-color:#EDF0FD;} + .d2-4111779322 .background-color-AB5{background-color:#F7F8FE;} + .d2-4111779322 .color-N1{color:#0A0F25;} + .d2-4111779322 .color-N2{color:#676C7E;} + .d2-4111779322 .color-N3{color:#9499AB;} + .d2-4111779322 .color-N4{color:#CFD2DD;} + .d2-4111779322 .color-N5{color:#DEE1EB;} + .d2-4111779322 .color-N6{color:#EEF1F8;} + .d2-4111779322 .color-N7{color:#FFFFFF;} + .d2-4111779322 .color-B1{color:#0D32B2;} + .d2-4111779322 .color-B2{color:#0D32B2;} + .d2-4111779322 .color-B3{color:#E3E9FD;} + .d2-4111779322 .color-B4{color:#E3E9FD;} + .d2-4111779322 .color-B5{color:#EDF0FD;} + .d2-4111779322 .color-B6{color:#F7F8FE;} + .d2-4111779322 .color-AA2{color:#4A6FF3;} + .d2-4111779322 .color-AA4{color:#EDF0FD;} + .d2-4111779322 .color-AA5{color:#F7F8FE;} + .d2-4111779322 .color-AB4{color:#EDF0FD;} + .d2-4111779322 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>bacthis is a message groupand this is a nested message groupwhat about more nestingyoyo + +======= + .d2-2822857998 .fill-N1{fill:#0A0F25;} + .d2-2822857998 .fill-N2{fill:#676C7E;} + .d2-2822857998 .fill-N3{fill:#9499AB;} + .d2-2822857998 .fill-N4{fill:#CFD2DD;} + .d2-2822857998 .fill-N5{fill:#DEE1EB;} + .d2-2822857998 .fill-N6{fill:#EEF1F8;} + .d2-2822857998 .fill-N7{fill:#FFFFFF;} + .d2-2822857998 .fill-B1{fill:#0D32B2;} + .d2-2822857998 .fill-B2{fill:#0D32B2;} + .d2-2822857998 .fill-B3{fill:#E3E9FD;} + .d2-2822857998 .fill-B4{fill:#E3E9FD;} + .d2-2822857998 .fill-B5{fill:#EDF0FD;} + .d2-2822857998 .fill-B6{fill:#F7F8FE;} + .d2-2822857998 .fill-AA2{fill:#4A6FF3;} + .d2-2822857998 .fill-AA4{fill:#EDF0FD;} + .d2-2822857998 .fill-AA5{fill:#F7F8FE;} + .d2-2822857998 .fill-AB4{fill:#EDF0FD;} + .d2-2822857998 .fill-AB5{fill:#F7F8FE;} + .d2-2822857998 .stroke-N1{stroke:#0A0F25;} + .d2-2822857998 .stroke-N2{stroke:#676C7E;} + .d2-2822857998 .stroke-N3{stroke:#9499AB;} + .d2-2822857998 .stroke-N4{stroke:#CFD2DD;} + .d2-2822857998 .stroke-N5{stroke:#DEE1EB;} + .d2-2822857998 .stroke-N6{stroke:#EEF1F8;} + .d2-2822857998 .stroke-N7{stroke:#FFFFFF;} + .d2-2822857998 .stroke-B1{stroke:#0D32B2;} + .d2-2822857998 .stroke-B2{stroke:#0D32B2;} + .d2-2822857998 .stroke-B3{stroke:#E3E9FD;} + .d2-2822857998 .stroke-B4{stroke:#E3E9FD;} + .d2-2822857998 .stroke-B5{stroke:#EDF0FD;} + .d2-2822857998 .stroke-B6{stroke:#F7F8FE;} + .d2-2822857998 .stroke-AA2{stroke:#4A6FF3;} + .d2-2822857998 .stroke-AA4{stroke:#EDF0FD;} + .d2-2822857998 .stroke-AA5{stroke:#F7F8FE;} + .d2-2822857998 .stroke-AB4{stroke:#EDF0FD;} + .d2-2822857998 .stroke-AB5{stroke:#F7F8FE;} + .d2-2822857998 .background-color-N1{background-color:#0A0F25;} + .d2-2822857998 .background-color-N2{background-color:#676C7E;} + .d2-2822857998 .background-color-N3{background-color:#9499AB;} + .d2-2822857998 .background-color-N4{background-color:#CFD2DD;} + .d2-2822857998 .background-color-N5{background-color:#DEE1EB;} + .d2-2822857998 .background-color-N6{background-color:#EEF1F8;} + .d2-2822857998 .background-color-N7{background-color:#FFFFFF;} + .d2-2822857998 .background-color-B1{background-color:#0D32B2;} + .d2-2822857998 .background-color-B2{background-color:#0D32B2;} + .d2-2822857998 .background-color-B3{background-color:#E3E9FD;} + .d2-2822857998 .background-color-B4{background-color:#E3E9FD;} + .d2-2822857998 .background-color-B5{background-color:#EDF0FD;} + .d2-2822857998 .background-color-B6{background-color:#F7F8FE;} + .d2-2822857998 .background-color-AA2{background-color:#4A6FF3;} + .d2-2822857998 .background-color-AA4{background-color:#EDF0FD;} + .d2-2822857998 .background-color-AA5{background-color:#F7F8FE;} + .d2-2822857998 .background-color-AB4{background-color:#EDF0FD;} + .d2-2822857998 .background-color-AB5{background-color:#F7F8FE;} + .d2-2822857998 .color-N1{color:#0A0F25;} + .d2-2822857998 .color-N2{color:#676C7E;} + .d2-2822857998 .color-N3{color:#9499AB;} + .d2-2822857998 .color-N4{color:#CFD2DD;} + .d2-2822857998 .color-N5{color:#DEE1EB;} + .d2-2822857998 .color-N6{color:#EEF1F8;} + .d2-2822857998 .color-N7{color:#FFFFFF;} + .d2-2822857998 .color-B1{color:#0D32B2;} + .d2-2822857998 .color-B2{color:#0D32B2;} + .d2-2822857998 .color-B3{color:#E3E9FD;} + .d2-2822857998 .color-B4{color:#E3E9FD;} + .d2-2822857998 .color-B5{color:#EDF0FD;} + .d2-2822857998 .color-B6{color:#F7F8FE;} + .d2-2822857998 .color-AA2{color:#4A6FF3;} + .d2-2822857998 .color-AA4{color:#EDF0FD;} + .d2-2822857998 .color-AA5{color:#F7F8FE;} + .d2-2822857998 .color-AB4{color:#EDF0FD;} + .d2-2822857998 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>bacthis is a message groupand this is a nested message groupwhat about more nestingyoyo + +>>>>>>> cb2f2823c (Fix changes) - - - - + + + + \ No newline at end of file diff --git a/e2etests/testdata/todo/sequence_diagram_edge_group_span_field/dagre/sketch.exp.svg b/e2etests/testdata/todo/sequence_diagram_edge_group_span_field/dagre/sketch.exp.svg index 79bca2f3b..93f3a2643 100644 --- a/e2etests/testdata/todo/sequence_diagram_edge_group_span_field/dagre/sketch.exp.svg +++ b/e2etests/testdata/todo/sequence_diagram_edge_group_span_field/dagre/sketch.exp.svg @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD Office chatterAliceBobbyawkward small talkicebreaker attemptunfortunate outcome uhm, hioh, hellowhat did you have for lunch?that's personal + + +======= + .d2-2918752435 .fill-N1{fill:#0A0F25;} + .d2-2918752435 .fill-N2{fill:#676C7E;} + .d2-2918752435 .fill-N3{fill:#9499AB;} + .d2-2918752435 .fill-N4{fill:#CFD2DD;} + .d2-2918752435 .fill-N5{fill:#DEE1EB;} + .d2-2918752435 .fill-N6{fill:#EEF1F8;} + .d2-2918752435 .fill-N7{fill:#FFFFFF;} + .d2-2918752435 .fill-B1{fill:#0D32B2;} + .d2-2918752435 .fill-B2{fill:#0D32B2;} + .d2-2918752435 .fill-B3{fill:#E3E9FD;} + .d2-2918752435 .fill-B4{fill:#E3E9FD;} + .d2-2918752435 .fill-B5{fill:#EDF0FD;} + .d2-2918752435 .fill-B6{fill:#F7F8FE;} + .d2-2918752435 .fill-AA2{fill:#4A6FF3;} + .d2-2918752435 .fill-AA4{fill:#EDF0FD;} + .d2-2918752435 .fill-AA5{fill:#F7F8FE;} + .d2-2918752435 .fill-AB4{fill:#EDF0FD;} + .d2-2918752435 .fill-AB5{fill:#F7F8FE;} + .d2-2918752435 .stroke-N1{stroke:#0A0F25;} + .d2-2918752435 .stroke-N2{stroke:#676C7E;} + .d2-2918752435 .stroke-N3{stroke:#9499AB;} + .d2-2918752435 .stroke-N4{stroke:#CFD2DD;} + .d2-2918752435 .stroke-N5{stroke:#DEE1EB;} + .d2-2918752435 .stroke-N6{stroke:#EEF1F8;} + .d2-2918752435 .stroke-N7{stroke:#FFFFFF;} + .d2-2918752435 .stroke-B1{stroke:#0D32B2;} + .d2-2918752435 .stroke-B2{stroke:#0D32B2;} + .d2-2918752435 .stroke-B3{stroke:#E3E9FD;} + .d2-2918752435 .stroke-B4{stroke:#E3E9FD;} + .d2-2918752435 .stroke-B5{stroke:#EDF0FD;} + .d2-2918752435 .stroke-B6{stroke:#F7F8FE;} + .d2-2918752435 .stroke-AA2{stroke:#4A6FF3;} + .d2-2918752435 .stroke-AA4{stroke:#EDF0FD;} + .d2-2918752435 .stroke-AA5{stroke:#F7F8FE;} + .d2-2918752435 .stroke-AB4{stroke:#EDF0FD;} + .d2-2918752435 .stroke-AB5{stroke:#F7F8FE;} + .d2-2918752435 .background-color-N1{background-color:#0A0F25;} + .d2-2918752435 .background-color-N2{background-color:#676C7E;} + .d2-2918752435 .background-color-N3{background-color:#9499AB;} + .d2-2918752435 .background-color-N4{background-color:#CFD2DD;} + .d2-2918752435 .background-color-N5{background-color:#DEE1EB;} + .d2-2918752435 .background-color-N6{background-color:#EEF1F8;} + .d2-2918752435 .background-color-N7{background-color:#FFFFFF;} + .d2-2918752435 .background-color-B1{background-color:#0D32B2;} + .d2-2918752435 .background-color-B2{background-color:#0D32B2;} + .d2-2918752435 .background-color-B3{background-color:#E3E9FD;} + .d2-2918752435 .background-color-B4{background-color:#E3E9FD;} + .d2-2918752435 .background-color-B5{background-color:#EDF0FD;} + .d2-2918752435 .background-color-B6{background-color:#F7F8FE;} + .d2-2918752435 .background-color-AA2{background-color:#4A6FF3;} + .d2-2918752435 .background-color-AA4{background-color:#EDF0FD;} + .d2-2918752435 .background-color-AA5{background-color:#F7F8FE;} + .d2-2918752435 .background-color-AB4{background-color:#EDF0FD;} + .d2-2918752435 .background-color-AB5{background-color:#F7F8FE;} + .d2-2918752435 .color-N1{color:#0A0F25;} + .d2-2918752435 .color-N2{color:#676C7E;} + .d2-2918752435 .color-N3{color:#9499AB;} + .d2-2918752435 .color-N4{color:#CFD2DD;} + .d2-2918752435 .color-N5{color:#DEE1EB;} + .d2-2918752435 .color-N6{color:#EEF1F8;} + .d2-2918752435 .color-N7{color:#FFFFFF;} + .d2-2918752435 .color-B1{color:#0D32B2;} + .d2-2918752435 .color-B2{color:#0D32B2;} + .d2-2918752435 .color-B3{color:#E3E9FD;} + .d2-2918752435 .color-B4{color:#E3E9FD;} + .d2-2918752435 .color-B5{color:#EDF0FD;} + .d2-2918752435 .color-B6{color:#F7F8FE;} + .d2-2918752435 .color-AA2{color:#4A6FF3;} + .d2-2918752435 .color-AA4{color:#EDF0FD;} + .d2-2918752435 .color-AA5{color:#F7F8FE;} + .d2-2918752435 .color-AB4{color:#EDF0FD;} + .d2-2918752435 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>Office chatterAliceBobbyawkward small talkicebreaker attemptunfortunate outcome uhm, hioh, hellowhat did you have for lunch?that's personal + + +>>>>>>> cb2f2823c (Fix changes) - - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/todo/sequence_diagram_edge_group_span_field/elk/sketch.exp.svg b/e2etests/testdata/todo/sequence_diagram_edge_group_span_field/elk/sketch.exp.svg index 05112ae62..0493e7a00 100644 --- a/e2etests/testdata/todo/sequence_diagram_edge_group_span_field/elk/sketch.exp.svg +++ b/e2etests/testdata/todo/sequence_diagram_edge_group_span_field/elk/sketch.exp.svg @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD Office chatterAliceBobbyawkward small talkicebreaker attemptunfortunate outcome uhm, hioh, hellowhat did you have for lunch?that's personal + + +======= + .d2-3429413863 .fill-N1{fill:#0A0F25;} + .d2-3429413863 .fill-N2{fill:#676C7E;} + .d2-3429413863 .fill-N3{fill:#9499AB;} + .d2-3429413863 .fill-N4{fill:#CFD2DD;} + .d2-3429413863 .fill-N5{fill:#DEE1EB;} + .d2-3429413863 .fill-N6{fill:#EEF1F8;} + .d2-3429413863 .fill-N7{fill:#FFFFFF;} + .d2-3429413863 .fill-B1{fill:#0D32B2;} + .d2-3429413863 .fill-B2{fill:#0D32B2;} + .d2-3429413863 .fill-B3{fill:#E3E9FD;} + .d2-3429413863 .fill-B4{fill:#E3E9FD;} + .d2-3429413863 .fill-B5{fill:#EDF0FD;} + .d2-3429413863 .fill-B6{fill:#F7F8FE;} + .d2-3429413863 .fill-AA2{fill:#4A6FF3;} + .d2-3429413863 .fill-AA4{fill:#EDF0FD;} + .d2-3429413863 .fill-AA5{fill:#F7F8FE;} + .d2-3429413863 .fill-AB4{fill:#EDF0FD;} + .d2-3429413863 .fill-AB5{fill:#F7F8FE;} + .d2-3429413863 .stroke-N1{stroke:#0A0F25;} + .d2-3429413863 .stroke-N2{stroke:#676C7E;} + .d2-3429413863 .stroke-N3{stroke:#9499AB;} + .d2-3429413863 .stroke-N4{stroke:#CFD2DD;} + .d2-3429413863 .stroke-N5{stroke:#DEE1EB;} + .d2-3429413863 .stroke-N6{stroke:#EEF1F8;} + .d2-3429413863 .stroke-N7{stroke:#FFFFFF;} + .d2-3429413863 .stroke-B1{stroke:#0D32B2;} + .d2-3429413863 .stroke-B2{stroke:#0D32B2;} + .d2-3429413863 .stroke-B3{stroke:#E3E9FD;} + .d2-3429413863 .stroke-B4{stroke:#E3E9FD;} + .d2-3429413863 .stroke-B5{stroke:#EDF0FD;} + .d2-3429413863 .stroke-B6{stroke:#F7F8FE;} + .d2-3429413863 .stroke-AA2{stroke:#4A6FF3;} + .d2-3429413863 .stroke-AA4{stroke:#EDF0FD;} + .d2-3429413863 .stroke-AA5{stroke:#F7F8FE;} + .d2-3429413863 .stroke-AB4{stroke:#EDF0FD;} + .d2-3429413863 .stroke-AB5{stroke:#F7F8FE;} + .d2-3429413863 .background-color-N1{background-color:#0A0F25;} + .d2-3429413863 .background-color-N2{background-color:#676C7E;} + .d2-3429413863 .background-color-N3{background-color:#9499AB;} + .d2-3429413863 .background-color-N4{background-color:#CFD2DD;} + .d2-3429413863 .background-color-N5{background-color:#DEE1EB;} + .d2-3429413863 .background-color-N6{background-color:#EEF1F8;} + .d2-3429413863 .background-color-N7{background-color:#FFFFFF;} + .d2-3429413863 .background-color-B1{background-color:#0D32B2;} + .d2-3429413863 .background-color-B2{background-color:#0D32B2;} + .d2-3429413863 .background-color-B3{background-color:#E3E9FD;} + .d2-3429413863 .background-color-B4{background-color:#E3E9FD;} + .d2-3429413863 .background-color-B5{background-color:#EDF0FD;} + .d2-3429413863 .background-color-B6{background-color:#F7F8FE;} + .d2-3429413863 .background-color-AA2{background-color:#4A6FF3;} + .d2-3429413863 .background-color-AA4{background-color:#EDF0FD;} + .d2-3429413863 .background-color-AA5{background-color:#F7F8FE;} + .d2-3429413863 .background-color-AB4{background-color:#EDF0FD;} + .d2-3429413863 .background-color-AB5{background-color:#F7F8FE;} + .d2-3429413863 .color-N1{color:#0A0F25;} + .d2-3429413863 .color-N2{color:#676C7E;} + .d2-3429413863 .color-N3{color:#9499AB;} + .d2-3429413863 .color-N4{color:#CFD2DD;} + .d2-3429413863 .color-N5{color:#DEE1EB;} + .d2-3429413863 .color-N6{color:#EEF1F8;} + .d2-3429413863 .color-N7{color:#FFFFFF;} + .d2-3429413863 .color-B1{color:#0D32B2;} + .d2-3429413863 .color-B2{color:#0D32B2;} + .d2-3429413863 .color-B3{color:#E3E9FD;} + .d2-3429413863 .color-B4{color:#E3E9FD;} + .d2-3429413863 .color-B5{color:#EDF0FD;} + .d2-3429413863 .color-B6{color:#F7F8FE;} + .d2-3429413863 .color-AA2{color:#4A6FF3;} + .d2-3429413863 .color-AA4{color:#EDF0FD;} + .d2-3429413863 .color-AA5{color:#F7F8FE;} + .d2-3429413863 .color-AB4{color:#EDF0FD;} + .d2-3429413863 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>Office chatterAliceBobbyawkward small talkicebreaker attemptunfortunate outcome uhm, hioh, hellowhat did you have for lunch?that's personal + + +>>>>>>> cb2f2823c (Fix changes) - - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/todo/shape_set_width_height/dagre/sketch.exp.svg b/e2etests/testdata/todo/shape_set_width_height/dagre/sketch.exp.svg index c9dbfb2e8..32c1936d8 100644 --- a/e2etests/testdata/todo/shape_set_width_height/dagre/sketch.exp.svg +++ b/e2etests/testdata/todo/shape_set_width_height/dagre/sketch.exp.svg @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD customeremployeerentalitemalicebob rent(this, i, p)new(this, i, p)isValid()isRentable(c)is(Adult)trueWhat does it meanto be well-adjusted?The ability to play bridge orgolf as if they were games. +||||||| parent of cb2f2823c (Fix changes) + .d2-1465015368 .fill-N1{fill:#0A0F25;} + .d2-1465015368 .fill-N2{fill:#676C7E;} + .d2-1465015368 .fill-N3{fill:#9499AB;} + .d2-1465015368 .fill-N4{fill:#CFD2DD;} + .d2-1465015368 .fill-N5{fill:#DEE1EB;} + .d2-1465015368 .fill-N6{fill:#EEF1F8;} + .d2-1465015368 .fill-N7{fill:#FFFFFF;} + .d2-1465015368 .fill-B1{fill:#0D32B2;} + .d2-1465015368 .fill-B2{fill:#0D32B2;} + .d2-1465015368 .fill-B3{fill:#E3E9FD;} + .d2-1465015368 .fill-B4{fill:#E3E9FD;} + .d2-1465015368 .fill-B5{fill:#EDF0FD;} + .d2-1465015368 .fill-B6{fill:#F7F8FE;} + .d2-1465015368 .fill-AA2{fill:#4A6FF3;} + .d2-1465015368 .fill-AA4{fill:#EDF0FD;} + .d2-1465015368 .fill-AA5{fill:#F7F8FE;} + .d2-1465015368 .fill-AB4{fill:#EDF0FD;} + .d2-1465015368 .fill-AB5{fill:#F7F8FE;} + .d2-1465015368 .stroke-N1{stroke:#0A0F25;} + .d2-1465015368 .stroke-N2{stroke:#676C7E;} + .d2-1465015368 .stroke-N3{stroke:#9499AB;} + .d2-1465015368 .stroke-N4{stroke:#CFD2DD;} + .d2-1465015368 .stroke-N5{stroke:#DEE1EB;} + .d2-1465015368 .stroke-N6{stroke:#EEF1F8;} + .d2-1465015368 .stroke-N7{stroke:#FFFFFF;} + .d2-1465015368 .stroke-B1{stroke:#0D32B2;} + .d2-1465015368 .stroke-B2{stroke:#0D32B2;} + .d2-1465015368 .stroke-B3{stroke:#E3E9FD;} + .d2-1465015368 .stroke-B4{stroke:#E3E9FD;} + .d2-1465015368 .stroke-B5{stroke:#EDF0FD;} + .d2-1465015368 .stroke-B6{stroke:#F7F8FE;} + .d2-1465015368 .stroke-AA2{stroke:#4A6FF3;} + .d2-1465015368 .stroke-AA4{stroke:#EDF0FD;} + .d2-1465015368 .stroke-AA5{stroke:#F7F8FE;} + .d2-1465015368 .stroke-AB4{stroke:#EDF0FD;} + .d2-1465015368 .stroke-AB5{stroke:#F7F8FE;} + .d2-1465015368 .background-color-N1{background-color:#0A0F25;} + .d2-1465015368 .background-color-N2{background-color:#676C7E;} + .d2-1465015368 .background-color-N3{background-color:#9499AB;} + .d2-1465015368 .background-color-N4{background-color:#CFD2DD;} + .d2-1465015368 .background-color-N5{background-color:#DEE1EB;} + .d2-1465015368 .background-color-N6{background-color:#EEF1F8;} + .d2-1465015368 .background-color-N7{background-color:#FFFFFF;} + .d2-1465015368 .background-color-B1{background-color:#0D32B2;} + .d2-1465015368 .background-color-B2{background-color:#0D32B2;} + .d2-1465015368 .background-color-B3{background-color:#E3E9FD;} + .d2-1465015368 .background-color-B4{background-color:#E3E9FD;} + .d2-1465015368 .background-color-B5{background-color:#EDF0FD;} + .d2-1465015368 .background-color-B6{background-color:#F7F8FE;} + .d2-1465015368 .background-color-AA2{background-color:#4A6FF3;} + .d2-1465015368 .background-color-AA4{background-color:#EDF0FD;} + .d2-1465015368 .background-color-AA5{background-color:#F7F8FE;} + .d2-1465015368 .background-color-AB4{background-color:#EDF0FD;} + .d2-1465015368 .background-color-AB5{background-color:#F7F8FE;} + .d2-1465015368 .color-N1{color:#0A0F25;} + .d2-1465015368 .color-N2{color:#676C7E;} + .d2-1465015368 .color-N3{color:#9499AB;} + .d2-1465015368 .color-N4{color:#CFD2DD;} + .d2-1465015368 .color-N5{color:#DEE1EB;} + .d2-1465015368 .color-N6{color:#EEF1F8;} + .d2-1465015368 .color-N7{color:#FFFFFF;} + .d2-1465015368 .color-B1{color:#0D32B2;} + .d2-1465015368 .color-B2{color:#0D32B2;} + .d2-1465015368 .color-B3{color:#E3E9FD;} + .d2-1465015368 .color-B4{color:#E3E9FD;} + .d2-1465015368 .color-B5{color:#EDF0FD;} + .d2-1465015368 .color-B6{color:#F7F8FE;} + .d2-1465015368 .color-AA2{color:#4A6FF3;} + .d2-1465015368 .color-AA4{color:#EDF0FD;} + .d2-1465015368 .color-AA5{color:#F7F8FE;} + .d2-1465015368 .color-AB4{color:#EDF0FD;} + .d2-1465015368 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>customeremployeerentalitemalicebob rent(this, i, p)new(this, i, p)isValid()isRentable(c)is(Adult)trueWhat does it meanto be well-adjusted?The ability to play bridge orgolf as if they were games. +======= + .d2-34624858 .fill-N1{fill:#0A0F25;} + .d2-34624858 .fill-N2{fill:#676C7E;} + .d2-34624858 .fill-N3{fill:#9499AB;} + .d2-34624858 .fill-N4{fill:#CFD2DD;} + .d2-34624858 .fill-N5{fill:#DEE1EB;} + .d2-34624858 .fill-N6{fill:#EEF1F8;} + .d2-34624858 .fill-N7{fill:#FFFFFF;} + .d2-34624858 .fill-B1{fill:#0D32B2;} + .d2-34624858 .fill-B2{fill:#0D32B2;} + .d2-34624858 .fill-B3{fill:#E3E9FD;} + .d2-34624858 .fill-B4{fill:#E3E9FD;} + .d2-34624858 .fill-B5{fill:#EDF0FD;} + .d2-34624858 .fill-B6{fill:#F7F8FE;} + .d2-34624858 .fill-AA2{fill:#4A6FF3;} + .d2-34624858 .fill-AA4{fill:#EDF0FD;} + .d2-34624858 .fill-AA5{fill:#F7F8FE;} + .d2-34624858 .fill-AB4{fill:#EDF0FD;} + .d2-34624858 .fill-AB5{fill:#F7F8FE;} + .d2-34624858 .stroke-N1{stroke:#0A0F25;} + .d2-34624858 .stroke-N2{stroke:#676C7E;} + .d2-34624858 .stroke-N3{stroke:#9499AB;} + .d2-34624858 .stroke-N4{stroke:#CFD2DD;} + .d2-34624858 .stroke-N5{stroke:#DEE1EB;} + .d2-34624858 .stroke-N6{stroke:#EEF1F8;} + .d2-34624858 .stroke-N7{stroke:#FFFFFF;} + .d2-34624858 .stroke-B1{stroke:#0D32B2;} + .d2-34624858 .stroke-B2{stroke:#0D32B2;} + .d2-34624858 .stroke-B3{stroke:#E3E9FD;} + .d2-34624858 .stroke-B4{stroke:#E3E9FD;} + .d2-34624858 .stroke-B5{stroke:#EDF0FD;} + .d2-34624858 .stroke-B6{stroke:#F7F8FE;} + .d2-34624858 .stroke-AA2{stroke:#4A6FF3;} + .d2-34624858 .stroke-AA4{stroke:#EDF0FD;} + .d2-34624858 .stroke-AA5{stroke:#F7F8FE;} + .d2-34624858 .stroke-AB4{stroke:#EDF0FD;} + .d2-34624858 .stroke-AB5{stroke:#F7F8FE;} + .d2-34624858 .background-color-N1{background-color:#0A0F25;} + .d2-34624858 .background-color-N2{background-color:#676C7E;} + .d2-34624858 .background-color-N3{background-color:#9499AB;} + .d2-34624858 .background-color-N4{background-color:#CFD2DD;} + .d2-34624858 .background-color-N5{background-color:#DEE1EB;} + .d2-34624858 .background-color-N6{background-color:#EEF1F8;} + .d2-34624858 .background-color-N7{background-color:#FFFFFF;} + .d2-34624858 .background-color-B1{background-color:#0D32B2;} + .d2-34624858 .background-color-B2{background-color:#0D32B2;} + .d2-34624858 .background-color-B3{background-color:#E3E9FD;} + .d2-34624858 .background-color-B4{background-color:#E3E9FD;} + .d2-34624858 .background-color-B5{background-color:#EDF0FD;} + .d2-34624858 .background-color-B6{background-color:#F7F8FE;} + .d2-34624858 .background-color-AA2{background-color:#4A6FF3;} + .d2-34624858 .background-color-AA4{background-color:#EDF0FD;} + .d2-34624858 .background-color-AA5{background-color:#F7F8FE;} + .d2-34624858 .background-color-AB4{background-color:#EDF0FD;} + .d2-34624858 .background-color-AB5{background-color:#F7F8FE;} + .d2-34624858 .color-N1{color:#0A0F25;} + .d2-34624858 .color-N2{color:#676C7E;} + .d2-34624858 .color-N3{color:#9499AB;} + .d2-34624858 .color-N4{color:#CFD2DD;} + .d2-34624858 .color-N5{color:#DEE1EB;} + .d2-34624858 .color-N6{color:#EEF1F8;} + .d2-34624858 .color-N7{color:#FFFFFF;} + .d2-34624858 .color-B1{color:#0D32B2;} + .d2-34624858 .color-B2{color:#0D32B2;} + .d2-34624858 .color-B3{color:#E3E9FD;} + .d2-34624858 .color-B4{color:#E3E9FD;} + .d2-34624858 .color-B5{color:#EDF0FD;} + .d2-34624858 .color-B6{color:#F7F8FE;} + .d2-34624858 .color-AA2{color:#4A6FF3;} + .d2-34624858 .color-AA4{color:#EDF0FD;} + .d2-34624858 .color-AA5{color:#F7F8FE;} + .d2-34624858 .color-AB4{color:#EDF0FD;} + .d2-34624858 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>customeremployeerentalitemalicebob rent(this, i, p)new(this, i, p)isValid()isRentable(c)is(Adult)trueWhat does it meanto be well-adjusted?The ability to play bridge orgolf as if they were games. +>>>>>>> cb2f2823c (Fix changes) diff --git a/e2etests/testdata/txtar/connection-style-fill/elk/board.exp.json b/e2etests/testdata/txtar/connection-style-fill/elk/board.exp.json index c9a07c69a..093133bd4 100644 --- a/e2etests/testdata/txtar/connection-style-fill/elk/board.exp.json +++ b/e2etests/testdata/txtar/connection-style-fill/elk/board.exp.json @@ -275,6 +275,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 66.5, @@ -314,6 +315,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 217, @@ -353,6 +355,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 367, @@ -392,6 +395,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 217, @@ -431,6 +435,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 367, @@ -470,6 +475,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 517, @@ -509,6 +515,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 66.5, @@ -548,6 +555,7 @@ "labelHeight": 37, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 667, @@ -587,6 +595,7 @@ "labelHeight": 37, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 908, @@ -625,6 +634,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 66.5, @@ -663,6 +673,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 217, @@ -701,6 +712,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 367, @@ -739,6 +751,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 517, @@ -777,6 +790,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 667, @@ -815,6 +829,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 908, diff --git a/e2etests/testdata/txtar/connection-style-fill/elk/sketch.exp.svg b/e2etests/testdata/txtar/connection-style-fill/elk/sketch.exp.svg index 669faa77b..34cac6847 100644 --- a/e2etests/testdata/txtar/connection-style-fill/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/connection-style-fill/elk/sketch.exp.svg @@ -1,16 +1,26 @@ +<<<<<<< HEAD customeremployeerentalitemalicebob rent(this, i, p)new(this, i, p)isValid()isRentable(c)is(Adult)trueWhat does it meanto be well-adjusted?The ability to play bridge orgolf as if they were games. +||||||| parent of cb2f2823c (Fix changes) + .d2-1465015368 .fill-N1{fill:#0A0F25;} + .d2-1465015368 .fill-N2{fill:#676C7E;} + .d2-1465015368 .fill-N3{fill:#9499AB;} + .d2-1465015368 .fill-N4{fill:#CFD2DD;} + .d2-1465015368 .fill-N5{fill:#DEE1EB;} + .d2-1465015368 .fill-N6{fill:#EEF1F8;} + .d2-1465015368 .fill-N7{fill:#FFFFFF;} + .d2-1465015368 .fill-B1{fill:#0D32B2;} + .d2-1465015368 .fill-B2{fill:#0D32B2;} + .d2-1465015368 .fill-B3{fill:#E3E9FD;} + .d2-1465015368 .fill-B4{fill:#E3E9FD;} + .d2-1465015368 .fill-B5{fill:#EDF0FD;} + .d2-1465015368 .fill-B6{fill:#F7F8FE;} + .d2-1465015368 .fill-AA2{fill:#4A6FF3;} + .d2-1465015368 .fill-AA4{fill:#EDF0FD;} + .d2-1465015368 .fill-AA5{fill:#F7F8FE;} + .d2-1465015368 .fill-AB4{fill:#EDF0FD;} + .d2-1465015368 .fill-AB5{fill:#F7F8FE;} + .d2-1465015368 .stroke-N1{stroke:#0A0F25;} + .d2-1465015368 .stroke-N2{stroke:#676C7E;} + .d2-1465015368 .stroke-N3{stroke:#9499AB;} + .d2-1465015368 .stroke-N4{stroke:#CFD2DD;} + .d2-1465015368 .stroke-N5{stroke:#DEE1EB;} + .d2-1465015368 .stroke-N6{stroke:#EEF1F8;} + .d2-1465015368 .stroke-N7{stroke:#FFFFFF;} + .d2-1465015368 .stroke-B1{stroke:#0D32B2;} + .d2-1465015368 .stroke-B2{stroke:#0D32B2;} + .d2-1465015368 .stroke-B3{stroke:#E3E9FD;} + .d2-1465015368 .stroke-B4{stroke:#E3E9FD;} + .d2-1465015368 .stroke-B5{stroke:#EDF0FD;} + .d2-1465015368 .stroke-B6{stroke:#F7F8FE;} + .d2-1465015368 .stroke-AA2{stroke:#4A6FF3;} + .d2-1465015368 .stroke-AA4{stroke:#EDF0FD;} + .d2-1465015368 .stroke-AA5{stroke:#F7F8FE;} + .d2-1465015368 .stroke-AB4{stroke:#EDF0FD;} + .d2-1465015368 .stroke-AB5{stroke:#F7F8FE;} + .d2-1465015368 .background-color-N1{background-color:#0A0F25;} + .d2-1465015368 .background-color-N2{background-color:#676C7E;} + .d2-1465015368 .background-color-N3{background-color:#9499AB;} + .d2-1465015368 .background-color-N4{background-color:#CFD2DD;} + .d2-1465015368 .background-color-N5{background-color:#DEE1EB;} + .d2-1465015368 .background-color-N6{background-color:#EEF1F8;} + .d2-1465015368 .background-color-N7{background-color:#FFFFFF;} + .d2-1465015368 .background-color-B1{background-color:#0D32B2;} + .d2-1465015368 .background-color-B2{background-color:#0D32B2;} + .d2-1465015368 .background-color-B3{background-color:#E3E9FD;} + .d2-1465015368 .background-color-B4{background-color:#E3E9FD;} + .d2-1465015368 .background-color-B5{background-color:#EDF0FD;} + .d2-1465015368 .background-color-B6{background-color:#F7F8FE;} + .d2-1465015368 .background-color-AA2{background-color:#4A6FF3;} + .d2-1465015368 .background-color-AA4{background-color:#EDF0FD;} + .d2-1465015368 .background-color-AA5{background-color:#F7F8FE;} + .d2-1465015368 .background-color-AB4{background-color:#EDF0FD;} + .d2-1465015368 .background-color-AB5{background-color:#F7F8FE;} + .d2-1465015368 .color-N1{color:#0A0F25;} + .d2-1465015368 .color-N2{color:#676C7E;} + .d2-1465015368 .color-N3{color:#9499AB;} + .d2-1465015368 .color-N4{color:#CFD2DD;} + .d2-1465015368 .color-N5{color:#DEE1EB;} + .d2-1465015368 .color-N6{color:#EEF1F8;} + .d2-1465015368 .color-N7{color:#FFFFFF;} + .d2-1465015368 .color-B1{color:#0D32B2;} + .d2-1465015368 .color-B2{color:#0D32B2;} + .d2-1465015368 .color-B3{color:#E3E9FD;} + .d2-1465015368 .color-B4{color:#E3E9FD;} + .d2-1465015368 .color-B5{color:#EDF0FD;} + .d2-1465015368 .color-B6{color:#F7F8FE;} + .d2-1465015368 .color-AA2{color:#4A6FF3;} + .d2-1465015368 .color-AA4{color:#EDF0FD;} + .d2-1465015368 .color-AA5{color:#F7F8FE;} + .d2-1465015368 .color-AB4{color:#EDF0FD;} + .d2-1465015368 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>customeremployeerentalitemalicebob rent(this, i, p)new(this, i, p)isValid()isRentable(c)is(Adult)trueWhat does it meanto be well-adjusted?The ability to play bridge orgolf as if they were games. +======= + .d2-34624858 .fill-N1{fill:#0A0F25;} + .d2-34624858 .fill-N2{fill:#676C7E;} + .d2-34624858 .fill-N3{fill:#9499AB;} + .d2-34624858 .fill-N4{fill:#CFD2DD;} + .d2-34624858 .fill-N5{fill:#DEE1EB;} + .d2-34624858 .fill-N6{fill:#EEF1F8;} + .d2-34624858 .fill-N7{fill:#FFFFFF;} + .d2-34624858 .fill-B1{fill:#0D32B2;} + .d2-34624858 .fill-B2{fill:#0D32B2;} + .d2-34624858 .fill-B3{fill:#E3E9FD;} + .d2-34624858 .fill-B4{fill:#E3E9FD;} + .d2-34624858 .fill-B5{fill:#EDF0FD;} + .d2-34624858 .fill-B6{fill:#F7F8FE;} + .d2-34624858 .fill-AA2{fill:#4A6FF3;} + .d2-34624858 .fill-AA4{fill:#EDF0FD;} + .d2-34624858 .fill-AA5{fill:#F7F8FE;} + .d2-34624858 .fill-AB4{fill:#EDF0FD;} + .d2-34624858 .fill-AB5{fill:#F7F8FE;} + .d2-34624858 .stroke-N1{stroke:#0A0F25;} + .d2-34624858 .stroke-N2{stroke:#676C7E;} + .d2-34624858 .stroke-N3{stroke:#9499AB;} + .d2-34624858 .stroke-N4{stroke:#CFD2DD;} + .d2-34624858 .stroke-N5{stroke:#DEE1EB;} + .d2-34624858 .stroke-N6{stroke:#EEF1F8;} + .d2-34624858 .stroke-N7{stroke:#FFFFFF;} + .d2-34624858 .stroke-B1{stroke:#0D32B2;} + .d2-34624858 .stroke-B2{stroke:#0D32B2;} + .d2-34624858 .stroke-B3{stroke:#E3E9FD;} + .d2-34624858 .stroke-B4{stroke:#E3E9FD;} + .d2-34624858 .stroke-B5{stroke:#EDF0FD;} + .d2-34624858 .stroke-B6{stroke:#F7F8FE;} + .d2-34624858 .stroke-AA2{stroke:#4A6FF3;} + .d2-34624858 .stroke-AA4{stroke:#EDF0FD;} + .d2-34624858 .stroke-AA5{stroke:#F7F8FE;} + .d2-34624858 .stroke-AB4{stroke:#EDF0FD;} + .d2-34624858 .stroke-AB5{stroke:#F7F8FE;} + .d2-34624858 .background-color-N1{background-color:#0A0F25;} + .d2-34624858 .background-color-N2{background-color:#676C7E;} + .d2-34624858 .background-color-N3{background-color:#9499AB;} + .d2-34624858 .background-color-N4{background-color:#CFD2DD;} + .d2-34624858 .background-color-N5{background-color:#DEE1EB;} + .d2-34624858 .background-color-N6{background-color:#EEF1F8;} + .d2-34624858 .background-color-N7{background-color:#FFFFFF;} + .d2-34624858 .background-color-B1{background-color:#0D32B2;} + .d2-34624858 .background-color-B2{background-color:#0D32B2;} + .d2-34624858 .background-color-B3{background-color:#E3E9FD;} + .d2-34624858 .background-color-B4{background-color:#E3E9FD;} + .d2-34624858 .background-color-B5{background-color:#EDF0FD;} + .d2-34624858 .background-color-B6{background-color:#F7F8FE;} + .d2-34624858 .background-color-AA2{background-color:#4A6FF3;} + .d2-34624858 .background-color-AA4{background-color:#EDF0FD;} + .d2-34624858 .background-color-AA5{background-color:#F7F8FE;} + .d2-34624858 .background-color-AB4{background-color:#EDF0FD;} + .d2-34624858 .background-color-AB5{background-color:#F7F8FE;} + .d2-34624858 .color-N1{color:#0A0F25;} + .d2-34624858 .color-N2{color:#676C7E;} + .d2-34624858 .color-N3{color:#9499AB;} + .d2-34624858 .color-N4{color:#CFD2DD;} + .d2-34624858 .color-N5{color:#DEE1EB;} + .d2-34624858 .color-N6{color:#EEF1F8;} + .d2-34624858 .color-N7{color:#FFFFFF;} + .d2-34624858 .color-B1{color:#0D32B2;} + .d2-34624858 .color-B2{color:#0D32B2;} + .d2-34624858 .color-B3{color:#E3E9FD;} + .d2-34624858 .color-B4{color:#E3E9FD;} + .d2-34624858 .color-B5{color:#EDF0FD;} + .d2-34624858 .color-B6{color:#F7F8FE;} + .d2-34624858 .color-AA2{color:#4A6FF3;} + .d2-34624858 .color-AA4{color:#EDF0FD;} + .d2-34624858 .color-AA5{color:#F7F8FE;} + .d2-34624858 .color-AB4{color:#EDF0FD;} + .d2-34624858 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>customeremployeerentalitemalicebob rent(this, i, p)new(this, i, p)isValid()isRentable(c)is(Adult)trueWhat does it meanto be well-adjusted?The ability to play bridge orgolf as if they were games. +>>>>>>> cb2f2823c (Fix changes) diff --git a/e2etests/testdata/txtar/connection-underline/dagre/sketch.exp.svg b/e2etests/testdata/txtar/connection-underline/dagre/sketch.exp.svg index e7a9a48e9..3c1f73b69 100644 --- a/e2etests/testdata/txtar/connection-underline/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/connection-underline/dagre/sketch.exp.svg @@ -1,10 +1,16 @@ <<<<<<< HEAD +<<<<<<< HEAD

ÇéþüðæØÅßñò

òØõùßÍÿåÆ

çÆÐÞ©ßþúí

ÉáøÿÑö

+<<<<<<< HEAD
+||||||| parent of cb2f2823c (Fix changes) + +======= + +>>>>>>> cb2f2823c (Fix changes) diff --git a/e2etests/testdata/txtar/extended-ascii/elk/board.exp.json b/e2etests/testdata/txtar/extended-ascii/elk/board.exp.json index 8c98196d6..8fdf42972 100644 --- a/e2etests/testdata/txtar/extended-ascii/elk/board.exp.json +++ b/e2etests/testdata/txtar/extended-ascii/elk/board.exp.json @@ -188,6 +188,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 78, @@ -226,6 +227,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 54, @@ -264,6 +266,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 54, @@ -310,6 +313,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 103.66600036621094, diff --git a/e2etests/testdata/txtar/extended-ascii/elk/sketch.exp.svg b/e2etests/testdata/txtar/extended-ascii/elk/sketch.exp.svg index 25cf0bc58..1e9514b45 100644 --- a/e2etests/testdata/txtar/extended-ascii/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/extended-ascii/elk/sketch.exp.svg @@ -1,13 +1,23 @@ +<<<<<<< HEAD

ÇéþüðæØÅßñò

òØõùßÍÿåÆ

çÆÐÞ©ßþúí

ÉáøÿÑö

+<<<<<<< HEAD
+||||||| parent of cb2f2823c (Fix changes) + +======= + +>>>>>>> cb2f2823c (Fix changes) diff --git a/e2etests/testdata/txtar/link-on-connections/dagre/board.exp.json b/e2etests/testdata/txtar/link-on-connections/dagre/board.exp.json index 8ff0e3009..99d265e68 100644 --- a/e2etests/testdata/txtar/link-on-connections/dagre/board.exp.json +++ b/e2etests/testdata/txtar/link-on-connections/dagre/board.exp.json @@ -7,7 +7,7 @@ "id": "a", "type": "rectangle", "pos": { - "x": 40, + "x": 0, "y": 0 }, "width": 53, @@ -48,8 +48,8 @@ "id": "b", "type": "rectangle", "pos": { - "x": 40, - "y": 187 + "x": 0, + "y": 166 }, "width": 53, "height": 66, @@ -89,8 +89,8 @@ "id": "c", "type": "rectangle", "pos": { - "x": 40, - "y": 374 + "x": 0, + "y": 353 }, "width": 53, "height": 66, @@ -139,7 +139,7 @@ "strokeWidth": 2, "stroke": "B1", "borderRadius": 10, - "label": "https://google.com/", + "label": "", "fontSize": 16, "fontFamily": "DEFAULT", "language": "", @@ -147,27 +147,27 @@ "italic": true, "bold": false, "underline": false, - "labelWidth": 133, - "labelHeight": 21, - "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", "labelPercentage": 0, "link": "https://google.com/", "route": [ { - "x": 66.5, - "y": 65.5 + "x": 26.5, + "y": 66 }, { - "x": 66.5, - "y": 114.30000305175781 + "x": 26.5, + "y": 106 }, { - "x": 66.5, - "y": 138.6999969482422 + "x": 26.5, + "y": 126 }, { - "x": 66.5, - "y": 187.5 + "x": 26.5, + "y": 166 } ], "isCurve": true, @@ -202,20 +202,20 @@ "link": "root.layers.d", "route": [ { - "x": 66.5, - "y": 252.5 + "x": 26.5, + "y": 231.5 }, { - "x": 66.5, - "y": 301.29998779296875 + "x": 26.5, + "y": 280.29998779296875 }, { - "x": 66.5, - "y": 325.70001220703125 + "x": 26.5, + "y": 304.70001220703125 }, { - "x": 66.5, - "y": 374.5 + "x": 26.5, + "y": 353.5 } ], "isCurve": true, diff --git a/e2etests/testdata/txtar/link-on-connections/dagre/sketch.exp.svg b/e2etests/testdata/txtar/link-on-connections/dagre/sketch.exp.svg index a8da25e18..f5aa57468 100644 --- a/e2etests/testdata/txtar/link-on-connections/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/link-on-connections/dagre/sketch.exp.svg @@ -1,4 +1,4 @@ -abc https://google.com/test - - - - - - -d +}]]>abc test + + + + + +d \ No newline at end of file diff --git a/e2etests/testdata/txtar/link-on-connections/elk/board.exp.json b/e2etests/testdata/txtar/link-on-connections/elk/board.exp.json index 4a6ee1a1d..77d37964f 100644 --- a/e2etests/testdata/txtar/link-on-connections/elk/board.exp.json +++ b/e2etests/testdata/txtar/link-on-connections/elk/board.exp.json @@ -7,7 +7,7 @@ "id": "a", "type": "rectangle", "pos": { - "x": 52, + "x": 12, "y": 12 }, "width": 53, @@ -48,8 +48,8 @@ "id": "b", "type": "rectangle", "pos": { - "x": 52, - "y": 239 + "x": 12, + "y": 148 }, "width": 53, "height": 66, @@ -89,8 +89,8 @@ "id": "c", "type": "rectangle", "pos": { - "x": 52, - "y": 466 + "x": 12, + "y": 375 }, "width": 53, "height": 66, @@ -139,7 +139,7 @@ "strokeWidth": 2, "stroke": "B1", "borderRadius": 10, - "label": "https://google.com/", + "label": "", "fontSize": 16, "fontFamily": "DEFAULT", "language": "", @@ -147,19 +147,19 @@ "italic": true, "bold": false, "underline": false, - "labelWidth": 133, - "labelHeight": 21, - "labelPosition": "INSIDE_MIDDLE_CENTER", + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", "labelPercentage": 0, "link": "https://google.com/", "route": [ { - "x": 78.5, + "x": 38.5, "y": 78 }, { - "x": 78.5, - "y": 239 + "x": 38.5, + "y": 148 } ], "animated": false, @@ -193,12 +193,12 @@ "link": "root.layers.d", "route": [ { - "x": 78.5, - "y": 305 + "x": 38.5, + "y": 214 }, { - "x": 78.5, - "y": 466 + "x": 38.5, + "y": 375 } ], "animated": false, diff --git a/e2etests/testdata/txtar/link-on-connections/elk/sketch.exp.svg b/e2etests/testdata/txtar/link-on-connections/elk/sketch.exp.svg index eecdf4765..71ca5fe92 100644 --- a/e2etests/testdata/txtar/link-on-connections/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/link-on-connections/elk/sketch.exp.svg @@ -1,4 +1,4 @@ -abc https://google.com/test - - - - - - -d +}]]>abc test + + + + + +d \ No newline at end of file diff --git a/e2etests/testdata/txtar/nested-spread-substitutions-regression/dagre/sketch.exp.svg b/e2etests/testdata/txtar/nested-spread-substitutions-regression/dagre/sketch.exp.svg index cc8c7c38b..149b69488 100644 --- a/e2etests/testdata/txtar/nested-spread-substitutions-regression/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/nested-spread-substitutions-regression/dagre/sketch.exp.svg @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD backendclientclient BO_ID -> D2_ID +||||||| parent of cb2f2823c (Fix changes) + .d2-1129939561 .fill-N1{fill:#0A0F25;} + .d2-1129939561 .fill-N2{fill:#676C7E;} + .d2-1129939561 .fill-N3{fill:#9499AB;} + .d2-1129939561 .fill-N4{fill:#CFD2DD;} + .d2-1129939561 .fill-N5{fill:#DEE1EB;} + .d2-1129939561 .fill-N6{fill:#EEF1F8;} + .d2-1129939561 .fill-N7{fill:#FFFFFF;} + .d2-1129939561 .fill-B1{fill:#0D32B2;} + .d2-1129939561 .fill-B2{fill:#0D32B2;} + .d2-1129939561 .fill-B3{fill:#E3E9FD;} + .d2-1129939561 .fill-B4{fill:#E3E9FD;} + .d2-1129939561 .fill-B5{fill:#EDF0FD;} + .d2-1129939561 .fill-B6{fill:#F7F8FE;} + .d2-1129939561 .fill-AA2{fill:#4A6FF3;} + .d2-1129939561 .fill-AA4{fill:#EDF0FD;} + .d2-1129939561 .fill-AA5{fill:#F7F8FE;} + .d2-1129939561 .fill-AB4{fill:#EDF0FD;} + .d2-1129939561 .fill-AB5{fill:#F7F8FE;} + .d2-1129939561 .stroke-N1{stroke:#0A0F25;} + .d2-1129939561 .stroke-N2{stroke:#676C7E;} + .d2-1129939561 .stroke-N3{stroke:#9499AB;} + .d2-1129939561 .stroke-N4{stroke:#CFD2DD;} + .d2-1129939561 .stroke-N5{stroke:#DEE1EB;} + .d2-1129939561 .stroke-N6{stroke:#EEF1F8;} + .d2-1129939561 .stroke-N7{stroke:#FFFFFF;} + .d2-1129939561 .stroke-B1{stroke:#0D32B2;} + .d2-1129939561 .stroke-B2{stroke:#0D32B2;} + .d2-1129939561 .stroke-B3{stroke:#E3E9FD;} + .d2-1129939561 .stroke-B4{stroke:#E3E9FD;} + .d2-1129939561 .stroke-B5{stroke:#EDF0FD;} + .d2-1129939561 .stroke-B6{stroke:#F7F8FE;} + .d2-1129939561 .stroke-AA2{stroke:#4A6FF3;} + .d2-1129939561 .stroke-AA4{stroke:#EDF0FD;} + .d2-1129939561 .stroke-AA5{stroke:#F7F8FE;} + .d2-1129939561 .stroke-AB4{stroke:#EDF0FD;} + .d2-1129939561 .stroke-AB5{stroke:#F7F8FE;} + .d2-1129939561 .background-color-N1{background-color:#0A0F25;} + .d2-1129939561 .background-color-N2{background-color:#676C7E;} + .d2-1129939561 .background-color-N3{background-color:#9499AB;} + .d2-1129939561 .background-color-N4{background-color:#CFD2DD;} + .d2-1129939561 .background-color-N5{background-color:#DEE1EB;} + .d2-1129939561 .background-color-N6{background-color:#EEF1F8;} + .d2-1129939561 .background-color-N7{background-color:#FFFFFF;} + .d2-1129939561 .background-color-B1{background-color:#0D32B2;} + .d2-1129939561 .background-color-B2{background-color:#0D32B2;} + .d2-1129939561 .background-color-B3{background-color:#E3E9FD;} + .d2-1129939561 .background-color-B4{background-color:#E3E9FD;} + .d2-1129939561 .background-color-B5{background-color:#EDF0FD;} + .d2-1129939561 .background-color-B6{background-color:#F7F8FE;} + .d2-1129939561 .background-color-AA2{background-color:#4A6FF3;} + .d2-1129939561 .background-color-AA4{background-color:#EDF0FD;} + .d2-1129939561 .background-color-AA5{background-color:#F7F8FE;} + .d2-1129939561 .background-color-AB4{background-color:#EDF0FD;} + .d2-1129939561 .background-color-AB5{background-color:#F7F8FE;} + .d2-1129939561 .color-N1{color:#0A0F25;} + .d2-1129939561 .color-N2{color:#676C7E;} + .d2-1129939561 .color-N3{color:#9499AB;} + .d2-1129939561 .color-N4{color:#CFD2DD;} + .d2-1129939561 .color-N5{color:#DEE1EB;} + .d2-1129939561 .color-N6{color:#EEF1F8;} + .d2-1129939561 .color-N7{color:#FFFFFF;} + .d2-1129939561 .color-B1{color:#0D32B2;} + .d2-1129939561 .color-B2{color:#0D32B2;} + .d2-1129939561 .color-B3{color:#E3E9FD;} + .d2-1129939561 .color-B4{color:#E3E9FD;} + .d2-1129939561 .color-B5{color:#EDF0FD;} + .d2-1129939561 .color-B6{color:#F7F8FE;} + .d2-1129939561 .color-AA2{color:#4A6FF3;} + .d2-1129939561 .color-AA4{color:#EDF0FD;} + .d2-1129939561 .color-AA5{color:#F7F8FE;} + .d2-1129939561 .color-AB4{color:#EDF0FD;} + .d2-1129939561 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>backendclientclient BO_ID -> D2_ID +======= + .d2-876605121 .fill-N1{fill:#0A0F25;} + .d2-876605121 .fill-N2{fill:#676C7E;} + .d2-876605121 .fill-N3{fill:#9499AB;} + .d2-876605121 .fill-N4{fill:#CFD2DD;} + .d2-876605121 .fill-N5{fill:#DEE1EB;} + .d2-876605121 .fill-N6{fill:#EEF1F8;} + .d2-876605121 .fill-N7{fill:#FFFFFF;} + .d2-876605121 .fill-B1{fill:#0D32B2;} + .d2-876605121 .fill-B2{fill:#0D32B2;} + .d2-876605121 .fill-B3{fill:#E3E9FD;} + .d2-876605121 .fill-B4{fill:#E3E9FD;} + .d2-876605121 .fill-B5{fill:#EDF0FD;} + .d2-876605121 .fill-B6{fill:#F7F8FE;} + .d2-876605121 .fill-AA2{fill:#4A6FF3;} + .d2-876605121 .fill-AA4{fill:#EDF0FD;} + .d2-876605121 .fill-AA5{fill:#F7F8FE;} + .d2-876605121 .fill-AB4{fill:#EDF0FD;} + .d2-876605121 .fill-AB5{fill:#F7F8FE;} + .d2-876605121 .stroke-N1{stroke:#0A0F25;} + .d2-876605121 .stroke-N2{stroke:#676C7E;} + .d2-876605121 .stroke-N3{stroke:#9499AB;} + .d2-876605121 .stroke-N4{stroke:#CFD2DD;} + .d2-876605121 .stroke-N5{stroke:#DEE1EB;} + .d2-876605121 .stroke-N6{stroke:#EEF1F8;} + .d2-876605121 .stroke-N7{stroke:#FFFFFF;} + .d2-876605121 .stroke-B1{stroke:#0D32B2;} + .d2-876605121 .stroke-B2{stroke:#0D32B2;} + .d2-876605121 .stroke-B3{stroke:#E3E9FD;} + .d2-876605121 .stroke-B4{stroke:#E3E9FD;} + .d2-876605121 .stroke-B5{stroke:#EDF0FD;} + .d2-876605121 .stroke-B6{stroke:#F7F8FE;} + .d2-876605121 .stroke-AA2{stroke:#4A6FF3;} + .d2-876605121 .stroke-AA4{stroke:#EDF0FD;} + .d2-876605121 .stroke-AA5{stroke:#F7F8FE;} + .d2-876605121 .stroke-AB4{stroke:#EDF0FD;} + .d2-876605121 .stroke-AB5{stroke:#F7F8FE;} + .d2-876605121 .background-color-N1{background-color:#0A0F25;} + .d2-876605121 .background-color-N2{background-color:#676C7E;} + .d2-876605121 .background-color-N3{background-color:#9499AB;} + .d2-876605121 .background-color-N4{background-color:#CFD2DD;} + .d2-876605121 .background-color-N5{background-color:#DEE1EB;} + .d2-876605121 .background-color-N6{background-color:#EEF1F8;} + .d2-876605121 .background-color-N7{background-color:#FFFFFF;} + .d2-876605121 .background-color-B1{background-color:#0D32B2;} + .d2-876605121 .background-color-B2{background-color:#0D32B2;} + .d2-876605121 .background-color-B3{background-color:#E3E9FD;} + .d2-876605121 .background-color-B4{background-color:#E3E9FD;} + .d2-876605121 .background-color-B5{background-color:#EDF0FD;} + .d2-876605121 .background-color-B6{background-color:#F7F8FE;} + .d2-876605121 .background-color-AA2{background-color:#4A6FF3;} + .d2-876605121 .background-color-AA4{background-color:#EDF0FD;} + .d2-876605121 .background-color-AA5{background-color:#F7F8FE;} + .d2-876605121 .background-color-AB4{background-color:#EDF0FD;} + .d2-876605121 .background-color-AB5{background-color:#F7F8FE;} + .d2-876605121 .color-N1{color:#0A0F25;} + .d2-876605121 .color-N2{color:#676C7E;} + .d2-876605121 .color-N3{color:#9499AB;} + .d2-876605121 .color-N4{color:#CFD2DD;} + .d2-876605121 .color-N5{color:#DEE1EB;} + .d2-876605121 .color-N6{color:#EEF1F8;} + .d2-876605121 .color-N7{color:#FFFFFF;} + .d2-876605121 .color-B1{color:#0D32B2;} + .d2-876605121 .color-B2{color:#0D32B2;} + .d2-876605121 .color-B3{color:#E3E9FD;} + .d2-876605121 .color-B4{color:#E3E9FD;} + .d2-876605121 .color-B5{color:#EDF0FD;} + .d2-876605121 .color-B6{color:#F7F8FE;} + .d2-876605121 .color-AA2{color:#4A6FF3;} + .d2-876605121 .color-AA4{color:#EDF0FD;} + .d2-876605121 .color-AA5{color:#F7F8FE;} + .d2-876605121 .color-AB4{color:#EDF0FD;} + .d2-876605121 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>backendclientclient BO_ID -> D2_ID +>>>>>>> cb2f2823c (Fix changes) diff --git a/e2etests/testdata/txtar/sequence-bounding-box/elk/board.exp.json b/e2etests/testdata/txtar/sequence-bounding-box/elk/board.exp.json index 11e468f6d..39f653ffa 100644 --- a/e2etests/testdata/txtar/sequence-bounding-box/elk/board.exp.json +++ b/e2etests/testdata/txtar/sequence-bounding-box/elk/board.exp.json @@ -151,6 +151,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 124, @@ -197,6 +198,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 124, diff --git a/e2etests/testdata/txtar/sequence-bounding-box/elk/sketch.exp.svg b/e2etests/testdata/txtar/sequence-bounding-box/elk/sketch.exp.svg index 1c42f1d17..7008e7be3 100644 --- a/e2etests/testdata/txtar/sequence-bounding-box/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/sequence-bounding-box/elk/sketch.exp.svg @@ -1,16 +1,26 @@ +<<<<<<< HEAD backendclientclient BO_ID -> D2_ID +||||||| parent of cb2f2823c (Fix changes) + .d2-9807582 .fill-N1{fill:#0A0F25;} + .d2-9807582 .fill-N2{fill:#676C7E;} + .d2-9807582 .fill-N3{fill:#9499AB;} + .d2-9807582 .fill-N4{fill:#CFD2DD;} + .d2-9807582 .fill-N5{fill:#DEE1EB;} + .d2-9807582 .fill-N6{fill:#EEF1F8;} + .d2-9807582 .fill-N7{fill:#FFFFFF;} + .d2-9807582 .fill-B1{fill:#0D32B2;} + .d2-9807582 .fill-B2{fill:#0D32B2;} + .d2-9807582 .fill-B3{fill:#E3E9FD;} + .d2-9807582 .fill-B4{fill:#E3E9FD;} + .d2-9807582 .fill-B5{fill:#EDF0FD;} + .d2-9807582 .fill-B6{fill:#F7F8FE;} + .d2-9807582 .fill-AA2{fill:#4A6FF3;} + .d2-9807582 .fill-AA4{fill:#EDF0FD;} + .d2-9807582 .fill-AA5{fill:#F7F8FE;} + .d2-9807582 .fill-AB4{fill:#EDF0FD;} + .d2-9807582 .fill-AB5{fill:#F7F8FE;} + .d2-9807582 .stroke-N1{stroke:#0A0F25;} + .d2-9807582 .stroke-N2{stroke:#676C7E;} + .d2-9807582 .stroke-N3{stroke:#9499AB;} + .d2-9807582 .stroke-N4{stroke:#CFD2DD;} + .d2-9807582 .stroke-N5{stroke:#DEE1EB;} + .d2-9807582 .stroke-N6{stroke:#EEF1F8;} + .d2-9807582 .stroke-N7{stroke:#FFFFFF;} + .d2-9807582 .stroke-B1{stroke:#0D32B2;} + .d2-9807582 .stroke-B2{stroke:#0D32B2;} + .d2-9807582 .stroke-B3{stroke:#E3E9FD;} + .d2-9807582 .stroke-B4{stroke:#E3E9FD;} + .d2-9807582 .stroke-B5{stroke:#EDF0FD;} + .d2-9807582 .stroke-B6{stroke:#F7F8FE;} + .d2-9807582 .stroke-AA2{stroke:#4A6FF3;} + .d2-9807582 .stroke-AA4{stroke:#EDF0FD;} + .d2-9807582 .stroke-AA5{stroke:#F7F8FE;} + .d2-9807582 .stroke-AB4{stroke:#EDF0FD;} + .d2-9807582 .stroke-AB5{stroke:#F7F8FE;} + .d2-9807582 .background-color-N1{background-color:#0A0F25;} + .d2-9807582 .background-color-N2{background-color:#676C7E;} + .d2-9807582 .background-color-N3{background-color:#9499AB;} + .d2-9807582 .background-color-N4{background-color:#CFD2DD;} + .d2-9807582 .background-color-N5{background-color:#DEE1EB;} + .d2-9807582 .background-color-N6{background-color:#EEF1F8;} + .d2-9807582 .background-color-N7{background-color:#FFFFFF;} + .d2-9807582 .background-color-B1{background-color:#0D32B2;} + .d2-9807582 .background-color-B2{background-color:#0D32B2;} + .d2-9807582 .background-color-B3{background-color:#E3E9FD;} + .d2-9807582 .background-color-B4{background-color:#E3E9FD;} + .d2-9807582 .background-color-B5{background-color:#EDF0FD;} + .d2-9807582 .background-color-B6{background-color:#F7F8FE;} + .d2-9807582 .background-color-AA2{background-color:#4A6FF3;} + .d2-9807582 .background-color-AA4{background-color:#EDF0FD;} + .d2-9807582 .background-color-AA5{background-color:#F7F8FE;} + .d2-9807582 .background-color-AB4{background-color:#EDF0FD;} + .d2-9807582 .background-color-AB5{background-color:#F7F8FE;} + .d2-9807582 .color-N1{color:#0A0F25;} + .d2-9807582 .color-N2{color:#676C7E;} + .d2-9807582 .color-N3{color:#9499AB;} + .d2-9807582 .color-N4{color:#CFD2DD;} + .d2-9807582 .color-N5{color:#DEE1EB;} + .d2-9807582 .color-N6{color:#EEF1F8;} + .d2-9807582 .color-N7{color:#FFFFFF;} + .d2-9807582 .color-B1{color:#0D32B2;} + .d2-9807582 .color-B2{color:#0D32B2;} + .d2-9807582 .color-B3{color:#E3E9FD;} + .d2-9807582 .color-B4{color:#E3E9FD;} + .d2-9807582 .color-B5{color:#EDF0FD;} + .d2-9807582 .color-B6{color:#F7F8FE;} + .d2-9807582 .color-AA2{color:#4A6FF3;} + .d2-9807582 .color-AA4{color:#EDF0FD;} + .d2-9807582 .color-AA5{color:#F7F8FE;} + .d2-9807582 .color-AB4{color:#EDF0FD;} + .d2-9807582 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>backendclientclient BO_ID -> D2_ID +======= + .d2-3769731346 .fill-N1{fill:#0A0F25;} + .d2-3769731346 .fill-N2{fill:#676C7E;} + .d2-3769731346 .fill-N3{fill:#9499AB;} + .d2-3769731346 .fill-N4{fill:#CFD2DD;} + .d2-3769731346 .fill-N5{fill:#DEE1EB;} + .d2-3769731346 .fill-N6{fill:#EEF1F8;} + .d2-3769731346 .fill-N7{fill:#FFFFFF;} + .d2-3769731346 .fill-B1{fill:#0D32B2;} + .d2-3769731346 .fill-B2{fill:#0D32B2;} + .d2-3769731346 .fill-B3{fill:#E3E9FD;} + .d2-3769731346 .fill-B4{fill:#E3E9FD;} + .d2-3769731346 .fill-B5{fill:#EDF0FD;} + .d2-3769731346 .fill-B6{fill:#F7F8FE;} + .d2-3769731346 .fill-AA2{fill:#4A6FF3;} + .d2-3769731346 .fill-AA4{fill:#EDF0FD;} + .d2-3769731346 .fill-AA5{fill:#F7F8FE;} + .d2-3769731346 .fill-AB4{fill:#EDF0FD;} + .d2-3769731346 .fill-AB5{fill:#F7F8FE;} + .d2-3769731346 .stroke-N1{stroke:#0A0F25;} + .d2-3769731346 .stroke-N2{stroke:#676C7E;} + .d2-3769731346 .stroke-N3{stroke:#9499AB;} + .d2-3769731346 .stroke-N4{stroke:#CFD2DD;} + .d2-3769731346 .stroke-N5{stroke:#DEE1EB;} + .d2-3769731346 .stroke-N6{stroke:#EEF1F8;} + .d2-3769731346 .stroke-N7{stroke:#FFFFFF;} + .d2-3769731346 .stroke-B1{stroke:#0D32B2;} + .d2-3769731346 .stroke-B2{stroke:#0D32B2;} + .d2-3769731346 .stroke-B3{stroke:#E3E9FD;} + .d2-3769731346 .stroke-B4{stroke:#E3E9FD;} + .d2-3769731346 .stroke-B5{stroke:#EDF0FD;} + .d2-3769731346 .stroke-B6{stroke:#F7F8FE;} + .d2-3769731346 .stroke-AA2{stroke:#4A6FF3;} + .d2-3769731346 .stroke-AA4{stroke:#EDF0FD;} + .d2-3769731346 .stroke-AA5{stroke:#F7F8FE;} + .d2-3769731346 .stroke-AB4{stroke:#EDF0FD;} + .d2-3769731346 .stroke-AB5{stroke:#F7F8FE;} + .d2-3769731346 .background-color-N1{background-color:#0A0F25;} + .d2-3769731346 .background-color-N2{background-color:#676C7E;} + .d2-3769731346 .background-color-N3{background-color:#9499AB;} + .d2-3769731346 .background-color-N4{background-color:#CFD2DD;} + .d2-3769731346 .background-color-N5{background-color:#DEE1EB;} + .d2-3769731346 .background-color-N6{background-color:#EEF1F8;} + .d2-3769731346 .background-color-N7{background-color:#FFFFFF;} + .d2-3769731346 .background-color-B1{background-color:#0D32B2;} + .d2-3769731346 .background-color-B2{background-color:#0D32B2;} + .d2-3769731346 .background-color-B3{background-color:#E3E9FD;} + .d2-3769731346 .background-color-B4{background-color:#E3E9FD;} + .d2-3769731346 .background-color-B5{background-color:#EDF0FD;} + .d2-3769731346 .background-color-B6{background-color:#F7F8FE;} + .d2-3769731346 .background-color-AA2{background-color:#4A6FF3;} + .d2-3769731346 .background-color-AA4{background-color:#EDF0FD;} + .d2-3769731346 .background-color-AA5{background-color:#F7F8FE;} + .d2-3769731346 .background-color-AB4{background-color:#EDF0FD;} + .d2-3769731346 .background-color-AB5{background-color:#F7F8FE;} + .d2-3769731346 .color-N1{color:#0A0F25;} + .d2-3769731346 .color-N2{color:#676C7E;} + .d2-3769731346 .color-N3{color:#9499AB;} + .d2-3769731346 .color-N4{color:#CFD2DD;} + .d2-3769731346 .color-N5{color:#DEE1EB;} + .d2-3769731346 .color-N6{color:#EEF1F8;} + .d2-3769731346 .color-N7{color:#FFFFFF;} + .d2-3769731346 .color-B1{color:#0D32B2;} + .d2-3769731346 .color-B2{color:#0D32B2;} + .d2-3769731346 .color-B3{color:#E3E9FD;} + .d2-3769731346 .color-B4{color:#E3E9FD;} + .d2-3769731346 .color-B5{color:#EDF0FD;} + .d2-3769731346 .color-B6{color:#F7F8FE;} + .d2-3769731346 .color-AA2{color:#4A6FF3;} + .d2-3769731346 .color-AA4{color:#EDF0FD;} + .d2-3769731346 .color-AA5{color:#F7F8FE;} + .d2-3769731346 .color-AB4{color:#EDF0FD;} + .d2-3769731346 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>backendclientclient BO_ID -> D2_ID +>>>>>>> cb2f2823c (Fix changes) diff --git a/e2etests/testdata/txtar/sequence-edge-group-tall-edge-label/dagre/board.exp.json b/e2etests/testdata/txtar/sequence-edge-group-tall-edge-label/dagre/board.exp.json index ac53c8663..4f735baf0 100644 --- a/e2etests/testdata/txtar/sequence-edge-group-tall-edge-label/dagre/board.exp.json +++ b/e2etests/testdata/txtar/sequence-edge-group-tall-edge-label/dagre/board.exp.json @@ -318,6 +318,7 @@ "labelHeight": 101, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -356,6 +357,7 @@ "labelHeight": 101, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -394,6 +396,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -432,6 +435,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -470,6 +474,7 @@ "labelHeight": 101, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -508,6 +513,7 @@ "labelHeight": 101, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -546,6 +552,7 @@ "labelHeight": 101, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 362, @@ -584,6 +591,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -622,6 +630,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 212, @@ -660,6 +669,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 362, diff --git a/e2etests/testdata/txtar/sequence-edge-group-tall-edge-label/dagre/sketch.exp.svg b/e2etests/testdata/txtar/sequence-edge-group-tall-edge-label/dagre/sketch.exp.svg index f5a70390e..22748e20e 100644 --- a/e2etests/testdata/txtar/sequence-edge-group-tall-edge-label/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/sequence-edge-group-tall-edge-label/dagre/sketch.exp.svg @@ -1,16 +1,26 @@ +<<<<<<< HEAD SequenceSystemFileASystem StartsOkayAlright OneTwoThreeFourFiveSix OneTwoThreeFourFiveSixOneTwoOneTwoThreeFourFiveSixOneTwoThreeFourFiveSixOneTwoThreeFourFiveSix +||||||| parent of cb2f2823c (Fix changes) + .d2-2960924353 .fill-N1{fill:#0A0F25;} + .d2-2960924353 .fill-N2{fill:#676C7E;} + .d2-2960924353 .fill-N3{fill:#9499AB;} + .d2-2960924353 .fill-N4{fill:#CFD2DD;} + .d2-2960924353 .fill-N5{fill:#DEE1EB;} + .d2-2960924353 .fill-N6{fill:#EEF1F8;} + .d2-2960924353 .fill-N7{fill:#FFFFFF;} + .d2-2960924353 .fill-B1{fill:#0D32B2;} + .d2-2960924353 .fill-B2{fill:#0D32B2;} + .d2-2960924353 .fill-B3{fill:#E3E9FD;} + .d2-2960924353 .fill-B4{fill:#E3E9FD;} + .d2-2960924353 .fill-B5{fill:#EDF0FD;} + .d2-2960924353 .fill-B6{fill:#F7F8FE;} + .d2-2960924353 .fill-AA2{fill:#4A6FF3;} + .d2-2960924353 .fill-AA4{fill:#EDF0FD;} + .d2-2960924353 .fill-AA5{fill:#F7F8FE;} + .d2-2960924353 .fill-AB4{fill:#EDF0FD;} + .d2-2960924353 .fill-AB5{fill:#F7F8FE;} + .d2-2960924353 .stroke-N1{stroke:#0A0F25;} + .d2-2960924353 .stroke-N2{stroke:#676C7E;} + .d2-2960924353 .stroke-N3{stroke:#9499AB;} + .d2-2960924353 .stroke-N4{stroke:#CFD2DD;} + .d2-2960924353 .stroke-N5{stroke:#DEE1EB;} + .d2-2960924353 .stroke-N6{stroke:#EEF1F8;} + .d2-2960924353 .stroke-N7{stroke:#FFFFFF;} + .d2-2960924353 .stroke-B1{stroke:#0D32B2;} + .d2-2960924353 .stroke-B2{stroke:#0D32B2;} + .d2-2960924353 .stroke-B3{stroke:#E3E9FD;} + .d2-2960924353 .stroke-B4{stroke:#E3E9FD;} + .d2-2960924353 .stroke-B5{stroke:#EDF0FD;} + .d2-2960924353 .stroke-B6{stroke:#F7F8FE;} + .d2-2960924353 .stroke-AA2{stroke:#4A6FF3;} + .d2-2960924353 .stroke-AA4{stroke:#EDF0FD;} + .d2-2960924353 .stroke-AA5{stroke:#F7F8FE;} + .d2-2960924353 .stroke-AB4{stroke:#EDF0FD;} + .d2-2960924353 .stroke-AB5{stroke:#F7F8FE;} + .d2-2960924353 .background-color-N1{background-color:#0A0F25;} + .d2-2960924353 .background-color-N2{background-color:#676C7E;} + .d2-2960924353 .background-color-N3{background-color:#9499AB;} + .d2-2960924353 .background-color-N4{background-color:#CFD2DD;} + .d2-2960924353 .background-color-N5{background-color:#DEE1EB;} + .d2-2960924353 .background-color-N6{background-color:#EEF1F8;} + .d2-2960924353 .background-color-N7{background-color:#FFFFFF;} + .d2-2960924353 .background-color-B1{background-color:#0D32B2;} + .d2-2960924353 .background-color-B2{background-color:#0D32B2;} + .d2-2960924353 .background-color-B3{background-color:#E3E9FD;} + .d2-2960924353 .background-color-B4{background-color:#E3E9FD;} + .d2-2960924353 .background-color-B5{background-color:#EDF0FD;} + .d2-2960924353 .background-color-B6{background-color:#F7F8FE;} + .d2-2960924353 .background-color-AA2{background-color:#4A6FF3;} + .d2-2960924353 .background-color-AA4{background-color:#EDF0FD;} + .d2-2960924353 .background-color-AA5{background-color:#F7F8FE;} + .d2-2960924353 .background-color-AB4{background-color:#EDF0FD;} + .d2-2960924353 .background-color-AB5{background-color:#F7F8FE;} + .d2-2960924353 .color-N1{color:#0A0F25;} + .d2-2960924353 .color-N2{color:#676C7E;} + .d2-2960924353 .color-N3{color:#9499AB;} + .d2-2960924353 .color-N4{color:#CFD2DD;} + .d2-2960924353 .color-N5{color:#DEE1EB;} + .d2-2960924353 .color-N6{color:#EEF1F8;} + .d2-2960924353 .color-N7{color:#FFFFFF;} + .d2-2960924353 .color-B1{color:#0D32B2;} + .d2-2960924353 .color-B2{color:#0D32B2;} + .d2-2960924353 .color-B3{color:#E3E9FD;} + .d2-2960924353 .color-B4{color:#E3E9FD;} + .d2-2960924353 .color-B5{color:#EDF0FD;} + .d2-2960924353 .color-B6{color:#F7F8FE;} + .d2-2960924353 .color-AA2{color:#4A6FF3;} + .d2-2960924353 .color-AA4{color:#EDF0FD;} + .d2-2960924353 .color-AA5{color:#F7F8FE;} + .d2-2960924353 .color-AB4{color:#EDF0FD;} + .d2-2960924353 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>SequenceSystemFileASystem StartsOkayAlright OneTwoThreeFourFiveSix OneTwoThreeFourFiveSixOneTwoOneTwoThreeFourFiveSixOneTwoThreeFourFiveSixOneTwoThreeFourFiveSix +======= + .d2-2545930397 .fill-N1{fill:#0A0F25;} + .d2-2545930397 .fill-N2{fill:#676C7E;} + .d2-2545930397 .fill-N3{fill:#9499AB;} + .d2-2545930397 .fill-N4{fill:#CFD2DD;} + .d2-2545930397 .fill-N5{fill:#DEE1EB;} + .d2-2545930397 .fill-N6{fill:#EEF1F8;} + .d2-2545930397 .fill-N7{fill:#FFFFFF;} + .d2-2545930397 .fill-B1{fill:#0D32B2;} + .d2-2545930397 .fill-B2{fill:#0D32B2;} + .d2-2545930397 .fill-B3{fill:#E3E9FD;} + .d2-2545930397 .fill-B4{fill:#E3E9FD;} + .d2-2545930397 .fill-B5{fill:#EDF0FD;} + .d2-2545930397 .fill-B6{fill:#F7F8FE;} + .d2-2545930397 .fill-AA2{fill:#4A6FF3;} + .d2-2545930397 .fill-AA4{fill:#EDF0FD;} + .d2-2545930397 .fill-AA5{fill:#F7F8FE;} + .d2-2545930397 .fill-AB4{fill:#EDF0FD;} + .d2-2545930397 .fill-AB5{fill:#F7F8FE;} + .d2-2545930397 .stroke-N1{stroke:#0A0F25;} + .d2-2545930397 .stroke-N2{stroke:#676C7E;} + .d2-2545930397 .stroke-N3{stroke:#9499AB;} + .d2-2545930397 .stroke-N4{stroke:#CFD2DD;} + .d2-2545930397 .stroke-N5{stroke:#DEE1EB;} + .d2-2545930397 .stroke-N6{stroke:#EEF1F8;} + .d2-2545930397 .stroke-N7{stroke:#FFFFFF;} + .d2-2545930397 .stroke-B1{stroke:#0D32B2;} + .d2-2545930397 .stroke-B2{stroke:#0D32B2;} + .d2-2545930397 .stroke-B3{stroke:#E3E9FD;} + .d2-2545930397 .stroke-B4{stroke:#E3E9FD;} + .d2-2545930397 .stroke-B5{stroke:#EDF0FD;} + .d2-2545930397 .stroke-B6{stroke:#F7F8FE;} + .d2-2545930397 .stroke-AA2{stroke:#4A6FF3;} + .d2-2545930397 .stroke-AA4{stroke:#EDF0FD;} + .d2-2545930397 .stroke-AA5{stroke:#F7F8FE;} + .d2-2545930397 .stroke-AB4{stroke:#EDF0FD;} + .d2-2545930397 .stroke-AB5{stroke:#F7F8FE;} + .d2-2545930397 .background-color-N1{background-color:#0A0F25;} + .d2-2545930397 .background-color-N2{background-color:#676C7E;} + .d2-2545930397 .background-color-N3{background-color:#9499AB;} + .d2-2545930397 .background-color-N4{background-color:#CFD2DD;} + .d2-2545930397 .background-color-N5{background-color:#DEE1EB;} + .d2-2545930397 .background-color-N6{background-color:#EEF1F8;} + .d2-2545930397 .background-color-N7{background-color:#FFFFFF;} + .d2-2545930397 .background-color-B1{background-color:#0D32B2;} + .d2-2545930397 .background-color-B2{background-color:#0D32B2;} + .d2-2545930397 .background-color-B3{background-color:#E3E9FD;} + .d2-2545930397 .background-color-B4{background-color:#E3E9FD;} + .d2-2545930397 .background-color-B5{background-color:#EDF0FD;} + .d2-2545930397 .background-color-B6{background-color:#F7F8FE;} + .d2-2545930397 .background-color-AA2{background-color:#4A6FF3;} + .d2-2545930397 .background-color-AA4{background-color:#EDF0FD;} + .d2-2545930397 .background-color-AA5{background-color:#F7F8FE;} + .d2-2545930397 .background-color-AB4{background-color:#EDF0FD;} + .d2-2545930397 .background-color-AB5{background-color:#F7F8FE;} + .d2-2545930397 .color-N1{color:#0A0F25;} + .d2-2545930397 .color-N2{color:#676C7E;} + .d2-2545930397 .color-N3{color:#9499AB;} + .d2-2545930397 .color-N4{color:#CFD2DD;} + .d2-2545930397 .color-N5{color:#DEE1EB;} + .d2-2545930397 .color-N6{color:#EEF1F8;} + .d2-2545930397 .color-N7{color:#FFFFFF;} + .d2-2545930397 .color-B1{color:#0D32B2;} + .d2-2545930397 .color-B2{color:#0D32B2;} + .d2-2545930397 .color-B3{color:#E3E9FD;} + .d2-2545930397 .color-B4{color:#E3E9FD;} + .d2-2545930397 .color-B5{color:#EDF0FD;} + .d2-2545930397 .color-B6{color:#F7F8FE;} + .d2-2545930397 .color-AA2{color:#4A6FF3;} + .d2-2545930397 .color-AA4{color:#EDF0FD;} + .d2-2545930397 .color-AA5{color:#F7F8FE;} + .d2-2545930397 .color-AB4{color:#EDF0FD;} + .d2-2545930397 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>SequenceSystemFileASystem StartsOkayAlright OneTwoThreeFourFiveSix OneTwoThreeFourFiveSixOneTwoOneTwoThreeFourFiveSixOneTwoThreeFourFiveSixOneTwoThreeFourFiveSix +>>>>>>> cb2f2823c (Fix changes) diff --git a/e2etests/testdata/txtar/sequence-edge-group-tall-edge-label/elk/board.exp.json b/e2etests/testdata/txtar/sequence-edge-group-tall-edge-label/elk/board.exp.json index b944f929b..40c4d0217 100644 --- a/e2etests/testdata/txtar/sequence-edge-group-tall-edge-label/elk/board.exp.json +++ b/e2etests/testdata/txtar/sequence-edge-group-tall-edge-label/elk/board.exp.json @@ -318,6 +318,7 @@ "labelHeight": 101, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 74, @@ -356,6 +357,7 @@ "labelHeight": 101, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 74, @@ -394,6 +396,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 74, @@ -432,6 +435,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 74, @@ -470,6 +474,7 @@ "labelHeight": 101, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 74, @@ -508,6 +513,7 @@ "labelHeight": 101, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 74, @@ -546,6 +552,7 @@ "labelHeight": 101, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 374, @@ -584,6 +591,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 74, @@ -622,6 +630,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 224, @@ -660,6 +669,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 374, diff --git a/e2etests/testdata/txtar/sequence-edge-group-tall-edge-label/elk/sketch.exp.svg b/e2etests/testdata/txtar/sequence-edge-group-tall-edge-label/elk/sketch.exp.svg index e52dd5bd5..9850420f0 100644 --- a/e2etests/testdata/txtar/sequence-edge-group-tall-edge-label/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/sequence-edge-group-tall-edge-label/elk/sketch.exp.svg @@ -1,16 +1,26 @@ +<<<<<<< HEAD SequenceSystemFileASystem StartsOkayAlright OneTwoThreeFourFiveSix OneTwoThreeFourFiveSixOneTwoOneTwoThreeFourFiveSixOneTwoThreeFourFiveSixOneTwoThreeFourFiveSix +||||||| parent of cb2f2823c (Fix changes) + .d2-3683522454 .fill-N1{fill:#0A0F25;} + .d2-3683522454 .fill-N2{fill:#676C7E;} + .d2-3683522454 .fill-N3{fill:#9499AB;} + .d2-3683522454 .fill-N4{fill:#CFD2DD;} + .d2-3683522454 .fill-N5{fill:#DEE1EB;} + .d2-3683522454 .fill-N6{fill:#EEF1F8;} + .d2-3683522454 .fill-N7{fill:#FFFFFF;} + .d2-3683522454 .fill-B1{fill:#0D32B2;} + .d2-3683522454 .fill-B2{fill:#0D32B2;} + .d2-3683522454 .fill-B3{fill:#E3E9FD;} + .d2-3683522454 .fill-B4{fill:#E3E9FD;} + .d2-3683522454 .fill-B5{fill:#EDF0FD;} + .d2-3683522454 .fill-B6{fill:#F7F8FE;} + .d2-3683522454 .fill-AA2{fill:#4A6FF3;} + .d2-3683522454 .fill-AA4{fill:#EDF0FD;} + .d2-3683522454 .fill-AA5{fill:#F7F8FE;} + .d2-3683522454 .fill-AB4{fill:#EDF0FD;} + .d2-3683522454 .fill-AB5{fill:#F7F8FE;} + .d2-3683522454 .stroke-N1{stroke:#0A0F25;} + .d2-3683522454 .stroke-N2{stroke:#676C7E;} + .d2-3683522454 .stroke-N3{stroke:#9499AB;} + .d2-3683522454 .stroke-N4{stroke:#CFD2DD;} + .d2-3683522454 .stroke-N5{stroke:#DEE1EB;} + .d2-3683522454 .stroke-N6{stroke:#EEF1F8;} + .d2-3683522454 .stroke-N7{stroke:#FFFFFF;} + .d2-3683522454 .stroke-B1{stroke:#0D32B2;} + .d2-3683522454 .stroke-B2{stroke:#0D32B2;} + .d2-3683522454 .stroke-B3{stroke:#E3E9FD;} + .d2-3683522454 .stroke-B4{stroke:#E3E9FD;} + .d2-3683522454 .stroke-B5{stroke:#EDF0FD;} + .d2-3683522454 .stroke-B6{stroke:#F7F8FE;} + .d2-3683522454 .stroke-AA2{stroke:#4A6FF3;} + .d2-3683522454 .stroke-AA4{stroke:#EDF0FD;} + .d2-3683522454 .stroke-AA5{stroke:#F7F8FE;} + .d2-3683522454 .stroke-AB4{stroke:#EDF0FD;} + .d2-3683522454 .stroke-AB5{stroke:#F7F8FE;} + .d2-3683522454 .background-color-N1{background-color:#0A0F25;} + .d2-3683522454 .background-color-N2{background-color:#676C7E;} + .d2-3683522454 .background-color-N3{background-color:#9499AB;} + .d2-3683522454 .background-color-N4{background-color:#CFD2DD;} + .d2-3683522454 .background-color-N5{background-color:#DEE1EB;} + .d2-3683522454 .background-color-N6{background-color:#EEF1F8;} + .d2-3683522454 .background-color-N7{background-color:#FFFFFF;} + .d2-3683522454 .background-color-B1{background-color:#0D32B2;} + .d2-3683522454 .background-color-B2{background-color:#0D32B2;} + .d2-3683522454 .background-color-B3{background-color:#E3E9FD;} + .d2-3683522454 .background-color-B4{background-color:#E3E9FD;} + .d2-3683522454 .background-color-B5{background-color:#EDF0FD;} + .d2-3683522454 .background-color-B6{background-color:#F7F8FE;} + .d2-3683522454 .background-color-AA2{background-color:#4A6FF3;} + .d2-3683522454 .background-color-AA4{background-color:#EDF0FD;} + .d2-3683522454 .background-color-AA5{background-color:#F7F8FE;} + .d2-3683522454 .background-color-AB4{background-color:#EDF0FD;} + .d2-3683522454 .background-color-AB5{background-color:#F7F8FE;} + .d2-3683522454 .color-N1{color:#0A0F25;} + .d2-3683522454 .color-N2{color:#676C7E;} + .d2-3683522454 .color-N3{color:#9499AB;} + .d2-3683522454 .color-N4{color:#CFD2DD;} + .d2-3683522454 .color-N5{color:#DEE1EB;} + .d2-3683522454 .color-N6{color:#EEF1F8;} + .d2-3683522454 .color-N7{color:#FFFFFF;} + .d2-3683522454 .color-B1{color:#0D32B2;} + .d2-3683522454 .color-B2{color:#0D32B2;} + .d2-3683522454 .color-B3{color:#E3E9FD;} + .d2-3683522454 .color-B4{color:#E3E9FD;} + .d2-3683522454 .color-B5{color:#EDF0FD;} + .d2-3683522454 .color-B6{color:#F7F8FE;} + .d2-3683522454 .color-AA2{color:#4A6FF3;} + .d2-3683522454 .color-AA4{color:#EDF0FD;} + .d2-3683522454 .color-AA5{color:#F7F8FE;} + .d2-3683522454 .color-AB4{color:#EDF0FD;} + .d2-3683522454 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>SequenceSystemFileASystem StartsOkayAlright OneTwoThreeFourFiveSix OneTwoThreeFourFiveSixOneTwoOneTwoThreeFourFiveSixOneTwoThreeFourFiveSixOneTwoThreeFourFiveSix +======= + .d2-2921011198 .fill-N1{fill:#0A0F25;} + .d2-2921011198 .fill-N2{fill:#676C7E;} + .d2-2921011198 .fill-N3{fill:#9499AB;} + .d2-2921011198 .fill-N4{fill:#CFD2DD;} + .d2-2921011198 .fill-N5{fill:#DEE1EB;} + .d2-2921011198 .fill-N6{fill:#EEF1F8;} + .d2-2921011198 .fill-N7{fill:#FFFFFF;} + .d2-2921011198 .fill-B1{fill:#0D32B2;} + .d2-2921011198 .fill-B2{fill:#0D32B2;} + .d2-2921011198 .fill-B3{fill:#E3E9FD;} + .d2-2921011198 .fill-B4{fill:#E3E9FD;} + .d2-2921011198 .fill-B5{fill:#EDF0FD;} + .d2-2921011198 .fill-B6{fill:#F7F8FE;} + .d2-2921011198 .fill-AA2{fill:#4A6FF3;} + .d2-2921011198 .fill-AA4{fill:#EDF0FD;} + .d2-2921011198 .fill-AA5{fill:#F7F8FE;} + .d2-2921011198 .fill-AB4{fill:#EDF0FD;} + .d2-2921011198 .fill-AB5{fill:#F7F8FE;} + .d2-2921011198 .stroke-N1{stroke:#0A0F25;} + .d2-2921011198 .stroke-N2{stroke:#676C7E;} + .d2-2921011198 .stroke-N3{stroke:#9499AB;} + .d2-2921011198 .stroke-N4{stroke:#CFD2DD;} + .d2-2921011198 .stroke-N5{stroke:#DEE1EB;} + .d2-2921011198 .stroke-N6{stroke:#EEF1F8;} + .d2-2921011198 .stroke-N7{stroke:#FFFFFF;} + .d2-2921011198 .stroke-B1{stroke:#0D32B2;} + .d2-2921011198 .stroke-B2{stroke:#0D32B2;} + .d2-2921011198 .stroke-B3{stroke:#E3E9FD;} + .d2-2921011198 .stroke-B4{stroke:#E3E9FD;} + .d2-2921011198 .stroke-B5{stroke:#EDF0FD;} + .d2-2921011198 .stroke-B6{stroke:#F7F8FE;} + .d2-2921011198 .stroke-AA2{stroke:#4A6FF3;} + .d2-2921011198 .stroke-AA4{stroke:#EDF0FD;} + .d2-2921011198 .stroke-AA5{stroke:#F7F8FE;} + .d2-2921011198 .stroke-AB4{stroke:#EDF0FD;} + .d2-2921011198 .stroke-AB5{stroke:#F7F8FE;} + .d2-2921011198 .background-color-N1{background-color:#0A0F25;} + .d2-2921011198 .background-color-N2{background-color:#676C7E;} + .d2-2921011198 .background-color-N3{background-color:#9499AB;} + .d2-2921011198 .background-color-N4{background-color:#CFD2DD;} + .d2-2921011198 .background-color-N5{background-color:#DEE1EB;} + .d2-2921011198 .background-color-N6{background-color:#EEF1F8;} + .d2-2921011198 .background-color-N7{background-color:#FFFFFF;} + .d2-2921011198 .background-color-B1{background-color:#0D32B2;} + .d2-2921011198 .background-color-B2{background-color:#0D32B2;} + .d2-2921011198 .background-color-B3{background-color:#E3E9FD;} + .d2-2921011198 .background-color-B4{background-color:#E3E9FD;} + .d2-2921011198 .background-color-B5{background-color:#EDF0FD;} + .d2-2921011198 .background-color-B6{background-color:#F7F8FE;} + .d2-2921011198 .background-color-AA2{background-color:#4A6FF3;} + .d2-2921011198 .background-color-AA4{background-color:#EDF0FD;} + .d2-2921011198 .background-color-AA5{background-color:#F7F8FE;} + .d2-2921011198 .background-color-AB4{background-color:#EDF0FD;} + .d2-2921011198 .background-color-AB5{background-color:#F7F8FE;} + .d2-2921011198 .color-N1{color:#0A0F25;} + .d2-2921011198 .color-N2{color:#676C7E;} + .d2-2921011198 .color-N3{color:#9499AB;} + .d2-2921011198 .color-N4{color:#CFD2DD;} + .d2-2921011198 .color-N5{color:#DEE1EB;} + .d2-2921011198 .color-N6{color:#EEF1F8;} + .d2-2921011198 .color-N7{color:#FFFFFF;} + .d2-2921011198 .color-B1{color:#0D32B2;} + .d2-2921011198 .color-B2{color:#0D32B2;} + .d2-2921011198 .color-B3{color:#E3E9FD;} + .d2-2921011198 .color-B4{color:#E3E9FD;} + .d2-2921011198 .color-B5{color:#EDF0FD;} + .d2-2921011198 .color-B6{color:#F7F8FE;} + .d2-2921011198 .color-AA2{color:#4A6FF3;} + .d2-2921011198 .color-AA4{color:#EDF0FD;} + .d2-2921011198 .color-AA5{color:#F7F8FE;} + .d2-2921011198 .color-AB4{color:#EDF0FD;} + .d2-2921011198 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>SequenceSystemFileASystem StartsOkayAlright OneTwoThreeFourFiveSix OneTwoThreeFourFiveSixOneTwoOneTwoThreeFourFiveSixOneTwoThreeFourFiveSixOneTwoThreeFourFiveSix +>>>>>>> cb2f2823c (Fix changes) diff --git a/e2etests/testdata/txtar/sequence-fontsize/dagre/board.exp.json b/e2etests/testdata/txtar/sequence-fontsize/dagre/board.exp.json index f0a400628..18fecc5d7 100644 --- a/e2etests/testdata/txtar/sequence-fontsize/dagre/board.exp.json +++ b/e2etests/testdata/txtar/sequence-fontsize/dagre/board.exp.json @@ -231,6 +231,7 @@ "labelHeight": 31, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 73.5, @@ -269,6 +270,7 @@ "labelHeight": 55, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 443, @@ -315,6 +317,7 @@ "labelHeight": 31, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 431, @@ -353,6 +356,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 67.5, @@ -391,6 +395,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 437, @@ -429,6 +434,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1319, diff --git a/e2etests/testdata/txtar/sequence-fontsize/dagre/sketch.exp.svg b/e2etests/testdata/txtar/sequence-fontsize/dagre/sketch.exp.svg index 4d0eafa94..6bc6018f9 100644 --- a/e2etests/testdata/txtar/sequence-fontsize/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/sequence-fontsize/dagre/sketch.exp.svg @@ -1,16 +1,26 @@ +<<<<<<< HEAD Front-EndLibreriaCD generatePresentationPayload()Generar y FirmarPrueba de TitularidadPrueba de TitularidadPrueba de TitularidadPrueba de TitularidadPresentacion Firmada +||||||| parent of cb2f2823c (Fix changes) + .d2-720299123 .fill-N1{fill:#0A0F25;} + .d2-720299123 .fill-N2{fill:#676C7E;} + .d2-720299123 .fill-N3{fill:#9499AB;} + .d2-720299123 .fill-N4{fill:#CFD2DD;} + .d2-720299123 .fill-N5{fill:#DEE1EB;} + .d2-720299123 .fill-N6{fill:#EEF1F8;} + .d2-720299123 .fill-N7{fill:#FFFFFF;} + .d2-720299123 .fill-B1{fill:#0D32B2;} + .d2-720299123 .fill-B2{fill:#0D32B2;} + .d2-720299123 .fill-B3{fill:#E3E9FD;} + .d2-720299123 .fill-B4{fill:#E3E9FD;} + .d2-720299123 .fill-B5{fill:#EDF0FD;} + .d2-720299123 .fill-B6{fill:#F7F8FE;} + .d2-720299123 .fill-AA2{fill:#4A6FF3;} + .d2-720299123 .fill-AA4{fill:#EDF0FD;} + .d2-720299123 .fill-AA5{fill:#F7F8FE;} + .d2-720299123 .fill-AB4{fill:#EDF0FD;} + .d2-720299123 .fill-AB5{fill:#F7F8FE;} + .d2-720299123 .stroke-N1{stroke:#0A0F25;} + .d2-720299123 .stroke-N2{stroke:#676C7E;} + .d2-720299123 .stroke-N3{stroke:#9499AB;} + .d2-720299123 .stroke-N4{stroke:#CFD2DD;} + .d2-720299123 .stroke-N5{stroke:#DEE1EB;} + .d2-720299123 .stroke-N6{stroke:#EEF1F8;} + .d2-720299123 .stroke-N7{stroke:#FFFFFF;} + .d2-720299123 .stroke-B1{stroke:#0D32B2;} + .d2-720299123 .stroke-B2{stroke:#0D32B2;} + .d2-720299123 .stroke-B3{stroke:#E3E9FD;} + .d2-720299123 .stroke-B4{stroke:#E3E9FD;} + .d2-720299123 .stroke-B5{stroke:#EDF0FD;} + .d2-720299123 .stroke-B6{stroke:#F7F8FE;} + .d2-720299123 .stroke-AA2{stroke:#4A6FF3;} + .d2-720299123 .stroke-AA4{stroke:#EDF0FD;} + .d2-720299123 .stroke-AA5{stroke:#F7F8FE;} + .d2-720299123 .stroke-AB4{stroke:#EDF0FD;} + .d2-720299123 .stroke-AB5{stroke:#F7F8FE;} + .d2-720299123 .background-color-N1{background-color:#0A0F25;} + .d2-720299123 .background-color-N2{background-color:#676C7E;} + .d2-720299123 .background-color-N3{background-color:#9499AB;} + .d2-720299123 .background-color-N4{background-color:#CFD2DD;} + .d2-720299123 .background-color-N5{background-color:#DEE1EB;} + .d2-720299123 .background-color-N6{background-color:#EEF1F8;} + .d2-720299123 .background-color-N7{background-color:#FFFFFF;} + .d2-720299123 .background-color-B1{background-color:#0D32B2;} + .d2-720299123 .background-color-B2{background-color:#0D32B2;} + .d2-720299123 .background-color-B3{background-color:#E3E9FD;} + .d2-720299123 .background-color-B4{background-color:#E3E9FD;} + .d2-720299123 .background-color-B5{background-color:#EDF0FD;} + .d2-720299123 .background-color-B6{background-color:#F7F8FE;} + .d2-720299123 .background-color-AA2{background-color:#4A6FF3;} + .d2-720299123 .background-color-AA4{background-color:#EDF0FD;} + .d2-720299123 .background-color-AA5{background-color:#F7F8FE;} + .d2-720299123 .background-color-AB4{background-color:#EDF0FD;} + .d2-720299123 .background-color-AB5{background-color:#F7F8FE;} + .d2-720299123 .color-N1{color:#0A0F25;} + .d2-720299123 .color-N2{color:#676C7E;} + .d2-720299123 .color-N3{color:#9499AB;} + .d2-720299123 .color-N4{color:#CFD2DD;} + .d2-720299123 .color-N5{color:#DEE1EB;} + .d2-720299123 .color-N6{color:#EEF1F8;} + .d2-720299123 .color-N7{color:#FFFFFF;} + .d2-720299123 .color-B1{color:#0D32B2;} + .d2-720299123 .color-B2{color:#0D32B2;} + .d2-720299123 .color-B3{color:#E3E9FD;} + .d2-720299123 .color-B4{color:#E3E9FD;} + .d2-720299123 .color-B5{color:#EDF0FD;} + .d2-720299123 .color-B6{color:#F7F8FE;} + .d2-720299123 .color-AA2{color:#4A6FF3;} + .d2-720299123 .color-AA4{color:#EDF0FD;} + .d2-720299123 .color-AA5{color:#F7F8FE;} + .d2-720299123 .color-AB4{color:#EDF0FD;} + .d2-720299123 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>Front-EndLibreriaCD generatePresentationPayload()Generar y FirmarPrueba de TitularidadPrueba de TitularidadPrueba de TitularidadPrueba de TitularidadPresentacion Firmada +======= + .d2-1300670411 .fill-N1{fill:#0A0F25;} + .d2-1300670411 .fill-N2{fill:#676C7E;} + .d2-1300670411 .fill-N3{fill:#9499AB;} + .d2-1300670411 .fill-N4{fill:#CFD2DD;} + .d2-1300670411 .fill-N5{fill:#DEE1EB;} + .d2-1300670411 .fill-N6{fill:#EEF1F8;} + .d2-1300670411 .fill-N7{fill:#FFFFFF;} + .d2-1300670411 .fill-B1{fill:#0D32B2;} + .d2-1300670411 .fill-B2{fill:#0D32B2;} + .d2-1300670411 .fill-B3{fill:#E3E9FD;} + .d2-1300670411 .fill-B4{fill:#E3E9FD;} + .d2-1300670411 .fill-B5{fill:#EDF0FD;} + .d2-1300670411 .fill-B6{fill:#F7F8FE;} + .d2-1300670411 .fill-AA2{fill:#4A6FF3;} + .d2-1300670411 .fill-AA4{fill:#EDF0FD;} + .d2-1300670411 .fill-AA5{fill:#F7F8FE;} + .d2-1300670411 .fill-AB4{fill:#EDF0FD;} + .d2-1300670411 .fill-AB5{fill:#F7F8FE;} + .d2-1300670411 .stroke-N1{stroke:#0A0F25;} + .d2-1300670411 .stroke-N2{stroke:#676C7E;} + .d2-1300670411 .stroke-N3{stroke:#9499AB;} + .d2-1300670411 .stroke-N4{stroke:#CFD2DD;} + .d2-1300670411 .stroke-N5{stroke:#DEE1EB;} + .d2-1300670411 .stroke-N6{stroke:#EEF1F8;} + .d2-1300670411 .stroke-N7{stroke:#FFFFFF;} + .d2-1300670411 .stroke-B1{stroke:#0D32B2;} + .d2-1300670411 .stroke-B2{stroke:#0D32B2;} + .d2-1300670411 .stroke-B3{stroke:#E3E9FD;} + .d2-1300670411 .stroke-B4{stroke:#E3E9FD;} + .d2-1300670411 .stroke-B5{stroke:#EDF0FD;} + .d2-1300670411 .stroke-B6{stroke:#F7F8FE;} + .d2-1300670411 .stroke-AA2{stroke:#4A6FF3;} + .d2-1300670411 .stroke-AA4{stroke:#EDF0FD;} + .d2-1300670411 .stroke-AA5{stroke:#F7F8FE;} + .d2-1300670411 .stroke-AB4{stroke:#EDF0FD;} + .d2-1300670411 .stroke-AB5{stroke:#F7F8FE;} + .d2-1300670411 .background-color-N1{background-color:#0A0F25;} + .d2-1300670411 .background-color-N2{background-color:#676C7E;} + .d2-1300670411 .background-color-N3{background-color:#9499AB;} + .d2-1300670411 .background-color-N4{background-color:#CFD2DD;} + .d2-1300670411 .background-color-N5{background-color:#DEE1EB;} + .d2-1300670411 .background-color-N6{background-color:#EEF1F8;} + .d2-1300670411 .background-color-N7{background-color:#FFFFFF;} + .d2-1300670411 .background-color-B1{background-color:#0D32B2;} + .d2-1300670411 .background-color-B2{background-color:#0D32B2;} + .d2-1300670411 .background-color-B3{background-color:#E3E9FD;} + .d2-1300670411 .background-color-B4{background-color:#E3E9FD;} + .d2-1300670411 .background-color-B5{background-color:#EDF0FD;} + .d2-1300670411 .background-color-B6{background-color:#F7F8FE;} + .d2-1300670411 .background-color-AA2{background-color:#4A6FF3;} + .d2-1300670411 .background-color-AA4{background-color:#EDF0FD;} + .d2-1300670411 .background-color-AA5{background-color:#F7F8FE;} + .d2-1300670411 .background-color-AB4{background-color:#EDF0FD;} + .d2-1300670411 .background-color-AB5{background-color:#F7F8FE;} + .d2-1300670411 .color-N1{color:#0A0F25;} + .d2-1300670411 .color-N2{color:#676C7E;} + .d2-1300670411 .color-N3{color:#9499AB;} + .d2-1300670411 .color-N4{color:#CFD2DD;} + .d2-1300670411 .color-N5{color:#DEE1EB;} + .d2-1300670411 .color-N6{color:#EEF1F8;} + .d2-1300670411 .color-N7{color:#FFFFFF;} + .d2-1300670411 .color-B1{color:#0D32B2;} + .d2-1300670411 .color-B2{color:#0D32B2;} + .d2-1300670411 .color-B3{color:#E3E9FD;} + .d2-1300670411 .color-B4{color:#E3E9FD;} + .d2-1300670411 .color-B5{color:#EDF0FD;} + .d2-1300670411 .color-B6{color:#F7F8FE;} + .d2-1300670411 .color-AA2{color:#4A6FF3;} + .d2-1300670411 .color-AA4{color:#EDF0FD;} + .d2-1300670411 .color-AA5{color:#F7F8FE;} + .d2-1300670411 .color-AB4{color:#EDF0FD;} + .d2-1300670411 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>Front-EndLibreriaCD generatePresentationPayload()Generar y FirmarPrueba de TitularidadPrueba de TitularidadPrueba de TitularidadPrueba de TitularidadPresentacion Firmada +>>>>>>> cb2f2823c (Fix changes) diff --git a/e2etests/testdata/txtar/sequence-fontsize/elk/board.exp.json b/e2etests/testdata/txtar/sequence-fontsize/elk/board.exp.json index f0a400628..18fecc5d7 100644 --- a/e2etests/testdata/txtar/sequence-fontsize/elk/board.exp.json +++ b/e2etests/testdata/txtar/sequence-fontsize/elk/board.exp.json @@ -231,6 +231,7 @@ "labelHeight": 31, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 73.5, @@ -269,6 +270,7 @@ "labelHeight": 55, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 443, @@ -315,6 +317,7 @@ "labelHeight": 31, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 431, @@ -353,6 +356,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 67.5, @@ -391,6 +395,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 437, @@ -429,6 +434,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 1319, diff --git a/e2etests/testdata/txtar/sequence-fontsize/elk/sketch.exp.svg b/e2etests/testdata/txtar/sequence-fontsize/elk/sketch.exp.svg index 4d0eafa94..6bc6018f9 100644 --- a/e2etests/testdata/txtar/sequence-fontsize/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/sequence-fontsize/elk/sketch.exp.svg @@ -1,16 +1,26 @@ +<<<<<<< HEAD Front-EndLibreriaCD generatePresentationPayload()Generar y FirmarPrueba de TitularidadPrueba de TitularidadPrueba de TitularidadPrueba de TitularidadPresentacion Firmada +||||||| parent of cb2f2823c (Fix changes) + .d2-720299123 .fill-N1{fill:#0A0F25;} + .d2-720299123 .fill-N2{fill:#676C7E;} + .d2-720299123 .fill-N3{fill:#9499AB;} + .d2-720299123 .fill-N4{fill:#CFD2DD;} + .d2-720299123 .fill-N5{fill:#DEE1EB;} + .d2-720299123 .fill-N6{fill:#EEF1F8;} + .d2-720299123 .fill-N7{fill:#FFFFFF;} + .d2-720299123 .fill-B1{fill:#0D32B2;} + .d2-720299123 .fill-B2{fill:#0D32B2;} + .d2-720299123 .fill-B3{fill:#E3E9FD;} + .d2-720299123 .fill-B4{fill:#E3E9FD;} + .d2-720299123 .fill-B5{fill:#EDF0FD;} + .d2-720299123 .fill-B6{fill:#F7F8FE;} + .d2-720299123 .fill-AA2{fill:#4A6FF3;} + .d2-720299123 .fill-AA4{fill:#EDF0FD;} + .d2-720299123 .fill-AA5{fill:#F7F8FE;} + .d2-720299123 .fill-AB4{fill:#EDF0FD;} + .d2-720299123 .fill-AB5{fill:#F7F8FE;} + .d2-720299123 .stroke-N1{stroke:#0A0F25;} + .d2-720299123 .stroke-N2{stroke:#676C7E;} + .d2-720299123 .stroke-N3{stroke:#9499AB;} + .d2-720299123 .stroke-N4{stroke:#CFD2DD;} + .d2-720299123 .stroke-N5{stroke:#DEE1EB;} + .d2-720299123 .stroke-N6{stroke:#EEF1F8;} + .d2-720299123 .stroke-N7{stroke:#FFFFFF;} + .d2-720299123 .stroke-B1{stroke:#0D32B2;} + .d2-720299123 .stroke-B2{stroke:#0D32B2;} + .d2-720299123 .stroke-B3{stroke:#E3E9FD;} + .d2-720299123 .stroke-B4{stroke:#E3E9FD;} + .d2-720299123 .stroke-B5{stroke:#EDF0FD;} + .d2-720299123 .stroke-B6{stroke:#F7F8FE;} + .d2-720299123 .stroke-AA2{stroke:#4A6FF3;} + .d2-720299123 .stroke-AA4{stroke:#EDF0FD;} + .d2-720299123 .stroke-AA5{stroke:#F7F8FE;} + .d2-720299123 .stroke-AB4{stroke:#EDF0FD;} + .d2-720299123 .stroke-AB5{stroke:#F7F8FE;} + .d2-720299123 .background-color-N1{background-color:#0A0F25;} + .d2-720299123 .background-color-N2{background-color:#676C7E;} + .d2-720299123 .background-color-N3{background-color:#9499AB;} + .d2-720299123 .background-color-N4{background-color:#CFD2DD;} + .d2-720299123 .background-color-N5{background-color:#DEE1EB;} + .d2-720299123 .background-color-N6{background-color:#EEF1F8;} + .d2-720299123 .background-color-N7{background-color:#FFFFFF;} + .d2-720299123 .background-color-B1{background-color:#0D32B2;} + .d2-720299123 .background-color-B2{background-color:#0D32B2;} + .d2-720299123 .background-color-B3{background-color:#E3E9FD;} + .d2-720299123 .background-color-B4{background-color:#E3E9FD;} + .d2-720299123 .background-color-B5{background-color:#EDF0FD;} + .d2-720299123 .background-color-B6{background-color:#F7F8FE;} + .d2-720299123 .background-color-AA2{background-color:#4A6FF3;} + .d2-720299123 .background-color-AA4{background-color:#EDF0FD;} + .d2-720299123 .background-color-AA5{background-color:#F7F8FE;} + .d2-720299123 .background-color-AB4{background-color:#EDF0FD;} + .d2-720299123 .background-color-AB5{background-color:#F7F8FE;} + .d2-720299123 .color-N1{color:#0A0F25;} + .d2-720299123 .color-N2{color:#676C7E;} + .d2-720299123 .color-N3{color:#9499AB;} + .d2-720299123 .color-N4{color:#CFD2DD;} + .d2-720299123 .color-N5{color:#DEE1EB;} + .d2-720299123 .color-N6{color:#EEF1F8;} + .d2-720299123 .color-N7{color:#FFFFFF;} + .d2-720299123 .color-B1{color:#0D32B2;} + .d2-720299123 .color-B2{color:#0D32B2;} + .d2-720299123 .color-B3{color:#E3E9FD;} + .d2-720299123 .color-B4{color:#E3E9FD;} + .d2-720299123 .color-B5{color:#EDF0FD;} + .d2-720299123 .color-B6{color:#F7F8FE;} + .d2-720299123 .color-AA2{color:#4A6FF3;} + .d2-720299123 .color-AA4{color:#EDF0FD;} + .d2-720299123 .color-AA5{color:#F7F8FE;} + .d2-720299123 .color-AB4{color:#EDF0FD;} + .d2-720299123 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>Front-EndLibreriaCD generatePresentationPayload()Generar y FirmarPrueba de TitularidadPrueba de TitularidadPrueba de TitularidadPrueba de TitularidadPresentacion Firmada +======= + .d2-1300670411 .fill-N1{fill:#0A0F25;} + .d2-1300670411 .fill-N2{fill:#676C7E;} + .d2-1300670411 .fill-N3{fill:#9499AB;} + .d2-1300670411 .fill-N4{fill:#CFD2DD;} + .d2-1300670411 .fill-N5{fill:#DEE1EB;} + .d2-1300670411 .fill-N6{fill:#EEF1F8;} + .d2-1300670411 .fill-N7{fill:#FFFFFF;} + .d2-1300670411 .fill-B1{fill:#0D32B2;} + .d2-1300670411 .fill-B2{fill:#0D32B2;} + .d2-1300670411 .fill-B3{fill:#E3E9FD;} + .d2-1300670411 .fill-B4{fill:#E3E9FD;} + .d2-1300670411 .fill-B5{fill:#EDF0FD;} + .d2-1300670411 .fill-B6{fill:#F7F8FE;} + .d2-1300670411 .fill-AA2{fill:#4A6FF3;} + .d2-1300670411 .fill-AA4{fill:#EDF0FD;} + .d2-1300670411 .fill-AA5{fill:#F7F8FE;} + .d2-1300670411 .fill-AB4{fill:#EDF0FD;} + .d2-1300670411 .fill-AB5{fill:#F7F8FE;} + .d2-1300670411 .stroke-N1{stroke:#0A0F25;} + .d2-1300670411 .stroke-N2{stroke:#676C7E;} + .d2-1300670411 .stroke-N3{stroke:#9499AB;} + .d2-1300670411 .stroke-N4{stroke:#CFD2DD;} + .d2-1300670411 .stroke-N5{stroke:#DEE1EB;} + .d2-1300670411 .stroke-N6{stroke:#EEF1F8;} + .d2-1300670411 .stroke-N7{stroke:#FFFFFF;} + .d2-1300670411 .stroke-B1{stroke:#0D32B2;} + .d2-1300670411 .stroke-B2{stroke:#0D32B2;} + .d2-1300670411 .stroke-B3{stroke:#E3E9FD;} + .d2-1300670411 .stroke-B4{stroke:#E3E9FD;} + .d2-1300670411 .stroke-B5{stroke:#EDF0FD;} + .d2-1300670411 .stroke-B6{stroke:#F7F8FE;} + .d2-1300670411 .stroke-AA2{stroke:#4A6FF3;} + .d2-1300670411 .stroke-AA4{stroke:#EDF0FD;} + .d2-1300670411 .stroke-AA5{stroke:#F7F8FE;} + .d2-1300670411 .stroke-AB4{stroke:#EDF0FD;} + .d2-1300670411 .stroke-AB5{stroke:#F7F8FE;} + .d2-1300670411 .background-color-N1{background-color:#0A0F25;} + .d2-1300670411 .background-color-N2{background-color:#676C7E;} + .d2-1300670411 .background-color-N3{background-color:#9499AB;} + .d2-1300670411 .background-color-N4{background-color:#CFD2DD;} + .d2-1300670411 .background-color-N5{background-color:#DEE1EB;} + .d2-1300670411 .background-color-N6{background-color:#EEF1F8;} + .d2-1300670411 .background-color-N7{background-color:#FFFFFF;} + .d2-1300670411 .background-color-B1{background-color:#0D32B2;} + .d2-1300670411 .background-color-B2{background-color:#0D32B2;} + .d2-1300670411 .background-color-B3{background-color:#E3E9FD;} + .d2-1300670411 .background-color-B4{background-color:#E3E9FD;} + .d2-1300670411 .background-color-B5{background-color:#EDF0FD;} + .d2-1300670411 .background-color-B6{background-color:#F7F8FE;} + .d2-1300670411 .background-color-AA2{background-color:#4A6FF3;} + .d2-1300670411 .background-color-AA4{background-color:#EDF0FD;} + .d2-1300670411 .background-color-AA5{background-color:#F7F8FE;} + .d2-1300670411 .background-color-AB4{background-color:#EDF0FD;} + .d2-1300670411 .background-color-AB5{background-color:#F7F8FE;} + .d2-1300670411 .color-N1{color:#0A0F25;} + .d2-1300670411 .color-N2{color:#676C7E;} + .d2-1300670411 .color-N3{color:#9499AB;} + .d2-1300670411 .color-N4{color:#CFD2DD;} + .d2-1300670411 .color-N5{color:#DEE1EB;} + .d2-1300670411 .color-N6{color:#EEF1F8;} + .d2-1300670411 .color-N7{color:#FFFFFF;} + .d2-1300670411 .color-B1{color:#0D32B2;} + .d2-1300670411 .color-B2{color:#0D32B2;} + .d2-1300670411 .color-B3{color:#E3E9FD;} + .d2-1300670411 .color-B4{color:#E3E9FD;} + .d2-1300670411 .color-B5{color:#EDF0FD;} + .d2-1300670411 .color-B6{color:#F7F8FE;} + .d2-1300670411 .color-AA2{color:#4A6FF3;} + .d2-1300670411 .color-AA4{color:#EDF0FD;} + .d2-1300670411 .color-AA5{color:#F7F8FE;} + .d2-1300670411 .color-AB4{color:#EDF0FD;} + .d2-1300670411 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>Front-EndLibreriaCD generatePresentationPayload()Generar y FirmarPrueba de TitularidadPrueba de TitularidadPrueba de TitularidadPrueba de TitularidadPresentacion Firmada +>>>>>>> cb2f2823c (Fix changes) diff --git a/e2etests/testdata/txtar/sequence-multiline-alignment/dagre/board.exp.json b/e2etests/testdata/txtar/sequence-multiline-alignment/dagre/board.exp.json index cbedac69f..6bdf35e96 100644 --- a/e2etests/testdata/txtar/sequence-multiline-alignment/dagre/board.exp.json +++ b/e2etests/testdata/txtar/sequence-multiline-alignment/dagre/board.exp.json @@ -150,6 +150,7 @@ "labelHeight": 85, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 212, @@ -196,6 +197,7 @@ "labelHeight": 85, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 212, @@ -242,6 +244,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 68, @@ -280,6 +283,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -318,6 +322,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 212, diff --git a/e2etests/testdata/txtar/sequence-multiline-alignment/dagre/sketch.exp.svg b/e2etests/testdata/txtar/sequence-multiline-alignment/dagre/sketch.exp.svg index 3feaf509c..0d533cce6 100644 --- a/e2etests/testdata/txtar/sequence-multiline-alignment/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/sequence-multiline-alignment/dagre/sketch.exp.svg @@ -1,16 +1,26 @@ +<<<<<<< HEAD ab onetwothreefourfiveonetwothreefourfiveokay then +||||||| parent of cb2f2823c (Fix changes) + .d2-899527791 .fill-N1{fill:#0A0F25;} + .d2-899527791 .fill-N2{fill:#676C7E;} + .d2-899527791 .fill-N3{fill:#9499AB;} + .d2-899527791 .fill-N4{fill:#CFD2DD;} + .d2-899527791 .fill-N5{fill:#DEE1EB;} + .d2-899527791 .fill-N6{fill:#EEF1F8;} + .d2-899527791 .fill-N7{fill:#FFFFFF;} + .d2-899527791 .fill-B1{fill:#0D32B2;} + .d2-899527791 .fill-B2{fill:#0D32B2;} + .d2-899527791 .fill-B3{fill:#E3E9FD;} + .d2-899527791 .fill-B4{fill:#E3E9FD;} + .d2-899527791 .fill-B5{fill:#EDF0FD;} + .d2-899527791 .fill-B6{fill:#F7F8FE;} + .d2-899527791 .fill-AA2{fill:#4A6FF3;} + .d2-899527791 .fill-AA4{fill:#EDF0FD;} + .d2-899527791 .fill-AA5{fill:#F7F8FE;} + .d2-899527791 .fill-AB4{fill:#EDF0FD;} + .d2-899527791 .fill-AB5{fill:#F7F8FE;} + .d2-899527791 .stroke-N1{stroke:#0A0F25;} + .d2-899527791 .stroke-N2{stroke:#676C7E;} + .d2-899527791 .stroke-N3{stroke:#9499AB;} + .d2-899527791 .stroke-N4{stroke:#CFD2DD;} + .d2-899527791 .stroke-N5{stroke:#DEE1EB;} + .d2-899527791 .stroke-N6{stroke:#EEF1F8;} + .d2-899527791 .stroke-N7{stroke:#FFFFFF;} + .d2-899527791 .stroke-B1{stroke:#0D32B2;} + .d2-899527791 .stroke-B2{stroke:#0D32B2;} + .d2-899527791 .stroke-B3{stroke:#E3E9FD;} + .d2-899527791 .stroke-B4{stroke:#E3E9FD;} + .d2-899527791 .stroke-B5{stroke:#EDF0FD;} + .d2-899527791 .stroke-B6{stroke:#F7F8FE;} + .d2-899527791 .stroke-AA2{stroke:#4A6FF3;} + .d2-899527791 .stroke-AA4{stroke:#EDF0FD;} + .d2-899527791 .stroke-AA5{stroke:#F7F8FE;} + .d2-899527791 .stroke-AB4{stroke:#EDF0FD;} + .d2-899527791 .stroke-AB5{stroke:#F7F8FE;} + .d2-899527791 .background-color-N1{background-color:#0A0F25;} + .d2-899527791 .background-color-N2{background-color:#676C7E;} + .d2-899527791 .background-color-N3{background-color:#9499AB;} + .d2-899527791 .background-color-N4{background-color:#CFD2DD;} + .d2-899527791 .background-color-N5{background-color:#DEE1EB;} + .d2-899527791 .background-color-N6{background-color:#EEF1F8;} + .d2-899527791 .background-color-N7{background-color:#FFFFFF;} + .d2-899527791 .background-color-B1{background-color:#0D32B2;} + .d2-899527791 .background-color-B2{background-color:#0D32B2;} + .d2-899527791 .background-color-B3{background-color:#E3E9FD;} + .d2-899527791 .background-color-B4{background-color:#E3E9FD;} + .d2-899527791 .background-color-B5{background-color:#EDF0FD;} + .d2-899527791 .background-color-B6{background-color:#F7F8FE;} + .d2-899527791 .background-color-AA2{background-color:#4A6FF3;} + .d2-899527791 .background-color-AA4{background-color:#EDF0FD;} + .d2-899527791 .background-color-AA5{background-color:#F7F8FE;} + .d2-899527791 .background-color-AB4{background-color:#EDF0FD;} + .d2-899527791 .background-color-AB5{background-color:#F7F8FE;} + .d2-899527791 .color-N1{color:#0A0F25;} + .d2-899527791 .color-N2{color:#676C7E;} + .d2-899527791 .color-N3{color:#9499AB;} + .d2-899527791 .color-N4{color:#CFD2DD;} + .d2-899527791 .color-N5{color:#DEE1EB;} + .d2-899527791 .color-N6{color:#EEF1F8;} + .d2-899527791 .color-N7{color:#FFFFFF;} + .d2-899527791 .color-B1{color:#0D32B2;} + .d2-899527791 .color-B2{color:#0D32B2;} + .d2-899527791 .color-B3{color:#E3E9FD;} + .d2-899527791 .color-B4{color:#E3E9FD;} + .d2-899527791 .color-B5{color:#EDF0FD;} + .d2-899527791 .color-B6{color:#F7F8FE;} + .d2-899527791 .color-AA2{color:#4A6FF3;} + .d2-899527791 .color-AA4{color:#EDF0FD;} + .d2-899527791 .color-AA5{color:#F7F8FE;} + .d2-899527791 .color-AB4{color:#EDF0FD;} + .d2-899527791 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>ab onetwothreefourfiveonetwothreefourfiveokay then +======= + .d2-1013481721 .fill-N1{fill:#0A0F25;} + .d2-1013481721 .fill-N2{fill:#676C7E;} + .d2-1013481721 .fill-N3{fill:#9499AB;} + .d2-1013481721 .fill-N4{fill:#CFD2DD;} + .d2-1013481721 .fill-N5{fill:#DEE1EB;} + .d2-1013481721 .fill-N6{fill:#EEF1F8;} + .d2-1013481721 .fill-N7{fill:#FFFFFF;} + .d2-1013481721 .fill-B1{fill:#0D32B2;} + .d2-1013481721 .fill-B2{fill:#0D32B2;} + .d2-1013481721 .fill-B3{fill:#E3E9FD;} + .d2-1013481721 .fill-B4{fill:#E3E9FD;} + .d2-1013481721 .fill-B5{fill:#EDF0FD;} + .d2-1013481721 .fill-B6{fill:#F7F8FE;} + .d2-1013481721 .fill-AA2{fill:#4A6FF3;} + .d2-1013481721 .fill-AA4{fill:#EDF0FD;} + .d2-1013481721 .fill-AA5{fill:#F7F8FE;} + .d2-1013481721 .fill-AB4{fill:#EDF0FD;} + .d2-1013481721 .fill-AB5{fill:#F7F8FE;} + .d2-1013481721 .stroke-N1{stroke:#0A0F25;} + .d2-1013481721 .stroke-N2{stroke:#676C7E;} + .d2-1013481721 .stroke-N3{stroke:#9499AB;} + .d2-1013481721 .stroke-N4{stroke:#CFD2DD;} + .d2-1013481721 .stroke-N5{stroke:#DEE1EB;} + .d2-1013481721 .stroke-N6{stroke:#EEF1F8;} + .d2-1013481721 .stroke-N7{stroke:#FFFFFF;} + .d2-1013481721 .stroke-B1{stroke:#0D32B2;} + .d2-1013481721 .stroke-B2{stroke:#0D32B2;} + .d2-1013481721 .stroke-B3{stroke:#E3E9FD;} + .d2-1013481721 .stroke-B4{stroke:#E3E9FD;} + .d2-1013481721 .stroke-B5{stroke:#EDF0FD;} + .d2-1013481721 .stroke-B6{stroke:#F7F8FE;} + .d2-1013481721 .stroke-AA2{stroke:#4A6FF3;} + .d2-1013481721 .stroke-AA4{stroke:#EDF0FD;} + .d2-1013481721 .stroke-AA5{stroke:#F7F8FE;} + .d2-1013481721 .stroke-AB4{stroke:#EDF0FD;} + .d2-1013481721 .stroke-AB5{stroke:#F7F8FE;} + .d2-1013481721 .background-color-N1{background-color:#0A0F25;} + .d2-1013481721 .background-color-N2{background-color:#676C7E;} + .d2-1013481721 .background-color-N3{background-color:#9499AB;} + .d2-1013481721 .background-color-N4{background-color:#CFD2DD;} + .d2-1013481721 .background-color-N5{background-color:#DEE1EB;} + .d2-1013481721 .background-color-N6{background-color:#EEF1F8;} + .d2-1013481721 .background-color-N7{background-color:#FFFFFF;} + .d2-1013481721 .background-color-B1{background-color:#0D32B2;} + .d2-1013481721 .background-color-B2{background-color:#0D32B2;} + .d2-1013481721 .background-color-B3{background-color:#E3E9FD;} + .d2-1013481721 .background-color-B4{background-color:#E3E9FD;} + .d2-1013481721 .background-color-B5{background-color:#EDF0FD;} + .d2-1013481721 .background-color-B6{background-color:#F7F8FE;} + .d2-1013481721 .background-color-AA2{background-color:#4A6FF3;} + .d2-1013481721 .background-color-AA4{background-color:#EDF0FD;} + .d2-1013481721 .background-color-AA5{background-color:#F7F8FE;} + .d2-1013481721 .background-color-AB4{background-color:#EDF0FD;} + .d2-1013481721 .background-color-AB5{background-color:#F7F8FE;} + .d2-1013481721 .color-N1{color:#0A0F25;} + .d2-1013481721 .color-N2{color:#676C7E;} + .d2-1013481721 .color-N3{color:#9499AB;} + .d2-1013481721 .color-N4{color:#CFD2DD;} + .d2-1013481721 .color-N5{color:#DEE1EB;} + .d2-1013481721 .color-N6{color:#EEF1F8;} + .d2-1013481721 .color-N7{color:#FFFFFF;} + .d2-1013481721 .color-B1{color:#0D32B2;} + .d2-1013481721 .color-B2{color:#0D32B2;} + .d2-1013481721 .color-B3{color:#E3E9FD;} + .d2-1013481721 .color-B4{color:#E3E9FD;} + .d2-1013481721 .color-B5{color:#EDF0FD;} + .d2-1013481721 .color-B6{color:#F7F8FE;} + .d2-1013481721 .color-AA2{color:#4A6FF3;} + .d2-1013481721 .color-AA4{color:#EDF0FD;} + .d2-1013481721 .color-AA5{color:#F7F8FE;} + .d2-1013481721 .color-AB4{color:#EDF0FD;} + .d2-1013481721 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>ab onetwothreefourfiveonetwothreefourfiveokay then +>>>>>>> cb2f2823c (Fix changes) diff --git a/e2etests/testdata/txtar/sequence-multiline-alignment/elk/board.exp.json b/e2etests/testdata/txtar/sequence-multiline-alignment/elk/board.exp.json index cbedac69f..6bdf35e96 100644 --- a/e2etests/testdata/txtar/sequence-multiline-alignment/elk/board.exp.json +++ b/e2etests/testdata/txtar/sequence-multiline-alignment/elk/board.exp.json @@ -150,6 +150,7 @@ "labelHeight": 85, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 212, @@ -196,6 +197,7 @@ "labelHeight": 85, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 212, @@ -242,6 +244,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 68, @@ -280,6 +283,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -318,6 +322,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 212, diff --git a/e2etests/testdata/txtar/sequence-multiline-alignment/elk/sketch.exp.svg b/e2etests/testdata/txtar/sequence-multiline-alignment/elk/sketch.exp.svg index 3feaf509c..0d533cce6 100644 --- a/e2etests/testdata/txtar/sequence-multiline-alignment/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/sequence-multiline-alignment/elk/sketch.exp.svg @@ -1,16 +1,26 @@ +<<<<<<< HEAD ab onetwothreefourfiveonetwothreefourfiveokay then +||||||| parent of cb2f2823c (Fix changes) + .d2-899527791 .fill-N1{fill:#0A0F25;} + .d2-899527791 .fill-N2{fill:#676C7E;} + .d2-899527791 .fill-N3{fill:#9499AB;} + .d2-899527791 .fill-N4{fill:#CFD2DD;} + .d2-899527791 .fill-N5{fill:#DEE1EB;} + .d2-899527791 .fill-N6{fill:#EEF1F8;} + .d2-899527791 .fill-N7{fill:#FFFFFF;} + .d2-899527791 .fill-B1{fill:#0D32B2;} + .d2-899527791 .fill-B2{fill:#0D32B2;} + .d2-899527791 .fill-B3{fill:#E3E9FD;} + .d2-899527791 .fill-B4{fill:#E3E9FD;} + .d2-899527791 .fill-B5{fill:#EDF0FD;} + .d2-899527791 .fill-B6{fill:#F7F8FE;} + .d2-899527791 .fill-AA2{fill:#4A6FF3;} + .d2-899527791 .fill-AA4{fill:#EDF0FD;} + .d2-899527791 .fill-AA5{fill:#F7F8FE;} + .d2-899527791 .fill-AB4{fill:#EDF0FD;} + .d2-899527791 .fill-AB5{fill:#F7F8FE;} + .d2-899527791 .stroke-N1{stroke:#0A0F25;} + .d2-899527791 .stroke-N2{stroke:#676C7E;} + .d2-899527791 .stroke-N3{stroke:#9499AB;} + .d2-899527791 .stroke-N4{stroke:#CFD2DD;} + .d2-899527791 .stroke-N5{stroke:#DEE1EB;} + .d2-899527791 .stroke-N6{stroke:#EEF1F8;} + .d2-899527791 .stroke-N7{stroke:#FFFFFF;} + .d2-899527791 .stroke-B1{stroke:#0D32B2;} + .d2-899527791 .stroke-B2{stroke:#0D32B2;} + .d2-899527791 .stroke-B3{stroke:#E3E9FD;} + .d2-899527791 .stroke-B4{stroke:#E3E9FD;} + .d2-899527791 .stroke-B5{stroke:#EDF0FD;} + .d2-899527791 .stroke-B6{stroke:#F7F8FE;} + .d2-899527791 .stroke-AA2{stroke:#4A6FF3;} + .d2-899527791 .stroke-AA4{stroke:#EDF0FD;} + .d2-899527791 .stroke-AA5{stroke:#F7F8FE;} + .d2-899527791 .stroke-AB4{stroke:#EDF0FD;} + .d2-899527791 .stroke-AB5{stroke:#F7F8FE;} + .d2-899527791 .background-color-N1{background-color:#0A0F25;} + .d2-899527791 .background-color-N2{background-color:#676C7E;} + .d2-899527791 .background-color-N3{background-color:#9499AB;} + .d2-899527791 .background-color-N4{background-color:#CFD2DD;} + .d2-899527791 .background-color-N5{background-color:#DEE1EB;} + .d2-899527791 .background-color-N6{background-color:#EEF1F8;} + .d2-899527791 .background-color-N7{background-color:#FFFFFF;} + .d2-899527791 .background-color-B1{background-color:#0D32B2;} + .d2-899527791 .background-color-B2{background-color:#0D32B2;} + .d2-899527791 .background-color-B3{background-color:#E3E9FD;} + .d2-899527791 .background-color-B4{background-color:#E3E9FD;} + .d2-899527791 .background-color-B5{background-color:#EDF0FD;} + .d2-899527791 .background-color-B6{background-color:#F7F8FE;} + .d2-899527791 .background-color-AA2{background-color:#4A6FF3;} + .d2-899527791 .background-color-AA4{background-color:#EDF0FD;} + .d2-899527791 .background-color-AA5{background-color:#F7F8FE;} + .d2-899527791 .background-color-AB4{background-color:#EDF0FD;} + .d2-899527791 .background-color-AB5{background-color:#F7F8FE;} + .d2-899527791 .color-N1{color:#0A0F25;} + .d2-899527791 .color-N2{color:#676C7E;} + .d2-899527791 .color-N3{color:#9499AB;} + .d2-899527791 .color-N4{color:#CFD2DD;} + .d2-899527791 .color-N5{color:#DEE1EB;} + .d2-899527791 .color-N6{color:#EEF1F8;} + .d2-899527791 .color-N7{color:#FFFFFF;} + .d2-899527791 .color-B1{color:#0D32B2;} + .d2-899527791 .color-B2{color:#0D32B2;} + .d2-899527791 .color-B3{color:#E3E9FD;} + .d2-899527791 .color-B4{color:#E3E9FD;} + .d2-899527791 .color-B5{color:#EDF0FD;} + .d2-899527791 .color-B6{color:#F7F8FE;} + .d2-899527791 .color-AA2{color:#4A6FF3;} + .d2-899527791 .color-AA4{color:#EDF0FD;} + .d2-899527791 .color-AA5{color:#F7F8FE;} + .d2-899527791 .color-AB4{color:#EDF0FD;} + .d2-899527791 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>ab onetwothreefourfiveonetwothreefourfiveokay then +======= + .d2-1013481721 .fill-N1{fill:#0A0F25;} + .d2-1013481721 .fill-N2{fill:#676C7E;} + .d2-1013481721 .fill-N3{fill:#9499AB;} + .d2-1013481721 .fill-N4{fill:#CFD2DD;} + .d2-1013481721 .fill-N5{fill:#DEE1EB;} + .d2-1013481721 .fill-N6{fill:#EEF1F8;} + .d2-1013481721 .fill-N7{fill:#FFFFFF;} + .d2-1013481721 .fill-B1{fill:#0D32B2;} + .d2-1013481721 .fill-B2{fill:#0D32B2;} + .d2-1013481721 .fill-B3{fill:#E3E9FD;} + .d2-1013481721 .fill-B4{fill:#E3E9FD;} + .d2-1013481721 .fill-B5{fill:#EDF0FD;} + .d2-1013481721 .fill-B6{fill:#F7F8FE;} + .d2-1013481721 .fill-AA2{fill:#4A6FF3;} + .d2-1013481721 .fill-AA4{fill:#EDF0FD;} + .d2-1013481721 .fill-AA5{fill:#F7F8FE;} + .d2-1013481721 .fill-AB4{fill:#EDF0FD;} + .d2-1013481721 .fill-AB5{fill:#F7F8FE;} + .d2-1013481721 .stroke-N1{stroke:#0A0F25;} + .d2-1013481721 .stroke-N2{stroke:#676C7E;} + .d2-1013481721 .stroke-N3{stroke:#9499AB;} + .d2-1013481721 .stroke-N4{stroke:#CFD2DD;} + .d2-1013481721 .stroke-N5{stroke:#DEE1EB;} + .d2-1013481721 .stroke-N6{stroke:#EEF1F8;} + .d2-1013481721 .stroke-N7{stroke:#FFFFFF;} + .d2-1013481721 .stroke-B1{stroke:#0D32B2;} + .d2-1013481721 .stroke-B2{stroke:#0D32B2;} + .d2-1013481721 .stroke-B3{stroke:#E3E9FD;} + .d2-1013481721 .stroke-B4{stroke:#E3E9FD;} + .d2-1013481721 .stroke-B5{stroke:#EDF0FD;} + .d2-1013481721 .stroke-B6{stroke:#F7F8FE;} + .d2-1013481721 .stroke-AA2{stroke:#4A6FF3;} + .d2-1013481721 .stroke-AA4{stroke:#EDF0FD;} + .d2-1013481721 .stroke-AA5{stroke:#F7F8FE;} + .d2-1013481721 .stroke-AB4{stroke:#EDF0FD;} + .d2-1013481721 .stroke-AB5{stroke:#F7F8FE;} + .d2-1013481721 .background-color-N1{background-color:#0A0F25;} + .d2-1013481721 .background-color-N2{background-color:#676C7E;} + .d2-1013481721 .background-color-N3{background-color:#9499AB;} + .d2-1013481721 .background-color-N4{background-color:#CFD2DD;} + .d2-1013481721 .background-color-N5{background-color:#DEE1EB;} + .d2-1013481721 .background-color-N6{background-color:#EEF1F8;} + .d2-1013481721 .background-color-N7{background-color:#FFFFFF;} + .d2-1013481721 .background-color-B1{background-color:#0D32B2;} + .d2-1013481721 .background-color-B2{background-color:#0D32B2;} + .d2-1013481721 .background-color-B3{background-color:#E3E9FD;} + .d2-1013481721 .background-color-B4{background-color:#E3E9FD;} + .d2-1013481721 .background-color-B5{background-color:#EDF0FD;} + .d2-1013481721 .background-color-B6{background-color:#F7F8FE;} + .d2-1013481721 .background-color-AA2{background-color:#4A6FF3;} + .d2-1013481721 .background-color-AA4{background-color:#EDF0FD;} + .d2-1013481721 .background-color-AA5{background-color:#F7F8FE;} + .d2-1013481721 .background-color-AB4{background-color:#EDF0FD;} + .d2-1013481721 .background-color-AB5{background-color:#F7F8FE;} + .d2-1013481721 .color-N1{color:#0A0F25;} + .d2-1013481721 .color-N2{color:#676C7E;} + .d2-1013481721 .color-N3{color:#9499AB;} + .d2-1013481721 .color-N4{color:#CFD2DD;} + .d2-1013481721 .color-N5{color:#DEE1EB;} + .d2-1013481721 .color-N6{color:#EEF1F8;} + .d2-1013481721 .color-N7{color:#FFFFFF;} + .d2-1013481721 .color-B1{color:#0D32B2;} + .d2-1013481721 .color-B2{color:#0D32B2;} + .d2-1013481721 .color-B3{color:#E3E9FD;} + .d2-1013481721 .color-B4{color:#E3E9FD;} + .d2-1013481721 .color-B5{color:#EDF0FD;} + .d2-1013481721 .color-B6{color:#F7F8FE;} + .d2-1013481721 .color-AA2{color:#4A6FF3;} + .d2-1013481721 .color-AA4{color:#EDF0FD;} + .d2-1013481721 .color-AA5{color:#F7F8FE;} + .d2-1013481721 .color-AB4{color:#EDF0FD;} + .d2-1013481721 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>ab onetwothreefourfiveonetwothreefourfiveokay then +>>>>>>> cb2f2823c (Fix changes) diff --git a/e2etests/testdata/txtar/sequence-multiline-label/dagre/board.exp.json b/e2etests/testdata/txtar/sequence-multiline-label/dagre/board.exp.json index 893b593a7..5f4c28710 100644 --- a/e2etests/testdata/txtar/sequence-multiline-label/dagre/board.exp.json +++ b/e2etests/testdata/txtar/sequence-multiline-label/dagre/board.exp.json @@ -110,6 +110,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -148,6 +149,7 @@ "labelHeight": 165, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -186,6 +188,7 @@ "labelHeight": 85, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -224,6 +227,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -262,6 +266,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 212, diff --git a/e2etests/testdata/txtar/sequence-multiline-label/dagre/sketch.exp.svg b/e2etests/testdata/txtar/sequence-multiline-label/dagre/sketch.exp.svg index c03d162c9..65d496133 100644 --- a/e2etests/testdata/txtar/sequence-multiline-label/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/sequence-multiline-label/dagre/sketch.exp.svg @@ -1,16 +1,26 @@ +<<<<<<< HEAD ab okay thenonetwothreefourfivesixseveneightninetenonetwothreefourfive +||||||| parent of cb2f2823c (Fix changes) + .d2-1652886398 .fill-N1{fill:#0A0F25;} + .d2-1652886398 .fill-N2{fill:#676C7E;} + .d2-1652886398 .fill-N3{fill:#9499AB;} + .d2-1652886398 .fill-N4{fill:#CFD2DD;} + .d2-1652886398 .fill-N5{fill:#DEE1EB;} + .d2-1652886398 .fill-N6{fill:#EEF1F8;} + .d2-1652886398 .fill-N7{fill:#FFFFFF;} + .d2-1652886398 .fill-B1{fill:#0D32B2;} + .d2-1652886398 .fill-B2{fill:#0D32B2;} + .d2-1652886398 .fill-B3{fill:#E3E9FD;} + .d2-1652886398 .fill-B4{fill:#E3E9FD;} + .d2-1652886398 .fill-B5{fill:#EDF0FD;} + .d2-1652886398 .fill-B6{fill:#F7F8FE;} + .d2-1652886398 .fill-AA2{fill:#4A6FF3;} + .d2-1652886398 .fill-AA4{fill:#EDF0FD;} + .d2-1652886398 .fill-AA5{fill:#F7F8FE;} + .d2-1652886398 .fill-AB4{fill:#EDF0FD;} + .d2-1652886398 .fill-AB5{fill:#F7F8FE;} + .d2-1652886398 .stroke-N1{stroke:#0A0F25;} + .d2-1652886398 .stroke-N2{stroke:#676C7E;} + .d2-1652886398 .stroke-N3{stroke:#9499AB;} + .d2-1652886398 .stroke-N4{stroke:#CFD2DD;} + .d2-1652886398 .stroke-N5{stroke:#DEE1EB;} + .d2-1652886398 .stroke-N6{stroke:#EEF1F8;} + .d2-1652886398 .stroke-N7{stroke:#FFFFFF;} + .d2-1652886398 .stroke-B1{stroke:#0D32B2;} + .d2-1652886398 .stroke-B2{stroke:#0D32B2;} + .d2-1652886398 .stroke-B3{stroke:#E3E9FD;} + .d2-1652886398 .stroke-B4{stroke:#E3E9FD;} + .d2-1652886398 .stroke-B5{stroke:#EDF0FD;} + .d2-1652886398 .stroke-B6{stroke:#F7F8FE;} + .d2-1652886398 .stroke-AA2{stroke:#4A6FF3;} + .d2-1652886398 .stroke-AA4{stroke:#EDF0FD;} + .d2-1652886398 .stroke-AA5{stroke:#F7F8FE;} + .d2-1652886398 .stroke-AB4{stroke:#EDF0FD;} + .d2-1652886398 .stroke-AB5{stroke:#F7F8FE;} + .d2-1652886398 .background-color-N1{background-color:#0A0F25;} + .d2-1652886398 .background-color-N2{background-color:#676C7E;} + .d2-1652886398 .background-color-N3{background-color:#9499AB;} + .d2-1652886398 .background-color-N4{background-color:#CFD2DD;} + .d2-1652886398 .background-color-N5{background-color:#DEE1EB;} + .d2-1652886398 .background-color-N6{background-color:#EEF1F8;} + .d2-1652886398 .background-color-N7{background-color:#FFFFFF;} + .d2-1652886398 .background-color-B1{background-color:#0D32B2;} + .d2-1652886398 .background-color-B2{background-color:#0D32B2;} + .d2-1652886398 .background-color-B3{background-color:#E3E9FD;} + .d2-1652886398 .background-color-B4{background-color:#E3E9FD;} + .d2-1652886398 .background-color-B5{background-color:#EDF0FD;} + .d2-1652886398 .background-color-B6{background-color:#F7F8FE;} + .d2-1652886398 .background-color-AA2{background-color:#4A6FF3;} + .d2-1652886398 .background-color-AA4{background-color:#EDF0FD;} + .d2-1652886398 .background-color-AA5{background-color:#F7F8FE;} + .d2-1652886398 .background-color-AB4{background-color:#EDF0FD;} + .d2-1652886398 .background-color-AB5{background-color:#F7F8FE;} + .d2-1652886398 .color-N1{color:#0A0F25;} + .d2-1652886398 .color-N2{color:#676C7E;} + .d2-1652886398 .color-N3{color:#9499AB;} + .d2-1652886398 .color-N4{color:#CFD2DD;} + .d2-1652886398 .color-N5{color:#DEE1EB;} + .d2-1652886398 .color-N6{color:#EEF1F8;} + .d2-1652886398 .color-N7{color:#FFFFFF;} + .d2-1652886398 .color-B1{color:#0D32B2;} + .d2-1652886398 .color-B2{color:#0D32B2;} + .d2-1652886398 .color-B3{color:#E3E9FD;} + .d2-1652886398 .color-B4{color:#E3E9FD;} + .d2-1652886398 .color-B5{color:#EDF0FD;} + .d2-1652886398 .color-B6{color:#F7F8FE;} + .d2-1652886398 .color-AA2{color:#4A6FF3;} + .d2-1652886398 .color-AA4{color:#EDF0FD;} + .d2-1652886398 .color-AA5{color:#F7F8FE;} + .d2-1652886398 .color-AB4{color:#EDF0FD;} + .d2-1652886398 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>ab okay thenonetwothreefourfivesixseveneightninetenonetwothreefourfive +======= + .d2-3900803748 .fill-N1{fill:#0A0F25;} + .d2-3900803748 .fill-N2{fill:#676C7E;} + .d2-3900803748 .fill-N3{fill:#9499AB;} + .d2-3900803748 .fill-N4{fill:#CFD2DD;} + .d2-3900803748 .fill-N5{fill:#DEE1EB;} + .d2-3900803748 .fill-N6{fill:#EEF1F8;} + .d2-3900803748 .fill-N7{fill:#FFFFFF;} + .d2-3900803748 .fill-B1{fill:#0D32B2;} + .d2-3900803748 .fill-B2{fill:#0D32B2;} + .d2-3900803748 .fill-B3{fill:#E3E9FD;} + .d2-3900803748 .fill-B4{fill:#E3E9FD;} + .d2-3900803748 .fill-B5{fill:#EDF0FD;} + .d2-3900803748 .fill-B6{fill:#F7F8FE;} + .d2-3900803748 .fill-AA2{fill:#4A6FF3;} + .d2-3900803748 .fill-AA4{fill:#EDF0FD;} + .d2-3900803748 .fill-AA5{fill:#F7F8FE;} + .d2-3900803748 .fill-AB4{fill:#EDF0FD;} + .d2-3900803748 .fill-AB5{fill:#F7F8FE;} + .d2-3900803748 .stroke-N1{stroke:#0A0F25;} + .d2-3900803748 .stroke-N2{stroke:#676C7E;} + .d2-3900803748 .stroke-N3{stroke:#9499AB;} + .d2-3900803748 .stroke-N4{stroke:#CFD2DD;} + .d2-3900803748 .stroke-N5{stroke:#DEE1EB;} + .d2-3900803748 .stroke-N6{stroke:#EEF1F8;} + .d2-3900803748 .stroke-N7{stroke:#FFFFFF;} + .d2-3900803748 .stroke-B1{stroke:#0D32B2;} + .d2-3900803748 .stroke-B2{stroke:#0D32B2;} + .d2-3900803748 .stroke-B3{stroke:#E3E9FD;} + .d2-3900803748 .stroke-B4{stroke:#E3E9FD;} + .d2-3900803748 .stroke-B5{stroke:#EDF0FD;} + .d2-3900803748 .stroke-B6{stroke:#F7F8FE;} + .d2-3900803748 .stroke-AA2{stroke:#4A6FF3;} + .d2-3900803748 .stroke-AA4{stroke:#EDF0FD;} + .d2-3900803748 .stroke-AA5{stroke:#F7F8FE;} + .d2-3900803748 .stroke-AB4{stroke:#EDF0FD;} + .d2-3900803748 .stroke-AB5{stroke:#F7F8FE;} + .d2-3900803748 .background-color-N1{background-color:#0A0F25;} + .d2-3900803748 .background-color-N2{background-color:#676C7E;} + .d2-3900803748 .background-color-N3{background-color:#9499AB;} + .d2-3900803748 .background-color-N4{background-color:#CFD2DD;} + .d2-3900803748 .background-color-N5{background-color:#DEE1EB;} + .d2-3900803748 .background-color-N6{background-color:#EEF1F8;} + .d2-3900803748 .background-color-N7{background-color:#FFFFFF;} + .d2-3900803748 .background-color-B1{background-color:#0D32B2;} + .d2-3900803748 .background-color-B2{background-color:#0D32B2;} + .d2-3900803748 .background-color-B3{background-color:#E3E9FD;} + .d2-3900803748 .background-color-B4{background-color:#E3E9FD;} + .d2-3900803748 .background-color-B5{background-color:#EDF0FD;} + .d2-3900803748 .background-color-B6{background-color:#F7F8FE;} + .d2-3900803748 .background-color-AA2{background-color:#4A6FF3;} + .d2-3900803748 .background-color-AA4{background-color:#EDF0FD;} + .d2-3900803748 .background-color-AA5{background-color:#F7F8FE;} + .d2-3900803748 .background-color-AB4{background-color:#EDF0FD;} + .d2-3900803748 .background-color-AB5{background-color:#F7F8FE;} + .d2-3900803748 .color-N1{color:#0A0F25;} + .d2-3900803748 .color-N2{color:#676C7E;} + .d2-3900803748 .color-N3{color:#9499AB;} + .d2-3900803748 .color-N4{color:#CFD2DD;} + .d2-3900803748 .color-N5{color:#DEE1EB;} + .d2-3900803748 .color-N6{color:#EEF1F8;} + .d2-3900803748 .color-N7{color:#FFFFFF;} + .d2-3900803748 .color-B1{color:#0D32B2;} + .d2-3900803748 .color-B2{color:#0D32B2;} + .d2-3900803748 .color-B3{color:#E3E9FD;} + .d2-3900803748 .color-B4{color:#E3E9FD;} + .d2-3900803748 .color-B5{color:#EDF0FD;} + .d2-3900803748 .color-B6{color:#F7F8FE;} + .d2-3900803748 .color-AA2{color:#4A6FF3;} + .d2-3900803748 .color-AA4{color:#EDF0FD;} + .d2-3900803748 .color-AA5{color:#F7F8FE;} + .d2-3900803748 .color-AB4{color:#EDF0FD;} + .d2-3900803748 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>ab okay thenonetwothreefourfivesixseveneightninetenonetwothreefourfive +>>>>>>> cb2f2823c (Fix changes) diff --git a/e2etests/testdata/txtar/sequence-multiline-label/elk/board.exp.json b/e2etests/testdata/txtar/sequence-multiline-label/elk/board.exp.json index 893b593a7..5f4c28710 100644 --- a/e2etests/testdata/txtar/sequence-multiline-label/elk/board.exp.json +++ b/e2etests/testdata/txtar/sequence-multiline-label/elk/board.exp.json @@ -110,6 +110,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -148,6 +149,7 @@ "labelHeight": 165, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -186,6 +188,7 @@ "labelHeight": 85, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -224,6 +227,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -262,6 +266,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 212, diff --git a/e2etests/testdata/txtar/sequence-multiline-label/elk/sketch.exp.svg b/e2etests/testdata/txtar/sequence-multiline-label/elk/sketch.exp.svg index c03d162c9..65d496133 100644 --- a/e2etests/testdata/txtar/sequence-multiline-label/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/sequence-multiline-label/elk/sketch.exp.svg @@ -1,16 +1,26 @@ +<<<<<<< HEAD ab okay thenonetwothreefourfivesixseveneightninetenonetwothreefourfive +||||||| parent of cb2f2823c (Fix changes) + .d2-1652886398 .fill-N1{fill:#0A0F25;} + .d2-1652886398 .fill-N2{fill:#676C7E;} + .d2-1652886398 .fill-N3{fill:#9499AB;} + .d2-1652886398 .fill-N4{fill:#CFD2DD;} + .d2-1652886398 .fill-N5{fill:#DEE1EB;} + .d2-1652886398 .fill-N6{fill:#EEF1F8;} + .d2-1652886398 .fill-N7{fill:#FFFFFF;} + .d2-1652886398 .fill-B1{fill:#0D32B2;} + .d2-1652886398 .fill-B2{fill:#0D32B2;} + .d2-1652886398 .fill-B3{fill:#E3E9FD;} + .d2-1652886398 .fill-B4{fill:#E3E9FD;} + .d2-1652886398 .fill-B5{fill:#EDF0FD;} + .d2-1652886398 .fill-B6{fill:#F7F8FE;} + .d2-1652886398 .fill-AA2{fill:#4A6FF3;} + .d2-1652886398 .fill-AA4{fill:#EDF0FD;} + .d2-1652886398 .fill-AA5{fill:#F7F8FE;} + .d2-1652886398 .fill-AB4{fill:#EDF0FD;} + .d2-1652886398 .fill-AB5{fill:#F7F8FE;} + .d2-1652886398 .stroke-N1{stroke:#0A0F25;} + .d2-1652886398 .stroke-N2{stroke:#676C7E;} + .d2-1652886398 .stroke-N3{stroke:#9499AB;} + .d2-1652886398 .stroke-N4{stroke:#CFD2DD;} + .d2-1652886398 .stroke-N5{stroke:#DEE1EB;} + .d2-1652886398 .stroke-N6{stroke:#EEF1F8;} + .d2-1652886398 .stroke-N7{stroke:#FFFFFF;} + .d2-1652886398 .stroke-B1{stroke:#0D32B2;} + .d2-1652886398 .stroke-B2{stroke:#0D32B2;} + .d2-1652886398 .stroke-B3{stroke:#E3E9FD;} + .d2-1652886398 .stroke-B4{stroke:#E3E9FD;} + .d2-1652886398 .stroke-B5{stroke:#EDF0FD;} + .d2-1652886398 .stroke-B6{stroke:#F7F8FE;} + .d2-1652886398 .stroke-AA2{stroke:#4A6FF3;} + .d2-1652886398 .stroke-AA4{stroke:#EDF0FD;} + .d2-1652886398 .stroke-AA5{stroke:#F7F8FE;} + .d2-1652886398 .stroke-AB4{stroke:#EDF0FD;} + .d2-1652886398 .stroke-AB5{stroke:#F7F8FE;} + .d2-1652886398 .background-color-N1{background-color:#0A0F25;} + .d2-1652886398 .background-color-N2{background-color:#676C7E;} + .d2-1652886398 .background-color-N3{background-color:#9499AB;} + .d2-1652886398 .background-color-N4{background-color:#CFD2DD;} + .d2-1652886398 .background-color-N5{background-color:#DEE1EB;} + .d2-1652886398 .background-color-N6{background-color:#EEF1F8;} + .d2-1652886398 .background-color-N7{background-color:#FFFFFF;} + .d2-1652886398 .background-color-B1{background-color:#0D32B2;} + .d2-1652886398 .background-color-B2{background-color:#0D32B2;} + .d2-1652886398 .background-color-B3{background-color:#E3E9FD;} + .d2-1652886398 .background-color-B4{background-color:#E3E9FD;} + .d2-1652886398 .background-color-B5{background-color:#EDF0FD;} + .d2-1652886398 .background-color-B6{background-color:#F7F8FE;} + .d2-1652886398 .background-color-AA2{background-color:#4A6FF3;} + .d2-1652886398 .background-color-AA4{background-color:#EDF0FD;} + .d2-1652886398 .background-color-AA5{background-color:#F7F8FE;} + .d2-1652886398 .background-color-AB4{background-color:#EDF0FD;} + .d2-1652886398 .background-color-AB5{background-color:#F7F8FE;} + .d2-1652886398 .color-N1{color:#0A0F25;} + .d2-1652886398 .color-N2{color:#676C7E;} + .d2-1652886398 .color-N3{color:#9499AB;} + .d2-1652886398 .color-N4{color:#CFD2DD;} + .d2-1652886398 .color-N5{color:#DEE1EB;} + .d2-1652886398 .color-N6{color:#EEF1F8;} + .d2-1652886398 .color-N7{color:#FFFFFF;} + .d2-1652886398 .color-B1{color:#0D32B2;} + .d2-1652886398 .color-B2{color:#0D32B2;} + .d2-1652886398 .color-B3{color:#E3E9FD;} + .d2-1652886398 .color-B4{color:#E3E9FD;} + .d2-1652886398 .color-B5{color:#EDF0FD;} + .d2-1652886398 .color-B6{color:#F7F8FE;} + .d2-1652886398 .color-AA2{color:#4A6FF3;} + .d2-1652886398 .color-AA4{color:#EDF0FD;} + .d2-1652886398 .color-AA5{color:#F7F8FE;} + .d2-1652886398 .color-AB4{color:#EDF0FD;} + .d2-1652886398 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>ab okay thenonetwothreefourfivesixseveneightninetenonetwothreefourfive +======= + .d2-3900803748 .fill-N1{fill:#0A0F25;} + .d2-3900803748 .fill-N2{fill:#676C7E;} + .d2-3900803748 .fill-N3{fill:#9499AB;} + .d2-3900803748 .fill-N4{fill:#CFD2DD;} + .d2-3900803748 .fill-N5{fill:#DEE1EB;} + .d2-3900803748 .fill-N6{fill:#EEF1F8;} + .d2-3900803748 .fill-N7{fill:#FFFFFF;} + .d2-3900803748 .fill-B1{fill:#0D32B2;} + .d2-3900803748 .fill-B2{fill:#0D32B2;} + .d2-3900803748 .fill-B3{fill:#E3E9FD;} + .d2-3900803748 .fill-B4{fill:#E3E9FD;} + .d2-3900803748 .fill-B5{fill:#EDF0FD;} + .d2-3900803748 .fill-B6{fill:#F7F8FE;} + .d2-3900803748 .fill-AA2{fill:#4A6FF3;} + .d2-3900803748 .fill-AA4{fill:#EDF0FD;} + .d2-3900803748 .fill-AA5{fill:#F7F8FE;} + .d2-3900803748 .fill-AB4{fill:#EDF0FD;} + .d2-3900803748 .fill-AB5{fill:#F7F8FE;} + .d2-3900803748 .stroke-N1{stroke:#0A0F25;} + .d2-3900803748 .stroke-N2{stroke:#676C7E;} + .d2-3900803748 .stroke-N3{stroke:#9499AB;} + .d2-3900803748 .stroke-N4{stroke:#CFD2DD;} + .d2-3900803748 .stroke-N5{stroke:#DEE1EB;} + .d2-3900803748 .stroke-N6{stroke:#EEF1F8;} + .d2-3900803748 .stroke-N7{stroke:#FFFFFF;} + .d2-3900803748 .stroke-B1{stroke:#0D32B2;} + .d2-3900803748 .stroke-B2{stroke:#0D32B2;} + .d2-3900803748 .stroke-B3{stroke:#E3E9FD;} + .d2-3900803748 .stroke-B4{stroke:#E3E9FD;} + .d2-3900803748 .stroke-B5{stroke:#EDF0FD;} + .d2-3900803748 .stroke-B6{stroke:#F7F8FE;} + .d2-3900803748 .stroke-AA2{stroke:#4A6FF3;} + .d2-3900803748 .stroke-AA4{stroke:#EDF0FD;} + .d2-3900803748 .stroke-AA5{stroke:#F7F8FE;} + .d2-3900803748 .stroke-AB4{stroke:#EDF0FD;} + .d2-3900803748 .stroke-AB5{stroke:#F7F8FE;} + .d2-3900803748 .background-color-N1{background-color:#0A0F25;} + .d2-3900803748 .background-color-N2{background-color:#676C7E;} + .d2-3900803748 .background-color-N3{background-color:#9499AB;} + .d2-3900803748 .background-color-N4{background-color:#CFD2DD;} + .d2-3900803748 .background-color-N5{background-color:#DEE1EB;} + .d2-3900803748 .background-color-N6{background-color:#EEF1F8;} + .d2-3900803748 .background-color-N7{background-color:#FFFFFF;} + .d2-3900803748 .background-color-B1{background-color:#0D32B2;} + .d2-3900803748 .background-color-B2{background-color:#0D32B2;} + .d2-3900803748 .background-color-B3{background-color:#E3E9FD;} + .d2-3900803748 .background-color-B4{background-color:#E3E9FD;} + .d2-3900803748 .background-color-B5{background-color:#EDF0FD;} + .d2-3900803748 .background-color-B6{background-color:#F7F8FE;} + .d2-3900803748 .background-color-AA2{background-color:#4A6FF3;} + .d2-3900803748 .background-color-AA4{background-color:#EDF0FD;} + .d2-3900803748 .background-color-AA5{background-color:#F7F8FE;} + .d2-3900803748 .background-color-AB4{background-color:#EDF0FD;} + .d2-3900803748 .background-color-AB5{background-color:#F7F8FE;} + .d2-3900803748 .color-N1{color:#0A0F25;} + .d2-3900803748 .color-N2{color:#676C7E;} + .d2-3900803748 .color-N3{color:#9499AB;} + .d2-3900803748 .color-N4{color:#CFD2DD;} + .d2-3900803748 .color-N5{color:#DEE1EB;} + .d2-3900803748 .color-N6{color:#EEF1F8;} + .d2-3900803748 .color-N7{color:#FFFFFF;} + .d2-3900803748 .color-B1{color:#0D32B2;} + .d2-3900803748 .color-B2{color:#0D32B2;} + .d2-3900803748 .color-B3{color:#E3E9FD;} + .d2-3900803748 .color-B4{color:#E3E9FD;} + .d2-3900803748 .color-B5{color:#EDF0FD;} + .d2-3900803748 .color-B6{color:#F7F8FE;} + .d2-3900803748 .color-AA2{color:#4A6FF3;} + .d2-3900803748 .color-AA4{color:#EDF0FD;} + .d2-3900803748 .color-AA5{color:#F7F8FE;} + .d2-3900803748 .color-AB4{color:#EDF0FD;} + .d2-3900803748 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>ab okay thenonetwothreefourfivesixseveneightninetenonetwothreefourfive +>>>>>>> cb2f2823c (Fix changes) diff --git a/e2etests/testdata/txtar/sequence-multiline-self-reference/dagre/board.exp.json b/e2etests/testdata/txtar/sequence-multiline-self-reference/dagre/board.exp.json index 4e415a14b..891a200ef 100644 --- a/e2etests/testdata/txtar/sequence-multiline-self-reference/dagre/board.exp.json +++ b/e2etests/testdata/txtar/sequence-multiline-self-reference/dagre/board.exp.json @@ -110,6 +110,7 @@ "labelHeight": 53, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -156,6 +157,7 @@ "labelHeight": 37, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -202,6 +204,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -240,6 +243,7 @@ "labelHeight": 53, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 343, @@ -286,6 +290,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -324,6 +329,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 343, diff --git a/e2etests/testdata/txtar/sequence-multiline-self-reference/dagre/sketch.exp.svg b/e2etests/testdata/txtar/sequence-multiline-self-reference/dagre/sketch.exp.svg index 1a2ac3def..6b00204d5 100644 --- a/e2etests/testdata/txtar/sequence-multiline-self-reference/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/sequence-multiline-self-reference/dagre/sketch.exp.svg @@ -1,16 +1,26 @@ +<<<<<<< HEAD xy self referential long description which ismultirow3 rowsself referential long description which ismultirownormalself referential long description which ismultirow3 rows +||||||| parent of cb2f2823c (Fix changes) + .d2-462515424 .fill-N1{fill:#0A0F25;} + .d2-462515424 .fill-N2{fill:#676C7E;} + .d2-462515424 .fill-N3{fill:#9499AB;} + .d2-462515424 .fill-N4{fill:#CFD2DD;} + .d2-462515424 .fill-N5{fill:#DEE1EB;} + .d2-462515424 .fill-N6{fill:#EEF1F8;} + .d2-462515424 .fill-N7{fill:#FFFFFF;} + .d2-462515424 .fill-B1{fill:#0D32B2;} + .d2-462515424 .fill-B2{fill:#0D32B2;} + .d2-462515424 .fill-B3{fill:#E3E9FD;} + .d2-462515424 .fill-B4{fill:#E3E9FD;} + .d2-462515424 .fill-B5{fill:#EDF0FD;} + .d2-462515424 .fill-B6{fill:#F7F8FE;} + .d2-462515424 .fill-AA2{fill:#4A6FF3;} + .d2-462515424 .fill-AA4{fill:#EDF0FD;} + .d2-462515424 .fill-AA5{fill:#F7F8FE;} + .d2-462515424 .fill-AB4{fill:#EDF0FD;} + .d2-462515424 .fill-AB5{fill:#F7F8FE;} + .d2-462515424 .stroke-N1{stroke:#0A0F25;} + .d2-462515424 .stroke-N2{stroke:#676C7E;} + .d2-462515424 .stroke-N3{stroke:#9499AB;} + .d2-462515424 .stroke-N4{stroke:#CFD2DD;} + .d2-462515424 .stroke-N5{stroke:#DEE1EB;} + .d2-462515424 .stroke-N6{stroke:#EEF1F8;} + .d2-462515424 .stroke-N7{stroke:#FFFFFF;} + .d2-462515424 .stroke-B1{stroke:#0D32B2;} + .d2-462515424 .stroke-B2{stroke:#0D32B2;} + .d2-462515424 .stroke-B3{stroke:#E3E9FD;} + .d2-462515424 .stroke-B4{stroke:#E3E9FD;} + .d2-462515424 .stroke-B5{stroke:#EDF0FD;} + .d2-462515424 .stroke-B6{stroke:#F7F8FE;} + .d2-462515424 .stroke-AA2{stroke:#4A6FF3;} + .d2-462515424 .stroke-AA4{stroke:#EDF0FD;} + .d2-462515424 .stroke-AA5{stroke:#F7F8FE;} + .d2-462515424 .stroke-AB4{stroke:#EDF0FD;} + .d2-462515424 .stroke-AB5{stroke:#F7F8FE;} + .d2-462515424 .background-color-N1{background-color:#0A0F25;} + .d2-462515424 .background-color-N2{background-color:#676C7E;} + .d2-462515424 .background-color-N3{background-color:#9499AB;} + .d2-462515424 .background-color-N4{background-color:#CFD2DD;} + .d2-462515424 .background-color-N5{background-color:#DEE1EB;} + .d2-462515424 .background-color-N6{background-color:#EEF1F8;} + .d2-462515424 .background-color-N7{background-color:#FFFFFF;} + .d2-462515424 .background-color-B1{background-color:#0D32B2;} + .d2-462515424 .background-color-B2{background-color:#0D32B2;} + .d2-462515424 .background-color-B3{background-color:#E3E9FD;} + .d2-462515424 .background-color-B4{background-color:#E3E9FD;} + .d2-462515424 .background-color-B5{background-color:#EDF0FD;} + .d2-462515424 .background-color-B6{background-color:#F7F8FE;} + .d2-462515424 .background-color-AA2{background-color:#4A6FF3;} + .d2-462515424 .background-color-AA4{background-color:#EDF0FD;} + .d2-462515424 .background-color-AA5{background-color:#F7F8FE;} + .d2-462515424 .background-color-AB4{background-color:#EDF0FD;} + .d2-462515424 .background-color-AB5{background-color:#F7F8FE;} + .d2-462515424 .color-N1{color:#0A0F25;} + .d2-462515424 .color-N2{color:#676C7E;} + .d2-462515424 .color-N3{color:#9499AB;} + .d2-462515424 .color-N4{color:#CFD2DD;} + .d2-462515424 .color-N5{color:#DEE1EB;} + .d2-462515424 .color-N6{color:#EEF1F8;} + .d2-462515424 .color-N7{color:#FFFFFF;} + .d2-462515424 .color-B1{color:#0D32B2;} + .d2-462515424 .color-B2{color:#0D32B2;} + .d2-462515424 .color-B3{color:#E3E9FD;} + .d2-462515424 .color-B4{color:#E3E9FD;} + .d2-462515424 .color-B5{color:#EDF0FD;} + .d2-462515424 .color-B6{color:#F7F8FE;} + .d2-462515424 .color-AA2{color:#4A6FF3;} + .d2-462515424 .color-AA4{color:#EDF0FD;} + .d2-462515424 .color-AA5{color:#F7F8FE;} + .d2-462515424 .color-AB4{color:#EDF0FD;} + .d2-462515424 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>xy self referential long description which ismultirow3 rowsself referential long description which ismultirownormalself referential long description which ismultirow3 rows +======= + .d2-3725553664 .fill-N1{fill:#0A0F25;} + .d2-3725553664 .fill-N2{fill:#676C7E;} + .d2-3725553664 .fill-N3{fill:#9499AB;} + .d2-3725553664 .fill-N4{fill:#CFD2DD;} + .d2-3725553664 .fill-N5{fill:#DEE1EB;} + .d2-3725553664 .fill-N6{fill:#EEF1F8;} + .d2-3725553664 .fill-N7{fill:#FFFFFF;} + .d2-3725553664 .fill-B1{fill:#0D32B2;} + .d2-3725553664 .fill-B2{fill:#0D32B2;} + .d2-3725553664 .fill-B3{fill:#E3E9FD;} + .d2-3725553664 .fill-B4{fill:#E3E9FD;} + .d2-3725553664 .fill-B5{fill:#EDF0FD;} + .d2-3725553664 .fill-B6{fill:#F7F8FE;} + .d2-3725553664 .fill-AA2{fill:#4A6FF3;} + .d2-3725553664 .fill-AA4{fill:#EDF0FD;} + .d2-3725553664 .fill-AA5{fill:#F7F8FE;} + .d2-3725553664 .fill-AB4{fill:#EDF0FD;} + .d2-3725553664 .fill-AB5{fill:#F7F8FE;} + .d2-3725553664 .stroke-N1{stroke:#0A0F25;} + .d2-3725553664 .stroke-N2{stroke:#676C7E;} + .d2-3725553664 .stroke-N3{stroke:#9499AB;} + .d2-3725553664 .stroke-N4{stroke:#CFD2DD;} + .d2-3725553664 .stroke-N5{stroke:#DEE1EB;} + .d2-3725553664 .stroke-N6{stroke:#EEF1F8;} + .d2-3725553664 .stroke-N7{stroke:#FFFFFF;} + .d2-3725553664 .stroke-B1{stroke:#0D32B2;} + .d2-3725553664 .stroke-B2{stroke:#0D32B2;} + .d2-3725553664 .stroke-B3{stroke:#E3E9FD;} + .d2-3725553664 .stroke-B4{stroke:#E3E9FD;} + .d2-3725553664 .stroke-B5{stroke:#EDF0FD;} + .d2-3725553664 .stroke-B6{stroke:#F7F8FE;} + .d2-3725553664 .stroke-AA2{stroke:#4A6FF3;} + .d2-3725553664 .stroke-AA4{stroke:#EDF0FD;} + .d2-3725553664 .stroke-AA5{stroke:#F7F8FE;} + .d2-3725553664 .stroke-AB4{stroke:#EDF0FD;} + .d2-3725553664 .stroke-AB5{stroke:#F7F8FE;} + .d2-3725553664 .background-color-N1{background-color:#0A0F25;} + .d2-3725553664 .background-color-N2{background-color:#676C7E;} + .d2-3725553664 .background-color-N3{background-color:#9499AB;} + .d2-3725553664 .background-color-N4{background-color:#CFD2DD;} + .d2-3725553664 .background-color-N5{background-color:#DEE1EB;} + .d2-3725553664 .background-color-N6{background-color:#EEF1F8;} + .d2-3725553664 .background-color-N7{background-color:#FFFFFF;} + .d2-3725553664 .background-color-B1{background-color:#0D32B2;} + .d2-3725553664 .background-color-B2{background-color:#0D32B2;} + .d2-3725553664 .background-color-B3{background-color:#E3E9FD;} + .d2-3725553664 .background-color-B4{background-color:#E3E9FD;} + .d2-3725553664 .background-color-B5{background-color:#EDF0FD;} + .d2-3725553664 .background-color-B6{background-color:#F7F8FE;} + .d2-3725553664 .background-color-AA2{background-color:#4A6FF3;} + .d2-3725553664 .background-color-AA4{background-color:#EDF0FD;} + .d2-3725553664 .background-color-AA5{background-color:#F7F8FE;} + .d2-3725553664 .background-color-AB4{background-color:#EDF0FD;} + .d2-3725553664 .background-color-AB5{background-color:#F7F8FE;} + .d2-3725553664 .color-N1{color:#0A0F25;} + .d2-3725553664 .color-N2{color:#676C7E;} + .d2-3725553664 .color-N3{color:#9499AB;} + .d2-3725553664 .color-N4{color:#CFD2DD;} + .d2-3725553664 .color-N5{color:#DEE1EB;} + .d2-3725553664 .color-N6{color:#EEF1F8;} + .d2-3725553664 .color-N7{color:#FFFFFF;} + .d2-3725553664 .color-B1{color:#0D32B2;} + .d2-3725553664 .color-B2{color:#0D32B2;} + .d2-3725553664 .color-B3{color:#E3E9FD;} + .d2-3725553664 .color-B4{color:#E3E9FD;} + .d2-3725553664 .color-B5{color:#EDF0FD;} + .d2-3725553664 .color-B6{color:#F7F8FE;} + .d2-3725553664 .color-AA2{color:#4A6FF3;} + .d2-3725553664 .color-AA4{color:#EDF0FD;} + .d2-3725553664 .color-AA5{color:#F7F8FE;} + .d2-3725553664 .color-AB4{color:#EDF0FD;} + .d2-3725553664 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>xy self referential long description which ismultirow3 rowsself referential long description which ismultirownormalself referential long description which ismultirow3 rows +>>>>>>> cb2f2823c (Fix changes) diff --git a/e2etests/testdata/txtar/sequence-multiline-self-reference/elk/board.exp.json b/e2etests/testdata/txtar/sequence-multiline-self-reference/elk/board.exp.json index 4e415a14b..891a200ef 100644 --- a/e2etests/testdata/txtar/sequence-multiline-self-reference/elk/board.exp.json +++ b/e2etests/testdata/txtar/sequence-multiline-self-reference/elk/board.exp.json @@ -110,6 +110,7 @@ "labelHeight": 53, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -156,6 +157,7 @@ "labelHeight": 37, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -202,6 +204,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -240,6 +243,7 @@ "labelHeight": 53, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 343, @@ -286,6 +290,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 62, @@ -324,6 +329,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 343, diff --git a/e2etests/testdata/txtar/sequence-multiline-self-reference/elk/sketch.exp.svg b/e2etests/testdata/txtar/sequence-multiline-self-reference/elk/sketch.exp.svg index 1a2ac3def..6b00204d5 100644 --- a/e2etests/testdata/txtar/sequence-multiline-self-reference/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/sequence-multiline-self-reference/elk/sketch.exp.svg @@ -1,16 +1,26 @@ +<<<<<<< HEAD xy self referential long description which ismultirow3 rowsself referential long description which ismultirownormalself referential long description which ismultirow3 rows +||||||| parent of cb2f2823c (Fix changes) + .d2-462515424 .fill-N1{fill:#0A0F25;} + .d2-462515424 .fill-N2{fill:#676C7E;} + .d2-462515424 .fill-N3{fill:#9499AB;} + .d2-462515424 .fill-N4{fill:#CFD2DD;} + .d2-462515424 .fill-N5{fill:#DEE1EB;} + .d2-462515424 .fill-N6{fill:#EEF1F8;} + .d2-462515424 .fill-N7{fill:#FFFFFF;} + .d2-462515424 .fill-B1{fill:#0D32B2;} + .d2-462515424 .fill-B2{fill:#0D32B2;} + .d2-462515424 .fill-B3{fill:#E3E9FD;} + .d2-462515424 .fill-B4{fill:#E3E9FD;} + .d2-462515424 .fill-B5{fill:#EDF0FD;} + .d2-462515424 .fill-B6{fill:#F7F8FE;} + .d2-462515424 .fill-AA2{fill:#4A6FF3;} + .d2-462515424 .fill-AA4{fill:#EDF0FD;} + .d2-462515424 .fill-AA5{fill:#F7F8FE;} + .d2-462515424 .fill-AB4{fill:#EDF0FD;} + .d2-462515424 .fill-AB5{fill:#F7F8FE;} + .d2-462515424 .stroke-N1{stroke:#0A0F25;} + .d2-462515424 .stroke-N2{stroke:#676C7E;} + .d2-462515424 .stroke-N3{stroke:#9499AB;} + .d2-462515424 .stroke-N4{stroke:#CFD2DD;} + .d2-462515424 .stroke-N5{stroke:#DEE1EB;} + .d2-462515424 .stroke-N6{stroke:#EEF1F8;} + .d2-462515424 .stroke-N7{stroke:#FFFFFF;} + .d2-462515424 .stroke-B1{stroke:#0D32B2;} + .d2-462515424 .stroke-B2{stroke:#0D32B2;} + .d2-462515424 .stroke-B3{stroke:#E3E9FD;} + .d2-462515424 .stroke-B4{stroke:#E3E9FD;} + .d2-462515424 .stroke-B5{stroke:#EDF0FD;} + .d2-462515424 .stroke-B6{stroke:#F7F8FE;} + .d2-462515424 .stroke-AA2{stroke:#4A6FF3;} + .d2-462515424 .stroke-AA4{stroke:#EDF0FD;} + .d2-462515424 .stroke-AA5{stroke:#F7F8FE;} + .d2-462515424 .stroke-AB4{stroke:#EDF0FD;} + .d2-462515424 .stroke-AB5{stroke:#F7F8FE;} + .d2-462515424 .background-color-N1{background-color:#0A0F25;} + .d2-462515424 .background-color-N2{background-color:#676C7E;} + .d2-462515424 .background-color-N3{background-color:#9499AB;} + .d2-462515424 .background-color-N4{background-color:#CFD2DD;} + .d2-462515424 .background-color-N5{background-color:#DEE1EB;} + .d2-462515424 .background-color-N6{background-color:#EEF1F8;} + .d2-462515424 .background-color-N7{background-color:#FFFFFF;} + .d2-462515424 .background-color-B1{background-color:#0D32B2;} + .d2-462515424 .background-color-B2{background-color:#0D32B2;} + .d2-462515424 .background-color-B3{background-color:#E3E9FD;} + .d2-462515424 .background-color-B4{background-color:#E3E9FD;} + .d2-462515424 .background-color-B5{background-color:#EDF0FD;} + .d2-462515424 .background-color-B6{background-color:#F7F8FE;} + .d2-462515424 .background-color-AA2{background-color:#4A6FF3;} + .d2-462515424 .background-color-AA4{background-color:#EDF0FD;} + .d2-462515424 .background-color-AA5{background-color:#F7F8FE;} + .d2-462515424 .background-color-AB4{background-color:#EDF0FD;} + .d2-462515424 .background-color-AB5{background-color:#F7F8FE;} + .d2-462515424 .color-N1{color:#0A0F25;} + .d2-462515424 .color-N2{color:#676C7E;} + .d2-462515424 .color-N3{color:#9499AB;} + .d2-462515424 .color-N4{color:#CFD2DD;} + .d2-462515424 .color-N5{color:#DEE1EB;} + .d2-462515424 .color-N6{color:#EEF1F8;} + .d2-462515424 .color-N7{color:#FFFFFF;} + .d2-462515424 .color-B1{color:#0D32B2;} + .d2-462515424 .color-B2{color:#0D32B2;} + .d2-462515424 .color-B3{color:#E3E9FD;} + .d2-462515424 .color-B4{color:#E3E9FD;} + .d2-462515424 .color-B5{color:#EDF0FD;} + .d2-462515424 .color-B6{color:#F7F8FE;} + .d2-462515424 .color-AA2{color:#4A6FF3;} + .d2-462515424 .color-AA4{color:#EDF0FD;} + .d2-462515424 .color-AA5{color:#F7F8FE;} + .d2-462515424 .color-AB4{color:#EDF0FD;} + .d2-462515424 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>xy self referential long description which ismultirow3 rowsself referential long description which ismultirownormalself referential long description which ismultirow3 rows +======= + .d2-3725553664 .fill-N1{fill:#0A0F25;} + .d2-3725553664 .fill-N2{fill:#676C7E;} + .d2-3725553664 .fill-N3{fill:#9499AB;} + .d2-3725553664 .fill-N4{fill:#CFD2DD;} + .d2-3725553664 .fill-N5{fill:#DEE1EB;} + .d2-3725553664 .fill-N6{fill:#EEF1F8;} + .d2-3725553664 .fill-N7{fill:#FFFFFF;} + .d2-3725553664 .fill-B1{fill:#0D32B2;} + .d2-3725553664 .fill-B2{fill:#0D32B2;} + .d2-3725553664 .fill-B3{fill:#E3E9FD;} + .d2-3725553664 .fill-B4{fill:#E3E9FD;} + .d2-3725553664 .fill-B5{fill:#EDF0FD;} + .d2-3725553664 .fill-B6{fill:#F7F8FE;} + .d2-3725553664 .fill-AA2{fill:#4A6FF3;} + .d2-3725553664 .fill-AA4{fill:#EDF0FD;} + .d2-3725553664 .fill-AA5{fill:#F7F8FE;} + .d2-3725553664 .fill-AB4{fill:#EDF0FD;} + .d2-3725553664 .fill-AB5{fill:#F7F8FE;} + .d2-3725553664 .stroke-N1{stroke:#0A0F25;} + .d2-3725553664 .stroke-N2{stroke:#676C7E;} + .d2-3725553664 .stroke-N3{stroke:#9499AB;} + .d2-3725553664 .stroke-N4{stroke:#CFD2DD;} + .d2-3725553664 .stroke-N5{stroke:#DEE1EB;} + .d2-3725553664 .stroke-N6{stroke:#EEF1F8;} + .d2-3725553664 .stroke-N7{stroke:#FFFFFF;} + .d2-3725553664 .stroke-B1{stroke:#0D32B2;} + .d2-3725553664 .stroke-B2{stroke:#0D32B2;} + .d2-3725553664 .stroke-B3{stroke:#E3E9FD;} + .d2-3725553664 .stroke-B4{stroke:#E3E9FD;} + .d2-3725553664 .stroke-B5{stroke:#EDF0FD;} + .d2-3725553664 .stroke-B6{stroke:#F7F8FE;} + .d2-3725553664 .stroke-AA2{stroke:#4A6FF3;} + .d2-3725553664 .stroke-AA4{stroke:#EDF0FD;} + .d2-3725553664 .stroke-AA5{stroke:#F7F8FE;} + .d2-3725553664 .stroke-AB4{stroke:#EDF0FD;} + .d2-3725553664 .stroke-AB5{stroke:#F7F8FE;} + .d2-3725553664 .background-color-N1{background-color:#0A0F25;} + .d2-3725553664 .background-color-N2{background-color:#676C7E;} + .d2-3725553664 .background-color-N3{background-color:#9499AB;} + .d2-3725553664 .background-color-N4{background-color:#CFD2DD;} + .d2-3725553664 .background-color-N5{background-color:#DEE1EB;} + .d2-3725553664 .background-color-N6{background-color:#EEF1F8;} + .d2-3725553664 .background-color-N7{background-color:#FFFFFF;} + .d2-3725553664 .background-color-B1{background-color:#0D32B2;} + .d2-3725553664 .background-color-B2{background-color:#0D32B2;} + .d2-3725553664 .background-color-B3{background-color:#E3E9FD;} + .d2-3725553664 .background-color-B4{background-color:#E3E9FD;} + .d2-3725553664 .background-color-B5{background-color:#EDF0FD;} + .d2-3725553664 .background-color-B6{background-color:#F7F8FE;} + .d2-3725553664 .background-color-AA2{background-color:#4A6FF3;} + .d2-3725553664 .background-color-AA4{background-color:#EDF0FD;} + .d2-3725553664 .background-color-AA5{background-color:#F7F8FE;} + .d2-3725553664 .background-color-AB4{background-color:#EDF0FD;} + .d2-3725553664 .background-color-AB5{background-color:#F7F8FE;} + .d2-3725553664 .color-N1{color:#0A0F25;} + .d2-3725553664 .color-N2{color:#676C7E;} + .d2-3725553664 .color-N3{color:#9499AB;} + .d2-3725553664 .color-N4{color:#CFD2DD;} + .d2-3725553664 .color-N5{color:#DEE1EB;} + .d2-3725553664 .color-N6{color:#EEF1F8;} + .d2-3725553664 .color-N7{color:#FFFFFF;} + .d2-3725553664 .color-B1{color:#0D32B2;} + .d2-3725553664 .color-B2{color:#0D32B2;} + .d2-3725553664 .color-B3{color:#E3E9FD;} + .d2-3725553664 .color-B4{color:#E3E9FD;} + .d2-3725553664 .color-B5{color:#EDF0FD;} + .d2-3725553664 .color-B6{color:#F7F8FE;} + .d2-3725553664 .color-AA2{color:#4A6FF3;} + .d2-3725553664 .color-AA4{color:#EDF0FD;} + .d2-3725553664 .color-AA5{color:#F7F8FE;} + .d2-3725553664 .color-AB4{color:#EDF0FD;} + .d2-3725553664 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>xy self referential long description which ismultirow3 rowsself referential long description which ismultirownormalself referential long description which ismultirow3 rows +>>>>>>> cb2f2823c (Fix changes) diff --git a/e2etests/testdata/txtar/sketch-bidirectional-connection-animation/dagre/sketch.exp.svg b/e2etests/testdata/txtar/sketch-bidirectional-connection-animation/dagre/sketch.exp.svg index 300865268..ba9a0ae59 100644 --- a/e2etests/testdata/txtar/sketch-bidirectional-connection-animation/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/sketch-bidirectional-connection-animation/dagre/sketch.exp.svg @@ -1,10 +1,16 @@ <<<<<<< HEAD +<<<<<<< HEAD 我 (wǒ) - Mandarin Chineseສະບາຍດີ (sabaai dii) - Laoជំរាបសួរ (jomreab suor) - Khmerสวัสดี (sà-wàt-dii) - Thaiສະບາຍດີ (sabaidee) - Laoဟယ်လို (helaou) - Burmesemari (まり) - Ainucào (草) - Zhuangкүнтізбе (kúntízbe) - Kazakhբարև (barev) - Armenianмонгол (mongol) - Mongolianmila (میلا) - Uyghurનમસ્તે (namaste) - Gujarati漢字 (kanji) - Japanese위 (wi) - Korean吾哥 (ngǔgāi) - Cantoneseမင်္ဂလာပါ (mingalaba) - Burmeseсайн уу (sain uu) - Mongolianਸਤਿ ਸ੍ਰੀ ਅਕਾਲ (sat sri akal) - Punjabi你吃了吗 (ní chī le ma) - Mandarin Chinese饭 (fan) - Zhuangمەن سىزنى ياخشى ئۈمىد ق >>>>>>> 33280fed5 (fixed e2e tests) +||||||| parent of cb2f2823c (Fix changes) + .d2-328716383 .fill-N1{fill:#0A0F25;} + .d2-328716383 .fill-N2{fill:#676C7E;} + .d2-328716383 .fill-N3{fill:#9499AB;} + .d2-328716383 .fill-N4{fill:#CFD2DD;} + .d2-328716383 .fill-N5{fill:#DEE1EB;} + .d2-328716383 .fill-N6{fill:#EEF1F8;} + .d2-328716383 .fill-N7{fill:#FFFFFF;} + .d2-328716383 .fill-B1{fill:#0D32B2;} + .d2-328716383 .fill-B2{fill:#0D32B2;} + .d2-328716383 .fill-B3{fill:#E3E9FD;} + .d2-328716383 .fill-B4{fill:#E3E9FD;} + .d2-328716383 .fill-B5{fill:#EDF0FD;} + .d2-328716383 .fill-B6{fill:#F7F8FE;} + .d2-328716383 .fill-AA2{fill:#4A6FF3;} + .d2-328716383 .fill-AA4{fill:#EDF0FD;} + .d2-328716383 .fill-AA5{fill:#F7F8FE;} + .d2-328716383 .fill-AB4{fill:#EDF0FD;} + .d2-328716383 .fill-AB5{fill:#F7F8FE;} + .d2-328716383 .stroke-N1{stroke:#0A0F25;} + .d2-328716383 .stroke-N2{stroke:#676C7E;} + .d2-328716383 .stroke-N3{stroke:#9499AB;} + .d2-328716383 .stroke-N4{stroke:#CFD2DD;} + .d2-328716383 .stroke-N5{stroke:#DEE1EB;} + .d2-328716383 .stroke-N6{stroke:#EEF1F8;} + .d2-328716383 .stroke-N7{stroke:#FFFFFF;} + .d2-328716383 .stroke-B1{stroke:#0D32B2;} + .d2-328716383 .stroke-B2{stroke:#0D32B2;} + .d2-328716383 .stroke-B3{stroke:#E3E9FD;} + .d2-328716383 .stroke-B4{stroke:#E3E9FD;} + .d2-328716383 .stroke-B5{stroke:#EDF0FD;} + .d2-328716383 .stroke-B6{stroke:#F7F8FE;} + .d2-328716383 .stroke-AA2{stroke:#4A6FF3;} + .d2-328716383 .stroke-AA4{stroke:#EDF0FD;} + .d2-328716383 .stroke-AA5{stroke:#F7F8FE;} + .d2-328716383 .stroke-AB4{stroke:#EDF0FD;} + .d2-328716383 .stroke-AB5{stroke:#F7F8FE;} + .d2-328716383 .background-color-N1{background-color:#0A0F25;} + .d2-328716383 .background-color-N2{background-color:#676C7E;} + .d2-328716383 .background-color-N3{background-color:#9499AB;} + .d2-328716383 .background-color-N4{background-color:#CFD2DD;} + .d2-328716383 .background-color-N5{background-color:#DEE1EB;} + .d2-328716383 .background-color-N6{background-color:#EEF1F8;} + .d2-328716383 .background-color-N7{background-color:#FFFFFF;} + .d2-328716383 .background-color-B1{background-color:#0D32B2;} + .d2-328716383 .background-color-B2{background-color:#0D32B2;} + .d2-328716383 .background-color-B3{background-color:#E3E9FD;} + .d2-328716383 .background-color-B4{background-color:#E3E9FD;} + .d2-328716383 .background-color-B5{background-color:#EDF0FD;} + .d2-328716383 .background-color-B6{background-color:#F7F8FE;} + .d2-328716383 .background-color-AA2{background-color:#4A6FF3;} + .d2-328716383 .background-color-AA4{background-color:#EDF0FD;} + .d2-328716383 .background-color-AA5{background-color:#F7F8FE;} + .d2-328716383 .background-color-AB4{background-color:#EDF0FD;} + .d2-328716383 .background-color-AB5{background-color:#F7F8FE;} + .d2-328716383 .color-N1{color:#0A0F25;} + .d2-328716383 .color-N2{color:#676C7E;} + .d2-328716383 .color-N3{color:#9499AB;} + .d2-328716383 .color-N4{color:#CFD2DD;} + .d2-328716383 .color-N5{color:#DEE1EB;} + .d2-328716383 .color-N6{color:#EEF1F8;} + .d2-328716383 .color-N7{color:#FFFFFF;} + .d2-328716383 .color-B1{color:#0D32B2;} + .d2-328716383 .color-B2{color:#0D32B2;} + .d2-328716383 .color-B3{color:#E3E9FD;} + .d2-328716383 .color-B4{color:#E3E9FD;} + .d2-328716383 .color-B5{color:#EDF0FD;} + .d2-328716383 .color-B6{color:#F7F8FE;} + .d2-328716383 .color-AA2{color:#4A6FF3;} + .d2-328716383 .color-AA4{color:#EDF0FD;} + .d2-328716383 .color-AA5{color:#F7F8FE;} + .d2-328716383 .color-AB4{color:#EDF0FD;} + .d2-328716383 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>我 (wǒ) - Mandarin Chineseສະບາຍດີ (sabaai dii) - Laoជំរាបសួរ (jomreab suor) - Khmerสวัสดี (sà-wàt-dii) - Thaiສະບາຍດີ (sabaidee) - Laoဟယ်လို (helaou) - Burmesemari (まり) - Ainucào (草) - Zhuangкүнтізбе (kúntízbe) - Kazakhբարև (barev) - Armenianмонгол (mongol) - Mongolianmila (میلا) - Uyghurનમસ્તે (namaste) - Gujarati漢字 (kanji) - Japanese위 (wi) - Korean吾哥 (ngǔgāi) - Cantoneseမင်္ဂလာပါ (mingalaba) - Burmeseсайн уу (sain uu) - Mongolianਸਤਿ ਸ੍ਰੀ ਅਕਾਲ (sat sri akal) - Punjabi你吃了吗 (ní chī le ma) - Mandarin Chinese饭 (fan) - Zhuangمەن سىزنى ياخشى ئۈمىد ق + +======= + .d2-3581917306 .fill-N1{fill:#0A0F25;} + .d2-3581917306 .fill-N2{fill:#676C7E;} + .d2-3581917306 .fill-N3{fill:#9499AB;} + .d2-3581917306 .fill-N4{fill:#CFD2DD;} + .d2-3581917306 .fill-N5{fill:#DEE1EB;} + .d2-3581917306 .fill-N6{fill:#EEF1F8;} + .d2-3581917306 .fill-N7{fill:#FFFFFF;} + .d2-3581917306 .fill-B1{fill:#0D32B2;} + .d2-3581917306 .fill-B2{fill:#0D32B2;} + .d2-3581917306 .fill-B3{fill:#E3E9FD;} + .d2-3581917306 .fill-B4{fill:#E3E9FD;} + .d2-3581917306 .fill-B5{fill:#EDF0FD;} + .d2-3581917306 .fill-B6{fill:#F7F8FE;} + .d2-3581917306 .fill-AA2{fill:#4A6FF3;} + .d2-3581917306 .fill-AA4{fill:#EDF0FD;} + .d2-3581917306 .fill-AA5{fill:#F7F8FE;} + .d2-3581917306 .fill-AB4{fill:#EDF0FD;} + .d2-3581917306 .fill-AB5{fill:#F7F8FE;} + .d2-3581917306 .stroke-N1{stroke:#0A0F25;} + .d2-3581917306 .stroke-N2{stroke:#676C7E;} + .d2-3581917306 .stroke-N3{stroke:#9499AB;} + .d2-3581917306 .stroke-N4{stroke:#CFD2DD;} + .d2-3581917306 .stroke-N5{stroke:#DEE1EB;} + .d2-3581917306 .stroke-N6{stroke:#EEF1F8;} + .d2-3581917306 .stroke-N7{stroke:#FFFFFF;} + .d2-3581917306 .stroke-B1{stroke:#0D32B2;} + .d2-3581917306 .stroke-B2{stroke:#0D32B2;} + .d2-3581917306 .stroke-B3{stroke:#E3E9FD;} + .d2-3581917306 .stroke-B4{stroke:#E3E9FD;} + .d2-3581917306 .stroke-B5{stroke:#EDF0FD;} + .d2-3581917306 .stroke-B6{stroke:#F7F8FE;} + .d2-3581917306 .stroke-AA2{stroke:#4A6FF3;} + .d2-3581917306 .stroke-AA4{stroke:#EDF0FD;} + .d2-3581917306 .stroke-AA5{stroke:#F7F8FE;} + .d2-3581917306 .stroke-AB4{stroke:#EDF0FD;} + .d2-3581917306 .stroke-AB5{stroke:#F7F8FE;} + .d2-3581917306 .background-color-N1{background-color:#0A0F25;} + .d2-3581917306 .background-color-N2{background-color:#676C7E;} + .d2-3581917306 .background-color-N3{background-color:#9499AB;} + .d2-3581917306 .background-color-N4{background-color:#CFD2DD;} + .d2-3581917306 .background-color-N5{background-color:#DEE1EB;} + .d2-3581917306 .background-color-N6{background-color:#EEF1F8;} + .d2-3581917306 .background-color-N7{background-color:#FFFFFF;} + .d2-3581917306 .background-color-B1{background-color:#0D32B2;} + .d2-3581917306 .background-color-B2{background-color:#0D32B2;} + .d2-3581917306 .background-color-B3{background-color:#E3E9FD;} + .d2-3581917306 .background-color-B4{background-color:#E3E9FD;} + .d2-3581917306 .background-color-B5{background-color:#EDF0FD;} + .d2-3581917306 .background-color-B6{background-color:#F7F8FE;} + .d2-3581917306 .background-color-AA2{background-color:#4A6FF3;} + .d2-3581917306 .background-color-AA4{background-color:#EDF0FD;} + .d2-3581917306 .background-color-AA5{background-color:#F7F8FE;} + .d2-3581917306 .background-color-AB4{background-color:#EDF0FD;} + .d2-3581917306 .background-color-AB5{background-color:#F7F8FE;} + .d2-3581917306 .color-N1{color:#0A0F25;} + .d2-3581917306 .color-N2{color:#676C7E;} + .d2-3581917306 .color-N3{color:#9499AB;} + .d2-3581917306 .color-N4{color:#CFD2DD;} + .d2-3581917306 .color-N5{color:#DEE1EB;} + .d2-3581917306 .color-N6{color:#EEF1F8;} + .d2-3581917306 .color-N7{color:#FFFFFF;} + .d2-3581917306 .color-B1{color:#0D32B2;} + .d2-3581917306 .color-B2{color:#0D32B2;} + .d2-3581917306 .color-B3{color:#E3E9FD;} + .d2-3581917306 .color-B4{color:#E3E9FD;} + .d2-3581917306 .color-B5{color:#EDF0FD;} + .d2-3581917306 .color-B6{color:#F7F8FE;} + .d2-3581917306 .color-AA2{color:#4A6FF3;} + .d2-3581917306 .color-AA4{color:#EDF0FD;} + .d2-3581917306 .color-AA5{color:#F7F8FE;} + .d2-3581917306 .color-AB4{color:#EDF0FD;} + .d2-3581917306 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>我 (wǒ) - Mandarin Chineseສະບາຍດີ (sabaai dii) - Laoជំរាបសួរ (jomreab suor) - Khmerสวัสดี (sà-wàt-dii) - Thaiສະບາຍດີ (sabaidee) - Laoဟယ်လို (helaou) - Burmesemari (まり) - Ainucào (草) - Zhuangкүнтізбе (kúntízbe) - Kazakhբարև (barev) - Armenianмонгол (mongol) - Mongolianmila (میلا) - Uyghurનમસ્તે (namaste) - Gujarati漢字 (kanji) - Japanese위 (wi) - Korean吾哥 (ngǔgāi) - Cantoneseမင်္ဂလာပါ (mingalaba) - Burmeseсайн уу (sain uu) - Mongolianਸਤਿ ਸ੍ਰੀ ਅਕਾਲ (sat sri akal) - Punjabi你吃了吗 (ní chī le ma) - Mandarin Chinese饭 (fan) - Zhuangمەن سىزنى ياخشى ئۈمىد ق + +>>>>>>> cb2f2823c (Fix changes) - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/unicode/mixed-language-2/elk/sketch.exp.svg b/e2etests/testdata/unicode/mixed-language-2/elk/sketch.exp.svg index 219544b0b..b95e68057 100644 --- a/e2etests/testdata/unicode/mixed-language-2/elk/sketch.exp.svg +++ b/e2etests/testdata/unicode/mixed-language-2/elk/sketch.exp.svg @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD 我 (wǒ) - Mandarin Chineseສະບາຍດີ (sabaai dii) - Laoជំរាបសួរ (jomreab suor) - Khmerสวัสดี (sà-wàt-dii) - Thaiສະບາຍດີ (sabaidee) - Laoဟယ်လို (helaou) - Burmesemari (まり) - Ainucào (草) - Zhuangкүнтізбе (kúntízbe) - Kazakhբարև (barev) - Armenianмонгол (mongol) - Mongolianmila (میلا) - Uyghurનમસ્તે (namaste) - Gujarati漢字 (kanji) - Japanese위 (wi) - Korean吾哥 (ngǔgāi) - Cantoneseမင်္ဂလာပါ (mingalaba) - Burmeseсайн уу (sain uu) - Mongolianਸਤਿ ਸ੍ਰੀ ਅਕਾਲ (sat sri akal) - Punjabi你吃了吗 (ní chī le ma) - Mandarin Chinese饭 (fan) - Zhuangمەن سىزنى ياخشى ئۈمىد ق >>>>>>> 33280fed5 (fixed e2e tests) +||||||| parent of cb2f2823c (Fix changes) + .d2-3003314079 .fill-N1{fill:#0A0F25;} + .d2-3003314079 .fill-N2{fill:#676C7E;} + .d2-3003314079 .fill-N3{fill:#9499AB;} + .d2-3003314079 .fill-N4{fill:#CFD2DD;} + .d2-3003314079 .fill-N5{fill:#DEE1EB;} + .d2-3003314079 .fill-N6{fill:#EEF1F8;} + .d2-3003314079 .fill-N7{fill:#FFFFFF;} + .d2-3003314079 .fill-B1{fill:#0D32B2;} + .d2-3003314079 .fill-B2{fill:#0D32B2;} + .d2-3003314079 .fill-B3{fill:#E3E9FD;} + .d2-3003314079 .fill-B4{fill:#E3E9FD;} + .d2-3003314079 .fill-B5{fill:#EDF0FD;} + .d2-3003314079 .fill-B6{fill:#F7F8FE;} + .d2-3003314079 .fill-AA2{fill:#4A6FF3;} + .d2-3003314079 .fill-AA4{fill:#EDF0FD;} + .d2-3003314079 .fill-AA5{fill:#F7F8FE;} + .d2-3003314079 .fill-AB4{fill:#EDF0FD;} + .d2-3003314079 .fill-AB5{fill:#F7F8FE;} + .d2-3003314079 .stroke-N1{stroke:#0A0F25;} + .d2-3003314079 .stroke-N2{stroke:#676C7E;} + .d2-3003314079 .stroke-N3{stroke:#9499AB;} + .d2-3003314079 .stroke-N4{stroke:#CFD2DD;} + .d2-3003314079 .stroke-N5{stroke:#DEE1EB;} + .d2-3003314079 .stroke-N6{stroke:#EEF1F8;} + .d2-3003314079 .stroke-N7{stroke:#FFFFFF;} + .d2-3003314079 .stroke-B1{stroke:#0D32B2;} + .d2-3003314079 .stroke-B2{stroke:#0D32B2;} + .d2-3003314079 .stroke-B3{stroke:#E3E9FD;} + .d2-3003314079 .stroke-B4{stroke:#E3E9FD;} + .d2-3003314079 .stroke-B5{stroke:#EDF0FD;} + .d2-3003314079 .stroke-B6{stroke:#F7F8FE;} + .d2-3003314079 .stroke-AA2{stroke:#4A6FF3;} + .d2-3003314079 .stroke-AA4{stroke:#EDF0FD;} + .d2-3003314079 .stroke-AA5{stroke:#F7F8FE;} + .d2-3003314079 .stroke-AB4{stroke:#EDF0FD;} + .d2-3003314079 .stroke-AB5{stroke:#F7F8FE;} + .d2-3003314079 .background-color-N1{background-color:#0A0F25;} + .d2-3003314079 .background-color-N2{background-color:#676C7E;} + .d2-3003314079 .background-color-N3{background-color:#9499AB;} + .d2-3003314079 .background-color-N4{background-color:#CFD2DD;} + .d2-3003314079 .background-color-N5{background-color:#DEE1EB;} + .d2-3003314079 .background-color-N6{background-color:#EEF1F8;} + .d2-3003314079 .background-color-N7{background-color:#FFFFFF;} + .d2-3003314079 .background-color-B1{background-color:#0D32B2;} + .d2-3003314079 .background-color-B2{background-color:#0D32B2;} + .d2-3003314079 .background-color-B3{background-color:#E3E9FD;} + .d2-3003314079 .background-color-B4{background-color:#E3E9FD;} + .d2-3003314079 .background-color-B5{background-color:#EDF0FD;} + .d2-3003314079 .background-color-B6{background-color:#F7F8FE;} + .d2-3003314079 .background-color-AA2{background-color:#4A6FF3;} + .d2-3003314079 .background-color-AA4{background-color:#EDF0FD;} + .d2-3003314079 .background-color-AA5{background-color:#F7F8FE;} + .d2-3003314079 .background-color-AB4{background-color:#EDF0FD;} + .d2-3003314079 .background-color-AB5{background-color:#F7F8FE;} + .d2-3003314079 .color-N1{color:#0A0F25;} + .d2-3003314079 .color-N2{color:#676C7E;} + .d2-3003314079 .color-N3{color:#9499AB;} + .d2-3003314079 .color-N4{color:#CFD2DD;} + .d2-3003314079 .color-N5{color:#DEE1EB;} + .d2-3003314079 .color-N6{color:#EEF1F8;} + .d2-3003314079 .color-N7{color:#FFFFFF;} + .d2-3003314079 .color-B1{color:#0D32B2;} + .d2-3003314079 .color-B2{color:#0D32B2;} + .d2-3003314079 .color-B3{color:#E3E9FD;} + .d2-3003314079 .color-B4{color:#E3E9FD;} + .d2-3003314079 .color-B5{color:#EDF0FD;} + .d2-3003314079 .color-B6{color:#F7F8FE;} + .d2-3003314079 .color-AA2{color:#4A6FF3;} + .d2-3003314079 .color-AA4{color:#EDF0FD;} + .d2-3003314079 .color-AA5{color:#F7F8FE;} + .d2-3003314079 .color-AB4{color:#EDF0FD;} + .d2-3003314079 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>我 (wǒ) - Mandarin Chineseສະບາຍດີ (sabaai dii) - Laoជំរាបសួរ (jomreab suor) - Khmerสวัสดี (sà-wàt-dii) - Thaiສະບາຍດີ (sabaidee) - Laoဟယ်လို (helaou) - Burmesemari (まり) - Ainucào (草) - Zhuangкүнтізбе (kúntízbe) - Kazakhբարև (barev) - Armenianмонгол (mongol) - Mongolianmila (میلا) - Uyghurનમસ્તે (namaste) - Gujarati漢字 (kanji) - Japanese위 (wi) - Korean吾哥 (ngǔgāi) - Cantoneseမင်္ဂလာပါ (mingalaba) - Burmeseсайн уу (sain uu) - Mongolianਸਤਿ ਸ੍ਰੀ ਅਕਾਲ (sat sri akal) - Punjabi你吃了吗 (ní chī le ma) - Mandarin Chinese饭 (fan) - Zhuangمەن سىزنى ياخشى ئۈمىد ق + +======= + .d2-901107430 .fill-N1{fill:#0A0F25;} + .d2-901107430 .fill-N2{fill:#676C7E;} + .d2-901107430 .fill-N3{fill:#9499AB;} + .d2-901107430 .fill-N4{fill:#CFD2DD;} + .d2-901107430 .fill-N5{fill:#DEE1EB;} + .d2-901107430 .fill-N6{fill:#EEF1F8;} + .d2-901107430 .fill-N7{fill:#FFFFFF;} + .d2-901107430 .fill-B1{fill:#0D32B2;} + .d2-901107430 .fill-B2{fill:#0D32B2;} + .d2-901107430 .fill-B3{fill:#E3E9FD;} + .d2-901107430 .fill-B4{fill:#E3E9FD;} + .d2-901107430 .fill-B5{fill:#EDF0FD;} + .d2-901107430 .fill-B6{fill:#F7F8FE;} + .d2-901107430 .fill-AA2{fill:#4A6FF3;} + .d2-901107430 .fill-AA4{fill:#EDF0FD;} + .d2-901107430 .fill-AA5{fill:#F7F8FE;} + .d2-901107430 .fill-AB4{fill:#EDF0FD;} + .d2-901107430 .fill-AB5{fill:#F7F8FE;} + .d2-901107430 .stroke-N1{stroke:#0A0F25;} + .d2-901107430 .stroke-N2{stroke:#676C7E;} + .d2-901107430 .stroke-N3{stroke:#9499AB;} + .d2-901107430 .stroke-N4{stroke:#CFD2DD;} + .d2-901107430 .stroke-N5{stroke:#DEE1EB;} + .d2-901107430 .stroke-N6{stroke:#EEF1F8;} + .d2-901107430 .stroke-N7{stroke:#FFFFFF;} + .d2-901107430 .stroke-B1{stroke:#0D32B2;} + .d2-901107430 .stroke-B2{stroke:#0D32B2;} + .d2-901107430 .stroke-B3{stroke:#E3E9FD;} + .d2-901107430 .stroke-B4{stroke:#E3E9FD;} + .d2-901107430 .stroke-B5{stroke:#EDF0FD;} + .d2-901107430 .stroke-B6{stroke:#F7F8FE;} + .d2-901107430 .stroke-AA2{stroke:#4A6FF3;} + .d2-901107430 .stroke-AA4{stroke:#EDF0FD;} + .d2-901107430 .stroke-AA5{stroke:#F7F8FE;} + .d2-901107430 .stroke-AB4{stroke:#EDF0FD;} + .d2-901107430 .stroke-AB5{stroke:#F7F8FE;} + .d2-901107430 .background-color-N1{background-color:#0A0F25;} + .d2-901107430 .background-color-N2{background-color:#676C7E;} + .d2-901107430 .background-color-N3{background-color:#9499AB;} + .d2-901107430 .background-color-N4{background-color:#CFD2DD;} + .d2-901107430 .background-color-N5{background-color:#DEE1EB;} + .d2-901107430 .background-color-N6{background-color:#EEF1F8;} + .d2-901107430 .background-color-N7{background-color:#FFFFFF;} + .d2-901107430 .background-color-B1{background-color:#0D32B2;} + .d2-901107430 .background-color-B2{background-color:#0D32B2;} + .d2-901107430 .background-color-B3{background-color:#E3E9FD;} + .d2-901107430 .background-color-B4{background-color:#E3E9FD;} + .d2-901107430 .background-color-B5{background-color:#EDF0FD;} + .d2-901107430 .background-color-B6{background-color:#F7F8FE;} + .d2-901107430 .background-color-AA2{background-color:#4A6FF3;} + .d2-901107430 .background-color-AA4{background-color:#EDF0FD;} + .d2-901107430 .background-color-AA5{background-color:#F7F8FE;} + .d2-901107430 .background-color-AB4{background-color:#EDF0FD;} + .d2-901107430 .background-color-AB5{background-color:#F7F8FE;} + .d2-901107430 .color-N1{color:#0A0F25;} + .d2-901107430 .color-N2{color:#676C7E;} + .d2-901107430 .color-N3{color:#9499AB;} + .d2-901107430 .color-N4{color:#CFD2DD;} + .d2-901107430 .color-N5{color:#DEE1EB;} + .d2-901107430 .color-N6{color:#EEF1F8;} + .d2-901107430 .color-N7{color:#FFFFFF;} + .d2-901107430 .color-B1{color:#0D32B2;} + .d2-901107430 .color-B2{color:#0D32B2;} + .d2-901107430 .color-B3{color:#E3E9FD;} + .d2-901107430 .color-B4{color:#E3E9FD;} + .d2-901107430 .color-B5{color:#EDF0FD;} + .d2-901107430 .color-B6{color:#F7F8FE;} + .d2-901107430 .color-AA2{color:#4A6FF3;} + .d2-901107430 .color-AA4{color:#EDF0FD;} + .d2-901107430 .color-AA5{color:#F7F8FE;} + .d2-901107430 .color-AB4{color:#EDF0FD;} + .d2-901107430 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>我 (wǒ) - Mandarin Chineseສະບາຍດີ (sabaai dii) - Laoជំរាបសួរ (jomreab suor) - Khmerสวัสดี (sà-wàt-dii) - Thaiສະບາຍດີ (sabaidee) - Laoဟယ်လို (helaou) - Burmesemari (まり) - Ainucào (草) - Zhuangкүнтізбе (kúntízbe) - Kazakhբարև (barev) - Armenianмонгол (mongol) - Mongolianmila (میلا) - Uyghurનમસ્તે (namaste) - Gujarati漢字 (kanji) - Japanese위 (wi) - Korean吾哥 (ngǔgāi) - Cantoneseမင်္ဂလာပါ (mingalaba) - Burmeseсайн уу (sain uu) - Mongolianਸਤਿ ਸ੍ਰੀ ਅਕਾਲ (sat sri akal) - Punjabi你吃了吗 (ní chī le ma) - Mandarin Chinese饭 (fan) - Zhuangمەن سىزنى ياخشى ئۈمىد ق + +>>>>>>> cb2f2823c (Fix changes) - + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/e2etests/testdata/unicode/mixed-language/dagre/sketch.exp.svg b/e2etests/testdata/unicode/mixed-language/dagre/sketch.exp.svg index c509173dc..243cd4594 100644 --- a/e2etests/testdata/unicode/mixed-language/dagre/sketch.exp.svg +++ b/e2etests/testdata/unicode/mixed-language/dagre/sketch.exp.svg @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD