diff --git a/ci/release/changelogs/next.md b/ci/release/changelogs/next.md index 02455ed2e..8f49f02ce 100644 --- a/ci/release/changelogs/next.md +++ b/ci/release/changelogs/next.md @@ -1,45 +1,17 @@ #### Features 🚀 -- Connections now support `link` in SVGs [#1955](https://github.com/terrastruct/d2/pull/1955) +- Connections now support `link` [#1955](https://github.com/terrastruct/d2/pull/1955) - Vars: vars in markdown blocks are substituted [#2218](https://github.com/terrastruct/d2/pull/2218) - Markdown: Github-flavored tables work in `md` blocks [#2221](https://github.com/terrastruct/d2/pull/2221) #### Improvements 🧹 -<<<<<<< HEAD - Composition: links pointing to own board are purged [#2203](https://github.com/terrastruct/d2/pull/2203) - Syntax: reserved keywords must be unquoted [#2231](https://github.com/terrastruct/d2/pull/2231) - Latex: Backslashes in Latex blocks do not escape [#2232](https://github.com/terrastruct/d2/pull/2232) - This is a breaking change. Previously Latex blocks required escaping the backslash. So for older D2 versions, you should remove the excess backslashes. - Links: non-http url scheme links are supported (e.g. `x.link: vscode://file/`) [#2237](https://github.com/terrastruct/d2/issues/2237) -||||||| parent of 703bcd388 (update next.md) -- Sequence diagram: edge groups account for edge label heights [#2038](https://github.com/terrastruct/d2/pull/2038) -- Sequence diagram: self-referential edges account for edge label heights [#2040](https://github.com/terrastruct/d2/pull/2040) -- Sequence diagram: The spacing between self-referential edges and regular edges is uniform [#2043](https://github.com/terrastruct/d2/pull/2043) -- Compiler: Error on multi-line labels in `sql_table` shapes [#2057](https://github.com/terrastruct/d2/pull/2057) -- Sequence diagram: Image shape actors can use spans and notes [#2056](https://github.com/terrastruct/d2/issues/2056) -- Globs: Filters work with default values (e.g. `&opacity: 1` will capture everything without opacity explicitly set) [#2090](https://github.com/terrastruct/d2/pull/2090) -- Render: connection label fills have a bit of padding and border-radius for better aesthetics [#2094](https://github.com/terrastruct/d2/pull/2094) -- Sequence diagram: the padding between message labels and message endpoints are slightly increased [#2096](https://github.com/terrastruct/d2/pull/2096) -======= -- Sequence diagram: edge groups account for edge label heights [#2038](https://github.com/terrastruct/d2/pull/2038) -- Sequence diagram: self-referential edges account for edge label heights [#2040](https://github.com/terrastruct/d2/pull/2040) -- Sequence diagram: The spacing between self-referential edges and regular edges is uniform [#2043](https://github.com/terrastruct/d2/pull/2043) -- Compiler: Error on multi-line labels in `sql_table` shapes [#2057](https://github.com/terrastruct/d2/pull/2057) -- Sequence diagram: Image shape actors can use spans and notes [#2056](https://github.com/terrastruct/d2/issues/2056) -- Globs: Filters work with default values (e.g. `&opacity: 1` will capture everything without opacity explicitly set) [#2090](https://github.com/terrastruct/d2/pull/2090) -- Render: connection label fills have a bit of padding and border-radius for better aesthetics [#2094](https://github.com/terrastruct/d2/pull/2094) -- Sequence diagram: the padding between message labels and message endpoints are slightly increased [#2096](https://github.com/terrastruct/d2/pull/2096) -- Opacity 0 shapes no longer have a label mask which made any segment of connections going through them lower opacity [#1940](https://github.com/terrastruct/d2/pull/1940) -- Bidirectional connections are now animated in opposite directions rather than one direction [#1939](https://github.com/terrastruct/d2/pull/1939) -<<<<<<< HEAD -- Connections now support `link` in SVGs [#1955](https://github.com/terrastruct/d2/pull/1955) ->>>>>>> 703bcd388 (update next.md) -||||||| parent of ba86dc990 (link on connections are now labels) -- Connections now support `link` in SVGs [#1955](https://github.com/terrastruct/d2/pull/1955) -======= ->>>>>>> ba86dc990 (link on connections are now labels) #### Bugfixes ⛑️ diff --git a/d2renderers/d2sketch/testdata/all_shapes/sketch.exp.svg b/d2renderers/d2sketch/testdata/all_shapes/sketch.exp.svg index ffc280b99..9038c489d 100644 --- a/d2renderers/d2sketch/testdata/all_shapes/sketch.exp.svg +++ b/d2renderers/d2sketch/testdata/all_shapes/sketch.exp.svg @@ -1,26 +1,4 @@ -<<<<<<< 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-2986291833 .fill-N1{fill:#0A0F25;} + .d2-2986291833 .fill-N2{fill:#676C7E;} + .d2-2986291833 .fill-N3{fill:#9499AB;} + .d2-2986291833 .fill-N4{fill:#CFD2DD;} + .d2-2986291833 .fill-N5{fill:#DEE1EB;} + .d2-2986291833 .fill-N6{fill:#EEF1F8;} + .d2-2986291833 .fill-N7{fill:#FFFFFF;} + .d2-2986291833 .fill-B1{fill:#0D32B2;} + .d2-2986291833 .fill-B2{fill:#0D32B2;} + .d2-2986291833 .fill-B3{fill:#E3E9FD;} + .d2-2986291833 .fill-B4{fill:#E3E9FD;} + .d2-2986291833 .fill-B5{fill:#EDF0FD;} + .d2-2986291833 .fill-B6{fill:#F7F8FE;} + .d2-2986291833 .fill-AA2{fill:#4A6FF3;} + .d2-2986291833 .fill-AA4{fill:#EDF0FD;} + .d2-2986291833 .fill-AA5{fill:#F7F8FE;} + .d2-2986291833 .fill-AB4{fill:#EDF0FD;} + .d2-2986291833 .fill-AB5{fill:#F7F8FE;} + .d2-2986291833 .stroke-N1{stroke:#0A0F25;} + .d2-2986291833 .stroke-N2{stroke:#676C7E;} + .d2-2986291833 .stroke-N3{stroke:#9499AB;} + .d2-2986291833 .stroke-N4{stroke:#CFD2DD;} + .d2-2986291833 .stroke-N5{stroke:#DEE1EB;} + .d2-2986291833 .stroke-N6{stroke:#EEF1F8;} + .d2-2986291833 .stroke-N7{stroke:#FFFFFF;} + .d2-2986291833 .stroke-B1{stroke:#0D32B2;} + .d2-2986291833 .stroke-B2{stroke:#0D32B2;} + .d2-2986291833 .stroke-B3{stroke:#E3E9FD;} + .d2-2986291833 .stroke-B4{stroke:#E3E9FD;} + .d2-2986291833 .stroke-B5{stroke:#EDF0FD;} + .d2-2986291833 .stroke-B6{stroke:#F7F8FE;} + .d2-2986291833 .stroke-AA2{stroke:#4A6FF3;} + .d2-2986291833 .stroke-AA4{stroke:#EDF0FD;} + .d2-2986291833 .stroke-AA5{stroke:#F7F8FE;} + .d2-2986291833 .stroke-AB4{stroke:#EDF0FD;} + .d2-2986291833 .stroke-AB5{stroke:#F7F8FE;} + .d2-2986291833 .background-color-N1{background-color:#0A0F25;} + .d2-2986291833 .background-color-N2{background-color:#676C7E;} + .d2-2986291833 .background-color-N3{background-color:#9499AB;} + .d2-2986291833 .background-color-N4{background-color:#CFD2DD;} + .d2-2986291833 .background-color-N5{background-color:#DEE1EB;} + .d2-2986291833 .background-color-N6{background-color:#EEF1F8;} + .d2-2986291833 .background-color-N7{background-color:#FFFFFF;} + .d2-2986291833 .background-color-B1{background-color:#0D32B2;} + .d2-2986291833 .background-color-B2{background-color:#0D32B2;} + .d2-2986291833 .background-color-B3{background-color:#E3E9FD;} + .d2-2986291833 .background-color-B4{background-color:#E3E9FD;} + .d2-2986291833 .background-color-B5{background-color:#EDF0FD;} + .d2-2986291833 .background-color-B6{background-color:#F7F8FE;} + .d2-2986291833 .background-color-AA2{background-color:#4A6FF3;} + .d2-2986291833 .background-color-AA4{background-color:#EDF0FD;} + .d2-2986291833 .background-color-AA5{background-color:#F7F8FE;} + .d2-2986291833 .background-color-AB4{background-color:#EDF0FD;} + .d2-2986291833 .background-color-AB5{background-color:#F7F8FE;} + .d2-2986291833 .color-N1{color:#0A0F25;} + .d2-2986291833 .color-N2{color:#676C7E;} + .d2-2986291833 .color-N3{color:#9499AB;} + .d2-2986291833 .color-N4{color:#CFD2DD;} + .d2-2986291833 .color-N5{color:#DEE1EB;} + .d2-2986291833 .color-N6{color:#EEF1F8;} + .d2-2986291833 .color-N7{color:#FFFFFF;} + .d2-2986291833 .color-B1{color:#0D32B2;} + .d2-2986291833 .color-B2{color:#0D32B2;} + .d2-2986291833 .color-B3{color:#E3E9FD;} + .d2-2986291833 .color-B4{color:#E3E9FD;} + .d2-2986291833 .color-B5{color:#EDF0FD;} + .d2-2986291833 .color-B6{color:#F7F8FE;} + .d2-2986291833 .color-AA2{color:#4A6FF3;} + .d2-2986291833 .color-AA4{color:#EDF0FD;} + .d2-2986291833 .color-AA5{color:#F7F8FE;} + .d2-2986291833 .color-AB4{color:#EDF0FD;} + .d2-2986291833 .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 -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-282011201 .fill-N1{fill:#0A0F25;} - .d2-282011201 .fill-N2{fill:#676C7E;} - .d2-282011201 .fill-N3{fill:#9499AB;} - .d2-282011201 .fill-N4{fill:#CFD2DD;} - .d2-282011201 .fill-N5{fill:#DEE1EB;} - .d2-282011201 .fill-N6{fill:#EEF1F8;} - .d2-282011201 .fill-N7{fill:#FFFFFF;} - .d2-282011201 .fill-B1{fill:#0D32B2;} - .d2-282011201 .fill-B2{fill:#0D32B2;} - .d2-282011201 .fill-B3{fill:#E3E9FD;} - .d2-282011201 .fill-B4{fill:#E3E9FD;} - .d2-282011201 .fill-B5{fill:#EDF0FD;} - .d2-282011201 .fill-B6{fill:#F7F8FE;} - .d2-282011201 .fill-AA2{fill:#4A6FF3;} - .d2-282011201 .fill-AA4{fill:#EDF0FD;} - .d2-282011201 .fill-AA5{fill:#F7F8FE;} - .d2-282011201 .fill-AB4{fill:#EDF0FD;} - .d2-282011201 .fill-AB5{fill:#F7F8FE;} - .d2-282011201 .stroke-N1{stroke:#0A0F25;} - .d2-282011201 .stroke-N2{stroke:#676C7E;} - .d2-282011201 .stroke-N3{stroke:#9499AB;} - .d2-282011201 .stroke-N4{stroke:#CFD2DD;} - .d2-282011201 .stroke-N5{stroke:#DEE1EB;} - .d2-282011201 .stroke-N6{stroke:#EEF1F8;} - .d2-282011201 .stroke-N7{stroke:#FFFFFF;} - .d2-282011201 .stroke-B1{stroke:#0D32B2;} - .d2-282011201 .stroke-B2{stroke:#0D32B2;} - .d2-282011201 .stroke-B3{stroke:#E3E9FD;} - .d2-282011201 .stroke-B4{stroke:#E3E9FD;} - .d2-282011201 .stroke-B5{stroke:#EDF0FD;} - .d2-282011201 .stroke-B6{stroke:#F7F8FE;} - .d2-282011201 .stroke-AA2{stroke:#4A6FF3;} - .d2-282011201 .stroke-AA4{stroke:#EDF0FD;} - .d2-282011201 .stroke-AA5{stroke:#F7F8FE;} - .d2-282011201 .stroke-AB4{stroke:#EDF0FD;} - .d2-282011201 .stroke-AB5{stroke:#F7F8FE;} - .d2-282011201 .background-color-N1{background-color:#0A0F25;} - .d2-282011201 .background-color-N2{background-color:#676C7E;} - .d2-282011201 .background-color-N3{background-color:#9499AB;} - .d2-282011201 .background-color-N4{background-color:#CFD2DD;} - .d2-282011201 .background-color-N5{background-color:#DEE1EB;} - .d2-282011201 .background-color-N6{background-color:#EEF1F8;} - .d2-282011201 .background-color-N7{background-color:#FFFFFF;} - .d2-282011201 .background-color-B1{background-color:#0D32B2;} - .d2-282011201 .background-color-B2{background-color:#0D32B2;} - .d2-282011201 .background-color-B3{background-color:#E3E9FD;} - .d2-282011201 .background-color-B4{background-color:#E3E9FD;} - .d2-282011201 .background-color-B5{background-color:#EDF0FD;} - .d2-282011201 .background-color-B6{background-color:#F7F8FE;} - .d2-282011201 .background-color-AA2{background-color:#4A6FF3;} - .d2-282011201 .background-color-AA4{background-color:#EDF0FD;} - .d2-282011201 .background-color-AA5{background-color:#F7F8FE;} - .d2-282011201 .background-color-AB4{background-color:#EDF0FD;} - .d2-282011201 .background-color-AB5{background-color:#F7F8FE;} - .d2-282011201 .color-N1{color:#0A0F25;} - .d2-282011201 .color-N2{color:#676C7E;} - .d2-282011201 .color-N3{color:#9499AB;} - .d2-282011201 .color-N4{color:#CFD2DD;} - .d2-282011201 .color-N5{color:#DEE1EB;} - .d2-282011201 .color-N6{color:#EEF1F8;} - .d2-282011201 .color-N7{color:#FFFFFF;} - .d2-282011201 .color-B1{color:#0D32B2;} - .d2-282011201 .color-B2{color:#0D32B2;} - .d2-282011201 .color-B3{color:#E3E9FD;} - .d2-282011201 .color-B4{color:#E3E9FD;} - .d2-282011201 .color-B5{color:#EDF0FD;} - .d2-282011201 .color-B6{color:#F7F8FE;} - .d2-282011201 .color-AA2{color:#4A6FF3;} - .d2-282011201 .color-AA4{color:#EDF0FD;} - .d2-282011201 .color-AA5{color:#F7F8FE;} - .d2-282011201 .color-AB4{color:#EDF0FD;} - .d2-282011201 .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 - -======= -<<<<<<< HEAD - .d2-3594683676 .fill-N1{fill:#0A0F25;} - .d2-3594683676 .fill-N2{fill:#676C7E;} - .d2-3594683676 .fill-N3{fill:#9499AB;} - .d2-3594683676 .fill-N4{fill:#CFD2DD;} - .d2-3594683676 .fill-N5{fill:#DEE1EB;} - .d2-3594683676 .fill-N6{fill:#EEF1F8;} - .d2-3594683676 .fill-N7{fill:#FFFFFF;} - .d2-3594683676 .fill-B1{fill:#0D32B2;} - .d2-3594683676 .fill-B2{fill:#0D32B2;} - .d2-3594683676 .fill-B3{fill:#E3E9FD;} - .d2-3594683676 .fill-B4{fill:#E3E9FD;} - .d2-3594683676 .fill-B5{fill:#EDF0FD;} - .d2-3594683676 .fill-B6{fill:#F7F8FE;} - .d2-3594683676 .fill-AA2{fill:#4A6FF3;} - .d2-3594683676 .fill-AA4{fill:#EDF0FD;} - .d2-3594683676 .fill-AA5{fill:#F7F8FE;} - .d2-3594683676 .fill-AB4{fill:#EDF0FD;} - .d2-3594683676 .fill-AB5{fill:#F7F8FE;} - .d2-3594683676 .stroke-N1{stroke:#0A0F25;} - .d2-3594683676 .stroke-N2{stroke:#676C7E;} - .d2-3594683676 .stroke-N3{stroke:#9499AB;} - .d2-3594683676 .stroke-N4{stroke:#CFD2DD;} - .d2-3594683676 .stroke-N5{stroke:#DEE1EB;} - .d2-3594683676 .stroke-N6{stroke:#EEF1F8;} - .d2-3594683676 .stroke-N7{stroke:#FFFFFF;} - .d2-3594683676 .stroke-B1{stroke:#0D32B2;} - .d2-3594683676 .stroke-B2{stroke:#0D32B2;} - .d2-3594683676 .stroke-B3{stroke:#E3E9FD;} - .d2-3594683676 .stroke-B4{stroke:#E3E9FD;} - .d2-3594683676 .stroke-B5{stroke:#EDF0FD;} - .d2-3594683676 .stroke-B6{stroke:#F7F8FE;} - .d2-3594683676 .stroke-AA2{stroke:#4A6FF3;} - .d2-3594683676 .stroke-AA4{stroke:#EDF0FD;} - .d2-3594683676 .stroke-AA5{stroke:#F7F8FE;} - .d2-3594683676 .stroke-AB4{stroke:#EDF0FD;} - .d2-3594683676 .stroke-AB5{stroke:#F7F8FE;} - .d2-3594683676 .background-color-N1{background-color:#0A0F25;} - .d2-3594683676 .background-color-N2{background-color:#676C7E;} - .d2-3594683676 .background-color-N3{background-color:#9499AB;} - .d2-3594683676 .background-color-N4{background-color:#CFD2DD;} - .d2-3594683676 .background-color-N5{background-color:#DEE1EB;} - .d2-3594683676 .background-color-N6{background-color:#EEF1F8;} - .d2-3594683676 .background-color-N7{background-color:#FFFFFF;} - .d2-3594683676 .background-color-B1{background-color:#0D32B2;} - .d2-3594683676 .background-color-B2{background-color:#0D32B2;} - .d2-3594683676 .background-color-B3{background-color:#E3E9FD;} - .d2-3594683676 .background-color-B4{background-color:#E3E9FD;} - .d2-3594683676 .background-color-B5{background-color:#EDF0FD;} - .d2-3594683676 .background-color-B6{background-color:#F7F8FE;} - .d2-3594683676 .background-color-AA2{background-color:#4A6FF3;} - .d2-3594683676 .background-color-AA4{background-color:#EDF0FD;} - .d2-3594683676 .background-color-AA5{background-color:#F7F8FE;} - .d2-3594683676 .background-color-AB4{background-color:#EDF0FD;} - .d2-3594683676 .background-color-AB5{background-color:#F7F8FE;} - .d2-3594683676 .color-N1{color:#0A0F25;} - .d2-3594683676 .color-N2{color:#676C7E;} - .d2-3594683676 .color-N3{color:#9499AB;} - .d2-3594683676 .color-N4{color:#CFD2DD;} - .d2-3594683676 .color-N5{color:#DEE1EB;} - .d2-3594683676 .color-N6{color:#EEF1F8;} - .d2-3594683676 .color-N7{color:#FFFFFF;} - .d2-3594683676 .color-B1{color:#0D32B2;} - .d2-3594683676 .color-B2{color:#0D32B2;} - .d2-3594683676 .color-B3{color:#E3E9FD;} - .d2-3594683676 .color-B4{color:#E3E9FD;} - .d2-3594683676 .color-B5{color:#EDF0FD;} - .d2-3594683676 .color-B6{color:#F7F8FE;} - .d2-3594683676 .color-AA2{color:#4A6FF3;} - .d2-3594683676 .color-AA4{color:#EDF0FD;} - .d2-3594683676 .color-AA5{color:#F7F8FE;} - .d2-3594683676 .color-AB4{color:#EDF0FD;} - .d2-3594683676 .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 - -======= - .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) ->>>>>>> 33280fed5 (fixed e2e tests) -||||||| parent of cb2f2823c (Fix changes) -<<<<<<< HEAD - .d2-3594683676 .fill-N1{fill:#0A0F25;} - .d2-3594683676 .fill-N2{fill:#676C7E;} - .d2-3594683676 .fill-N3{fill:#9499AB;} - .d2-3594683676 .fill-N4{fill:#CFD2DD;} - .d2-3594683676 .fill-N5{fill:#DEE1EB;} - .d2-3594683676 .fill-N6{fill:#EEF1F8;} - .d2-3594683676 .fill-N7{fill:#FFFFFF;} - .d2-3594683676 .fill-B1{fill:#0D32B2;} - .d2-3594683676 .fill-B2{fill:#0D32B2;} - .d2-3594683676 .fill-B3{fill:#E3E9FD;} - .d2-3594683676 .fill-B4{fill:#E3E9FD;} - .d2-3594683676 .fill-B5{fill:#EDF0FD;} - .d2-3594683676 .fill-B6{fill:#F7F8FE;} - .d2-3594683676 .fill-AA2{fill:#4A6FF3;} - .d2-3594683676 .fill-AA4{fill:#EDF0FD;} - .d2-3594683676 .fill-AA5{fill:#F7F8FE;} - .d2-3594683676 .fill-AB4{fill:#EDF0FD;} - .d2-3594683676 .fill-AB5{fill:#F7F8FE;} - .d2-3594683676 .stroke-N1{stroke:#0A0F25;} - .d2-3594683676 .stroke-N2{stroke:#676C7E;} - .d2-3594683676 .stroke-N3{stroke:#9499AB;} - .d2-3594683676 .stroke-N4{stroke:#CFD2DD;} - .d2-3594683676 .stroke-N5{stroke:#DEE1EB;} - .d2-3594683676 .stroke-N6{stroke:#EEF1F8;} - .d2-3594683676 .stroke-N7{stroke:#FFFFFF;} - .d2-3594683676 .stroke-B1{stroke:#0D32B2;} - .d2-3594683676 .stroke-B2{stroke:#0D32B2;} - .d2-3594683676 .stroke-B3{stroke:#E3E9FD;} - .d2-3594683676 .stroke-B4{stroke:#E3E9FD;} - .d2-3594683676 .stroke-B5{stroke:#EDF0FD;} - .d2-3594683676 .stroke-B6{stroke:#F7F8FE;} - .d2-3594683676 .stroke-AA2{stroke:#4A6FF3;} - .d2-3594683676 .stroke-AA4{stroke:#EDF0FD;} - .d2-3594683676 .stroke-AA5{stroke:#F7F8FE;} - .d2-3594683676 .stroke-AB4{stroke:#EDF0FD;} - .d2-3594683676 .stroke-AB5{stroke:#F7F8FE;} - .d2-3594683676 .background-color-N1{background-color:#0A0F25;} - .d2-3594683676 .background-color-N2{background-color:#676C7E;} - .d2-3594683676 .background-color-N3{background-color:#9499AB;} - .d2-3594683676 .background-color-N4{background-color:#CFD2DD;} - .d2-3594683676 .background-color-N5{background-color:#DEE1EB;} - .d2-3594683676 .background-color-N6{background-color:#EEF1F8;} - .d2-3594683676 .background-color-N7{background-color:#FFFFFF;} - .d2-3594683676 .background-color-B1{background-color:#0D32B2;} - .d2-3594683676 .background-color-B2{background-color:#0D32B2;} - .d2-3594683676 .background-color-B3{background-color:#E3E9FD;} - .d2-3594683676 .background-color-B4{background-color:#E3E9FD;} - .d2-3594683676 .background-color-B5{background-color:#EDF0FD;} - .d2-3594683676 .background-color-B6{background-color:#F7F8FE;} - .d2-3594683676 .background-color-AA2{background-color:#4A6FF3;} - .d2-3594683676 .background-color-AA4{background-color:#EDF0FD;} - .d2-3594683676 .background-color-AA5{background-color:#F7F8FE;} - .d2-3594683676 .background-color-AB4{background-color:#EDF0FD;} - .d2-3594683676 .background-color-AB5{background-color:#F7F8FE;} - .d2-3594683676 .color-N1{color:#0A0F25;} - .d2-3594683676 .color-N2{color:#676C7E;} - .d2-3594683676 .color-N3{color:#9499AB;} - .d2-3594683676 .color-N4{color:#CFD2DD;} - .d2-3594683676 .color-N5{color:#DEE1EB;} - .d2-3594683676 .color-N6{color:#EEF1F8;} - .d2-3594683676 .color-N7{color:#FFFFFF;} - .d2-3594683676 .color-B1{color:#0D32B2;} - .d2-3594683676 .color-B2{color:#0D32B2;} - .d2-3594683676 .color-B3{color:#E3E9FD;} - .d2-3594683676 .color-B4{color:#E3E9FD;} - .d2-3594683676 .color-B5{color:#EDF0FD;} - .d2-3594683676 .color-B6{color:#F7F8FE;} - .d2-3594683676 .color-AA2{color:#4A6FF3;} - .d2-3594683676 .color-AA4{color:#EDF0FD;} - .d2-3594683676 .color-AA5{color:#F7F8FE;} - .d2-3594683676 .color-AB4{color:#EDF0FD;} - .d2-3594683676 .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 - -======= - .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 -||||||| parent of 33280fed5 (fixed e2e tests) - - - - - -======= - - - - - ->>>>>>> 33280fed5 (fixed e2e tests) -||||||| parent of cb2f2823c (Fix changes) - - - - - -======= - - - - - ->>>>>>> cb2f2823c (Fix changes) -<<<<<<< HEAD -<<<<<<< HEAD @@ -698,58 +122,8 @@ -||||||| parent of 33280fed5 (fixed e2e tests) - - - - - - - - -======= - - - - - - - - ->>>>>>> 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 xyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! 1Gee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS!23 -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-2990259904 .fill-N1{fill:#0A0F25;} - .d2-2990259904 .fill-N2{fill:#676C7E;} - .d2-2990259904 .fill-N3{fill:#9499AB;} - .d2-2990259904 .fill-N4{fill:#CFD2DD;} - .d2-2990259904 .fill-N5{fill:#DEE1EB;} - .d2-2990259904 .fill-N6{fill:#EEF1F8;} - .d2-2990259904 .fill-N7{fill:#FFFFFF;} - .d2-2990259904 .fill-B1{fill:#0D32B2;} - .d2-2990259904 .fill-B2{fill:#0D32B2;} - .d2-2990259904 .fill-B3{fill:#E3E9FD;} - .d2-2990259904 .fill-B4{fill:#E3E9FD;} - .d2-2990259904 .fill-B5{fill:#EDF0FD;} - .d2-2990259904 .fill-B6{fill:#F7F8FE;} - .d2-2990259904 .fill-AA2{fill:#4A6FF3;} - .d2-2990259904 .fill-AA4{fill:#EDF0FD;} - .d2-2990259904 .fill-AA5{fill:#F7F8FE;} - .d2-2990259904 .fill-AB4{fill:#EDF0FD;} - .d2-2990259904 .fill-AB5{fill:#F7F8FE;} - .d2-2990259904 .stroke-N1{stroke:#0A0F25;} - .d2-2990259904 .stroke-N2{stroke:#676C7E;} - .d2-2990259904 .stroke-N3{stroke:#9499AB;} - .d2-2990259904 .stroke-N4{stroke:#CFD2DD;} - .d2-2990259904 .stroke-N5{stroke:#DEE1EB;} - .d2-2990259904 .stroke-N6{stroke:#EEF1F8;} - .d2-2990259904 .stroke-N7{stroke:#FFFFFF;} - .d2-2990259904 .stroke-B1{stroke:#0D32B2;} - .d2-2990259904 .stroke-B2{stroke:#0D32B2;} - .d2-2990259904 .stroke-B3{stroke:#E3E9FD;} - .d2-2990259904 .stroke-B4{stroke:#E3E9FD;} - .d2-2990259904 .stroke-B5{stroke:#EDF0FD;} - .d2-2990259904 .stroke-B6{stroke:#F7F8FE;} - .d2-2990259904 .stroke-AA2{stroke:#4A6FF3;} - .d2-2990259904 .stroke-AA4{stroke:#EDF0FD;} - .d2-2990259904 .stroke-AA5{stroke:#F7F8FE;} - .d2-2990259904 .stroke-AB4{stroke:#EDF0FD;} - .d2-2990259904 .stroke-AB5{stroke:#F7F8FE;} - .d2-2990259904 .background-color-N1{background-color:#0A0F25;} - .d2-2990259904 .background-color-N2{background-color:#676C7E;} - .d2-2990259904 .background-color-N3{background-color:#9499AB;} - .d2-2990259904 .background-color-N4{background-color:#CFD2DD;} - .d2-2990259904 .background-color-N5{background-color:#DEE1EB;} - .d2-2990259904 .background-color-N6{background-color:#EEF1F8;} - .d2-2990259904 .background-color-N7{background-color:#FFFFFF;} - .d2-2990259904 .background-color-B1{background-color:#0D32B2;} - .d2-2990259904 .background-color-B2{background-color:#0D32B2;} - .d2-2990259904 .background-color-B3{background-color:#E3E9FD;} - .d2-2990259904 .background-color-B4{background-color:#E3E9FD;} - .d2-2990259904 .background-color-B5{background-color:#EDF0FD;} - .d2-2990259904 .background-color-B6{background-color:#F7F8FE;} - .d2-2990259904 .background-color-AA2{background-color:#4A6FF3;} - .d2-2990259904 .background-color-AA4{background-color:#EDF0FD;} - .d2-2990259904 .background-color-AA5{background-color:#F7F8FE;} - .d2-2990259904 .background-color-AB4{background-color:#EDF0FD;} - .d2-2990259904 .background-color-AB5{background-color:#F7F8FE;} - .d2-2990259904 .color-N1{color:#0A0F25;} - .d2-2990259904 .color-N2{color:#676C7E;} - .d2-2990259904 .color-N3{color:#9499AB;} - .d2-2990259904 .color-N4{color:#CFD2DD;} - .d2-2990259904 .color-N5{color:#DEE1EB;} - .d2-2990259904 .color-N6{color:#EEF1F8;} - .d2-2990259904 .color-N7{color:#FFFFFF;} - .d2-2990259904 .color-B1{color:#0D32B2;} - .d2-2990259904 .color-B2{color:#0D32B2;} - .d2-2990259904 .color-B3{color:#E3E9FD;} - .d2-2990259904 .color-B4{color:#E3E9FD;} - .d2-2990259904 .color-B5{color:#EDF0FD;} - .d2-2990259904 .color-B6{color:#F7F8FE;} - .d2-2990259904 .color-AA2{color:#4A6FF3;} - .d2-2990259904 .color-AA4{color:#EDF0FD;} - .d2-2990259904 .color-AA5{color:#F7F8FE;} - .d2-2990259904 .color-AB4{color:#EDF0FD;} - .d2-2990259904 .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}]]>xyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! 1Gee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS!23 -======= - .d2-1029983806 .fill-N1{fill:#0A0F25;} - .d2-1029983806 .fill-N2{fill:#676C7E;} - .d2-1029983806 .fill-N3{fill:#9499AB;} - .d2-1029983806 .fill-N4{fill:#CFD2DD;} - .d2-1029983806 .fill-N5{fill:#DEE1EB;} - .d2-1029983806 .fill-N6{fill:#EEF1F8;} - .d2-1029983806 .fill-N7{fill:#FFFFFF;} - .d2-1029983806 .fill-B1{fill:#0D32B2;} - .d2-1029983806 .fill-B2{fill:#0D32B2;} - .d2-1029983806 .fill-B3{fill:#E3E9FD;} - .d2-1029983806 .fill-B4{fill:#E3E9FD;} - .d2-1029983806 .fill-B5{fill:#EDF0FD;} - .d2-1029983806 .fill-B6{fill:#F7F8FE;} - .d2-1029983806 .fill-AA2{fill:#4A6FF3;} - .d2-1029983806 .fill-AA4{fill:#EDF0FD;} - .d2-1029983806 .fill-AA5{fill:#F7F8FE;} - .d2-1029983806 .fill-AB4{fill:#EDF0FD;} - .d2-1029983806 .fill-AB5{fill:#F7F8FE;} - .d2-1029983806 .stroke-N1{stroke:#0A0F25;} - .d2-1029983806 .stroke-N2{stroke:#676C7E;} - .d2-1029983806 .stroke-N3{stroke:#9499AB;} - .d2-1029983806 .stroke-N4{stroke:#CFD2DD;} - .d2-1029983806 .stroke-N5{stroke:#DEE1EB;} - .d2-1029983806 .stroke-N6{stroke:#EEF1F8;} - .d2-1029983806 .stroke-N7{stroke:#FFFFFF;} - .d2-1029983806 .stroke-B1{stroke:#0D32B2;} - .d2-1029983806 .stroke-B2{stroke:#0D32B2;} - .d2-1029983806 .stroke-B3{stroke:#E3E9FD;} - .d2-1029983806 .stroke-B4{stroke:#E3E9FD;} - .d2-1029983806 .stroke-B5{stroke:#EDF0FD;} - .d2-1029983806 .stroke-B6{stroke:#F7F8FE;} - .d2-1029983806 .stroke-AA2{stroke:#4A6FF3;} - .d2-1029983806 .stroke-AA4{stroke:#EDF0FD;} - .d2-1029983806 .stroke-AA5{stroke:#F7F8FE;} - .d2-1029983806 .stroke-AB4{stroke:#EDF0FD;} - .d2-1029983806 .stroke-AB5{stroke:#F7F8FE;} - .d2-1029983806 .background-color-N1{background-color:#0A0F25;} - .d2-1029983806 .background-color-N2{background-color:#676C7E;} - .d2-1029983806 .background-color-N3{background-color:#9499AB;} - .d2-1029983806 .background-color-N4{background-color:#CFD2DD;} - .d2-1029983806 .background-color-N5{background-color:#DEE1EB;} - .d2-1029983806 .background-color-N6{background-color:#EEF1F8;} - .d2-1029983806 .background-color-N7{background-color:#FFFFFF;} - .d2-1029983806 .background-color-B1{background-color:#0D32B2;} - .d2-1029983806 .background-color-B2{background-color:#0D32B2;} - .d2-1029983806 .background-color-B3{background-color:#E3E9FD;} - .d2-1029983806 .background-color-B4{background-color:#E3E9FD;} - .d2-1029983806 .background-color-B5{background-color:#EDF0FD;} - .d2-1029983806 .background-color-B6{background-color:#F7F8FE;} - .d2-1029983806 .background-color-AA2{background-color:#4A6FF3;} - .d2-1029983806 .background-color-AA4{background-color:#EDF0FD;} - .d2-1029983806 .background-color-AA5{background-color:#F7F8FE;} - .d2-1029983806 .background-color-AB4{background-color:#EDF0FD;} - .d2-1029983806 .background-color-AB5{background-color:#F7F8FE;} - .d2-1029983806 .color-N1{color:#0A0F25;} - .d2-1029983806 .color-N2{color:#676C7E;} - .d2-1029983806 .color-N3{color:#9499AB;} - .d2-1029983806 .color-N4{color:#CFD2DD;} - .d2-1029983806 .color-N5{color:#DEE1EB;} - .d2-1029983806 .color-N6{color:#EEF1F8;} - .d2-1029983806 .color-N7{color:#FFFFFF;} - .d2-1029983806 .color-B1{color:#0D32B2;} - .d2-1029983806 .color-B2{color:#0D32B2;} - .d2-1029983806 .color-B3{color:#E3E9FD;} - .d2-1029983806 .color-B4{color:#E3E9FD;} - .d2-1029983806 .color-B5{color:#EDF0FD;} - .d2-1029983806 .color-B6{color:#F7F8FE;} - .d2-1029983806 .color-AA2{color:#4A6FF3;} - .d2-1029983806 .color-AA4{color:#EDF0FD;} - .d2-1029983806 .color-AA5{color:#F7F8FE;} - .d2-1029983806 .color-AB4{color:#EDF0FD;} - .d2-1029983806 .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}]]>xyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! 1Gee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS!23 ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-1998242947 .fill-N1{fill:#0A0F25;} + .d2-1998242947 .fill-N2{fill:#676C7E;} + .d2-1998242947 .fill-N3{fill:#9499AB;} + .d2-1998242947 .fill-N4{fill:#CFD2DD;} + .d2-1998242947 .fill-N5{fill:#DEE1EB;} + .d2-1998242947 .fill-N6{fill:#EEF1F8;} + .d2-1998242947 .fill-N7{fill:#FFFFFF;} + .d2-1998242947 .fill-B1{fill:#0D32B2;} + .d2-1998242947 .fill-B2{fill:#0D32B2;} + .d2-1998242947 .fill-B3{fill:#E3E9FD;} + .d2-1998242947 .fill-B4{fill:#E3E9FD;} + .d2-1998242947 .fill-B5{fill:#EDF0FD;} + .d2-1998242947 .fill-B6{fill:#F7F8FE;} + .d2-1998242947 .fill-AA2{fill:#4A6FF3;} + .d2-1998242947 .fill-AA4{fill:#EDF0FD;} + .d2-1998242947 .fill-AA5{fill:#F7F8FE;} + .d2-1998242947 .fill-AB4{fill:#EDF0FD;} + .d2-1998242947 .fill-AB5{fill:#F7F8FE;} + .d2-1998242947 .stroke-N1{stroke:#0A0F25;} + .d2-1998242947 .stroke-N2{stroke:#676C7E;} + .d2-1998242947 .stroke-N3{stroke:#9499AB;} + .d2-1998242947 .stroke-N4{stroke:#CFD2DD;} + .d2-1998242947 .stroke-N5{stroke:#DEE1EB;} + .d2-1998242947 .stroke-N6{stroke:#EEF1F8;} + .d2-1998242947 .stroke-N7{stroke:#FFFFFF;} + .d2-1998242947 .stroke-B1{stroke:#0D32B2;} + .d2-1998242947 .stroke-B2{stroke:#0D32B2;} + .d2-1998242947 .stroke-B3{stroke:#E3E9FD;} + .d2-1998242947 .stroke-B4{stroke:#E3E9FD;} + .d2-1998242947 .stroke-B5{stroke:#EDF0FD;} + .d2-1998242947 .stroke-B6{stroke:#F7F8FE;} + .d2-1998242947 .stroke-AA2{stroke:#4A6FF3;} + .d2-1998242947 .stroke-AA4{stroke:#EDF0FD;} + .d2-1998242947 .stroke-AA5{stroke:#F7F8FE;} + .d2-1998242947 .stroke-AB4{stroke:#EDF0FD;} + .d2-1998242947 .stroke-AB5{stroke:#F7F8FE;} + .d2-1998242947 .background-color-N1{background-color:#0A0F25;} + .d2-1998242947 .background-color-N2{background-color:#676C7E;} + .d2-1998242947 .background-color-N3{background-color:#9499AB;} + .d2-1998242947 .background-color-N4{background-color:#CFD2DD;} + .d2-1998242947 .background-color-N5{background-color:#DEE1EB;} + .d2-1998242947 .background-color-N6{background-color:#EEF1F8;} + .d2-1998242947 .background-color-N7{background-color:#FFFFFF;} + .d2-1998242947 .background-color-B1{background-color:#0D32B2;} + .d2-1998242947 .background-color-B2{background-color:#0D32B2;} + .d2-1998242947 .background-color-B3{background-color:#E3E9FD;} + .d2-1998242947 .background-color-B4{background-color:#E3E9FD;} + .d2-1998242947 .background-color-B5{background-color:#EDF0FD;} + .d2-1998242947 .background-color-B6{background-color:#F7F8FE;} + .d2-1998242947 .background-color-AA2{background-color:#4A6FF3;} + .d2-1998242947 .background-color-AA4{background-color:#EDF0FD;} + .d2-1998242947 .background-color-AA5{background-color:#F7F8FE;} + .d2-1998242947 .background-color-AB4{background-color:#EDF0FD;} + .d2-1998242947 .background-color-AB5{background-color:#F7F8FE;} + .d2-1998242947 .color-N1{color:#0A0F25;} + .d2-1998242947 .color-N2{color:#676C7E;} + .d2-1998242947 .color-N3{color:#9499AB;} + .d2-1998242947 .color-N4{color:#CFD2DD;} + .d2-1998242947 .color-N5{color:#DEE1EB;} + .d2-1998242947 .color-N6{color:#EEF1F8;} + .d2-1998242947 .color-N7{color:#FFFFFF;} + .d2-1998242947 .color-B1{color:#0D32B2;} + .d2-1998242947 .color-B2{color:#0D32B2;} + .d2-1998242947 .color-B3{color:#E3E9FD;} + .d2-1998242947 .color-B4{color:#E3E9FD;} + .d2-1998242947 .color-B5{color:#EDF0FD;} + .d2-1998242947 .color-B6{color:#F7F8FE;} + .d2-1998242947 .color-AA2{color:#4A6FF3;} + .d2-1998242947 .color-AA4{color:#EDF0FD;} + .d2-1998242947 .color-AA5{color:#F7F8FE;} + .d2-1998242947 .color-AB4{color:#EDF0FD;} + .d2-1998242947 .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}]]>xyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! 1Gee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS!23 diff --git a/d2renderers/d2svg/appendix/testdata/links_dark/sketch.exp.svg b/d2renderers/d2svg/appendix/testdata/links_dark/sketch.exp.svg index 550825d87..f6d7cc0d1 100644 --- a/d2renderers/d2svg/appendix/testdata/links_dark/sketch.exp.svg +++ b/d2renderers/d2svg/appendix/testdata/links_dark/sketch.exp.svg @@ -1,46 +1,12 @@ -<<<<<<< HEAD -<<<<<<< HEAD -xyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! 1Gee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS!23 -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-3058966282 .fill-N1{fill:#CDD6F4;} - .d2-3058966282 .fill-N2{fill:#BAC2DE;} - .d2-3058966282 .fill-N3{fill:#A6ADC8;} - .d2-3058966282 .fill-N4{fill:#585B70;} - .d2-3058966282 .fill-N5{fill:#45475A;} - .d2-3058966282 .fill-N6{fill:#313244;} - .d2-3058966282 .fill-N7{fill:#1E1E2E;} - .d2-3058966282 .fill-B1{fill:#CBA6f7;} - .d2-3058966282 .fill-B2{fill:#CBA6f7;} - .d2-3058966282 .fill-B3{fill:#6C7086;} - .d2-3058966282 .fill-B4{fill:#585B70;} - .d2-3058966282 .fill-B5{fill:#45475A;} - .d2-3058966282 .fill-B6{fill:#313244;} - .d2-3058966282 .fill-AA2{fill:#f38BA8;} - .d2-3058966282 .fill-AA4{fill:#45475A;} - .d2-3058966282 .fill-AA5{fill:#313244;} - .d2-3058966282 .fill-AB4{fill:#45475A;} - .d2-3058966282 .fill-AB5{fill:#313244;} - .d2-3058966282 .stroke-N1{stroke:#CDD6F4;} - .d2-3058966282 .stroke-N2{stroke:#BAC2DE;} - .d2-3058966282 .stroke-N3{stroke:#A6ADC8;} - .d2-3058966282 .stroke-N4{stroke:#585B70;} - .d2-3058966282 .stroke-N5{stroke:#45475A;} - .d2-3058966282 .stroke-N6{stroke:#313244;} - .d2-3058966282 .stroke-N7{stroke:#1E1E2E;} - .d2-3058966282 .stroke-B1{stroke:#CBA6f7;} - .d2-3058966282 .stroke-B2{stroke:#CBA6f7;} - .d2-3058966282 .stroke-B3{stroke:#6C7086;} - .d2-3058966282 .stroke-B4{stroke:#585B70;} - .d2-3058966282 .stroke-B5{stroke:#45475A;} - .d2-3058966282 .stroke-B6{stroke:#313244;} - .d2-3058966282 .stroke-AA2{stroke:#f38BA8;} - .d2-3058966282 .stroke-AA4{stroke:#45475A;} - .d2-3058966282 .stroke-AA5{stroke:#313244;} - .d2-3058966282 .stroke-AB4{stroke:#45475A;} - .d2-3058966282 .stroke-AB5{stroke:#313244;} - .d2-3058966282 .background-color-N1{background-color:#CDD6F4;} - .d2-3058966282 .background-color-N2{background-color:#BAC2DE;} - .d2-3058966282 .background-color-N3{background-color:#A6ADC8;} - .d2-3058966282 .background-color-N4{background-color:#585B70;} - .d2-3058966282 .background-color-N5{background-color:#45475A;} - .d2-3058966282 .background-color-N6{background-color:#313244;} - .d2-3058966282 .background-color-N7{background-color:#1E1E2E;} - .d2-3058966282 .background-color-B1{background-color:#CBA6f7;} - .d2-3058966282 .background-color-B2{background-color:#CBA6f7;} - .d2-3058966282 .background-color-B3{background-color:#6C7086;} - .d2-3058966282 .background-color-B4{background-color:#585B70;} - .d2-3058966282 .background-color-B5{background-color:#45475A;} - .d2-3058966282 .background-color-B6{background-color:#313244;} - .d2-3058966282 .background-color-AA2{background-color:#f38BA8;} - .d2-3058966282 .background-color-AA4{background-color:#45475A;} - .d2-3058966282 .background-color-AA5{background-color:#313244;} - .d2-3058966282 .background-color-AB4{background-color:#45475A;} - .d2-3058966282 .background-color-AB5{background-color:#313244;} - .d2-3058966282 .color-N1{color:#CDD6F4;} - .d2-3058966282 .color-N2{color:#BAC2DE;} - .d2-3058966282 .color-N3{color:#A6ADC8;} - .d2-3058966282 .color-N4{color:#585B70;} - .d2-3058966282 .color-N5{color:#45475A;} - .d2-3058966282 .color-N6{color:#313244;} - .d2-3058966282 .color-N7{color:#1E1E2E;} - .d2-3058966282 .color-B1{color:#CBA6f7;} - .d2-3058966282 .color-B2{color:#CBA6f7;} - .d2-3058966282 .color-B3{color:#6C7086;} - .d2-3058966282 .color-B4{color:#585B70;} - .d2-3058966282 .color-B5{color:#45475A;} - .d2-3058966282 .color-B6{color:#313244;} - .d2-3058966282 .color-AA2{color:#f38BA8;} - .d2-3058966282 .color-AA4{color:#45475A;} - .d2-3058966282 .color-AA5{color:#313244;} - .d2-3058966282 .color-AB4{color:#45475A;} - .d2-3058966282 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]>xyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! 1Gee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS!23 -======= - .d2-772414340 .fill-N1{fill:#CDD6F4;} - .d2-772414340 .fill-N2{fill:#BAC2DE;} - .d2-772414340 .fill-N3{fill:#A6ADC8;} - .d2-772414340 .fill-N4{fill:#585B70;} - .d2-772414340 .fill-N5{fill:#45475A;} - .d2-772414340 .fill-N6{fill:#313244;} - .d2-772414340 .fill-N7{fill:#1E1E2E;} - .d2-772414340 .fill-B1{fill:#CBA6f7;} - .d2-772414340 .fill-B2{fill:#CBA6f7;} - .d2-772414340 .fill-B3{fill:#6C7086;} - .d2-772414340 .fill-B4{fill:#585B70;} - .d2-772414340 .fill-B5{fill:#45475A;} - .d2-772414340 .fill-B6{fill:#313244;} - .d2-772414340 .fill-AA2{fill:#f38BA8;} - .d2-772414340 .fill-AA4{fill:#45475A;} - .d2-772414340 .fill-AA5{fill:#313244;} - .d2-772414340 .fill-AB4{fill:#45475A;} - .d2-772414340 .fill-AB5{fill:#313244;} - .d2-772414340 .stroke-N1{stroke:#CDD6F4;} - .d2-772414340 .stroke-N2{stroke:#BAC2DE;} - .d2-772414340 .stroke-N3{stroke:#A6ADC8;} - .d2-772414340 .stroke-N4{stroke:#585B70;} - .d2-772414340 .stroke-N5{stroke:#45475A;} - .d2-772414340 .stroke-N6{stroke:#313244;} - .d2-772414340 .stroke-N7{stroke:#1E1E2E;} - .d2-772414340 .stroke-B1{stroke:#CBA6f7;} - .d2-772414340 .stroke-B2{stroke:#CBA6f7;} - .d2-772414340 .stroke-B3{stroke:#6C7086;} - .d2-772414340 .stroke-B4{stroke:#585B70;} - .d2-772414340 .stroke-B5{stroke:#45475A;} - .d2-772414340 .stroke-B6{stroke:#313244;} - .d2-772414340 .stroke-AA2{stroke:#f38BA8;} - .d2-772414340 .stroke-AA4{stroke:#45475A;} - .d2-772414340 .stroke-AA5{stroke:#313244;} - .d2-772414340 .stroke-AB4{stroke:#45475A;} - .d2-772414340 .stroke-AB5{stroke:#313244;} - .d2-772414340 .background-color-N1{background-color:#CDD6F4;} - .d2-772414340 .background-color-N2{background-color:#BAC2DE;} - .d2-772414340 .background-color-N3{background-color:#A6ADC8;} - .d2-772414340 .background-color-N4{background-color:#585B70;} - .d2-772414340 .background-color-N5{background-color:#45475A;} - .d2-772414340 .background-color-N6{background-color:#313244;} - .d2-772414340 .background-color-N7{background-color:#1E1E2E;} - .d2-772414340 .background-color-B1{background-color:#CBA6f7;} - .d2-772414340 .background-color-B2{background-color:#CBA6f7;} - .d2-772414340 .background-color-B3{background-color:#6C7086;} - .d2-772414340 .background-color-B4{background-color:#585B70;} - .d2-772414340 .background-color-B5{background-color:#45475A;} - .d2-772414340 .background-color-B6{background-color:#313244;} - .d2-772414340 .background-color-AA2{background-color:#f38BA8;} - .d2-772414340 .background-color-AA4{background-color:#45475A;} - .d2-772414340 .background-color-AA5{background-color:#313244;} - .d2-772414340 .background-color-AB4{background-color:#45475A;} - .d2-772414340 .background-color-AB5{background-color:#313244;} - .d2-772414340 .color-N1{color:#CDD6F4;} - .d2-772414340 .color-N2{color:#BAC2DE;} - .d2-772414340 .color-N3{color:#A6ADC8;} - .d2-772414340 .color-N4{color:#585B70;} - .d2-772414340 .color-N5{color:#45475A;} - .d2-772414340 .color-N6{color:#313244;} - .d2-772414340 .color-N7{color:#1E1E2E;} - .d2-772414340 .color-B1{color:#CBA6f7;} - .d2-772414340 .color-B2{color:#CBA6f7;} - .d2-772414340 .color-B3{color:#6C7086;} - .d2-772414340 .color-B4{color:#585B70;} - .d2-772414340 .color-B5{color:#45475A;} - .d2-772414340 .color-B6{color:#313244;} - .d2-772414340 .color-AA2{color:#f38BA8;} - .d2-772414340 .color-AA4{color:#45475A;} - .d2-772414340 .color-AA5{color:#313244;} - .d2-772414340 .color-AB4{color:#45475A;} - .d2-772414340 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]>xyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! 1Gee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS!23 ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-1509997597 .fill-N1{fill:#CDD6F4;} + .d2-1509997597 .fill-N2{fill:#BAC2DE;} + .d2-1509997597 .fill-N3{fill:#A6ADC8;} + .d2-1509997597 .fill-N4{fill:#585B70;} + .d2-1509997597 .fill-N5{fill:#45475A;} + .d2-1509997597 .fill-N6{fill:#313244;} + .d2-1509997597 .fill-N7{fill:#1E1E2E;} + .d2-1509997597 .fill-B1{fill:#CBA6f7;} + .d2-1509997597 .fill-B2{fill:#CBA6f7;} + .d2-1509997597 .fill-B3{fill:#6C7086;} + .d2-1509997597 .fill-B4{fill:#585B70;} + .d2-1509997597 .fill-B5{fill:#45475A;} + .d2-1509997597 .fill-B6{fill:#313244;} + .d2-1509997597 .fill-AA2{fill:#f38BA8;} + .d2-1509997597 .fill-AA4{fill:#45475A;} + .d2-1509997597 .fill-AA5{fill:#313244;} + .d2-1509997597 .fill-AB4{fill:#45475A;} + .d2-1509997597 .fill-AB5{fill:#313244;} + .d2-1509997597 .stroke-N1{stroke:#CDD6F4;} + .d2-1509997597 .stroke-N2{stroke:#BAC2DE;} + .d2-1509997597 .stroke-N3{stroke:#A6ADC8;} + .d2-1509997597 .stroke-N4{stroke:#585B70;} + .d2-1509997597 .stroke-N5{stroke:#45475A;} + .d2-1509997597 .stroke-N6{stroke:#313244;} + .d2-1509997597 .stroke-N7{stroke:#1E1E2E;} + .d2-1509997597 .stroke-B1{stroke:#CBA6f7;} + .d2-1509997597 .stroke-B2{stroke:#CBA6f7;} + .d2-1509997597 .stroke-B3{stroke:#6C7086;} + .d2-1509997597 .stroke-B4{stroke:#585B70;} + .d2-1509997597 .stroke-B5{stroke:#45475A;} + .d2-1509997597 .stroke-B6{stroke:#313244;} + .d2-1509997597 .stroke-AA2{stroke:#f38BA8;} + .d2-1509997597 .stroke-AA4{stroke:#45475A;} + .d2-1509997597 .stroke-AA5{stroke:#313244;} + .d2-1509997597 .stroke-AB4{stroke:#45475A;} + .d2-1509997597 .stroke-AB5{stroke:#313244;} + .d2-1509997597 .background-color-N1{background-color:#CDD6F4;} + .d2-1509997597 .background-color-N2{background-color:#BAC2DE;} + .d2-1509997597 .background-color-N3{background-color:#A6ADC8;} + .d2-1509997597 .background-color-N4{background-color:#585B70;} + .d2-1509997597 .background-color-N5{background-color:#45475A;} + .d2-1509997597 .background-color-N6{background-color:#313244;} + .d2-1509997597 .background-color-N7{background-color:#1E1E2E;} + .d2-1509997597 .background-color-B1{background-color:#CBA6f7;} + .d2-1509997597 .background-color-B2{background-color:#CBA6f7;} + .d2-1509997597 .background-color-B3{background-color:#6C7086;} + .d2-1509997597 .background-color-B4{background-color:#585B70;} + .d2-1509997597 .background-color-B5{background-color:#45475A;} + .d2-1509997597 .background-color-B6{background-color:#313244;} + .d2-1509997597 .background-color-AA2{background-color:#f38BA8;} + .d2-1509997597 .background-color-AA4{background-color:#45475A;} + .d2-1509997597 .background-color-AA5{background-color:#313244;} + .d2-1509997597 .background-color-AB4{background-color:#45475A;} + .d2-1509997597 .background-color-AB5{background-color:#313244;} + .d2-1509997597 .color-N1{color:#CDD6F4;} + .d2-1509997597 .color-N2{color:#BAC2DE;} + .d2-1509997597 .color-N3{color:#A6ADC8;} + .d2-1509997597 .color-N4{color:#585B70;} + .d2-1509997597 .color-N5{color:#45475A;} + .d2-1509997597 .color-N6{color:#313244;} + .d2-1509997597 .color-N7{color:#1E1E2E;} + .d2-1509997597 .color-B1{color:#CBA6f7;} + .d2-1509997597 .color-B2{color:#CBA6f7;} + .d2-1509997597 .color-B3{color:#6C7086;} + .d2-1509997597 .color-B4{color:#585B70;} + .d2-1509997597 .color-B5{color:#45475A;} + .d2-1509997597 .color-B6{color:#313244;} + .d2-1509997597 .color-AA2{color:#f38BA8;} + .d2-1509997597 .color-AA4{color:#45475A;} + .d2-1509997597 .color-AA5{color:#313244;} + .d2-1509997597 .color-AB4{color:#45475A;} + .d2-1509997597 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]>xyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! 1Gee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS!23 diff --git a/d2renderers/d2svg/appendix/testdata/tooltip_fill/sketch.exp.svg b/d2renderers/d2svg/appendix/testdata/tooltip_fill/sketch.exp.svg index d29874de5..cbe76600d 100644 --- a/d2renderers/d2svg/appendix/testdata/tooltip_fill/sketch.exp.svg +++ b/d2renderers/d2svg/appendix/testdata/tooltip_fill/sketch.exp.svg @@ -1,46 +1,12 @@ -<<<<<<< HEAD -<<<<<<< HEAD -xTotal abstinence is easier than perfect moderationyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! Total abstinence is easier than perfect moderation1Gee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS!2 + .d2-3586650765 .fill-N1{fill:#0A0F25;} + .d2-3586650765 .fill-N2{fill:#676C7E;} + .d2-3586650765 .fill-N3{fill:#9499AB;} + .d2-3586650765 .fill-N4{fill:#CFD2DD;} + .d2-3586650765 .fill-N5{fill:#DEE1EB;} + .d2-3586650765 .fill-N6{fill:#EEF1F8;} + .d2-3586650765 .fill-N7{fill:#FFFFFF;} + .d2-3586650765 .fill-B1{fill:#0D32B2;} + .d2-3586650765 .fill-B2{fill:#0D32B2;} + .d2-3586650765 .fill-B3{fill:#E3E9FD;} + .d2-3586650765 .fill-B4{fill:#E3E9FD;} + .d2-3586650765 .fill-B5{fill:#EDF0FD;} + .d2-3586650765 .fill-B6{fill:#F7F8FE;} + .d2-3586650765 .fill-AA2{fill:#4A6FF3;} + .d2-3586650765 .fill-AA4{fill:#EDF0FD;} + .d2-3586650765 .fill-AA5{fill:#F7F8FE;} + .d2-3586650765 .fill-AB4{fill:#EDF0FD;} + .d2-3586650765 .fill-AB5{fill:#F7F8FE;} + .d2-3586650765 .stroke-N1{stroke:#0A0F25;} + .d2-3586650765 .stroke-N2{stroke:#676C7E;} + .d2-3586650765 .stroke-N3{stroke:#9499AB;} + .d2-3586650765 .stroke-N4{stroke:#CFD2DD;} + .d2-3586650765 .stroke-N5{stroke:#DEE1EB;} + .d2-3586650765 .stroke-N6{stroke:#EEF1F8;} + .d2-3586650765 .stroke-N7{stroke:#FFFFFF;} + .d2-3586650765 .stroke-B1{stroke:#0D32B2;} + .d2-3586650765 .stroke-B2{stroke:#0D32B2;} + .d2-3586650765 .stroke-B3{stroke:#E3E9FD;} + .d2-3586650765 .stroke-B4{stroke:#E3E9FD;} + .d2-3586650765 .stroke-B5{stroke:#EDF0FD;} + .d2-3586650765 .stroke-B6{stroke:#F7F8FE;} + .d2-3586650765 .stroke-AA2{stroke:#4A6FF3;} + .d2-3586650765 .stroke-AA4{stroke:#EDF0FD;} + .d2-3586650765 .stroke-AA5{stroke:#F7F8FE;} + .d2-3586650765 .stroke-AB4{stroke:#EDF0FD;} + .d2-3586650765 .stroke-AB5{stroke:#F7F8FE;} + .d2-3586650765 .background-color-N1{background-color:#0A0F25;} + .d2-3586650765 .background-color-N2{background-color:#676C7E;} + .d2-3586650765 .background-color-N3{background-color:#9499AB;} + .d2-3586650765 .background-color-N4{background-color:#CFD2DD;} + .d2-3586650765 .background-color-N5{background-color:#DEE1EB;} + .d2-3586650765 .background-color-N6{background-color:#EEF1F8;} + .d2-3586650765 .background-color-N7{background-color:#FFFFFF;} + .d2-3586650765 .background-color-B1{background-color:#0D32B2;} + .d2-3586650765 .background-color-B2{background-color:#0D32B2;} + .d2-3586650765 .background-color-B3{background-color:#E3E9FD;} + .d2-3586650765 .background-color-B4{background-color:#E3E9FD;} + .d2-3586650765 .background-color-B5{background-color:#EDF0FD;} + .d2-3586650765 .background-color-B6{background-color:#F7F8FE;} + .d2-3586650765 .background-color-AA2{background-color:#4A6FF3;} + .d2-3586650765 .background-color-AA4{background-color:#EDF0FD;} + .d2-3586650765 .background-color-AA5{background-color:#F7F8FE;} + .d2-3586650765 .background-color-AB4{background-color:#EDF0FD;} + .d2-3586650765 .background-color-AB5{background-color:#F7F8FE;} + .d2-3586650765 .color-N1{color:#0A0F25;} + .d2-3586650765 .color-N2{color:#676C7E;} + .d2-3586650765 .color-N3{color:#9499AB;} + .d2-3586650765 .color-N4{color:#CFD2DD;} + .d2-3586650765 .color-N5{color:#DEE1EB;} + .d2-3586650765 .color-N6{color:#EEF1F8;} + .d2-3586650765 .color-N7{color:#FFFFFF;} + .d2-3586650765 .color-B1{color:#0D32B2;} + .d2-3586650765 .color-B2{color:#0D32B2;} + .d2-3586650765 .color-B3{color:#E3E9FD;} + .d2-3586650765 .color-B4{color:#E3E9FD;} + .d2-3586650765 .color-B5{color:#EDF0FD;} + .d2-3586650765 .color-B6{color:#F7F8FE;} + .d2-3586650765 .color-AA2{color:#4A6FF3;} + .d2-3586650765 .color-AA4{color:#EDF0FD;} + .d2-3586650765 .color-AA5{color:#F7F8FE;} + .d2-3586650765 .color-AB4{color:#EDF0FD;} + .d2-3586650765 .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}]]>xTotal abstinence is easier than perfect moderationyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! Total abstinence is easier than perfect moderation1Gee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS!2 1Total abstinence is easier than perfect moderation -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-3026443247 .fill-N1{fill:#0A0F25;} - .d2-3026443247 .fill-N2{fill:#676C7E;} - .d2-3026443247 .fill-N3{fill:#9499AB;} - .d2-3026443247 .fill-N4{fill:#CFD2DD;} - .d2-3026443247 .fill-N5{fill:#DEE1EB;} - .d2-3026443247 .fill-N6{fill:#EEF1F8;} - .d2-3026443247 .fill-N7{fill:#FFFFFF;} - .d2-3026443247 .fill-B1{fill:#0D32B2;} - .d2-3026443247 .fill-B2{fill:#0D32B2;} - .d2-3026443247 .fill-B3{fill:#E3E9FD;} - .d2-3026443247 .fill-B4{fill:#E3E9FD;} - .d2-3026443247 .fill-B5{fill:#EDF0FD;} - .d2-3026443247 .fill-B6{fill:#F7F8FE;} - .d2-3026443247 .fill-AA2{fill:#4A6FF3;} - .d2-3026443247 .fill-AA4{fill:#EDF0FD;} - .d2-3026443247 .fill-AA5{fill:#F7F8FE;} - .d2-3026443247 .fill-AB4{fill:#EDF0FD;} - .d2-3026443247 .fill-AB5{fill:#F7F8FE;} - .d2-3026443247 .stroke-N1{stroke:#0A0F25;} - .d2-3026443247 .stroke-N2{stroke:#676C7E;} - .d2-3026443247 .stroke-N3{stroke:#9499AB;} - .d2-3026443247 .stroke-N4{stroke:#CFD2DD;} - .d2-3026443247 .stroke-N5{stroke:#DEE1EB;} - .d2-3026443247 .stroke-N6{stroke:#EEF1F8;} - .d2-3026443247 .stroke-N7{stroke:#FFFFFF;} - .d2-3026443247 .stroke-B1{stroke:#0D32B2;} - .d2-3026443247 .stroke-B2{stroke:#0D32B2;} - .d2-3026443247 .stroke-B3{stroke:#E3E9FD;} - .d2-3026443247 .stroke-B4{stroke:#E3E9FD;} - .d2-3026443247 .stroke-B5{stroke:#EDF0FD;} - .d2-3026443247 .stroke-B6{stroke:#F7F8FE;} - .d2-3026443247 .stroke-AA2{stroke:#4A6FF3;} - .d2-3026443247 .stroke-AA4{stroke:#EDF0FD;} - .d2-3026443247 .stroke-AA5{stroke:#F7F8FE;} - .d2-3026443247 .stroke-AB4{stroke:#EDF0FD;} - .d2-3026443247 .stroke-AB5{stroke:#F7F8FE;} - .d2-3026443247 .background-color-N1{background-color:#0A0F25;} - .d2-3026443247 .background-color-N2{background-color:#676C7E;} - .d2-3026443247 .background-color-N3{background-color:#9499AB;} - .d2-3026443247 .background-color-N4{background-color:#CFD2DD;} - .d2-3026443247 .background-color-N5{background-color:#DEE1EB;} - .d2-3026443247 .background-color-N6{background-color:#EEF1F8;} - .d2-3026443247 .background-color-N7{background-color:#FFFFFF;} - .d2-3026443247 .background-color-B1{background-color:#0D32B2;} - .d2-3026443247 .background-color-B2{background-color:#0D32B2;} - .d2-3026443247 .background-color-B3{background-color:#E3E9FD;} - .d2-3026443247 .background-color-B4{background-color:#E3E9FD;} - .d2-3026443247 .background-color-B5{background-color:#EDF0FD;} - .d2-3026443247 .background-color-B6{background-color:#F7F8FE;} - .d2-3026443247 .background-color-AA2{background-color:#4A6FF3;} - .d2-3026443247 .background-color-AA4{background-color:#EDF0FD;} - .d2-3026443247 .background-color-AA5{background-color:#F7F8FE;} - .d2-3026443247 .background-color-AB4{background-color:#EDF0FD;} - .d2-3026443247 .background-color-AB5{background-color:#F7F8FE;} - .d2-3026443247 .color-N1{color:#0A0F25;} - .d2-3026443247 .color-N2{color:#676C7E;} - .d2-3026443247 .color-N3{color:#9499AB;} - .d2-3026443247 .color-N4{color:#CFD2DD;} - .d2-3026443247 .color-N5{color:#DEE1EB;} - .d2-3026443247 .color-N6{color:#EEF1F8;} - .d2-3026443247 .color-N7{color:#FFFFFF;} - .d2-3026443247 .color-B1{color:#0D32B2;} - .d2-3026443247 .color-B2{color:#0D32B2;} - .d2-3026443247 .color-B3{color:#E3E9FD;} - .d2-3026443247 .color-B4{color:#E3E9FD;} - .d2-3026443247 .color-B5{color:#EDF0FD;} - .d2-3026443247 .color-B6{color:#F7F8FE;} - .d2-3026443247 .color-AA2{color:#4A6FF3;} - .d2-3026443247 .color-AA4{color:#EDF0FD;} - .d2-3026443247 .color-AA5{color:#F7F8FE;} - .d2-3026443247 .color-AB4{color:#EDF0FD;} - .d2-3026443247 .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}]]>xTotal abstinence is easier than perfect moderationyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! Total abstinence is easier than perfect moderation1Gee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS!2 - - - -1Total abstinence is easier than perfect moderation -======= - .d2-3766483361 .fill-N1{fill:#0A0F25;} - .d2-3766483361 .fill-N2{fill:#676C7E;} - .d2-3766483361 .fill-N3{fill:#9499AB;} - .d2-3766483361 .fill-N4{fill:#CFD2DD;} - .d2-3766483361 .fill-N5{fill:#DEE1EB;} - .d2-3766483361 .fill-N6{fill:#EEF1F8;} - .d2-3766483361 .fill-N7{fill:#FFFFFF;} - .d2-3766483361 .fill-B1{fill:#0D32B2;} - .d2-3766483361 .fill-B2{fill:#0D32B2;} - .d2-3766483361 .fill-B3{fill:#E3E9FD;} - .d2-3766483361 .fill-B4{fill:#E3E9FD;} - .d2-3766483361 .fill-B5{fill:#EDF0FD;} - .d2-3766483361 .fill-B6{fill:#F7F8FE;} - .d2-3766483361 .fill-AA2{fill:#4A6FF3;} - .d2-3766483361 .fill-AA4{fill:#EDF0FD;} - .d2-3766483361 .fill-AA5{fill:#F7F8FE;} - .d2-3766483361 .fill-AB4{fill:#EDF0FD;} - .d2-3766483361 .fill-AB5{fill:#F7F8FE;} - .d2-3766483361 .stroke-N1{stroke:#0A0F25;} - .d2-3766483361 .stroke-N2{stroke:#676C7E;} - .d2-3766483361 .stroke-N3{stroke:#9499AB;} - .d2-3766483361 .stroke-N4{stroke:#CFD2DD;} - .d2-3766483361 .stroke-N5{stroke:#DEE1EB;} - .d2-3766483361 .stroke-N6{stroke:#EEF1F8;} - .d2-3766483361 .stroke-N7{stroke:#FFFFFF;} - .d2-3766483361 .stroke-B1{stroke:#0D32B2;} - .d2-3766483361 .stroke-B2{stroke:#0D32B2;} - .d2-3766483361 .stroke-B3{stroke:#E3E9FD;} - .d2-3766483361 .stroke-B4{stroke:#E3E9FD;} - .d2-3766483361 .stroke-B5{stroke:#EDF0FD;} - .d2-3766483361 .stroke-B6{stroke:#F7F8FE;} - .d2-3766483361 .stroke-AA2{stroke:#4A6FF3;} - .d2-3766483361 .stroke-AA4{stroke:#EDF0FD;} - .d2-3766483361 .stroke-AA5{stroke:#F7F8FE;} - .d2-3766483361 .stroke-AB4{stroke:#EDF0FD;} - .d2-3766483361 .stroke-AB5{stroke:#F7F8FE;} - .d2-3766483361 .background-color-N1{background-color:#0A0F25;} - .d2-3766483361 .background-color-N2{background-color:#676C7E;} - .d2-3766483361 .background-color-N3{background-color:#9499AB;} - .d2-3766483361 .background-color-N4{background-color:#CFD2DD;} - .d2-3766483361 .background-color-N5{background-color:#DEE1EB;} - .d2-3766483361 .background-color-N6{background-color:#EEF1F8;} - .d2-3766483361 .background-color-N7{background-color:#FFFFFF;} - .d2-3766483361 .background-color-B1{background-color:#0D32B2;} - .d2-3766483361 .background-color-B2{background-color:#0D32B2;} - .d2-3766483361 .background-color-B3{background-color:#E3E9FD;} - .d2-3766483361 .background-color-B4{background-color:#E3E9FD;} - .d2-3766483361 .background-color-B5{background-color:#EDF0FD;} - .d2-3766483361 .background-color-B6{background-color:#F7F8FE;} - .d2-3766483361 .background-color-AA2{background-color:#4A6FF3;} - .d2-3766483361 .background-color-AA4{background-color:#EDF0FD;} - .d2-3766483361 .background-color-AA5{background-color:#F7F8FE;} - .d2-3766483361 .background-color-AB4{background-color:#EDF0FD;} - .d2-3766483361 .background-color-AB5{background-color:#F7F8FE;} - .d2-3766483361 .color-N1{color:#0A0F25;} - .d2-3766483361 .color-N2{color:#676C7E;} - .d2-3766483361 .color-N3{color:#9499AB;} - .d2-3766483361 .color-N4{color:#CFD2DD;} - .d2-3766483361 .color-N5{color:#DEE1EB;} - .d2-3766483361 .color-N6{color:#EEF1F8;} - .d2-3766483361 .color-N7{color:#FFFFFF;} - .d2-3766483361 .color-B1{color:#0D32B2;} - .d2-3766483361 .color-B2{color:#0D32B2;} - .d2-3766483361 .color-B3{color:#E3E9FD;} - .d2-3766483361 .color-B4{color:#E3E9FD;} - .d2-3766483361 .color-B5{color:#EDF0FD;} - .d2-3766483361 .color-B6{color:#F7F8FE;} - .d2-3766483361 .color-AA2{color:#4A6FF3;} - .d2-3766483361 .color-AA4{color:#EDF0FD;} - .d2-3766483361 .color-AA5{color:#F7F8FE;} - .d2-3766483361 .color-AB4{color:#EDF0FD;} - .d2-3766483361 .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}]]>xTotal abstinence is easier than perfect moderationyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! Total abstinence is easier than perfect moderation1Gee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS!2 - - - -1Total abstinence is easier than perfect moderation ->>>>>>> 33280fed5 (fixed e2e tests) 2Gee, I feel kind of LIGHT in the head now,knowing I can't make my satellite dish PAYMENTS! xTotal abstinence is easier than perfect moderationyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! Total abstinence is easier than perfect moderation1Gee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS!2 + .d2-1071335462 .fill-N1{fill:#0A0F25;} + .d2-1071335462 .fill-N2{fill:#676C7E;} + .d2-1071335462 .fill-N3{fill:#9499AB;} + .d2-1071335462 .fill-N4{fill:#CFD2DD;} + .d2-1071335462 .fill-N5{fill:#DEE1EB;} + .d2-1071335462 .fill-N6{fill:#EEF1F8;} + .d2-1071335462 .fill-N7{fill:#FFFFFF;} + .d2-1071335462 .fill-B1{fill:#0D32B2;} + .d2-1071335462 .fill-B2{fill:#0D32B2;} + .d2-1071335462 .fill-B3{fill:#E3E9FD;} + .d2-1071335462 .fill-B4{fill:#E3E9FD;} + .d2-1071335462 .fill-B5{fill:#EDF0FD;} + .d2-1071335462 .fill-B6{fill:#F7F8FE;} + .d2-1071335462 .fill-AA2{fill:#4A6FF3;} + .d2-1071335462 .fill-AA4{fill:#EDF0FD;} + .d2-1071335462 .fill-AA5{fill:#F7F8FE;} + .d2-1071335462 .fill-AB4{fill:#EDF0FD;} + .d2-1071335462 .fill-AB5{fill:#F7F8FE;} + .d2-1071335462 .stroke-N1{stroke:#0A0F25;} + .d2-1071335462 .stroke-N2{stroke:#676C7E;} + .d2-1071335462 .stroke-N3{stroke:#9499AB;} + .d2-1071335462 .stroke-N4{stroke:#CFD2DD;} + .d2-1071335462 .stroke-N5{stroke:#DEE1EB;} + .d2-1071335462 .stroke-N6{stroke:#EEF1F8;} + .d2-1071335462 .stroke-N7{stroke:#FFFFFF;} + .d2-1071335462 .stroke-B1{stroke:#0D32B2;} + .d2-1071335462 .stroke-B2{stroke:#0D32B2;} + .d2-1071335462 .stroke-B3{stroke:#E3E9FD;} + .d2-1071335462 .stroke-B4{stroke:#E3E9FD;} + .d2-1071335462 .stroke-B5{stroke:#EDF0FD;} + .d2-1071335462 .stroke-B6{stroke:#F7F8FE;} + .d2-1071335462 .stroke-AA2{stroke:#4A6FF3;} + .d2-1071335462 .stroke-AA4{stroke:#EDF0FD;} + .d2-1071335462 .stroke-AA5{stroke:#F7F8FE;} + .d2-1071335462 .stroke-AB4{stroke:#EDF0FD;} + .d2-1071335462 .stroke-AB5{stroke:#F7F8FE;} + .d2-1071335462 .background-color-N1{background-color:#0A0F25;} + .d2-1071335462 .background-color-N2{background-color:#676C7E;} + .d2-1071335462 .background-color-N3{background-color:#9499AB;} + .d2-1071335462 .background-color-N4{background-color:#CFD2DD;} + .d2-1071335462 .background-color-N5{background-color:#DEE1EB;} + .d2-1071335462 .background-color-N6{background-color:#EEF1F8;} + .d2-1071335462 .background-color-N7{background-color:#FFFFFF;} + .d2-1071335462 .background-color-B1{background-color:#0D32B2;} + .d2-1071335462 .background-color-B2{background-color:#0D32B2;} + .d2-1071335462 .background-color-B3{background-color:#E3E9FD;} + .d2-1071335462 .background-color-B4{background-color:#E3E9FD;} + .d2-1071335462 .background-color-B5{background-color:#EDF0FD;} + .d2-1071335462 .background-color-B6{background-color:#F7F8FE;} + .d2-1071335462 .background-color-AA2{background-color:#4A6FF3;} + .d2-1071335462 .background-color-AA4{background-color:#EDF0FD;} + .d2-1071335462 .background-color-AA5{background-color:#F7F8FE;} + .d2-1071335462 .background-color-AB4{background-color:#EDF0FD;} + .d2-1071335462 .background-color-AB5{background-color:#F7F8FE;} + .d2-1071335462 .color-N1{color:#0A0F25;} + .d2-1071335462 .color-N2{color:#676C7E;} + .d2-1071335462 .color-N3{color:#9499AB;} + .d2-1071335462 .color-N4{color:#CFD2DD;} + .d2-1071335462 .color-N5{color:#DEE1EB;} + .d2-1071335462 .color-N6{color:#EEF1F8;} + .d2-1071335462 .color-N7{color:#FFFFFF;} + .d2-1071335462 .color-B1{color:#0D32B2;} + .d2-1071335462 .color-B2{color:#0D32B2;} + .d2-1071335462 .color-B3{color:#E3E9FD;} + .d2-1071335462 .color-B4{color:#E3E9FD;} + .d2-1071335462 .color-B5{color:#EDF0FD;} + .d2-1071335462 .color-B6{color:#F7F8FE;} + .d2-1071335462 .color-AA2{color:#4A6FF3;} + .d2-1071335462 .color-AA4{color:#EDF0FD;} + .d2-1071335462 .color-AA5{color:#F7F8FE;} + .d2-1071335462 .color-AB4{color:#EDF0FD;} + .d2-1071335462 .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}]]>xTotal abstinence is easier than perfect moderationyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! Total abstinence is easier than perfect moderation1Gee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS!2 1Total abstinence is easier than perfect moderation -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-2257413360 .fill-N1{fill:#0A0F25;} - .d2-2257413360 .fill-N2{fill:#676C7E;} - .d2-2257413360 .fill-N3{fill:#9499AB;} - .d2-2257413360 .fill-N4{fill:#CFD2DD;} - .d2-2257413360 .fill-N5{fill:#DEE1EB;} - .d2-2257413360 .fill-N6{fill:#EEF1F8;} - .d2-2257413360 .fill-N7{fill:#FFFFFF;} - .d2-2257413360 .fill-B1{fill:#0D32B2;} - .d2-2257413360 .fill-B2{fill:#0D32B2;} - .d2-2257413360 .fill-B3{fill:#E3E9FD;} - .d2-2257413360 .fill-B4{fill:#E3E9FD;} - .d2-2257413360 .fill-B5{fill:#EDF0FD;} - .d2-2257413360 .fill-B6{fill:#F7F8FE;} - .d2-2257413360 .fill-AA2{fill:#4A6FF3;} - .d2-2257413360 .fill-AA4{fill:#EDF0FD;} - .d2-2257413360 .fill-AA5{fill:#F7F8FE;} - .d2-2257413360 .fill-AB4{fill:#EDF0FD;} - .d2-2257413360 .fill-AB5{fill:#F7F8FE;} - .d2-2257413360 .stroke-N1{stroke:#0A0F25;} - .d2-2257413360 .stroke-N2{stroke:#676C7E;} - .d2-2257413360 .stroke-N3{stroke:#9499AB;} - .d2-2257413360 .stroke-N4{stroke:#CFD2DD;} - .d2-2257413360 .stroke-N5{stroke:#DEE1EB;} - .d2-2257413360 .stroke-N6{stroke:#EEF1F8;} - .d2-2257413360 .stroke-N7{stroke:#FFFFFF;} - .d2-2257413360 .stroke-B1{stroke:#0D32B2;} - .d2-2257413360 .stroke-B2{stroke:#0D32B2;} - .d2-2257413360 .stroke-B3{stroke:#E3E9FD;} - .d2-2257413360 .stroke-B4{stroke:#E3E9FD;} - .d2-2257413360 .stroke-B5{stroke:#EDF0FD;} - .d2-2257413360 .stroke-B6{stroke:#F7F8FE;} - .d2-2257413360 .stroke-AA2{stroke:#4A6FF3;} - .d2-2257413360 .stroke-AA4{stroke:#EDF0FD;} - .d2-2257413360 .stroke-AA5{stroke:#F7F8FE;} - .d2-2257413360 .stroke-AB4{stroke:#EDF0FD;} - .d2-2257413360 .stroke-AB5{stroke:#F7F8FE;} - .d2-2257413360 .background-color-N1{background-color:#0A0F25;} - .d2-2257413360 .background-color-N2{background-color:#676C7E;} - .d2-2257413360 .background-color-N3{background-color:#9499AB;} - .d2-2257413360 .background-color-N4{background-color:#CFD2DD;} - .d2-2257413360 .background-color-N5{background-color:#DEE1EB;} - .d2-2257413360 .background-color-N6{background-color:#EEF1F8;} - .d2-2257413360 .background-color-N7{background-color:#FFFFFF;} - .d2-2257413360 .background-color-B1{background-color:#0D32B2;} - .d2-2257413360 .background-color-B2{background-color:#0D32B2;} - .d2-2257413360 .background-color-B3{background-color:#E3E9FD;} - .d2-2257413360 .background-color-B4{background-color:#E3E9FD;} - .d2-2257413360 .background-color-B5{background-color:#EDF0FD;} - .d2-2257413360 .background-color-B6{background-color:#F7F8FE;} - .d2-2257413360 .background-color-AA2{background-color:#4A6FF3;} - .d2-2257413360 .background-color-AA4{background-color:#EDF0FD;} - .d2-2257413360 .background-color-AA5{background-color:#F7F8FE;} - .d2-2257413360 .background-color-AB4{background-color:#EDF0FD;} - .d2-2257413360 .background-color-AB5{background-color:#F7F8FE;} - .d2-2257413360 .color-N1{color:#0A0F25;} - .d2-2257413360 .color-N2{color:#676C7E;} - .d2-2257413360 .color-N3{color:#9499AB;} - .d2-2257413360 .color-N4{color:#CFD2DD;} - .d2-2257413360 .color-N5{color:#DEE1EB;} - .d2-2257413360 .color-N6{color:#EEF1F8;} - .d2-2257413360 .color-N7{color:#FFFFFF;} - .d2-2257413360 .color-B1{color:#0D32B2;} - .d2-2257413360 .color-B2{color:#0D32B2;} - .d2-2257413360 .color-B3{color:#E3E9FD;} - .d2-2257413360 .color-B4{color:#E3E9FD;} - .d2-2257413360 .color-B5{color:#EDF0FD;} - .d2-2257413360 .color-B6{color:#F7F8FE;} - .d2-2257413360 .color-AA2{color:#4A6FF3;} - .d2-2257413360 .color-AA4{color:#EDF0FD;} - .d2-2257413360 .color-AA5{color:#F7F8FE;} - .d2-2257413360 .color-AB4{color:#EDF0FD;} - .d2-2257413360 .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}]]>xTotal abstinence is easier than perfect moderationyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! Total abstinence is easier than perfect moderation1Gee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS!2 - - - -1Total abstinence is easier than perfect moderation -======= - .d2-640834314 .fill-N1{fill:#0A0F25;} - .d2-640834314 .fill-N2{fill:#676C7E;} - .d2-640834314 .fill-N3{fill:#9499AB;} - .d2-640834314 .fill-N4{fill:#CFD2DD;} - .d2-640834314 .fill-N5{fill:#DEE1EB;} - .d2-640834314 .fill-N6{fill:#EEF1F8;} - .d2-640834314 .fill-N7{fill:#FFFFFF;} - .d2-640834314 .fill-B1{fill:#0D32B2;} - .d2-640834314 .fill-B2{fill:#0D32B2;} - .d2-640834314 .fill-B3{fill:#E3E9FD;} - .d2-640834314 .fill-B4{fill:#E3E9FD;} - .d2-640834314 .fill-B5{fill:#EDF0FD;} - .d2-640834314 .fill-B6{fill:#F7F8FE;} - .d2-640834314 .fill-AA2{fill:#4A6FF3;} - .d2-640834314 .fill-AA4{fill:#EDF0FD;} - .d2-640834314 .fill-AA5{fill:#F7F8FE;} - .d2-640834314 .fill-AB4{fill:#EDF0FD;} - .d2-640834314 .fill-AB5{fill:#F7F8FE;} - .d2-640834314 .stroke-N1{stroke:#0A0F25;} - .d2-640834314 .stroke-N2{stroke:#676C7E;} - .d2-640834314 .stroke-N3{stroke:#9499AB;} - .d2-640834314 .stroke-N4{stroke:#CFD2DD;} - .d2-640834314 .stroke-N5{stroke:#DEE1EB;} - .d2-640834314 .stroke-N6{stroke:#EEF1F8;} - .d2-640834314 .stroke-N7{stroke:#FFFFFF;} - .d2-640834314 .stroke-B1{stroke:#0D32B2;} - .d2-640834314 .stroke-B2{stroke:#0D32B2;} - .d2-640834314 .stroke-B3{stroke:#E3E9FD;} - .d2-640834314 .stroke-B4{stroke:#E3E9FD;} - .d2-640834314 .stroke-B5{stroke:#EDF0FD;} - .d2-640834314 .stroke-B6{stroke:#F7F8FE;} - .d2-640834314 .stroke-AA2{stroke:#4A6FF3;} - .d2-640834314 .stroke-AA4{stroke:#EDF0FD;} - .d2-640834314 .stroke-AA5{stroke:#F7F8FE;} - .d2-640834314 .stroke-AB4{stroke:#EDF0FD;} - .d2-640834314 .stroke-AB5{stroke:#F7F8FE;} - .d2-640834314 .background-color-N1{background-color:#0A0F25;} - .d2-640834314 .background-color-N2{background-color:#676C7E;} - .d2-640834314 .background-color-N3{background-color:#9499AB;} - .d2-640834314 .background-color-N4{background-color:#CFD2DD;} - .d2-640834314 .background-color-N5{background-color:#DEE1EB;} - .d2-640834314 .background-color-N6{background-color:#EEF1F8;} - .d2-640834314 .background-color-N7{background-color:#FFFFFF;} - .d2-640834314 .background-color-B1{background-color:#0D32B2;} - .d2-640834314 .background-color-B2{background-color:#0D32B2;} - .d2-640834314 .background-color-B3{background-color:#E3E9FD;} - .d2-640834314 .background-color-B4{background-color:#E3E9FD;} - .d2-640834314 .background-color-B5{background-color:#EDF0FD;} - .d2-640834314 .background-color-B6{background-color:#F7F8FE;} - .d2-640834314 .background-color-AA2{background-color:#4A6FF3;} - .d2-640834314 .background-color-AA4{background-color:#EDF0FD;} - .d2-640834314 .background-color-AA5{background-color:#F7F8FE;} - .d2-640834314 .background-color-AB4{background-color:#EDF0FD;} - .d2-640834314 .background-color-AB5{background-color:#F7F8FE;} - .d2-640834314 .color-N1{color:#0A0F25;} - .d2-640834314 .color-N2{color:#676C7E;} - .d2-640834314 .color-N3{color:#9499AB;} - .d2-640834314 .color-N4{color:#CFD2DD;} - .d2-640834314 .color-N5{color:#DEE1EB;} - .d2-640834314 .color-N6{color:#EEF1F8;} - .d2-640834314 .color-N7{color:#FFFFFF;} - .d2-640834314 .color-B1{color:#0D32B2;} - .d2-640834314 .color-B2{color:#0D32B2;} - .d2-640834314 .color-B3{color:#E3E9FD;} - .d2-640834314 .color-B4{color:#E3E9FD;} - .d2-640834314 .color-B5{color:#EDF0FD;} - .d2-640834314 .color-B6{color:#F7F8FE;} - .d2-640834314 .color-AA2{color:#4A6FF3;} - .d2-640834314 .color-AA4{color:#EDF0FD;} - .d2-640834314 .color-AA5{color:#F7F8FE;} - .d2-640834314 .color-AB4{color:#EDF0FD;} - .d2-640834314 .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}]]>xTotal abstinence is easier than perfect moderationyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! Total abstinence is easier than perfect moderation1Gee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS!2 - - - -1Total abstinence is easier than perfect moderation ->>>>>>> 33280fed5 (fixed e2e tests) 2Gee, I feel kind of LIGHT in the head now,knowing I can't make my satellite dish PAYMENTS! rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-2513870599 .fill-N1{fill:#CDD6F4;} - .d2-2513870599 .fill-N2{fill:#BAC2DE;} - .d2-2513870599 .fill-N3{fill:#A6ADC8;} - .d2-2513870599 .fill-N4{fill:#585B70;} - .d2-2513870599 .fill-N5{fill:#45475A;} - .d2-2513870599 .fill-N6{fill:#313244;} - .d2-2513870599 .fill-N7{fill:#1E1E2E;} - .d2-2513870599 .fill-B1{fill:#CBA6f7;} - .d2-2513870599 .fill-B2{fill:#CBA6f7;} - .d2-2513870599 .fill-B3{fill:#6C7086;} - .d2-2513870599 .fill-B4{fill:#585B70;} - .d2-2513870599 .fill-B5{fill:#45475A;} - .d2-2513870599 .fill-B6{fill:#313244;} - .d2-2513870599 .fill-AA2{fill:#f38BA8;} - .d2-2513870599 .fill-AA4{fill:#45475A;} - .d2-2513870599 .fill-AA5{fill:#313244;} - .d2-2513870599 .fill-AB4{fill:#45475A;} - .d2-2513870599 .fill-AB5{fill:#313244;} - .d2-2513870599 .stroke-N1{stroke:#CDD6F4;} - .d2-2513870599 .stroke-N2{stroke:#BAC2DE;} - .d2-2513870599 .stroke-N3{stroke:#A6ADC8;} - .d2-2513870599 .stroke-N4{stroke:#585B70;} - .d2-2513870599 .stroke-N5{stroke:#45475A;} - .d2-2513870599 .stroke-N6{stroke:#313244;} - .d2-2513870599 .stroke-N7{stroke:#1E1E2E;} - .d2-2513870599 .stroke-B1{stroke:#CBA6f7;} - .d2-2513870599 .stroke-B2{stroke:#CBA6f7;} - .d2-2513870599 .stroke-B3{stroke:#6C7086;} - .d2-2513870599 .stroke-B4{stroke:#585B70;} - .d2-2513870599 .stroke-B5{stroke:#45475A;} - .d2-2513870599 .stroke-B6{stroke:#313244;} - .d2-2513870599 .stroke-AA2{stroke:#f38BA8;} - .d2-2513870599 .stroke-AA4{stroke:#45475A;} - .d2-2513870599 .stroke-AA5{stroke:#313244;} - .d2-2513870599 .stroke-AB4{stroke:#45475A;} - .d2-2513870599 .stroke-AB5{stroke:#313244;} - .d2-2513870599 .background-color-N1{background-color:#CDD6F4;} - .d2-2513870599 .background-color-N2{background-color:#BAC2DE;} - .d2-2513870599 .background-color-N3{background-color:#A6ADC8;} - .d2-2513870599 .background-color-N4{background-color:#585B70;} - .d2-2513870599 .background-color-N5{background-color:#45475A;} - .d2-2513870599 .background-color-N6{background-color:#313244;} - .d2-2513870599 .background-color-N7{background-color:#1E1E2E;} - .d2-2513870599 .background-color-B1{background-color:#CBA6f7;} - .d2-2513870599 .background-color-B2{background-color:#CBA6f7;} - .d2-2513870599 .background-color-B3{background-color:#6C7086;} - .d2-2513870599 .background-color-B4{background-color:#585B70;} - .d2-2513870599 .background-color-B5{background-color:#45475A;} - .d2-2513870599 .background-color-B6{background-color:#313244;} - .d2-2513870599 .background-color-AA2{background-color:#f38BA8;} - .d2-2513870599 .background-color-AA4{background-color:#45475A;} - .d2-2513870599 .background-color-AA5{background-color:#313244;} - .d2-2513870599 .background-color-AB4{background-color:#45475A;} - .d2-2513870599 .background-color-AB5{background-color:#313244;} - .d2-2513870599 .color-N1{color:#CDD6F4;} - .d2-2513870599 .color-N2{color:#BAC2DE;} - .d2-2513870599 .color-N3{color:#A6ADC8;} - .d2-2513870599 .color-N4{color:#585B70;} - .d2-2513870599 .color-N5{color:#45475A;} - .d2-2513870599 .color-N6{color:#313244;} - .d2-2513870599 .color-N7{color:#1E1E2E;} - .d2-2513870599 .color-B1{color:#CBA6f7;} - .d2-2513870599 .color-B2{color:#CBA6f7;} - .d2-2513870599 .color-B3{color:#6C7086;} - .d2-2513870599 .color-B4{color:#585B70;} - .d2-2513870599 .color-B5{color:#45475A;} - .d2-2513870599 .color-B6{color:#313244;} - .d2-2513870599 .color-AA2{color:#f38BA8;} - .d2-2513870599 .color-AA4{color:#45475A;} - .d2-2513870599 .color-AA5{color:#313244;} - .d2-2513870599 .color-AB4{color:#45475A;} - .d2-2513870599 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]>rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud -======= .d2-1948124657 .fill-N1{fill:#CDD6F4;} .d2-1948124657 .fill-N2{fill:#BAC2DE;} .d2-1948124657 .fill-N3{fill:#A6ADC8;} @@ -258,8 +89,7 @@ .d2-1948124657 .color-AA4{color:#45475A;} .d2-1948124657 .color-AA5{color:#313244;} .d2-1948124657 .color-AB4{color:#45475A;} - .d2-1948124657 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]>rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-1948124657 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]>rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud diff --git a/d2renderers/d2svg/dark_theme/testdata/animated/dark_theme.exp.svg b/d2renderers/d2svg/dark_theme/testdata/animated/dark_theme.exp.svg index 0afd0a9ea..89829862a 100644 --- a/d2renderers/d2svg/dark_theme/testdata/animated/dark_theme.exp.svg +++ b/d2renderers/d2svg/dark_theme/testdata/animated/dark_theme.exp.svg @@ -1,26 +1,4 @@ -<<<<<<< HEAD -<<<<<<< HEAD -wintersummertreessnowsun -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-2916329547 .fill-N1{fill:#CDD6F4;} - .d2-2916329547 .fill-N2{fill:#BAC2DE;} - .d2-2916329547 .fill-N3{fill:#A6ADC8;} - .d2-2916329547 .fill-N4{fill:#585B70;} - .d2-2916329547 .fill-N5{fill:#45475A;} - .d2-2916329547 .fill-N6{fill:#313244;} - .d2-2916329547 .fill-N7{fill:#1E1E2E;} - .d2-2916329547 .fill-B1{fill:#CBA6f7;} - .d2-2916329547 .fill-B2{fill:#CBA6f7;} - .d2-2916329547 .fill-B3{fill:#6C7086;} - .d2-2916329547 .fill-B4{fill:#585B70;} - .d2-2916329547 .fill-B5{fill:#45475A;} - .d2-2916329547 .fill-B6{fill:#313244;} - .d2-2916329547 .fill-AA2{fill:#f38BA8;} - .d2-2916329547 .fill-AA4{fill:#45475A;} - .d2-2916329547 .fill-AA5{fill:#313244;} - .d2-2916329547 .fill-AB4{fill:#45475A;} - .d2-2916329547 .fill-AB5{fill:#313244;} - .d2-2916329547 .stroke-N1{stroke:#CDD6F4;} - .d2-2916329547 .stroke-N2{stroke:#BAC2DE;} - .d2-2916329547 .stroke-N3{stroke:#A6ADC8;} - .d2-2916329547 .stroke-N4{stroke:#585B70;} - .d2-2916329547 .stroke-N5{stroke:#45475A;} - .d2-2916329547 .stroke-N6{stroke:#313244;} - .d2-2916329547 .stroke-N7{stroke:#1E1E2E;} - .d2-2916329547 .stroke-B1{stroke:#CBA6f7;} - .d2-2916329547 .stroke-B2{stroke:#CBA6f7;} - .d2-2916329547 .stroke-B3{stroke:#6C7086;} - .d2-2916329547 .stroke-B4{stroke:#585B70;} - .d2-2916329547 .stroke-B5{stroke:#45475A;} - .d2-2916329547 .stroke-B6{stroke:#313244;} - .d2-2916329547 .stroke-AA2{stroke:#f38BA8;} - .d2-2916329547 .stroke-AA4{stroke:#45475A;} - .d2-2916329547 .stroke-AA5{stroke:#313244;} - .d2-2916329547 .stroke-AB4{stroke:#45475A;} - .d2-2916329547 .stroke-AB5{stroke:#313244;} - .d2-2916329547 .background-color-N1{background-color:#CDD6F4;} - .d2-2916329547 .background-color-N2{background-color:#BAC2DE;} - .d2-2916329547 .background-color-N3{background-color:#A6ADC8;} - .d2-2916329547 .background-color-N4{background-color:#585B70;} - .d2-2916329547 .background-color-N5{background-color:#45475A;} - .d2-2916329547 .background-color-N6{background-color:#313244;} - .d2-2916329547 .background-color-N7{background-color:#1E1E2E;} - .d2-2916329547 .background-color-B1{background-color:#CBA6f7;} - .d2-2916329547 .background-color-B2{background-color:#CBA6f7;} - .d2-2916329547 .background-color-B3{background-color:#6C7086;} - .d2-2916329547 .background-color-B4{background-color:#585B70;} - .d2-2916329547 .background-color-B5{background-color:#45475A;} - .d2-2916329547 .background-color-B6{background-color:#313244;} - .d2-2916329547 .background-color-AA2{background-color:#f38BA8;} - .d2-2916329547 .background-color-AA4{background-color:#45475A;} - .d2-2916329547 .background-color-AA5{background-color:#313244;} - .d2-2916329547 .background-color-AB4{background-color:#45475A;} - .d2-2916329547 .background-color-AB5{background-color:#313244;} - .d2-2916329547 .color-N1{color:#CDD6F4;} - .d2-2916329547 .color-N2{color:#BAC2DE;} - .d2-2916329547 .color-N3{color:#A6ADC8;} - .d2-2916329547 .color-N4{color:#585B70;} - .d2-2916329547 .color-N5{color:#45475A;} - .d2-2916329547 .color-N6{color:#313244;} - .d2-2916329547 .color-N7{color:#1E1E2E;} - .d2-2916329547 .color-B1{color:#CBA6f7;} - .d2-2916329547 .color-B2{color:#CBA6f7;} - .d2-2916329547 .color-B3{color:#6C7086;} - .d2-2916329547 .color-B4{color:#585B70;} - .d2-2916329547 .color-B5{color:#45475A;} - .d2-2916329547 .color-B6{color:#313244;} - .d2-2916329547 .color-AA2{color:#f38BA8;} - .d2-2916329547 .color-AA4{color:#45475A;} - .d2-2916329547 .color-AA5{color:#313244;} - .d2-2916329547 .color-AB4{color:#45475A;} - .d2-2916329547 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]>wintersummertreessnowsun -======= .d2-1579070777 .fill-N1{fill:#CDD6F4;} .d2-1579070777 .fill-N2{fill:#BAC2DE;} .d2-1579070777 .fill-N3{fill:#A6ADC8;} @@ -271,8 +102,7 @@ .d2-1579070777 .color-AA4{color:#45475A;} .d2-1579070777 .color-AA5{color:#313244;} .d2-1579070777 .color-AB4{color:#45475A;} - .d2-1579070777 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]>wintersummertreessnowsun ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-1579070777 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]>wintersummertreessnowsun diff --git a/d2renderers/d2svg/dark_theme/testdata/arrowheads/dark_theme.exp.svg b/d2renderers/d2svg/dark_theme/testdata/arrowheads/dark_theme.exp.svg index 094ff8fc2..11fe35694 100644 --- a/d2renderers/d2svg/dark_theme/testdata/arrowheads/dark_theme.exp.svg +++ b/d2renderers/d2svg/dark_theme/testdata/arrowheads/dark_theme.exp.svg @@ -1,26 +1,4 @@ -<<<<<<< HEAD -<<<<<<< HEAD -112233445566778899none arrow triangle diamond diamond filled cf-many cf-many-required cf-one cf-one-required -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-3148583989 .fill-N1{fill:#CDD6F4;} - .d2-3148583989 .fill-N2{fill:#BAC2DE;} - .d2-3148583989 .fill-N3{fill:#A6ADC8;} - .d2-3148583989 .fill-N4{fill:#585B70;} - .d2-3148583989 .fill-N5{fill:#45475A;} - .d2-3148583989 .fill-N6{fill:#313244;} - .d2-3148583989 .fill-N7{fill:#1E1E2E;} - .d2-3148583989 .fill-B1{fill:#CBA6f7;} - .d2-3148583989 .fill-B2{fill:#CBA6f7;} - .d2-3148583989 .fill-B3{fill:#6C7086;} - .d2-3148583989 .fill-B4{fill:#585B70;} - .d2-3148583989 .fill-B5{fill:#45475A;} - .d2-3148583989 .fill-B6{fill:#313244;} - .d2-3148583989 .fill-AA2{fill:#f38BA8;} - .d2-3148583989 .fill-AA4{fill:#45475A;} - .d2-3148583989 .fill-AA5{fill:#313244;} - .d2-3148583989 .fill-AB4{fill:#45475A;} - .d2-3148583989 .fill-AB5{fill:#313244;} - .d2-3148583989 .stroke-N1{stroke:#CDD6F4;} - .d2-3148583989 .stroke-N2{stroke:#BAC2DE;} - .d2-3148583989 .stroke-N3{stroke:#A6ADC8;} - .d2-3148583989 .stroke-N4{stroke:#585B70;} - .d2-3148583989 .stroke-N5{stroke:#45475A;} - .d2-3148583989 .stroke-N6{stroke:#313244;} - .d2-3148583989 .stroke-N7{stroke:#1E1E2E;} - .d2-3148583989 .stroke-B1{stroke:#CBA6f7;} - .d2-3148583989 .stroke-B2{stroke:#CBA6f7;} - .d2-3148583989 .stroke-B3{stroke:#6C7086;} - .d2-3148583989 .stroke-B4{stroke:#585B70;} - .d2-3148583989 .stroke-B5{stroke:#45475A;} - .d2-3148583989 .stroke-B6{stroke:#313244;} - .d2-3148583989 .stroke-AA2{stroke:#f38BA8;} - .d2-3148583989 .stroke-AA4{stroke:#45475A;} - .d2-3148583989 .stroke-AA5{stroke:#313244;} - .d2-3148583989 .stroke-AB4{stroke:#45475A;} - .d2-3148583989 .stroke-AB5{stroke:#313244;} - .d2-3148583989 .background-color-N1{background-color:#CDD6F4;} - .d2-3148583989 .background-color-N2{background-color:#BAC2DE;} - .d2-3148583989 .background-color-N3{background-color:#A6ADC8;} - .d2-3148583989 .background-color-N4{background-color:#585B70;} - .d2-3148583989 .background-color-N5{background-color:#45475A;} - .d2-3148583989 .background-color-N6{background-color:#313244;} - .d2-3148583989 .background-color-N7{background-color:#1E1E2E;} - .d2-3148583989 .background-color-B1{background-color:#CBA6f7;} - .d2-3148583989 .background-color-B2{background-color:#CBA6f7;} - .d2-3148583989 .background-color-B3{background-color:#6C7086;} - .d2-3148583989 .background-color-B4{background-color:#585B70;} - .d2-3148583989 .background-color-B5{background-color:#45475A;} - .d2-3148583989 .background-color-B6{background-color:#313244;} - .d2-3148583989 .background-color-AA2{background-color:#f38BA8;} - .d2-3148583989 .background-color-AA4{background-color:#45475A;} - .d2-3148583989 .background-color-AA5{background-color:#313244;} - .d2-3148583989 .background-color-AB4{background-color:#45475A;} - .d2-3148583989 .background-color-AB5{background-color:#313244;} - .d2-3148583989 .color-N1{color:#CDD6F4;} - .d2-3148583989 .color-N2{color:#BAC2DE;} - .d2-3148583989 .color-N3{color:#A6ADC8;} - .d2-3148583989 .color-N4{color:#585B70;} - .d2-3148583989 .color-N5{color:#45475A;} - .d2-3148583989 .color-N6{color:#313244;} - .d2-3148583989 .color-N7{color:#1E1E2E;} - .d2-3148583989 .color-B1{color:#CBA6f7;} - .d2-3148583989 .color-B2{color:#CBA6f7;} - .d2-3148583989 .color-B3{color:#6C7086;} - .d2-3148583989 .color-B4{color:#585B70;} - .d2-3148583989 .color-B5{color:#45475A;} - .d2-3148583989 .color-B6{color:#313244;} - .d2-3148583989 .color-AA2{color:#f38BA8;} - .d2-3148583989 .color-AA4{color:#45475A;} - .d2-3148583989 .color-AA5{color:#313244;} - .d2-3148583989 .color-AB4{color:#45475A;} - .d2-3148583989 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]>112233445566778899none arrow triangle diamond diamond filled cf-many cf-many-required cf-one cf-one-required -======= .d2-2630768955 .fill-N1{fill:#CDD6F4;} .d2-2630768955 .fill-N2{fill:#BAC2DE;} .d2-2630768955 .fill-N3{fill:#A6ADC8;} @@ -265,8 +96,7 @@ .d2-2630768955 .color-AA4{color:#45475A;} .d2-2630768955 .color-AA5{color:#313244;} .d2-2630768955 .color-AB4{color:#45475A;} - .d2-2630768955 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]>112233445566778899none arrow triangle diamond diamond filled cf-many cf-many-required cf-one cf-one-required ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-2630768955 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]>112233445566778899none arrow triangle diamond diamond filled cf-many cf-many-required cf-one cf-one-required diff --git a/d2renderers/d2svg/dark_theme/testdata/basic/dark_theme.exp.svg b/d2renderers/d2svg/dark_theme/testdata/basic/dark_theme.exp.svg index 6b40cdb8f..bb800f8cc 100644 --- a/d2renderers/d2svg/dark_theme/testdata/basic/dark_theme.exp.svg +++ b/d2renderers/d2svg/dark_theme/testdata/basic/dark_theme.exp.svg @@ -1,26 +1,4 @@ -<<<<<<< HEAD -<<<<<<< HEAD -ab -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-327680947 .fill-N1{fill:#CDD6F4;} - .d2-327680947 .fill-N2{fill:#BAC2DE;} - .d2-327680947 .fill-N3{fill:#A6ADC8;} - .d2-327680947 .fill-N4{fill:#585B70;} - .d2-327680947 .fill-N5{fill:#45475A;} - .d2-327680947 .fill-N6{fill:#313244;} - .d2-327680947 .fill-N7{fill:#1E1E2E;} - .d2-327680947 .fill-B1{fill:#CBA6f7;} - .d2-327680947 .fill-B2{fill:#CBA6f7;} - .d2-327680947 .fill-B3{fill:#6C7086;} - .d2-327680947 .fill-B4{fill:#585B70;} - .d2-327680947 .fill-B5{fill:#45475A;} - .d2-327680947 .fill-B6{fill:#313244;} - .d2-327680947 .fill-AA2{fill:#f38BA8;} - .d2-327680947 .fill-AA4{fill:#45475A;} - .d2-327680947 .fill-AA5{fill:#313244;} - .d2-327680947 .fill-AB4{fill:#45475A;} - .d2-327680947 .fill-AB5{fill:#313244;} - .d2-327680947 .stroke-N1{stroke:#CDD6F4;} - .d2-327680947 .stroke-N2{stroke:#BAC2DE;} - .d2-327680947 .stroke-N3{stroke:#A6ADC8;} - .d2-327680947 .stroke-N4{stroke:#585B70;} - .d2-327680947 .stroke-N5{stroke:#45475A;} - .d2-327680947 .stroke-N6{stroke:#313244;} - .d2-327680947 .stroke-N7{stroke:#1E1E2E;} - .d2-327680947 .stroke-B1{stroke:#CBA6f7;} - .d2-327680947 .stroke-B2{stroke:#CBA6f7;} - .d2-327680947 .stroke-B3{stroke:#6C7086;} - .d2-327680947 .stroke-B4{stroke:#585B70;} - .d2-327680947 .stroke-B5{stroke:#45475A;} - .d2-327680947 .stroke-B6{stroke:#313244;} - .d2-327680947 .stroke-AA2{stroke:#f38BA8;} - .d2-327680947 .stroke-AA4{stroke:#45475A;} - .d2-327680947 .stroke-AA5{stroke:#313244;} - .d2-327680947 .stroke-AB4{stroke:#45475A;} - .d2-327680947 .stroke-AB5{stroke:#313244;} - .d2-327680947 .background-color-N1{background-color:#CDD6F4;} - .d2-327680947 .background-color-N2{background-color:#BAC2DE;} - .d2-327680947 .background-color-N3{background-color:#A6ADC8;} - .d2-327680947 .background-color-N4{background-color:#585B70;} - .d2-327680947 .background-color-N5{background-color:#45475A;} - .d2-327680947 .background-color-N6{background-color:#313244;} - .d2-327680947 .background-color-N7{background-color:#1E1E2E;} - .d2-327680947 .background-color-B1{background-color:#CBA6f7;} - .d2-327680947 .background-color-B2{background-color:#CBA6f7;} - .d2-327680947 .background-color-B3{background-color:#6C7086;} - .d2-327680947 .background-color-B4{background-color:#585B70;} - .d2-327680947 .background-color-B5{background-color:#45475A;} - .d2-327680947 .background-color-B6{background-color:#313244;} - .d2-327680947 .background-color-AA2{background-color:#f38BA8;} - .d2-327680947 .background-color-AA4{background-color:#45475A;} - .d2-327680947 .background-color-AA5{background-color:#313244;} - .d2-327680947 .background-color-AB4{background-color:#45475A;} - .d2-327680947 .background-color-AB5{background-color:#313244;} - .d2-327680947 .color-N1{color:#CDD6F4;} - .d2-327680947 .color-N2{color:#BAC2DE;} - .d2-327680947 .color-N3{color:#A6ADC8;} - .d2-327680947 .color-N4{color:#585B70;} - .d2-327680947 .color-N5{color:#45475A;} - .d2-327680947 .color-N6{color:#313244;} - .d2-327680947 .color-N7{color:#1E1E2E;} - .d2-327680947 .color-B1{color:#CBA6f7;} - .d2-327680947 .color-B2{color:#CBA6f7;} - .d2-327680947 .color-B3{color:#6C7086;} - .d2-327680947 .color-B4{color:#585B70;} - .d2-327680947 .color-B5{color:#45475A;} - .d2-327680947 .color-B6{color:#313244;} - .d2-327680947 .color-AA2{color:#f38BA8;} - .d2-327680947 .color-AA4{color:#45475A;} - .d2-327680947 .color-AA5{color:#313244;} - .d2-327680947 .color-AB4{color:#45475A;} - .d2-327680947 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]>ab -======= .d2-3451263933 .fill-N1{fill:#CDD6F4;} .d2-3451263933 .fill-N2{fill:#BAC2DE;} .d2-3451263933 .fill-N3{fill:#A6ADC8;} @@ -258,8 +89,7 @@ .d2-3451263933 .color-AA4{color:#45475A;} .d2-3451263933 .color-AA5{color:#313244;} .d2-3451263933 .color-AB4{color:#45475A;} - .d2-3451263933 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]>ab ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-3451263933 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]>ab diff --git a/d2renderers/d2svg/dark_theme/testdata/child_to_child/dark_theme.exp.svg b/d2renderers/d2svg/dark_theme/testdata/child_to_child/dark_theme.exp.svg index 1ee0fb82f..870762732 100644 --- a/d2renderers/d2svg/dark_theme/testdata/child_to_child/dark_theme.exp.svg +++ b/d2renderers/d2svg/dark_theme/testdata/child_to_child/dark_theme.exp.svg @@ -1,26 +1,4 @@ -<<<<<<< HEAD -<<<<<<< HEAD -wintersummersnowsun -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-914436609 .fill-N1{fill:#CDD6F4;} - .d2-914436609 .fill-N2{fill:#BAC2DE;} - .d2-914436609 .fill-N3{fill:#A6ADC8;} - .d2-914436609 .fill-N4{fill:#585B70;} - .d2-914436609 .fill-N5{fill:#45475A;} - .d2-914436609 .fill-N6{fill:#313244;} - .d2-914436609 .fill-N7{fill:#1E1E2E;} - .d2-914436609 .fill-B1{fill:#CBA6f7;} - .d2-914436609 .fill-B2{fill:#CBA6f7;} - .d2-914436609 .fill-B3{fill:#6C7086;} - .d2-914436609 .fill-B4{fill:#585B70;} - .d2-914436609 .fill-B5{fill:#45475A;} - .d2-914436609 .fill-B6{fill:#313244;} - .d2-914436609 .fill-AA2{fill:#f38BA8;} - .d2-914436609 .fill-AA4{fill:#45475A;} - .d2-914436609 .fill-AA5{fill:#313244;} - .d2-914436609 .fill-AB4{fill:#45475A;} - .d2-914436609 .fill-AB5{fill:#313244;} - .d2-914436609 .stroke-N1{stroke:#CDD6F4;} - .d2-914436609 .stroke-N2{stroke:#BAC2DE;} - .d2-914436609 .stroke-N3{stroke:#A6ADC8;} - .d2-914436609 .stroke-N4{stroke:#585B70;} - .d2-914436609 .stroke-N5{stroke:#45475A;} - .d2-914436609 .stroke-N6{stroke:#313244;} - .d2-914436609 .stroke-N7{stroke:#1E1E2E;} - .d2-914436609 .stroke-B1{stroke:#CBA6f7;} - .d2-914436609 .stroke-B2{stroke:#CBA6f7;} - .d2-914436609 .stroke-B3{stroke:#6C7086;} - .d2-914436609 .stroke-B4{stroke:#585B70;} - .d2-914436609 .stroke-B5{stroke:#45475A;} - .d2-914436609 .stroke-B6{stroke:#313244;} - .d2-914436609 .stroke-AA2{stroke:#f38BA8;} - .d2-914436609 .stroke-AA4{stroke:#45475A;} - .d2-914436609 .stroke-AA5{stroke:#313244;} - .d2-914436609 .stroke-AB4{stroke:#45475A;} - .d2-914436609 .stroke-AB5{stroke:#313244;} - .d2-914436609 .background-color-N1{background-color:#CDD6F4;} - .d2-914436609 .background-color-N2{background-color:#BAC2DE;} - .d2-914436609 .background-color-N3{background-color:#A6ADC8;} - .d2-914436609 .background-color-N4{background-color:#585B70;} - .d2-914436609 .background-color-N5{background-color:#45475A;} - .d2-914436609 .background-color-N6{background-color:#313244;} - .d2-914436609 .background-color-N7{background-color:#1E1E2E;} - .d2-914436609 .background-color-B1{background-color:#CBA6f7;} - .d2-914436609 .background-color-B2{background-color:#CBA6f7;} - .d2-914436609 .background-color-B3{background-color:#6C7086;} - .d2-914436609 .background-color-B4{background-color:#585B70;} - .d2-914436609 .background-color-B5{background-color:#45475A;} - .d2-914436609 .background-color-B6{background-color:#313244;} - .d2-914436609 .background-color-AA2{background-color:#f38BA8;} - .d2-914436609 .background-color-AA4{background-color:#45475A;} - .d2-914436609 .background-color-AA5{background-color:#313244;} - .d2-914436609 .background-color-AB4{background-color:#45475A;} - .d2-914436609 .background-color-AB5{background-color:#313244;} - .d2-914436609 .color-N1{color:#CDD6F4;} - .d2-914436609 .color-N2{color:#BAC2DE;} - .d2-914436609 .color-N3{color:#A6ADC8;} - .d2-914436609 .color-N4{color:#585B70;} - .d2-914436609 .color-N5{color:#45475A;} - .d2-914436609 .color-N6{color:#313244;} - .d2-914436609 .color-N7{color:#1E1E2E;} - .d2-914436609 .color-B1{color:#CBA6f7;} - .d2-914436609 .color-B2{color:#CBA6f7;} - .d2-914436609 .color-B3{color:#6C7086;} - .d2-914436609 .color-B4{color:#585B70;} - .d2-914436609 .color-B5{color:#45475A;} - .d2-914436609 .color-B6{color:#313244;} - .d2-914436609 .color-AA2{color:#f38BA8;} - .d2-914436609 .color-AA4{color:#45475A;} - .d2-914436609 .color-AA5{color:#313244;} - .d2-914436609 .color-AB4{color:#45475A;} - .d2-914436609 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]>wintersummersnowsun -======= .d2-1306478287 .fill-N1{fill:#CDD6F4;} .d2-1306478287 .fill-N2{fill:#BAC2DE;} .d2-1306478287 .fill-N3{fill:#A6ADC8;} @@ -265,8 +96,7 @@ .d2-1306478287 .color-AA4{color:#45475A;} .d2-1306478287 .color-AA5{color:#313244;} .d2-1306478287 .color-AB4{color:#45475A;} - .d2-1306478287 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]>wintersummersnowsun ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-1306478287 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]>wintersummersnowsun diff --git a/d2renderers/d2svg/dark_theme/testdata/code/dark_theme.exp.svg b/d2renderers/d2svg/dark_theme/testdata/code/dark_theme.exp.svg index 2d951f687..f813fbe82 100644 --- a/d2renderers/d2svg/dark_theme/testdata/code/dark_theme.exp.svg +++ b/d2renderers/d2svg/dark_theme/testdata/code/dark_theme.exp.svg @@ -1,26 +1,4 @@ -<<<<<<< HEAD -<<<<<<< HEAD -ab hello -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-2029734873 .fill-N1{fill:#CDD6F4;} - .d2-2029734873 .fill-N2{fill:#BAC2DE;} - .d2-2029734873 .fill-N3{fill:#A6ADC8;} - .d2-2029734873 .fill-N4{fill:#585B70;} - .d2-2029734873 .fill-N5{fill:#45475A;} - .d2-2029734873 .fill-N6{fill:#313244;} - .d2-2029734873 .fill-N7{fill:#1E1E2E;} - .d2-2029734873 .fill-B1{fill:#CBA6f7;} - .d2-2029734873 .fill-B2{fill:#CBA6f7;} - .d2-2029734873 .fill-B3{fill:#6C7086;} - .d2-2029734873 .fill-B4{fill:#585B70;} - .d2-2029734873 .fill-B5{fill:#45475A;} - .d2-2029734873 .fill-B6{fill:#313244;} - .d2-2029734873 .fill-AA2{fill:#f38BA8;} - .d2-2029734873 .fill-AA4{fill:#45475A;} - .d2-2029734873 .fill-AA5{fill:#313244;} - .d2-2029734873 .fill-AB4{fill:#45475A;} - .d2-2029734873 .fill-AB5{fill:#313244;} - .d2-2029734873 .stroke-N1{stroke:#CDD6F4;} - .d2-2029734873 .stroke-N2{stroke:#BAC2DE;} - .d2-2029734873 .stroke-N3{stroke:#A6ADC8;} - .d2-2029734873 .stroke-N4{stroke:#585B70;} - .d2-2029734873 .stroke-N5{stroke:#45475A;} - .d2-2029734873 .stroke-N6{stroke:#313244;} - .d2-2029734873 .stroke-N7{stroke:#1E1E2E;} - .d2-2029734873 .stroke-B1{stroke:#CBA6f7;} - .d2-2029734873 .stroke-B2{stroke:#CBA6f7;} - .d2-2029734873 .stroke-B3{stroke:#6C7086;} - .d2-2029734873 .stroke-B4{stroke:#585B70;} - .d2-2029734873 .stroke-B5{stroke:#45475A;} - .d2-2029734873 .stroke-B6{stroke:#313244;} - .d2-2029734873 .stroke-AA2{stroke:#f38BA8;} - .d2-2029734873 .stroke-AA4{stroke:#45475A;} - .d2-2029734873 .stroke-AA5{stroke:#313244;} - .d2-2029734873 .stroke-AB4{stroke:#45475A;} - .d2-2029734873 .stroke-AB5{stroke:#313244;} - .d2-2029734873 .background-color-N1{background-color:#CDD6F4;} - .d2-2029734873 .background-color-N2{background-color:#BAC2DE;} - .d2-2029734873 .background-color-N3{background-color:#A6ADC8;} - .d2-2029734873 .background-color-N4{background-color:#585B70;} - .d2-2029734873 .background-color-N5{background-color:#45475A;} - .d2-2029734873 .background-color-N6{background-color:#313244;} - .d2-2029734873 .background-color-N7{background-color:#1E1E2E;} - .d2-2029734873 .background-color-B1{background-color:#CBA6f7;} - .d2-2029734873 .background-color-B2{background-color:#CBA6f7;} - .d2-2029734873 .background-color-B3{background-color:#6C7086;} - .d2-2029734873 .background-color-B4{background-color:#585B70;} - .d2-2029734873 .background-color-B5{background-color:#45475A;} - .d2-2029734873 .background-color-B6{background-color:#313244;} - .d2-2029734873 .background-color-AA2{background-color:#f38BA8;} - .d2-2029734873 .background-color-AA4{background-color:#45475A;} - .d2-2029734873 .background-color-AA5{background-color:#313244;} - .d2-2029734873 .background-color-AB4{background-color:#45475A;} - .d2-2029734873 .background-color-AB5{background-color:#313244;} - .d2-2029734873 .color-N1{color:#CDD6F4;} - .d2-2029734873 .color-N2{color:#BAC2DE;} - .d2-2029734873 .color-N3{color:#A6ADC8;} - .d2-2029734873 .color-N4{color:#585B70;} - .d2-2029734873 .color-N5{color:#45475A;} - .d2-2029734873 .color-N6{color:#313244;} - .d2-2029734873 .color-N7{color:#1E1E2E;} - .d2-2029734873 .color-B1{color:#CBA6f7;} - .d2-2029734873 .color-B2{color:#CBA6f7;} - .d2-2029734873 .color-B3{color:#6C7086;} - .d2-2029734873 .color-B4{color:#585B70;} - .d2-2029734873 .color-B5{color:#45475A;} - .d2-2029734873 .color-B6{color:#313244;} - .d2-2029734873 .color-AA2{color:#f38BA8;} - .d2-2029734873 .color-AA4{color:#45475A;} - .d2-2029734873 .color-AA5{color:#313244;} - .d2-2029734873 .color-AB4{color:#45475A;} - .d2-2029734873 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]>ab hello -======= .d2-1929145507 .fill-N1{fill:#CDD6F4;} .d2-1929145507 .fill-N2{fill:#BAC2DE;} .d2-1929145507 .fill-N3{fill:#A6ADC8;} @@ -265,8 +96,7 @@ .d2-1929145507 .color-AA4{color:#45475A;} .d2-1929145507 .color-AA5{color:#313244;} .d2-1929145507 .color-AB4{color:#45475A;} - .d2-1929145507 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]>ab hello ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-1929145507 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]>ab hello diff --git a/d2renderers/d2svg/dark_theme/testdata/opacity/dark_theme.exp.svg b/d2renderers/d2svg/dark_theme/testdata/opacity/dark_theme.exp.svg index 40c4dd641..be555f7e7 100644 --- a/d2renderers/d2svg/dark_theme/testdata/opacity/dark_theme.exp.svg +++ b/d2renderers/d2svg/dark_theme/testdata/opacity/dark_theme.exp.svg @@ -1,26 +1,4 @@ -<<<<<<< HEAD -<<<<<<< HEAD -usersidintnamestringemailstringpasswordstringlast_logindatetimeproductsidintpricedecimalskustringnamestringordersidintuser_idintproduct_idintshipmentsidintorder_idinttracking_numberstringPKstatusstring -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-2504113906 .fill-N1{fill:#CDD6F4;} - .d2-2504113906 .fill-N2{fill:#BAC2DE;} - .d2-2504113906 .fill-N3{fill:#A6ADC8;} - .d2-2504113906 .fill-N4{fill:#585B70;} - .d2-2504113906 .fill-N5{fill:#45475A;} - .d2-2504113906 .fill-N6{fill:#313244;} - .d2-2504113906 .fill-N7{fill:#1E1E2E;} - .d2-2504113906 .fill-B1{fill:#CBA6f7;} - .d2-2504113906 .fill-B2{fill:#CBA6f7;} - .d2-2504113906 .fill-B3{fill:#6C7086;} - .d2-2504113906 .fill-B4{fill:#585B70;} - .d2-2504113906 .fill-B5{fill:#45475A;} - .d2-2504113906 .fill-B6{fill:#313244;} - .d2-2504113906 .fill-AA2{fill:#f38BA8;} - .d2-2504113906 .fill-AA4{fill:#45475A;} - .d2-2504113906 .fill-AA5{fill:#313244;} - .d2-2504113906 .fill-AB4{fill:#45475A;} - .d2-2504113906 .fill-AB5{fill:#313244;} - .d2-2504113906 .stroke-N1{stroke:#CDD6F4;} - .d2-2504113906 .stroke-N2{stroke:#BAC2DE;} - .d2-2504113906 .stroke-N3{stroke:#A6ADC8;} - .d2-2504113906 .stroke-N4{stroke:#585B70;} - .d2-2504113906 .stroke-N5{stroke:#45475A;} - .d2-2504113906 .stroke-N6{stroke:#313244;} - .d2-2504113906 .stroke-N7{stroke:#1E1E2E;} - .d2-2504113906 .stroke-B1{stroke:#CBA6f7;} - .d2-2504113906 .stroke-B2{stroke:#CBA6f7;} - .d2-2504113906 .stroke-B3{stroke:#6C7086;} - .d2-2504113906 .stroke-B4{stroke:#585B70;} - .d2-2504113906 .stroke-B5{stroke:#45475A;} - .d2-2504113906 .stroke-B6{stroke:#313244;} - .d2-2504113906 .stroke-AA2{stroke:#f38BA8;} - .d2-2504113906 .stroke-AA4{stroke:#45475A;} - .d2-2504113906 .stroke-AA5{stroke:#313244;} - .d2-2504113906 .stroke-AB4{stroke:#45475A;} - .d2-2504113906 .stroke-AB5{stroke:#313244;} - .d2-2504113906 .background-color-N1{background-color:#CDD6F4;} - .d2-2504113906 .background-color-N2{background-color:#BAC2DE;} - .d2-2504113906 .background-color-N3{background-color:#A6ADC8;} - .d2-2504113906 .background-color-N4{background-color:#585B70;} - .d2-2504113906 .background-color-N5{background-color:#45475A;} - .d2-2504113906 .background-color-N6{background-color:#313244;} - .d2-2504113906 .background-color-N7{background-color:#1E1E2E;} - .d2-2504113906 .background-color-B1{background-color:#CBA6f7;} - .d2-2504113906 .background-color-B2{background-color:#CBA6f7;} - .d2-2504113906 .background-color-B3{background-color:#6C7086;} - .d2-2504113906 .background-color-B4{background-color:#585B70;} - .d2-2504113906 .background-color-B5{background-color:#45475A;} - .d2-2504113906 .background-color-B6{background-color:#313244;} - .d2-2504113906 .background-color-AA2{background-color:#f38BA8;} - .d2-2504113906 .background-color-AA4{background-color:#45475A;} - .d2-2504113906 .background-color-AA5{background-color:#313244;} - .d2-2504113906 .background-color-AB4{background-color:#45475A;} - .d2-2504113906 .background-color-AB5{background-color:#313244;} - .d2-2504113906 .color-N1{color:#CDD6F4;} - .d2-2504113906 .color-N2{color:#BAC2DE;} - .d2-2504113906 .color-N3{color:#A6ADC8;} - .d2-2504113906 .color-N4{color:#585B70;} - .d2-2504113906 .color-N5{color:#45475A;} - .d2-2504113906 .color-N6{color:#313244;} - .d2-2504113906 .color-N7{color:#1E1E2E;} - .d2-2504113906 .color-B1{color:#CBA6f7;} - .d2-2504113906 .color-B2{color:#CBA6f7;} - .d2-2504113906 .color-B3{color:#6C7086;} - .d2-2504113906 .color-B4{color:#585B70;} - .d2-2504113906 .color-B5{color:#45475A;} - .d2-2504113906 .color-B6{color:#313244;} - .d2-2504113906 .color-AA2{color:#f38BA8;} - .d2-2504113906 .color-AA4{color:#45475A;} - .d2-2504113906 .color-AA5{color:#313244;} - .d2-2504113906 .color-AB4{color:#45475A;} - .d2-2504113906 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]>usersidintnamestringemailstringpasswordstringlast_logindatetimeproductsidintpricedecimalskustringnamestringordersidintuser_idintproduct_idintshipmentsidintorder_idinttracking_numberstringPKstatusstring -======= .d2-3175421624 .fill-N1{fill:#CDD6F4;} .d2-3175421624 .fill-N2{fill:#BAC2DE;} .d2-3175421624 .fill-N3{fill:#A6ADC8;} @@ -258,8 +89,7 @@ .d2-3175421624 .color-AA4{color:#45475A;} .d2-3175421624 .color-AA5{color:#313244;} .d2-3175421624 .color-AB4{color:#45475A;} - .d2-3175421624 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]>usersidintnamestringemailstringpasswordstringlast_logindatetimeproductsidintpricedecimalskustringnamestringordersidintuser_idintproduct_idintshipmentsidintorder_idinttracking_numberstringPKstatusstring ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-3175421624 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]>usersidintnamestringemailstringpasswordstringlast_logindatetimeproductsidintpricedecimalskustringnamestringordersidintuser_idintproduct_idintshipmentsidintorder_idinttracking_numberstringPKstatusstring \ No newline at end of file diff --git a/d2renderers/d2svg/dark_theme/testdata/twitter/dark_theme.exp.svg b/d2renderers/d2svg/dark_theme/testdata/twitter/dark_theme.exp.svg index 1c38744b5..a88485370 100644 --- a/d2renderers/d2svg/dark_theme/testdata/twitter/dark_theme.exp.svg +++ b/d2renderers/d2svg/dark_theme/testdata/twitter/dark_theme.exp.svg @@ -1,26 +1,4 @@ -<<<<<<< HEAD -<<<<<<< HEAD -xy -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-1843626214 .fill-N1{fill:#0A0F25;} - .d2-1843626214 .fill-N2{fill:#676C7E;} - .d2-1843626214 .fill-N3{fill:#9499AB;} - .d2-1843626214 .fill-N4{fill:#CFD2DD;} - .d2-1843626214 .fill-N5{fill:#DEE1EB;} - .d2-1843626214 .fill-N6{fill:#EEF1F8;} - .d2-1843626214 .fill-N7{fill:#FFFFFF;} - .d2-1843626214 .fill-B1{fill:#0D32B2;} - .d2-1843626214 .fill-B2{fill:#0D32B2;} - .d2-1843626214 .fill-B3{fill:#E3E9FD;} - .d2-1843626214 .fill-B4{fill:#E3E9FD;} - .d2-1843626214 .fill-B5{fill:#EDF0FD;} - .d2-1843626214 .fill-B6{fill:#F7F8FE;} - .d2-1843626214 .fill-AA2{fill:#4A6FF3;} - .d2-1843626214 .fill-AA4{fill:#EDF0FD;} - .d2-1843626214 .fill-AA5{fill:#F7F8FE;} - .d2-1843626214 .fill-AB4{fill:#EDF0FD;} - .d2-1843626214 .fill-AB5{fill:#F7F8FE;} - .d2-1843626214 .stroke-N1{stroke:#0A0F25;} - .d2-1843626214 .stroke-N2{stroke:#676C7E;} - .d2-1843626214 .stroke-N3{stroke:#9499AB;} - .d2-1843626214 .stroke-N4{stroke:#CFD2DD;} - .d2-1843626214 .stroke-N5{stroke:#DEE1EB;} - .d2-1843626214 .stroke-N6{stroke:#EEF1F8;} - .d2-1843626214 .stroke-N7{stroke:#FFFFFF;} - .d2-1843626214 .stroke-B1{stroke:#0D32B2;} - .d2-1843626214 .stroke-B2{stroke:#0D32B2;} - .d2-1843626214 .stroke-B3{stroke:#E3E9FD;} - .d2-1843626214 .stroke-B4{stroke:#E3E9FD;} - .d2-1843626214 .stroke-B5{stroke:#EDF0FD;} - .d2-1843626214 .stroke-B6{stroke:#F7F8FE;} - .d2-1843626214 .stroke-AA2{stroke:#4A6FF3;} - .d2-1843626214 .stroke-AA4{stroke:#EDF0FD;} - .d2-1843626214 .stroke-AA5{stroke:#F7F8FE;} - .d2-1843626214 .stroke-AB4{stroke:#EDF0FD;} - .d2-1843626214 .stroke-AB5{stroke:#F7F8FE;} - .d2-1843626214 .background-color-N1{background-color:#0A0F25;} - .d2-1843626214 .background-color-N2{background-color:#676C7E;} - .d2-1843626214 .background-color-N3{background-color:#9499AB;} - .d2-1843626214 .background-color-N4{background-color:#CFD2DD;} - .d2-1843626214 .background-color-N5{background-color:#DEE1EB;} - .d2-1843626214 .background-color-N6{background-color:#EEF1F8;} - .d2-1843626214 .background-color-N7{background-color:#FFFFFF;} - .d2-1843626214 .background-color-B1{background-color:#0D32B2;} - .d2-1843626214 .background-color-B2{background-color:#0D32B2;} - .d2-1843626214 .background-color-B3{background-color:#E3E9FD;} - .d2-1843626214 .background-color-B4{background-color:#E3E9FD;} - .d2-1843626214 .background-color-B5{background-color:#EDF0FD;} - .d2-1843626214 .background-color-B6{background-color:#F7F8FE;} - .d2-1843626214 .background-color-AA2{background-color:#4A6FF3;} - .d2-1843626214 .background-color-AA4{background-color:#EDF0FD;} - .d2-1843626214 .background-color-AA5{background-color:#F7F8FE;} - .d2-1843626214 .background-color-AB4{background-color:#EDF0FD;} - .d2-1843626214 .background-color-AB5{background-color:#F7F8FE;} - .d2-1843626214 .color-N1{color:#0A0F25;} - .d2-1843626214 .color-N2{color:#676C7E;} - .d2-1843626214 .color-N3{color:#9499AB;} - .d2-1843626214 .color-N4{color:#CFD2DD;} - .d2-1843626214 .color-N5{color:#DEE1EB;} - .d2-1843626214 .color-N6{color:#EEF1F8;} - .d2-1843626214 .color-N7{color:#FFFFFF;} - .d2-1843626214 .color-B1{color:#0D32B2;} - .d2-1843626214 .color-B2{color:#0D32B2;} - .d2-1843626214 .color-B3{color:#E3E9FD;} - .d2-1843626214 .color-B4{color:#E3E9FD;} - .d2-1843626214 .color-B5{color:#EDF0FD;} - .d2-1843626214 .color-B6{color:#F7F8FE;} - .d2-1843626214 .color-AA2{color:#4A6FF3;} - .d2-1843626214 .color-AA4{color:#EDF0FD;} - .d2-1843626214 .color-AA5{color:#F7F8FE;} - .d2-1843626214 .color-AB4{color:#EDF0FD;} - .d2-1843626214 .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 -======= .d2-4198988860 .fill-N1{fill:#0A0F25;} .d2-4198988860 .fill-N2{fill:#676C7E;} .d2-4198988860 .fill-N3{fill:#9499AB;} @@ -258,8 +89,7 @@ .d2-4198988860 .color-AA4{color:#EDF0FD;} .d2-4198988860 .color-AA5{color:#F7F8FE;} .d2-4198988860 .color-AB4{color:#EDF0FD;} - .d2-4198988860 .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 ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-4198988860 .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 diff --git a/e2etests-cli/testdata/TestCLI_E2E/animation.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/animation.exp.svg index 80a50bf1c..617e8cd3c 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/animation.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/animation.exp.svg @@ -1,28 +1,4 @@ -<<<<<<< HEAD -<<<<<<< HEAD Chicken's plan -||||||| parent of 33280fed5 (fixed e2e tests) -}]]>Chicken's plan -======= -}]]>Chicken's plan ->>>>>>> 33280fed5 (fixed e2e tests) +}]]>Chicken's plan -<<<<<<< HEAD -Chicken's planApproach road -||||||| parent of 33280fed5 (fixed e2e tests) -Chicken's planApproach road -======= -Chicken's planApproach road ->>>>>>> 33280fed5 (fixed e2e tests) +Chicken's planApproach road -<<<<<<< HEAD -Chicken's planApproach roadCross road -||||||| parent of 33280fed5 (fixed e2e tests) -Chicken's planApproach roadCross road -======= -Chicken's planApproach roadCross road ->>>>>>> 33280fed5 (fixed e2e tests) +Chicken's planApproach roadCross road -<<<<<<< HEAD -Chicken's planApproach roadCross roadMake you wonder why -||||||| parent of 33280fed5 (fixed e2e tests) -Chicken's planApproach roadCross roadMake you wonder why -======= -Chicken's planApproach roadCross roadMake you wonder why ->>>>>>> 33280fed5 (fixed e2e tests) +Chicken's planApproach roadCross roadMake you wonder why diff --git a/e2etests-cli/testdata/TestCLI_E2E/center.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/center.exp.svg index 21c852aaf..45f532d11 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/center.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/center.exp.svg @@ -1,26 +1,4 @@ -<<<<<<< HEAD -<<<<<<< HEAD -xy -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-1843626214 .fill-N1{fill:#0A0F25;} - .d2-1843626214 .fill-N2{fill:#676C7E;} - .d2-1843626214 .fill-N3{fill:#9499AB;} - .d2-1843626214 .fill-N4{fill:#CFD2DD;} - .d2-1843626214 .fill-N5{fill:#DEE1EB;} - .d2-1843626214 .fill-N6{fill:#EEF1F8;} - .d2-1843626214 .fill-N7{fill:#FFFFFF;} - .d2-1843626214 .fill-B1{fill:#0D32B2;} - .d2-1843626214 .fill-B2{fill:#0D32B2;} - .d2-1843626214 .fill-B3{fill:#E3E9FD;} - .d2-1843626214 .fill-B4{fill:#E3E9FD;} - .d2-1843626214 .fill-B5{fill:#EDF0FD;} - .d2-1843626214 .fill-B6{fill:#F7F8FE;} - .d2-1843626214 .fill-AA2{fill:#4A6FF3;} - .d2-1843626214 .fill-AA4{fill:#EDF0FD;} - .d2-1843626214 .fill-AA5{fill:#F7F8FE;} - .d2-1843626214 .fill-AB4{fill:#EDF0FD;} - .d2-1843626214 .fill-AB5{fill:#F7F8FE;} - .d2-1843626214 .stroke-N1{stroke:#0A0F25;} - .d2-1843626214 .stroke-N2{stroke:#676C7E;} - .d2-1843626214 .stroke-N3{stroke:#9499AB;} - .d2-1843626214 .stroke-N4{stroke:#CFD2DD;} - .d2-1843626214 .stroke-N5{stroke:#DEE1EB;} - .d2-1843626214 .stroke-N6{stroke:#EEF1F8;} - .d2-1843626214 .stroke-N7{stroke:#FFFFFF;} - .d2-1843626214 .stroke-B1{stroke:#0D32B2;} - .d2-1843626214 .stroke-B2{stroke:#0D32B2;} - .d2-1843626214 .stroke-B3{stroke:#E3E9FD;} - .d2-1843626214 .stroke-B4{stroke:#E3E9FD;} - .d2-1843626214 .stroke-B5{stroke:#EDF0FD;} - .d2-1843626214 .stroke-B6{stroke:#F7F8FE;} - .d2-1843626214 .stroke-AA2{stroke:#4A6FF3;} - .d2-1843626214 .stroke-AA4{stroke:#EDF0FD;} - .d2-1843626214 .stroke-AA5{stroke:#F7F8FE;} - .d2-1843626214 .stroke-AB4{stroke:#EDF0FD;} - .d2-1843626214 .stroke-AB5{stroke:#F7F8FE;} - .d2-1843626214 .background-color-N1{background-color:#0A0F25;} - .d2-1843626214 .background-color-N2{background-color:#676C7E;} - .d2-1843626214 .background-color-N3{background-color:#9499AB;} - .d2-1843626214 .background-color-N4{background-color:#CFD2DD;} - .d2-1843626214 .background-color-N5{background-color:#DEE1EB;} - .d2-1843626214 .background-color-N6{background-color:#EEF1F8;} - .d2-1843626214 .background-color-N7{background-color:#FFFFFF;} - .d2-1843626214 .background-color-B1{background-color:#0D32B2;} - .d2-1843626214 .background-color-B2{background-color:#0D32B2;} - .d2-1843626214 .background-color-B3{background-color:#E3E9FD;} - .d2-1843626214 .background-color-B4{background-color:#E3E9FD;} - .d2-1843626214 .background-color-B5{background-color:#EDF0FD;} - .d2-1843626214 .background-color-B6{background-color:#F7F8FE;} - .d2-1843626214 .background-color-AA2{background-color:#4A6FF3;} - .d2-1843626214 .background-color-AA4{background-color:#EDF0FD;} - .d2-1843626214 .background-color-AA5{background-color:#F7F8FE;} - .d2-1843626214 .background-color-AB4{background-color:#EDF0FD;} - .d2-1843626214 .background-color-AB5{background-color:#F7F8FE;} - .d2-1843626214 .color-N1{color:#0A0F25;} - .d2-1843626214 .color-N2{color:#676C7E;} - .d2-1843626214 .color-N3{color:#9499AB;} - .d2-1843626214 .color-N4{color:#CFD2DD;} - .d2-1843626214 .color-N5{color:#DEE1EB;} - .d2-1843626214 .color-N6{color:#EEF1F8;} - .d2-1843626214 .color-N7{color:#FFFFFF;} - .d2-1843626214 .color-B1{color:#0D32B2;} - .d2-1843626214 .color-B2{color:#0D32B2;} - .d2-1843626214 .color-B3{color:#E3E9FD;} - .d2-1843626214 .color-B4{color:#E3E9FD;} - .d2-1843626214 .color-B5{color:#EDF0FD;} - .d2-1843626214 .color-B6{color:#F7F8FE;} - .d2-1843626214 .color-AA2{color:#4A6FF3;} - .d2-1843626214 .color-AA4{color:#EDF0FD;} - .d2-1843626214 .color-AA5{color:#F7F8FE;} - .d2-1843626214 .color-AB4{color:#EDF0FD;} - .d2-1843626214 .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 -======= .d2-4198988860 .fill-N1{fill:#0A0F25;} .d2-4198988860 .fill-N2{fill:#676C7E;} .d2-4198988860 .fill-N3{fill:#9499AB;} @@ -258,8 +89,7 @@ .d2-4198988860 .color-AA4{color:#EDF0FD;} .d2-4198988860 .color-AA5{color:#F7F8FE;} .d2-4198988860 .color-AB4{color:#EDF0FD;} - .d2-4198988860 .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 ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-4198988860 .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 diff --git a/e2etests-cli/testdata/TestCLI_E2E/empty-base.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/empty-base.exp.svg index c10e64555..ff220c36d 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/empty-base.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/empty-base.exp.svg @@ -1,28 +1,4 @@ -<<<<<<< HEAD -<<<<<<< HEAD ab -||||||| parent of 33280fed5 (fixed e2e tests) -}]]>ab -======= -}]]>ab ->>>>>>> 33280fed5 (fixed e2e tests) +}]]>ab -<<<<<<< HEAD -abdc -||||||| parent of 33280fed5 (fixed e2e tests) -abdc -======= -abdc ->>>>>>> 33280fed5 (fixed e2e tests) +abdc -<<<<<<< HEAD -abdce -||||||| parent of 33280fed5 (fixed e2e tests) -abdce -======= -abdce ->>>>>>> 33280fed5 (fixed e2e tests) +abdce diff --git a/e2etests-cli/testdata/TestCLI_E2E/hello_world_png.exp.png b/e2etests-cli/testdata/TestCLI_E2E/hello_world_png.exp.png index ad098e23d..eb8c79b00 100644 Binary files a/e2etests-cli/testdata/TestCLI_E2E/hello_world_png.exp.png and b/e2etests-cli/testdata/TestCLI_E2E/hello_world_png.exp.png differ diff --git a/e2etests-cli/testdata/TestCLI_E2E/hello_world_png_pad.exp.png b/e2etests-cli/testdata/TestCLI_E2E/hello_world_png_pad.exp.png index f8c4043d1..ebd9743ef 100644 Binary files a/e2etests-cli/testdata/TestCLI_E2E/hello_world_png_pad.exp.png and b/e2etests-cli/testdata/TestCLI_E2E/hello_world_png_pad.exp.png differ diff --git a/e2etests-cli/testdata/TestCLI_E2E/hello_world_png_sketch.exp.png b/e2etests-cli/testdata/TestCLI_E2E/hello_world_png_sketch.exp.png index 3b5375b75..7caa3575f 100644 Binary files a/e2etests-cli/testdata/TestCLI_E2E/hello_world_png_sketch.exp.png and b/e2etests-cli/testdata/TestCLI_E2E/hello_world_png_sketch.exp.png differ diff --git a/e2etests-cli/testdata/TestCLI_E2E/import.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/import.exp.svg index 27174f8a8..20cba7473 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/import.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/import.exp.svg @@ -1,26 +1,4 @@ -<<<<<<< HEAD -<<<<<<< HEAD -xy -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-3562348775 .fill-N1{fill:#0A0F25;} - .d2-3562348775 .fill-N2{fill:#676C7E;} - .d2-3562348775 .fill-N3{fill:#9499AB;} - .d2-3562348775 .fill-N4{fill:#CFD2DD;} - .d2-3562348775 .fill-N5{fill:#DEE1EB;} - .d2-3562348775 .fill-N6{fill:#EEF1F8;} - .d2-3562348775 .fill-N7{fill:#FFFFFF;} - .d2-3562348775 .fill-B1{fill:#0D32B2;} - .d2-3562348775 .fill-B2{fill:#0D32B2;} - .d2-3562348775 .fill-B3{fill:#E3E9FD;} - .d2-3562348775 .fill-B4{fill:#E3E9FD;} - .d2-3562348775 .fill-B5{fill:#EDF0FD;} - .d2-3562348775 .fill-B6{fill:#F7F8FE;} - .d2-3562348775 .fill-AA2{fill:#4A6FF3;} - .d2-3562348775 .fill-AA4{fill:#EDF0FD;} - .d2-3562348775 .fill-AA5{fill:#F7F8FE;} - .d2-3562348775 .fill-AB4{fill:#EDF0FD;} - .d2-3562348775 .fill-AB5{fill:#F7F8FE;} - .d2-3562348775 .stroke-N1{stroke:#0A0F25;} - .d2-3562348775 .stroke-N2{stroke:#676C7E;} - .d2-3562348775 .stroke-N3{stroke:#9499AB;} - .d2-3562348775 .stroke-N4{stroke:#CFD2DD;} - .d2-3562348775 .stroke-N5{stroke:#DEE1EB;} - .d2-3562348775 .stroke-N6{stroke:#EEF1F8;} - .d2-3562348775 .stroke-N7{stroke:#FFFFFF;} - .d2-3562348775 .stroke-B1{stroke:#0D32B2;} - .d2-3562348775 .stroke-B2{stroke:#0D32B2;} - .d2-3562348775 .stroke-B3{stroke:#E3E9FD;} - .d2-3562348775 .stroke-B4{stroke:#E3E9FD;} - .d2-3562348775 .stroke-B5{stroke:#EDF0FD;} - .d2-3562348775 .stroke-B6{stroke:#F7F8FE;} - .d2-3562348775 .stroke-AA2{stroke:#4A6FF3;} - .d2-3562348775 .stroke-AA4{stroke:#EDF0FD;} - .d2-3562348775 .stroke-AA5{stroke:#F7F8FE;} - .d2-3562348775 .stroke-AB4{stroke:#EDF0FD;} - .d2-3562348775 .stroke-AB5{stroke:#F7F8FE;} - .d2-3562348775 .background-color-N1{background-color:#0A0F25;} - .d2-3562348775 .background-color-N2{background-color:#676C7E;} - .d2-3562348775 .background-color-N3{background-color:#9499AB;} - .d2-3562348775 .background-color-N4{background-color:#CFD2DD;} - .d2-3562348775 .background-color-N5{background-color:#DEE1EB;} - .d2-3562348775 .background-color-N6{background-color:#EEF1F8;} - .d2-3562348775 .background-color-N7{background-color:#FFFFFF;} - .d2-3562348775 .background-color-B1{background-color:#0D32B2;} - .d2-3562348775 .background-color-B2{background-color:#0D32B2;} - .d2-3562348775 .background-color-B3{background-color:#E3E9FD;} - .d2-3562348775 .background-color-B4{background-color:#E3E9FD;} - .d2-3562348775 .background-color-B5{background-color:#EDF0FD;} - .d2-3562348775 .background-color-B6{background-color:#F7F8FE;} - .d2-3562348775 .background-color-AA2{background-color:#4A6FF3;} - .d2-3562348775 .background-color-AA4{background-color:#EDF0FD;} - .d2-3562348775 .background-color-AA5{background-color:#F7F8FE;} - .d2-3562348775 .background-color-AB4{background-color:#EDF0FD;} - .d2-3562348775 .background-color-AB5{background-color:#F7F8FE;} - .d2-3562348775 .color-N1{color:#0A0F25;} - .d2-3562348775 .color-N2{color:#676C7E;} - .d2-3562348775 .color-N3{color:#9499AB;} - .d2-3562348775 .color-N4{color:#CFD2DD;} - .d2-3562348775 .color-N5{color:#DEE1EB;} - .d2-3562348775 .color-N6{color:#EEF1F8;} - .d2-3562348775 .color-N7{color:#FFFFFF;} - .d2-3562348775 .color-B1{color:#0D32B2;} - .d2-3562348775 .color-B2{color:#0D32B2;} - .d2-3562348775 .color-B3{color:#E3E9FD;} - .d2-3562348775 .color-B4{color:#E3E9FD;} - .d2-3562348775 .color-B5{color:#EDF0FD;} - .d2-3562348775 .color-B6{color:#F7F8FE;} - .d2-3562348775 .color-AA2{color:#4A6FF3;} - .d2-3562348775 .color-AA4{color:#EDF0FD;} - .d2-3562348775 .color-AA5{color:#F7F8FE;} - .d2-3562348775 .color-AB4{color:#EDF0FD;} - .d2-3562348775 .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 -======= .d2-4289526217 .fill-N1{fill:#0A0F25;} .d2-4289526217 .fill-N2{fill:#676C7E;} .d2-4289526217 .fill-N3{fill:#9499AB;} @@ -258,8 +89,7 @@ .d2-4289526217 .color-AA4{color:#EDF0FD;} .d2-4289526217 .color-AA5{color:#F7F8FE;} .d2-4289526217 .color-AB4{color:#EDF0FD;} - .d2-4289526217 .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 ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-4289526217 .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 diff --git a/e2etests-cli/testdata/TestCLI_E2E/import_vars.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/import_vars.exp.svg index 7efc7003b..588cac8f8 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/import_vars.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/import_vars.exp.svg @@ -1,26 +1,4 @@ -<<<<<<< HEAD -<<<<<<< HEAD -xy -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-2712468095 .fill-N1{fill:#CDD6F4;} - .d2-2712468095 .fill-N2{fill:#BAC2DE;} - .d2-2712468095 .fill-N3{fill:#A6ADC8;} - .d2-2712468095 .fill-N4{fill:#585B70;} - .d2-2712468095 .fill-N5{fill:#45475A;} - .d2-2712468095 .fill-N6{fill:#313244;} - .d2-2712468095 .fill-N7{fill:#1E1E2E;} - .d2-2712468095 .fill-B1{fill:#CBA6f7;} - .d2-2712468095 .fill-B2{fill:#CBA6f7;} - .d2-2712468095 .fill-B3{fill:#6C7086;} - .d2-2712468095 .fill-B4{fill:#585B70;} - .d2-2712468095 .fill-B5{fill:#45475A;} - .d2-2712468095 .fill-B6{fill:#313244;} - .d2-2712468095 .fill-AA2{fill:#f38BA8;} - .d2-2712468095 .fill-AA4{fill:#45475A;} - .d2-2712468095 .fill-AA5{fill:#313244;} - .d2-2712468095 .fill-AB4{fill:#45475A;} - .d2-2712468095 .fill-AB5{fill:#313244;} - .d2-2712468095 .stroke-N1{stroke:#CDD6F4;} - .d2-2712468095 .stroke-N2{stroke:#BAC2DE;} - .d2-2712468095 .stroke-N3{stroke:#A6ADC8;} - .d2-2712468095 .stroke-N4{stroke:#585B70;} - .d2-2712468095 .stroke-N5{stroke:#45475A;} - .d2-2712468095 .stroke-N6{stroke:#313244;} - .d2-2712468095 .stroke-N7{stroke:#1E1E2E;} - .d2-2712468095 .stroke-B1{stroke:#CBA6f7;} - .d2-2712468095 .stroke-B2{stroke:#CBA6f7;} - .d2-2712468095 .stroke-B3{stroke:#6C7086;} - .d2-2712468095 .stroke-B4{stroke:#585B70;} - .d2-2712468095 .stroke-B5{stroke:#45475A;} - .d2-2712468095 .stroke-B6{stroke:#313244;} - .d2-2712468095 .stroke-AA2{stroke:#f38BA8;} - .d2-2712468095 .stroke-AA4{stroke:#45475A;} - .d2-2712468095 .stroke-AA5{stroke:#313244;} - .d2-2712468095 .stroke-AB4{stroke:#45475A;} - .d2-2712468095 .stroke-AB5{stroke:#313244;} - .d2-2712468095 .background-color-N1{background-color:#CDD6F4;} - .d2-2712468095 .background-color-N2{background-color:#BAC2DE;} - .d2-2712468095 .background-color-N3{background-color:#A6ADC8;} - .d2-2712468095 .background-color-N4{background-color:#585B70;} - .d2-2712468095 .background-color-N5{background-color:#45475A;} - .d2-2712468095 .background-color-N6{background-color:#313244;} - .d2-2712468095 .background-color-N7{background-color:#1E1E2E;} - .d2-2712468095 .background-color-B1{background-color:#CBA6f7;} - .d2-2712468095 .background-color-B2{background-color:#CBA6f7;} - .d2-2712468095 .background-color-B3{background-color:#6C7086;} - .d2-2712468095 .background-color-B4{background-color:#585B70;} - .d2-2712468095 .background-color-B5{background-color:#45475A;} - .d2-2712468095 .background-color-B6{background-color:#313244;} - .d2-2712468095 .background-color-AA2{background-color:#f38BA8;} - .d2-2712468095 .background-color-AA4{background-color:#45475A;} - .d2-2712468095 .background-color-AA5{background-color:#313244;} - .d2-2712468095 .background-color-AB4{background-color:#45475A;} - .d2-2712468095 .background-color-AB5{background-color:#313244;} - .d2-2712468095 .color-N1{color:#CDD6F4;} - .d2-2712468095 .color-N2{color:#BAC2DE;} - .d2-2712468095 .color-N3{color:#A6ADC8;} - .d2-2712468095 .color-N4{color:#585B70;} - .d2-2712468095 .color-N5{color:#45475A;} - .d2-2712468095 .color-N6{color:#313244;} - .d2-2712468095 .color-N7{color:#1E1E2E;} - .d2-2712468095 .color-B1{color:#CBA6f7;} - .d2-2712468095 .color-B2{color:#CBA6f7;} - .d2-2712468095 .color-B3{color:#6C7086;} - .d2-2712468095 .color-B4{color:#585B70;} - .d2-2712468095 .color-B5{color:#45475A;} - .d2-2712468095 .color-B6{color:#313244;} - .d2-2712468095 .color-AA2{color:#f38BA8;} - .d2-2712468095 .color-AA4{color:#45475A;} - .d2-2712468095 .color-AA5{color:#313244;} - .d2-2712468095 .color-AB4{color:#45475A;} - .d2-2712468095 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]>xy -======= .d2-2746395997 .fill-N1{fill:#CDD6F4;} .d2-2746395997 .fill-N2{fill:#BAC2DE;} .d2-2746395997 .fill-N3{fill:#A6ADC8;} @@ -258,8 +89,7 @@ .d2-2746395997 .color-AA4{color:#45475A;} .d2-2746395997 .color-AA5{color:#313244;} .d2-2746395997 .color-AB4{color:#45475A;} - .d2-2746395997 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]>xy ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-2746395997 .color-AB5{color:#313244;}.appendix text.text{fill:#CDD6F4}.md{--color-fg-default:#CDD6F4;--color-fg-muted:#BAC2DE;--color-fg-subtle:#A6ADC8;--color-canvas-default:#1E1E2E;--color-canvas-subtle:#313244;--color-border-default:#CBA6f7;--color-border-muted:#CBA6f7;--color-neutral-muted:#313244;--color-accent-fg:#CBA6f7;--color-accent-emphasis:#CBA6f7;--color-attention-subtle:#BAC2DE;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AA4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AA5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB4{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-AB5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N1{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N6{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N7{fill:url(#streaks-darker);mix-blend-mode:lighten}.light-code{display: none}.dark-code{display: block}]]>xy diff --git a/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf b/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf index b1ef566be..deb3744f2 100644 Binary files a/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf and b/e2etests-cli/testdata/TestCLI_E2E/internal_linked_pdf.exp.pdf differ diff --git a/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/index.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/index.exp.svg index ba8d9e868..47497a946 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/index.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/index.exp.svg @@ -1,26 +1,4 @@ -<<<<<<< HEAD -<<<<<<< HEAD -xy -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-3748359424 .fill-N1{fill:#0A0F25;} - .d2-3748359424 .fill-N2{fill:#676C7E;} - .d2-3748359424 .fill-N3{fill:#9499AB;} - .d2-3748359424 .fill-N4{fill:#CFD2DD;} - .d2-3748359424 .fill-N5{fill:#DEE1EB;} - .d2-3748359424 .fill-N6{fill:#EEF1F8;} - .d2-3748359424 .fill-N7{fill:#FFFFFF;} - .d2-3748359424 .fill-B1{fill:#0D32B2;} - .d2-3748359424 .fill-B2{fill:#0D32B2;} - .d2-3748359424 .fill-B3{fill:#E3E9FD;} - .d2-3748359424 .fill-B4{fill:#E3E9FD;} - .d2-3748359424 .fill-B5{fill:#EDF0FD;} - .d2-3748359424 .fill-B6{fill:#F7F8FE;} - .d2-3748359424 .fill-AA2{fill:#4A6FF3;} - .d2-3748359424 .fill-AA4{fill:#EDF0FD;} - .d2-3748359424 .fill-AA5{fill:#F7F8FE;} - .d2-3748359424 .fill-AB4{fill:#EDF0FD;} - .d2-3748359424 .fill-AB5{fill:#F7F8FE;} - .d2-3748359424 .stroke-N1{stroke:#0A0F25;} - .d2-3748359424 .stroke-N2{stroke:#676C7E;} - .d2-3748359424 .stroke-N3{stroke:#9499AB;} - .d2-3748359424 .stroke-N4{stroke:#CFD2DD;} - .d2-3748359424 .stroke-N5{stroke:#DEE1EB;} - .d2-3748359424 .stroke-N6{stroke:#EEF1F8;} - .d2-3748359424 .stroke-N7{stroke:#FFFFFF;} - .d2-3748359424 .stroke-B1{stroke:#0D32B2;} - .d2-3748359424 .stroke-B2{stroke:#0D32B2;} - .d2-3748359424 .stroke-B3{stroke:#E3E9FD;} - .d2-3748359424 .stroke-B4{stroke:#E3E9FD;} - .d2-3748359424 .stroke-B5{stroke:#EDF0FD;} - .d2-3748359424 .stroke-B6{stroke:#F7F8FE;} - .d2-3748359424 .stroke-AA2{stroke:#4A6FF3;} - .d2-3748359424 .stroke-AA4{stroke:#EDF0FD;} - .d2-3748359424 .stroke-AA5{stroke:#F7F8FE;} - .d2-3748359424 .stroke-AB4{stroke:#EDF0FD;} - .d2-3748359424 .stroke-AB5{stroke:#F7F8FE;} - .d2-3748359424 .background-color-N1{background-color:#0A0F25;} - .d2-3748359424 .background-color-N2{background-color:#676C7E;} - .d2-3748359424 .background-color-N3{background-color:#9499AB;} - .d2-3748359424 .background-color-N4{background-color:#CFD2DD;} - .d2-3748359424 .background-color-N5{background-color:#DEE1EB;} - .d2-3748359424 .background-color-N6{background-color:#EEF1F8;} - .d2-3748359424 .background-color-N7{background-color:#FFFFFF;} - .d2-3748359424 .background-color-B1{background-color:#0D32B2;} - .d2-3748359424 .background-color-B2{background-color:#0D32B2;} - .d2-3748359424 .background-color-B3{background-color:#E3E9FD;} - .d2-3748359424 .background-color-B4{background-color:#E3E9FD;} - .d2-3748359424 .background-color-B5{background-color:#EDF0FD;} - .d2-3748359424 .background-color-B6{background-color:#F7F8FE;} - .d2-3748359424 .background-color-AA2{background-color:#4A6FF3;} - .d2-3748359424 .background-color-AA4{background-color:#EDF0FD;} - .d2-3748359424 .background-color-AA5{background-color:#F7F8FE;} - .d2-3748359424 .background-color-AB4{background-color:#EDF0FD;} - .d2-3748359424 .background-color-AB5{background-color:#F7F8FE;} - .d2-3748359424 .color-N1{color:#0A0F25;} - .d2-3748359424 .color-N2{color:#676C7E;} - .d2-3748359424 .color-N3{color:#9499AB;} - .d2-3748359424 .color-N4{color:#CFD2DD;} - .d2-3748359424 .color-N5{color:#DEE1EB;} - .d2-3748359424 .color-N6{color:#EEF1F8;} - .d2-3748359424 .color-N7{color:#FFFFFF;} - .d2-3748359424 .color-B1{color:#0D32B2;} - .d2-3748359424 .color-B2{color:#0D32B2;} - .d2-3748359424 .color-B3{color:#E3E9FD;} - .d2-3748359424 .color-B4{color:#E3E9FD;} - .d2-3748359424 .color-B5{color:#EDF0FD;} - .d2-3748359424 .color-B6{color:#F7F8FE;} - .d2-3748359424 .color-AA2{color:#4A6FF3;} - .d2-3748359424 .color-AA4{color:#EDF0FD;} - .d2-3748359424 .color-AA5{color:#F7F8FE;} - .d2-3748359424 .color-AB4{color:#EDF0FD;} - .d2-3748359424 .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 -======= .d2-1250993138 .fill-N1{fill:#0A0F25;} .d2-1250993138 .fill-N2{fill:#676C7E;} .d2-1250993138 .fill-N3{fill:#9499AB;} @@ -258,8 +89,7 @@ .d2-1250993138 .color-AA4{color:#EDF0FD;} .d2-1250993138 .color-AA5{color:#F7F8FE;} .d2-1250993138 .color-AB4{color:#EDF0FD;} - .d2-1250993138 .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 ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-1250993138 .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 diff --git a/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/scenarios/why.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/scenarios/why.exp.svg index a532752b1..821511171 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/scenarios/why.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life/scenarios/why.exp.svg @@ -1,26 +1,4 @@ -<<<<<<< HEAD -<<<<<<< HEAD -xy -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-2626224973 .fill-N1{fill:#0A0F25;} - .d2-2626224973 .fill-N2{fill:#676C7E;} - .d2-2626224973 .fill-N3{fill:#9499AB;} - .d2-2626224973 .fill-N4{fill:#CFD2DD;} - .d2-2626224973 .fill-N5{fill:#DEE1EB;} - .d2-2626224973 .fill-N6{fill:#EEF1F8;} - .d2-2626224973 .fill-N7{fill:#FFFFFF;} - .d2-2626224973 .fill-B1{fill:#0D32B2;} - .d2-2626224973 .fill-B2{fill:#0D32B2;} - .d2-2626224973 .fill-B3{fill:#E3E9FD;} - .d2-2626224973 .fill-B4{fill:#E3E9FD;} - .d2-2626224973 .fill-B5{fill:#EDF0FD;} - .d2-2626224973 .fill-B6{fill:#F7F8FE;} - .d2-2626224973 .fill-AA2{fill:#4A6FF3;} - .d2-2626224973 .fill-AA4{fill:#EDF0FD;} - .d2-2626224973 .fill-AA5{fill:#F7F8FE;} - .d2-2626224973 .fill-AB4{fill:#EDF0FD;} - .d2-2626224973 .fill-AB5{fill:#F7F8FE;} - .d2-2626224973 .stroke-N1{stroke:#0A0F25;} - .d2-2626224973 .stroke-N2{stroke:#676C7E;} - .d2-2626224973 .stroke-N3{stroke:#9499AB;} - .d2-2626224973 .stroke-N4{stroke:#CFD2DD;} - .d2-2626224973 .stroke-N5{stroke:#DEE1EB;} - .d2-2626224973 .stroke-N6{stroke:#EEF1F8;} - .d2-2626224973 .stroke-N7{stroke:#FFFFFF;} - .d2-2626224973 .stroke-B1{stroke:#0D32B2;} - .d2-2626224973 .stroke-B2{stroke:#0D32B2;} - .d2-2626224973 .stroke-B3{stroke:#E3E9FD;} - .d2-2626224973 .stroke-B4{stroke:#E3E9FD;} - .d2-2626224973 .stroke-B5{stroke:#EDF0FD;} - .d2-2626224973 .stroke-B6{stroke:#F7F8FE;} - .d2-2626224973 .stroke-AA2{stroke:#4A6FF3;} - .d2-2626224973 .stroke-AA4{stroke:#EDF0FD;} - .d2-2626224973 .stroke-AA5{stroke:#F7F8FE;} - .d2-2626224973 .stroke-AB4{stroke:#EDF0FD;} - .d2-2626224973 .stroke-AB5{stroke:#F7F8FE;} - .d2-2626224973 .background-color-N1{background-color:#0A0F25;} - .d2-2626224973 .background-color-N2{background-color:#676C7E;} - .d2-2626224973 .background-color-N3{background-color:#9499AB;} - .d2-2626224973 .background-color-N4{background-color:#CFD2DD;} - .d2-2626224973 .background-color-N5{background-color:#DEE1EB;} - .d2-2626224973 .background-color-N6{background-color:#EEF1F8;} - .d2-2626224973 .background-color-N7{background-color:#FFFFFF;} - .d2-2626224973 .background-color-B1{background-color:#0D32B2;} - .d2-2626224973 .background-color-B2{background-color:#0D32B2;} - .d2-2626224973 .background-color-B3{background-color:#E3E9FD;} - .d2-2626224973 .background-color-B4{background-color:#E3E9FD;} - .d2-2626224973 .background-color-B5{background-color:#EDF0FD;} - .d2-2626224973 .background-color-B6{background-color:#F7F8FE;} - .d2-2626224973 .background-color-AA2{background-color:#4A6FF3;} - .d2-2626224973 .background-color-AA4{background-color:#EDF0FD;} - .d2-2626224973 .background-color-AA5{background-color:#F7F8FE;} - .d2-2626224973 .background-color-AB4{background-color:#EDF0FD;} - .d2-2626224973 .background-color-AB5{background-color:#F7F8FE;} - .d2-2626224973 .color-N1{color:#0A0F25;} - .d2-2626224973 .color-N2{color:#676C7E;} - .d2-2626224973 .color-N3{color:#9499AB;} - .d2-2626224973 .color-N4{color:#CFD2DD;} - .d2-2626224973 .color-N5{color:#DEE1EB;} - .d2-2626224973 .color-N6{color:#EEF1F8;} - .d2-2626224973 .color-N7{color:#FFFFFF;} - .d2-2626224973 .color-B1{color:#0D32B2;} - .d2-2626224973 .color-B2{color:#0D32B2;} - .d2-2626224973 .color-B3{color:#E3E9FD;} - .d2-2626224973 .color-B4{color:#E3E9FD;} - .d2-2626224973 .color-B5{color:#EDF0FD;} - .d2-2626224973 .color-B6{color:#F7F8FE;} - .d2-2626224973 .color-AA2{color:#4A6FF3;} - .d2-2626224973 .color-AA4{color:#EDF0FD;} - .d2-2626224973 .color-AA5{color:#F7F8FE;} - .d2-2626224973 .color-AB4{color:#EDF0FD;} - .d2-2626224973 .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 -======= .d2-2808374517 .fill-N1{fill:#0A0F25;} .d2-2808374517 .fill-N2{fill:#676C7E;} .d2-2808374517 .fill-N3{fill:#9499AB;} @@ -258,8 +89,7 @@ .d2-2808374517 .color-AA4{color:#EDF0FD;} .d2-2808374517 .color-AA5{color:#F7F8FE;} .d2-2808374517 .color-AB4{color:#EDF0FD;} - .d2-2808374517 .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 ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-2808374517 .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 diff --git a/e2etests-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/index.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/index.exp.svg index ba8d9e868..47497a946 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/index.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/index.exp.svg @@ -1,26 +1,4 @@ -<<<<<<< HEAD -<<<<<<< HEAD -xy -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-3748359424 .fill-N1{fill:#0A0F25;} - .d2-3748359424 .fill-N2{fill:#676C7E;} - .d2-3748359424 .fill-N3{fill:#9499AB;} - .d2-3748359424 .fill-N4{fill:#CFD2DD;} - .d2-3748359424 .fill-N5{fill:#DEE1EB;} - .d2-3748359424 .fill-N6{fill:#EEF1F8;} - .d2-3748359424 .fill-N7{fill:#FFFFFF;} - .d2-3748359424 .fill-B1{fill:#0D32B2;} - .d2-3748359424 .fill-B2{fill:#0D32B2;} - .d2-3748359424 .fill-B3{fill:#E3E9FD;} - .d2-3748359424 .fill-B4{fill:#E3E9FD;} - .d2-3748359424 .fill-B5{fill:#EDF0FD;} - .d2-3748359424 .fill-B6{fill:#F7F8FE;} - .d2-3748359424 .fill-AA2{fill:#4A6FF3;} - .d2-3748359424 .fill-AA4{fill:#EDF0FD;} - .d2-3748359424 .fill-AA5{fill:#F7F8FE;} - .d2-3748359424 .fill-AB4{fill:#EDF0FD;} - .d2-3748359424 .fill-AB5{fill:#F7F8FE;} - .d2-3748359424 .stroke-N1{stroke:#0A0F25;} - .d2-3748359424 .stroke-N2{stroke:#676C7E;} - .d2-3748359424 .stroke-N3{stroke:#9499AB;} - .d2-3748359424 .stroke-N4{stroke:#CFD2DD;} - .d2-3748359424 .stroke-N5{stroke:#DEE1EB;} - .d2-3748359424 .stroke-N6{stroke:#EEF1F8;} - .d2-3748359424 .stroke-N7{stroke:#FFFFFF;} - .d2-3748359424 .stroke-B1{stroke:#0D32B2;} - .d2-3748359424 .stroke-B2{stroke:#0D32B2;} - .d2-3748359424 .stroke-B3{stroke:#E3E9FD;} - .d2-3748359424 .stroke-B4{stroke:#E3E9FD;} - .d2-3748359424 .stroke-B5{stroke:#EDF0FD;} - .d2-3748359424 .stroke-B6{stroke:#F7F8FE;} - .d2-3748359424 .stroke-AA2{stroke:#4A6FF3;} - .d2-3748359424 .stroke-AA4{stroke:#EDF0FD;} - .d2-3748359424 .stroke-AA5{stroke:#F7F8FE;} - .d2-3748359424 .stroke-AB4{stroke:#EDF0FD;} - .d2-3748359424 .stroke-AB5{stroke:#F7F8FE;} - .d2-3748359424 .background-color-N1{background-color:#0A0F25;} - .d2-3748359424 .background-color-N2{background-color:#676C7E;} - .d2-3748359424 .background-color-N3{background-color:#9499AB;} - .d2-3748359424 .background-color-N4{background-color:#CFD2DD;} - .d2-3748359424 .background-color-N5{background-color:#DEE1EB;} - .d2-3748359424 .background-color-N6{background-color:#EEF1F8;} - .d2-3748359424 .background-color-N7{background-color:#FFFFFF;} - .d2-3748359424 .background-color-B1{background-color:#0D32B2;} - .d2-3748359424 .background-color-B2{background-color:#0D32B2;} - .d2-3748359424 .background-color-B3{background-color:#E3E9FD;} - .d2-3748359424 .background-color-B4{background-color:#E3E9FD;} - .d2-3748359424 .background-color-B5{background-color:#EDF0FD;} - .d2-3748359424 .background-color-B6{background-color:#F7F8FE;} - .d2-3748359424 .background-color-AA2{background-color:#4A6FF3;} - .d2-3748359424 .background-color-AA4{background-color:#EDF0FD;} - .d2-3748359424 .background-color-AA5{background-color:#F7F8FE;} - .d2-3748359424 .background-color-AB4{background-color:#EDF0FD;} - .d2-3748359424 .background-color-AB5{background-color:#F7F8FE;} - .d2-3748359424 .color-N1{color:#0A0F25;} - .d2-3748359424 .color-N2{color:#676C7E;} - .d2-3748359424 .color-N3{color:#9499AB;} - .d2-3748359424 .color-N4{color:#CFD2DD;} - .d2-3748359424 .color-N5{color:#DEE1EB;} - .d2-3748359424 .color-N6{color:#EEF1F8;} - .d2-3748359424 .color-N7{color:#FFFFFF;} - .d2-3748359424 .color-B1{color:#0D32B2;} - .d2-3748359424 .color-B2{color:#0D32B2;} - .d2-3748359424 .color-B3{color:#E3E9FD;} - .d2-3748359424 .color-B4{color:#E3E9FD;} - .d2-3748359424 .color-B5{color:#EDF0FD;} - .d2-3748359424 .color-B6{color:#F7F8FE;} - .d2-3748359424 .color-AA2{color:#4A6FF3;} - .d2-3748359424 .color-AA4{color:#EDF0FD;} - .d2-3748359424 .color-AA5{color:#F7F8FE;} - .d2-3748359424 .color-AB4{color:#EDF0FD;} - .d2-3748359424 .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 -======= .d2-1250993138 .fill-N1{fill:#0A0F25;} .d2-1250993138 .fill-N2{fill:#676C7E;} .d2-1250993138 .fill-N3{fill:#9499AB;} @@ -258,8 +89,7 @@ .d2-1250993138 .color-AA4{color:#EDF0FD;} .d2-1250993138 .color-AA5{color:#F7F8FE;} .d2-1250993138 .color-AB4{color:#EDF0FD;} - .d2-1250993138 .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 ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-1250993138 .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 diff --git a/e2etests-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/scenarios/why.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/scenarios/why.exp.svg index a532752b1..821511171 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/scenarios/why.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/multiboard/life_index_d2/scenarios/why.exp.svg @@ -1,26 +1,4 @@ -<<<<<<< HEAD -<<<<<<< HEAD -xy -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-2626224973 .fill-N1{fill:#0A0F25;} - .d2-2626224973 .fill-N2{fill:#676C7E;} - .d2-2626224973 .fill-N3{fill:#9499AB;} - .d2-2626224973 .fill-N4{fill:#CFD2DD;} - .d2-2626224973 .fill-N5{fill:#DEE1EB;} - .d2-2626224973 .fill-N6{fill:#EEF1F8;} - .d2-2626224973 .fill-N7{fill:#FFFFFF;} - .d2-2626224973 .fill-B1{fill:#0D32B2;} - .d2-2626224973 .fill-B2{fill:#0D32B2;} - .d2-2626224973 .fill-B3{fill:#E3E9FD;} - .d2-2626224973 .fill-B4{fill:#E3E9FD;} - .d2-2626224973 .fill-B5{fill:#EDF0FD;} - .d2-2626224973 .fill-B6{fill:#F7F8FE;} - .d2-2626224973 .fill-AA2{fill:#4A6FF3;} - .d2-2626224973 .fill-AA4{fill:#EDF0FD;} - .d2-2626224973 .fill-AA5{fill:#F7F8FE;} - .d2-2626224973 .fill-AB4{fill:#EDF0FD;} - .d2-2626224973 .fill-AB5{fill:#F7F8FE;} - .d2-2626224973 .stroke-N1{stroke:#0A0F25;} - .d2-2626224973 .stroke-N2{stroke:#676C7E;} - .d2-2626224973 .stroke-N3{stroke:#9499AB;} - .d2-2626224973 .stroke-N4{stroke:#CFD2DD;} - .d2-2626224973 .stroke-N5{stroke:#DEE1EB;} - .d2-2626224973 .stroke-N6{stroke:#EEF1F8;} - .d2-2626224973 .stroke-N7{stroke:#FFFFFF;} - .d2-2626224973 .stroke-B1{stroke:#0D32B2;} - .d2-2626224973 .stroke-B2{stroke:#0D32B2;} - .d2-2626224973 .stroke-B3{stroke:#E3E9FD;} - .d2-2626224973 .stroke-B4{stroke:#E3E9FD;} - .d2-2626224973 .stroke-B5{stroke:#EDF0FD;} - .d2-2626224973 .stroke-B6{stroke:#F7F8FE;} - .d2-2626224973 .stroke-AA2{stroke:#4A6FF3;} - .d2-2626224973 .stroke-AA4{stroke:#EDF0FD;} - .d2-2626224973 .stroke-AA5{stroke:#F7F8FE;} - .d2-2626224973 .stroke-AB4{stroke:#EDF0FD;} - .d2-2626224973 .stroke-AB5{stroke:#F7F8FE;} - .d2-2626224973 .background-color-N1{background-color:#0A0F25;} - .d2-2626224973 .background-color-N2{background-color:#676C7E;} - .d2-2626224973 .background-color-N3{background-color:#9499AB;} - .d2-2626224973 .background-color-N4{background-color:#CFD2DD;} - .d2-2626224973 .background-color-N5{background-color:#DEE1EB;} - .d2-2626224973 .background-color-N6{background-color:#EEF1F8;} - .d2-2626224973 .background-color-N7{background-color:#FFFFFF;} - .d2-2626224973 .background-color-B1{background-color:#0D32B2;} - .d2-2626224973 .background-color-B2{background-color:#0D32B2;} - .d2-2626224973 .background-color-B3{background-color:#E3E9FD;} - .d2-2626224973 .background-color-B4{background-color:#E3E9FD;} - .d2-2626224973 .background-color-B5{background-color:#EDF0FD;} - .d2-2626224973 .background-color-B6{background-color:#F7F8FE;} - .d2-2626224973 .background-color-AA2{background-color:#4A6FF3;} - .d2-2626224973 .background-color-AA4{background-color:#EDF0FD;} - .d2-2626224973 .background-color-AA5{background-color:#F7F8FE;} - .d2-2626224973 .background-color-AB4{background-color:#EDF0FD;} - .d2-2626224973 .background-color-AB5{background-color:#F7F8FE;} - .d2-2626224973 .color-N1{color:#0A0F25;} - .d2-2626224973 .color-N2{color:#676C7E;} - .d2-2626224973 .color-N3{color:#9499AB;} - .d2-2626224973 .color-N4{color:#CFD2DD;} - .d2-2626224973 .color-N5{color:#DEE1EB;} - .d2-2626224973 .color-N6{color:#EEF1F8;} - .d2-2626224973 .color-N7{color:#FFFFFF;} - .d2-2626224973 .color-B1{color:#0D32B2;} - .d2-2626224973 .color-B2{color:#0D32B2;} - .d2-2626224973 .color-B3{color:#E3E9FD;} - .d2-2626224973 .color-B4{color:#E3E9FD;} - .d2-2626224973 .color-B5{color:#EDF0FD;} - .d2-2626224973 .color-B6{color:#F7F8FE;} - .d2-2626224973 .color-AA2{color:#4A6FF3;} - .d2-2626224973 .color-AA4{color:#EDF0FD;} - .d2-2626224973 .color-AA5{color:#F7F8FE;} - .d2-2626224973 .color-AB4{color:#EDF0FD;} - .d2-2626224973 .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 -======= .d2-2808374517 .fill-N1{fill:#0A0F25;} .d2-2808374517 .fill-N2{fill:#676C7E;} .d2-2808374517 .fill-N3{fill:#9499AB;} @@ -258,8 +89,7 @@ .d2-2808374517 .color-AA4{color:#EDF0FD;} .d2-2808374517 .color-AA5{color:#F7F8FE;} .d2-2808374517 .color-AB4{color:#EDF0FD;} - .d2-2808374517 .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 ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-2808374517 .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 diff --git a/e2etests-cli/testdata/TestCLI_E2E/no-nav-pdf.exp.pdf b/e2etests-cli/testdata/TestCLI_E2E/no-nav-pdf.exp.pdf index 5a6a7c364..75f717b6b 100644 Binary files a/e2etests-cli/testdata/TestCLI_E2E/no-nav-pdf.exp.pdf and b/e2etests-cli/testdata/TestCLI_E2E/no-nav-pdf.exp.pdf differ diff --git a/e2etests-cli/testdata/TestCLI_E2E/no-nav-pptx.exp.pptx b/e2etests-cli/testdata/TestCLI_E2E/no-nav-pptx.exp.pptx index 4aaa3aa5b..0590d887f 100644 Binary files a/e2etests-cli/testdata/TestCLI_E2E/no-nav-pptx.exp.pptx and b/e2etests-cli/testdata/TestCLI_E2E/no-nav-pptx.exp.pptx differ diff --git a/e2etests-cli/testdata/TestCLI_E2E/pptx-theme-overrides.exp.pptx b/e2etests-cli/testdata/TestCLI_E2E/pptx-theme-overrides.exp.pptx index d8d7d5d9b..765957789 100644 Binary files a/e2etests-cli/testdata/TestCLI_E2E/pptx-theme-overrides.exp.pptx and b/e2etests-cli/testdata/TestCLI_E2E/pptx-theme-overrides.exp.pptx differ diff --git a/e2etests-cli/testdata/TestCLI_E2E/renamed-board.exp.pdf b/e2etests-cli/testdata/TestCLI_E2E/renamed-board.exp.pdf index c520c51ab..c4a82ab99 100644 Binary files a/e2etests-cli/testdata/TestCLI_E2E/renamed-board.exp.pdf and b/e2etests-cli/testdata/TestCLI_E2E/renamed-board.exp.pdf differ diff --git a/e2etests-cli/testdata/TestCLI_E2E/sequence-layer/index.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/sequence-layer/index.exp.svg index 4bdde5937..2b7c32547 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/sequence-layer/index.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/sequence-layer/index.exp.svg @@ -1,16 +1,6 @@ -<<<<<<< HEAD -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;} @@ -246,8 +89,7 @@ .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) + .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 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 8a6ae6cce..32002bd77 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,6 @@ -<<<<<<< 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;} @@ -253,8 +96,7 @@ .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) + .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 diff --git a/e2etests-cli/testdata/TestCLI_E2E/sequence-spread-layer/index.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/sequence-spread-layer/index.exp.svg index 5822fff64..2b7c32547 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/sequence-spread-layer/index.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/sequence-spread-layer/index.exp.svg @@ -1,9 +1,9 @@ -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 diff --git a/e2etests-cli/testdata/TestCLI_E2E/sequence-spread-layer/seq.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/sequence-spread-layer/seq.exp.svg index 70a6e7ba3..32002bd77 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/sequence-spread-layer/seq.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/sequence-spread-layer/seq.exp.svg @@ -1,16 +1,16 @@ -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 diff --git a/e2etests-cli/testdata/TestCLI_E2E/stdin.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/stdin.exp.svg index 5ae1566b6..83392e040 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/stdin.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/stdin.exp.svg @@ -1,26 +1,4 @@ -<<<<<<< HEAD -<<<<<<< HEAD -xy -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-1843626214 .fill-N1{fill:#0A0F25;} - .d2-1843626214 .fill-N2{fill:#676C7E;} - .d2-1843626214 .fill-N3{fill:#9499AB;} - .d2-1843626214 .fill-N4{fill:#CFD2DD;} - .d2-1843626214 .fill-N5{fill:#DEE1EB;} - .d2-1843626214 .fill-N6{fill:#EEF1F8;} - .d2-1843626214 .fill-N7{fill:#FFFFFF;} - .d2-1843626214 .fill-B1{fill:#0D32B2;} - .d2-1843626214 .fill-B2{fill:#0D32B2;} - .d2-1843626214 .fill-B3{fill:#E3E9FD;} - .d2-1843626214 .fill-B4{fill:#E3E9FD;} - .d2-1843626214 .fill-B5{fill:#EDF0FD;} - .d2-1843626214 .fill-B6{fill:#F7F8FE;} - .d2-1843626214 .fill-AA2{fill:#4A6FF3;} - .d2-1843626214 .fill-AA4{fill:#EDF0FD;} - .d2-1843626214 .fill-AA5{fill:#F7F8FE;} - .d2-1843626214 .fill-AB4{fill:#EDF0FD;} - .d2-1843626214 .fill-AB5{fill:#F7F8FE;} - .d2-1843626214 .stroke-N1{stroke:#0A0F25;} - .d2-1843626214 .stroke-N2{stroke:#676C7E;} - .d2-1843626214 .stroke-N3{stroke:#9499AB;} - .d2-1843626214 .stroke-N4{stroke:#CFD2DD;} - .d2-1843626214 .stroke-N5{stroke:#DEE1EB;} - .d2-1843626214 .stroke-N6{stroke:#EEF1F8;} - .d2-1843626214 .stroke-N7{stroke:#FFFFFF;} - .d2-1843626214 .stroke-B1{stroke:#0D32B2;} - .d2-1843626214 .stroke-B2{stroke:#0D32B2;} - .d2-1843626214 .stroke-B3{stroke:#E3E9FD;} - .d2-1843626214 .stroke-B4{stroke:#E3E9FD;} - .d2-1843626214 .stroke-B5{stroke:#EDF0FD;} - .d2-1843626214 .stroke-B6{stroke:#F7F8FE;} - .d2-1843626214 .stroke-AA2{stroke:#4A6FF3;} - .d2-1843626214 .stroke-AA4{stroke:#EDF0FD;} - .d2-1843626214 .stroke-AA5{stroke:#F7F8FE;} - .d2-1843626214 .stroke-AB4{stroke:#EDF0FD;} - .d2-1843626214 .stroke-AB5{stroke:#F7F8FE;} - .d2-1843626214 .background-color-N1{background-color:#0A0F25;} - .d2-1843626214 .background-color-N2{background-color:#676C7E;} - .d2-1843626214 .background-color-N3{background-color:#9499AB;} - .d2-1843626214 .background-color-N4{background-color:#CFD2DD;} - .d2-1843626214 .background-color-N5{background-color:#DEE1EB;} - .d2-1843626214 .background-color-N6{background-color:#EEF1F8;} - .d2-1843626214 .background-color-N7{background-color:#FFFFFF;} - .d2-1843626214 .background-color-B1{background-color:#0D32B2;} - .d2-1843626214 .background-color-B2{background-color:#0D32B2;} - .d2-1843626214 .background-color-B3{background-color:#E3E9FD;} - .d2-1843626214 .background-color-B4{background-color:#E3E9FD;} - .d2-1843626214 .background-color-B5{background-color:#EDF0FD;} - .d2-1843626214 .background-color-B6{background-color:#F7F8FE;} - .d2-1843626214 .background-color-AA2{background-color:#4A6FF3;} - .d2-1843626214 .background-color-AA4{background-color:#EDF0FD;} - .d2-1843626214 .background-color-AA5{background-color:#F7F8FE;} - .d2-1843626214 .background-color-AB4{background-color:#EDF0FD;} - .d2-1843626214 .background-color-AB5{background-color:#F7F8FE;} - .d2-1843626214 .color-N1{color:#0A0F25;} - .d2-1843626214 .color-N2{color:#676C7E;} - .d2-1843626214 .color-N3{color:#9499AB;} - .d2-1843626214 .color-N4{color:#CFD2DD;} - .d2-1843626214 .color-N5{color:#DEE1EB;} - .d2-1843626214 .color-N6{color:#EEF1F8;} - .d2-1843626214 .color-N7{color:#FFFFFF;} - .d2-1843626214 .color-B1{color:#0D32B2;} - .d2-1843626214 .color-B2{color:#0D32B2;} - .d2-1843626214 .color-B3{color:#E3E9FD;} - .d2-1843626214 .color-B4{color:#E3E9FD;} - .d2-1843626214 .color-B5{color:#EDF0FD;} - .d2-1843626214 .color-B6{color:#F7F8FE;} - .d2-1843626214 .color-AA2{color:#4A6FF3;} - .d2-1843626214 .color-AA4{color:#EDF0FD;} - .d2-1843626214 .color-AA5{color:#F7F8FE;} - .d2-1843626214 .color-AB4{color:#EDF0FD;} - .d2-1843626214 .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 -======= .d2-4198988860 .fill-N1{fill:#0A0F25;} .d2-4198988860 .fill-N2{fill:#676C7E;} .d2-4198988860 .fill-N3{fill:#9499AB;} @@ -258,8 +89,7 @@ .d2-4198988860 .color-AA4{color:#EDF0FD;} .d2-4198988860 .color-AA5{color:#F7F8FE;} .d2-4198988860 .color-AB4{color:#EDF0FD;} - .d2-4198988860 .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 ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-4198988860 .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 diff --git a/e2etests-cli/testdata/TestCLI_E2E/theme-override.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/theme-override.exp.svg index 19f929e87..20600c847 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/theme-override.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/theme-override.exp.svg @@ -1,26 +1,4 @@ -<<<<<<< HEAD -<<<<<<< HEAD -logsUserNetworkAPI ServercostumesidintPKsillinessintmonsterintlast_updatedtimestampmonstersidintPKmoviestringweightintlast_updatedtimestampCell TowerData ProcessorOnline PortalsatellitestransmitterStorageUI phone logsMake callpersistdisplay access -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-64011612 .fill-N1{fill:#2E2E2E;} - .d2-64011612 .fill-N2{fill:#2E2E2E;} - .d2-64011612 .fill-N3{fill:#595959;} - .d2-64011612 .fill-N4{fill:#858585;} - .d2-64011612 .fill-N5{fill:#B1B1B1;} - .d2-64011612 .fill-N6{fill:#DCDCDC;} - .d2-64011612 .fill-N7{fill:#DCDCDC;} - .d2-64011612 .fill-B1{fill:#2E7D32;} - .d2-64011612 .fill-B2{fill:#66BB6A;} - .d2-64011612 .fill-B3{fill:#A5D6A7;} - .d2-64011612 .fill-B4{fill:#C5E1A5;} - .d2-64011612 .fill-B5{fill:#E6EE9C;} - .d2-64011612 .fill-B6{fill:#FFF59D;} - .d2-64011612 .fill-AA2{fill:#0D47A1;} - .d2-64011612 .fill-AA4{fill:#42A5F5;} - .d2-64011612 .fill-AA5{fill:#90CAF9;} - .d2-64011612 .fill-AB4{fill:#F44336;} - .d2-64011612 .fill-AB5{fill:#FFCDD2;} - .d2-64011612 .stroke-N1{stroke:#2E2E2E;} - .d2-64011612 .stroke-N2{stroke:#2E2E2E;} - .d2-64011612 .stroke-N3{stroke:#595959;} - .d2-64011612 .stroke-N4{stroke:#858585;} - .d2-64011612 .stroke-N5{stroke:#B1B1B1;} - .d2-64011612 .stroke-N6{stroke:#DCDCDC;} - .d2-64011612 .stroke-N7{stroke:#DCDCDC;} - .d2-64011612 .stroke-B1{stroke:#2E7D32;} - .d2-64011612 .stroke-B2{stroke:#66BB6A;} - .d2-64011612 .stroke-B3{stroke:#A5D6A7;} - .d2-64011612 .stroke-B4{stroke:#C5E1A5;} - .d2-64011612 .stroke-B5{stroke:#E6EE9C;} - .d2-64011612 .stroke-B6{stroke:#FFF59D;} - .d2-64011612 .stroke-AA2{stroke:#0D47A1;} - .d2-64011612 .stroke-AA4{stroke:#42A5F5;} - .d2-64011612 .stroke-AA5{stroke:#90CAF9;} - .d2-64011612 .stroke-AB4{stroke:#F44336;} - .d2-64011612 .stroke-AB5{stroke:#FFCDD2;} - .d2-64011612 .background-color-N1{background-color:#2E2E2E;} - .d2-64011612 .background-color-N2{background-color:#2E2E2E;} - .d2-64011612 .background-color-N3{background-color:#595959;} - .d2-64011612 .background-color-N4{background-color:#858585;} - .d2-64011612 .background-color-N5{background-color:#B1B1B1;} - .d2-64011612 .background-color-N6{background-color:#DCDCDC;} - .d2-64011612 .background-color-N7{background-color:#DCDCDC;} - .d2-64011612 .background-color-B1{background-color:#2E7D32;} - .d2-64011612 .background-color-B2{background-color:#66BB6A;} - .d2-64011612 .background-color-B3{background-color:#A5D6A7;} - .d2-64011612 .background-color-B4{background-color:#C5E1A5;} - .d2-64011612 .background-color-B5{background-color:#E6EE9C;} - .d2-64011612 .background-color-B6{background-color:#FFF59D;} - .d2-64011612 .background-color-AA2{background-color:#0D47A1;} - .d2-64011612 .background-color-AA4{background-color:#42A5F5;} - .d2-64011612 .background-color-AA5{background-color:#90CAF9;} - .d2-64011612 .background-color-AB4{background-color:#F44336;} - .d2-64011612 .background-color-AB5{background-color:#FFCDD2;} - .d2-64011612 .color-N1{color:#2E2E2E;} - .d2-64011612 .color-N2{color:#2E2E2E;} - .d2-64011612 .color-N3{color:#595959;} - .d2-64011612 .color-N4{color:#858585;} - .d2-64011612 .color-N5{color:#B1B1B1;} - .d2-64011612 .color-N6{color:#DCDCDC;} - .d2-64011612 .color-N7{color:#DCDCDC;} - .d2-64011612 .color-B1{color:#2E7D32;} - .d2-64011612 .color-B2{color:#66BB6A;} - .d2-64011612 .color-B3{color:#A5D6A7;} - .d2-64011612 .color-B4{color:#C5E1A5;} - .d2-64011612 .color-B5{color:#E6EE9C;} - .d2-64011612 .color-B6{color:#FFF59D;} - .d2-64011612 .color-AA2{color:#0D47A1;} - .d2-64011612 .color-AA4{color:#42A5F5;} - .d2-64011612 .color-AA5{color:#90CAF9;} - .d2-64011612 .color-AB4{color:#F44336;} - .d2-64011612 .color-AB5{color:#FFCDD2;}.appendix text.text{fill:#2E2E2E}.md{--color-fg-default:#2E2E2E;--color-fg-muted:#2E2E2E;--color-fg-subtle:#595959;--color-canvas-default:#DCDCDC;--color-canvas-subtle:#DCDCDC;--color-border-default:#2E7D32;--color-border-muted:#66BB6A;--color-neutral-muted:#DCDCDC;--color-accent-fg:#66BB6A;--color-accent-emphasis:#66BB6A;--color-attention-subtle:#2E2E2E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.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-darker);mix-blend-mode:lighten}.sketch-overlay-AA4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AA5{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AB4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AB5{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N3{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N6{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N7{fill:url(#streaks-normal);mix-blend-mode:color-burn}.light-code{display: block}.dark-code{display: none}]]>logsUserNetworkAPI ServercostumesidintPKsillinessintmonsterintlast_updatedtimestampmonstersidintPKmoviestringweightintlast_updatedtimestampCell TowerData ProcessorOnline PortalsatellitestransmitterStorageUI phone logsMake callpersistdisplay access -======= .d2-3500999268 .fill-N1{fill:#2E2E2E;} .d2-3500999268 .fill-N2{fill:#2E2E2E;} .d2-3500999268 .fill-N3{fill:#595959;} @@ -272,8 +103,7 @@ .d2-3500999268 .color-AA4{color:#42A5F5;} .d2-3500999268 .color-AA5{color:#90CAF9;} .d2-3500999268 .color-AB4{color:#F44336;} - .d2-3500999268 .color-AB5{color:#FFCDD2;}.appendix text.text{fill:#2E2E2E}.md{--color-fg-default:#2E2E2E;--color-fg-muted:#2E2E2E;--color-fg-subtle:#595959;--color-canvas-default:#DCDCDC;--color-canvas-subtle:#DCDCDC;--color-border-default:#2E7D32;--color-border-muted:#66BB6A;--color-neutral-muted:#DCDCDC;--color-accent-fg:#66BB6A;--color-accent-emphasis:#66BB6A;--color-attention-subtle:#2E2E2E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.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-darker);mix-blend-mode:lighten}.sketch-overlay-AA4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AA5{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AB4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AB5{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N3{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N6{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N7{fill:url(#streaks-normal);mix-blend-mode:color-burn}.light-code{display: block}.dark-code{display: none}]]>logsUserNetworkAPI ServercostumesidintPKsillinessintmonsterintlast_updatedtimestampmonstersidintPKmoviestringweightintlast_updatedtimestampCell TowerData ProcessorOnline PortalsatellitestransmitterStorageUI phone logsMake callpersistdisplay access ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-3500999268 .color-AB5{color:#FFCDD2;}.appendix text.text{fill:#2E2E2E}.md{--color-fg-default:#2E2E2E;--color-fg-muted:#2E2E2E;--color-fg-subtle:#595959;--color-canvas-default:#DCDCDC;--color-canvas-subtle:#DCDCDC;--color-border-default:#2E7D32;--color-border-muted:#66BB6A;--color-neutral-muted:#DCDCDC;--color-accent-fg:#66BB6A;--color-accent-emphasis:#66BB6A;--color-attention-subtle:#2E2E2E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.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-darker);mix-blend-mode:lighten}.sketch-overlay-AA4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AA5{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AB4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AB5{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N3{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N6{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N7{fill:url(#streaks-normal);mix-blend-mode:color-burn}.light-code{display: block}.dark-code{display: none}]]>logsUserNetworkAPI ServercostumesidintPKsillinessintmonsterintlast_updatedtimestampmonstersidintPKmoviestringweightintlast_updatedtimestampCell TowerData ProcessorOnline PortalsatellitestransmitterStorageUI phone logsMake callpersistdisplay access diff --git a/e2etests-cli/testdata/TestCLI_E2E/theme-pdf.exp.pdf b/e2etests-cli/testdata/TestCLI_E2E/theme-pdf.exp.pdf index 79e8b42da..c6437033f 100644 Binary files a/e2etests-cli/testdata/TestCLI_E2E/theme-pdf.exp.pdf and b/e2etests-cli/testdata/TestCLI_E2E/theme-pdf.exp.pdf differ diff --git a/e2etests-cli/testdata/TestCLI_E2E/vars-animation.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/vars-animation.exp.svg index cee95efee..46d3b4da0 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/vars-animation.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/vars-animation.exp.svg @@ -1,28 +1,4 @@ -<<<<<<< HEAD -<<<<<<< HEAD CHICKEN'S PLAN -||||||| parent of 33280fed5 (fixed e2e tests) -}]]>CHICKEN'S PLAN -======= -}]]>CHICKEN'S PLAN ->>>>>>> 33280fed5 (fixed e2e tests) +}]]>CHICKEN'S PLAN -<<<<<<< HEAD -CHICKEN'S PLANAPPROACH ROAD -||||||| parent of 33280fed5 (fixed e2e tests) -CHICKEN'S PLANAPPROACH ROAD -======= -CHICKEN'S PLANAPPROACH ROAD ->>>>>>> 33280fed5 (fixed e2e tests) +CHICKEN'S PLANAPPROACH ROAD -<<<<<<< HEAD -CHICKEN'S PLANAPPROACH ROADCROSS ROAD -||||||| parent of 33280fed5 (fixed e2e tests) -CHICKEN'S PLANAPPROACH ROADCROSS ROAD -======= -CHICKEN'S PLANAPPROACH ROADCROSS ROAD ->>>>>>> 33280fed5 (fixed e2e tests) +CHICKEN'S PLANAPPROACH ROADCROSS ROAD -<<<<<<< HEAD -CHICKEN'S PLANAPPROACH ROADCROSS ROADMAKE YOU WONDER WHY -||||||| parent of 33280fed5 (fixed e2e tests) -CHICKEN'S PLANAPPROACH ROADCROSS ROADMAKE YOU WONDER WHY -======= -CHICKEN'S PLANAPPROACH ROADCROSS ROADMAKE YOU WONDER WHY ->>>>>>> 33280fed5 (fixed e2e tests) +CHICKEN'S PLANAPPROACH ROADCROSS ROADMAKE YOU WONDER WHY diff --git a/e2etests-cli/testdata/TestCLI_E2E/vars-config.exp.svg b/e2etests-cli/testdata/TestCLI_E2E/vars-config.exp.svg index ba03ead68..e5577b6f9 100644 --- a/e2etests-cli/testdata/TestCLI_E2E/vars-config.exp.svg +++ b/e2etests-cli/testdata/TestCLI_E2E/vars-config.exp.svg @@ -1,26 +1,4 @@ -<<<<<<< HEAD -<<<<<<< HEAD -Why do computers get sick often?Because their Windows are always open! italic font -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-1771907023 .fill-N1{fill:#0A0F25;} - .d2-1771907023 .fill-N2{fill:#676C7E;} - .d2-1771907023 .fill-N3{fill:#9499AB;} - .d2-1771907023 .fill-N4{fill:#CFD2DD;} - .d2-1771907023 .fill-N5{fill:#DEE1EB;} - .d2-1771907023 .fill-N6{fill:#EEF1F8;} - .d2-1771907023 .fill-N7{fill:#FFFFFF;} - .d2-1771907023 .fill-B1{fill:#0D32B2;} - .d2-1771907023 .fill-B2{fill:#0D32B2;} - .d2-1771907023 .fill-B3{fill:#E3E9FD;} - .d2-1771907023 .fill-B4{fill:#E3E9FD;} - .d2-1771907023 .fill-B5{fill:#EDF0FD;} - .d2-1771907023 .fill-B6{fill:#F7F8FE;} - .d2-1771907023 .fill-AA2{fill:#4A6FF3;} - .d2-1771907023 .fill-AA4{fill:#EDF0FD;} - .d2-1771907023 .fill-AA5{fill:#F7F8FE;} - .d2-1771907023 .fill-AB4{fill:#EDF0FD;} - .d2-1771907023 .fill-AB5{fill:#F7F8FE;} - .d2-1771907023 .stroke-N1{stroke:#0A0F25;} - .d2-1771907023 .stroke-N2{stroke:#676C7E;} - .d2-1771907023 .stroke-N3{stroke:#9499AB;} - .d2-1771907023 .stroke-N4{stroke:#CFD2DD;} - .d2-1771907023 .stroke-N5{stroke:#DEE1EB;} - .d2-1771907023 .stroke-N6{stroke:#EEF1F8;} - .d2-1771907023 .stroke-N7{stroke:#FFFFFF;} - .d2-1771907023 .stroke-B1{stroke:#0D32B2;} - .d2-1771907023 .stroke-B2{stroke:#0D32B2;} - .d2-1771907023 .stroke-B3{stroke:#E3E9FD;} - .d2-1771907023 .stroke-B4{stroke:#E3E9FD;} - .d2-1771907023 .stroke-B5{stroke:#EDF0FD;} - .d2-1771907023 .stroke-B6{stroke:#F7F8FE;} - .d2-1771907023 .stroke-AA2{stroke:#4A6FF3;} - .d2-1771907023 .stroke-AA4{stroke:#EDF0FD;} - .d2-1771907023 .stroke-AA5{stroke:#F7F8FE;} - .d2-1771907023 .stroke-AB4{stroke:#EDF0FD;} - .d2-1771907023 .stroke-AB5{stroke:#F7F8FE;} - .d2-1771907023 .background-color-N1{background-color:#0A0F25;} - .d2-1771907023 .background-color-N2{background-color:#676C7E;} - .d2-1771907023 .background-color-N3{background-color:#9499AB;} - .d2-1771907023 .background-color-N4{background-color:#CFD2DD;} - .d2-1771907023 .background-color-N5{background-color:#DEE1EB;} - .d2-1771907023 .background-color-N6{background-color:#EEF1F8;} - .d2-1771907023 .background-color-N7{background-color:#FFFFFF;} - .d2-1771907023 .background-color-B1{background-color:#0D32B2;} - .d2-1771907023 .background-color-B2{background-color:#0D32B2;} - .d2-1771907023 .background-color-B3{background-color:#E3E9FD;} - .d2-1771907023 .background-color-B4{background-color:#E3E9FD;} - .d2-1771907023 .background-color-B5{background-color:#EDF0FD;} - .d2-1771907023 .background-color-B6{background-color:#F7F8FE;} - .d2-1771907023 .background-color-AA2{background-color:#4A6FF3;} - .d2-1771907023 .background-color-AA4{background-color:#EDF0FD;} - .d2-1771907023 .background-color-AA5{background-color:#F7F8FE;} - .d2-1771907023 .background-color-AB4{background-color:#EDF0FD;} - .d2-1771907023 .background-color-AB5{background-color:#F7F8FE;} - .d2-1771907023 .color-N1{color:#0A0F25;} - .d2-1771907023 .color-N2{color:#676C7E;} - .d2-1771907023 .color-N3{color:#9499AB;} - .d2-1771907023 .color-N4{color:#CFD2DD;} - .d2-1771907023 .color-N5{color:#DEE1EB;} - .d2-1771907023 .color-N6{color:#EEF1F8;} - .d2-1771907023 .color-N7{color:#FFFFFF;} - .d2-1771907023 .color-B1{color:#0D32B2;} - .d2-1771907023 .color-B2{color:#0D32B2;} - .d2-1771907023 .color-B3{color:#E3E9FD;} - .d2-1771907023 .color-B4{color:#E3E9FD;} - .d2-1771907023 .color-B5{color:#EDF0FD;} - .d2-1771907023 .color-B6{color:#F7F8FE;} - .d2-1771907023 .color-AA2{color:#4A6FF3;} - .d2-1771907023 .color-AA4{color:#EDF0FD;} - .d2-1771907023 .color-AA5{color:#F7F8FE;} - .d2-1771907023 .color-AB4{color:#EDF0FD;} - .d2-1771907023 .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}]]>Why do computers get sick often?Because their Windows are always open! italic font -======= .d2-373183345 .fill-N1{fill:#0A0F25;} .d2-373183345 .fill-N2{fill:#676C7E;} .d2-373183345 .fill-N3{fill:#9499AB;} @@ -265,8 +96,7 @@ .d2-373183345 .color-AA4{color:#EDF0FD;} .d2-373183345 .color-AA5{color:#F7F8FE;} .d2-373183345 .color-AB4{color:#EDF0FD;} - .d2-373183345 .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}]]>Why do computers get sick often?Because their Windows are always open! italic font ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-373183345 .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}]]>Why do computers get sick often?Because their Windows are always open! italic font diff --git a/e2etests/testdata/patterns/all_shapes/dagre/sketch.exp.svg b/e2etests/testdata/patterns/all_shapes/dagre/sketch.exp.svg index 1842cb8c3..22750912e 100644 --- a/e2etests/testdata/patterns/all_shapes/dagre/sketch.exp.svg +++ b/e2etests/testdata/patterns/all_shapes/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -xy eth1eth2 -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-344710325 .fill-N1{fill:#0A0F25;} - .d2-344710325 .fill-N2{fill:#676C7E;} - .d2-344710325 .fill-N3{fill:#9499AB;} - .d2-344710325 .fill-N4{fill:#CFD2DD;} - .d2-344710325 .fill-N5{fill:#DEE1EB;} - .d2-344710325 .fill-N6{fill:#EEF1F8;} - .d2-344710325 .fill-N7{fill:#FFFFFF;} - .d2-344710325 .fill-B1{fill:#0D32B2;} - .d2-344710325 .fill-B2{fill:#0D32B2;} - .d2-344710325 .fill-B3{fill:#E3E9FD;} - .d2-344710325 .fill-B4{fill:#E3E9FD;} - .d2-344710325 .fill-B5{fill:#EDF0FD;} - .d2-344710325 .fill-B6{fill:#F7F8FE;} - .d2-344710325 .fill-AA2{fill:#4A6FF3;} - .d2-344710325 .fill-AA4{fill:#EDF0FD;} - .d2-344710325 .fill-AA5{fill:#F7F8FE;} - .d2-344710325 .fill-AB4{fill:#EDF0FD;} - .d2-344710325 .fill-AB5{fill:#F7F8FE;} - .d2-344710325 .stroke-N1{stroke:#0A0F25;} - .d2-344710325 .stroke-N2{stroke:#676C7E;} - .d2-344710325 .stroke-N3{stroke:#9499AB;} - .d2-344710325 .stroke-N4{stroke:#CFD2DD;} - .d2-344710325 .stroke-N5{stroke:#DEE1EB;} - .d2-344710325 .stroke-N6{stroke:#EEF1F8;} - .d2-344710325 .stroke-N7{stroke:#FFFFFF;} - .d2-344710325 .stroke-B1{stroke:#0D32B2;} - .d2-344710325 .stroke-B2{stroke:#0D32B2;} - .d2-344710325 .stroke-B3{stroke:#E3E9FD;} - .d2-344710325 .stroke-B4{stroke:#E3E9FD;} - .d2-344710325 .stroke-B5{stroke:#EDF0FD;} - .d2-344710325 .stroke-B6{stroke:#F7F8FE;} - .d2-344710325 .stroke-AA2{stroke:#4A6FF3;} - .d2-344710325 .stroke-AA4{stroke:#EDF0FD;} - .d2-344710325 .stroke-AA5{stroke:#F7F8FE;} - .d2-344710325 .stroke-AB4{stroke:#EDF0FD;} - .d2-344710325 .stroke-AB5{stroke:#F7F8FE;} - .d2-344710325 .background-color-N1{background-color:#0A0F25;} - .d2-344710325 .background-color-N2{background-color:#676C7E;} - .d2-344710325 .background-color-N3{background-color:#9499AB;} - .d2-344710325 .background-color-N4{background-color:#CFD2DD;} - .d2-344710325 .background-color-N5{background-color:#DEE1EB;} - .d2-344710325 .background-color-N6{background-color:#EEF1F8;} - .d2-344710325 .background-color-N7{background-color:#FFFFFF;} - .d2-344710325 .background-color-B1{background-color:#0D32B2;} - .d2-344710325 .background-color-B2{background-color:#0D32B2;} - .d2-344710325 .background-color-B3{background-color:#E3E9FD;} - .d2-344710325 .background-color-B4{background-color:#E3E9FD;} - .d2-344710325 .background-color-B5{background-color:#EDF0FD;} - .d2-344710325 .background-color-B6{background-color:#F7F8FE;} - .d2-344710325 .background-color-AA2{background-color:#4A6FF3;} - .d2-344710325 .background-color-AA4{background-color:#EDF0FD;} - .d2-344710325 .background-color-AA5{background-color:#F7F8FE;} - .d2-344710325 .background-color-AB4{background-color:#EDF0FD;} - .d2-344710325 .background-color-AB5{background-color:#F7F8FE;} - .d2-344710325 .color-N1{color:#0A0F25;} - .d2-344710325 .color-N2{color:#676C7E;} - .d2-344710325 .color-N3{color:#9499AB;} - .d2-344710325 .color-N4{color:#CFD2DD;} - .d2-344710325 .color-N5{color:#DEE1EB;} - .d2-344710325 .color-N6{color:#EEF1F8;} - .d2-344710325 .color-N7{color:#FFFFFF;} - .d2-344710325 .color-B1{color:#0D32B2;} - .d2-344710325 .color-B2{color:#0D32B2;} - .d2-344710325 .color-B3{color:#E3E9FD;} - .d2-344710325 .color-B4{color:#E3E9FD;} - .d2-344710325 .color-B5{color:#EDF0FD;} - .d2-344710325 .color-B6{color:#F7F8FE;} - .d2-344710325 .color-AA2{color:#4A6FF3;} - .d2-344710325 .color-AA4{color:#EDF0FD;} - .d2-344710325 .color-AA5{color:#F7F8FE;} - .d2-344710325 .color-AB4{color:#EDF0FD;} - .d2-344710325 .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 eth1eth2 -======= .d2-3801853211 .fill-N1{fill:#0A0F25;} .d2-3801853211 .fill-N2{fill:#676C7E;} .d2-3801853211 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-3801853211 .color-AA4{color:#EDF0FD;} .d2-3801853211 .color-AA5{color:#F7F8FE;} .d2-3801853211 .color-AB4{color:#EDF0FD;} - .d2-3801853211 .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 eth1eth2 ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-3801853211 .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 eth1eth2 diff --git a/e2etests/testdata/regression/arrowhead_font_color/elk/sketch.exp.svg b/e2etests/testdata/regression/arrowhead_font_color/elk/sketch.exp.svg index 4092cc591..8ba2d63ec 100644 --- a/e2etests/testdata/regression/arrowhead_font_color/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/arrowhead_font_color/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -xy eth1eth2 -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-1665242727 .fill-N1{fill:#0A0F25;} - .d2-1665242727 .fill-N2{fill:#676C7E;} - .d2-1665242727 .fill-N3{fill:#9499AB;} - .d2-1665242727 .fill-N4{fill:#CFD2DD;} - .d2-1665242727 .fill-N5{fill:#DEE1EB;} - .d2-1665242727 .fill-N6{fill:#EEF1F8;} - .d2-1665242727 .fill-N7{fill:#FFFFFF;} - .d2-1665242727 .fill-B1{fill:#0D32B2;} - .d2-1665242727 .fill-B2{fill:#0D32B2;} - .d2-1665242727 .fill-B3{fill:#E3E9FD;} - .d2-1665242727 .fill-B4{fill:#E3E9FD;} - .d2-1665242727 .fill-B5{fill:#EDF0FD;} - .d2-1665242727 .fill-B6{fill:#F7F8FE;} - .d2-1665242727 .fill-AA2{fill:#4A6FF3;} - .d2-1665242727 .fill-AA4{fill:#EDF0FD;} - .d2-1665242727 .fill-AA5{fill:#F7F8FE;} - .d2-1665242727 .fill-AB4{fill:#EDF0FD;} - .d2-1665242727 .fill-AB5{fill:#F7F8FE;} - .d2-1665242727 .stroke-N1{stroke:#0A0F25;} - .d2-1665242727 .stroke-N2{stroke:#676C7E;} - .d2-1665242727 .stroke-N3{stroke:#9499AB;} - .d2-1665242727 .stroke-N4{stroke:#CFD2DD;} - .d2-1665242727 .stroke-N5{stroke:#DEE1EB;} - .d2-1665242727 .stroke-N6{stroke:#EEF1F8;} - .d2-1665242727 .stroke-N7{stroke:#FFFFFF;} - .d2-1665242727 .stroke-B1{stroke:#0D32B2;} - .d2-1665242727 .stroke-B2{stroke:#0D32B2;} - .d2-1665242727 .stroke-B3{stroke:#E3E9FD;} - .d2-1665242727 .stroke-B4{stroke:#E3E9FD;} - .d2-1665242727 .stroke-B5{stroke:#EDF0FD;} - .d2-1665242727 .stroke-B6{stroke:#F7F8FE;} - .d2-1665242727 .stroke-AA2{stroke:#4A6FF3;} - .d2-1665242727 .stroke-AA4{stroke:#EDF0FD;} - .d2-1665242727 .stroke-AA5{stroke:#F7F8FE;} - .d2-1665242727 .stroke-AB4{stroke:#EDF0FD;} - .d2-1665242727 .stroke-AB5{stroke:#F7F8FE;} - .d2-1665242727 .background-color-N1{background-color:#0A0F25;} - .d2-1665242727 .background-color-N2{background-color:#676C7E;} - .d2-1665242727 .background-color-N3{background-color:#9499AB;} - .d2-1665242727 .background-color-N4{background-color:#CFD2DD;} - .d2-1665242727 .background-color-N5{background-color:#DEE1EB;} - .d2-1665242727 .background-color-N6{background-color:#EEF1F8;} - .d2-1665242727 .background-color-N7{background-color:#FFFFFF;} - .d2-1665242727 .background-color-B1{background-color:#0D32B2;} - .d2-1665242727 .background-color-B2{background-color:#0D32B2;} - .d2-1665242727 .background-color-B3{background-color:#E3E9FD;} - .d2-1665242727 .background-color-B4{background-color:#E3E9FD;} - .d2-1665242727 .background-color-B5{background-color:#EDF0FD;} - .d2-1665242727 .background-color-B6{background-color:#F7F8FE;} - .d2-1665242727 .background-color-AA2{background-color:#4A6FF3;} - .d2-1665242727 .background-color-AA4{background-color:#EDF0FD;} - .d2-1665242727 .background-color-AA5{background-color:#F7F8FE;} - .d2-1665242727 .background-color-AB4{background-color:#EDF0FD;} - .d2-1665242727 .background-color-AB5{background-color:#F7F8FE;} - .d2-1665242727 .color-N1{color:#0A0F25;} - .d2-1665242727 .color-N2{color:#676C7E;} - .d2-1665242727 .color-N3{color:#9499AB;} - .d2-1665242727 .color-N4{color:#CFD2DD;} - .d2-1665242727 .color-N5{color:#DEE1EB;} - .d2-1665242727 .color-N6{color:#EEF1F8;} - .d2-1665242727 .color-N7{color:#FFFFFF;} - .d2-1665242727 .color-B1{color:#0D32B2;} - .d2-1665242727 .color-B2{color:#0D32B2;} - .d2-1665242727 .color-B3{color:#E3E9FD;} - .d2-1665242727 .color-B4{color:#E3E9FD;} - .d2-1665242727 .color-B5{color:#EDF0FD;} - .d2-1665242727 .color-B6{color:#F7F8FE;} - .d2-1665242727 .color-AA2{color:#4A6FF3;} - .d2-1665242727 .color-AA4{color:#EDF0FD;} - .d2-1665242727 .color-AA5{color:#F7F8FE;} - .d2-1665242727 .color-AB4{color:#EDF0FD;} - .d2-1665242727 .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 eth1eth2 -======= .d2-142564125 .fill-N1{fill:#0A0F25;} .d2-142564125 .fill-N2{fill:#676C7E;} .d2-142564125 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-142564125 .color-AA4{color:#EDF0FD;} .d2-142564125 .color-AA5{color:#F7F8FE;} .d2-142564125 .color-AB4{color:#EDF0FD;} - .d2-142564125 .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 eth1eth2 ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-142564125 .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 eth1eth2 diff --git a/e2etests/testdata/regression/arrowhead_sizes_with_labels/dagre/sketch.exp.svg b/e2etests/testdata/regression/arrowhead_sizes_with_labels/dagre/sketch.exp.svg index 6f263bb52..cd477727b 100644 --- a/e2etests/testdata/regression/arrowhead_sizes_with_labels/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/arrowhead_sizes_with_labels/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -trianglenonearrowdiamondfilled diamondcirclefilled circlecf onecf one requiredcf manycf many requiredabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcd 11 111111 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-3069999377 .fill-N1{fill:#0A0F25;} - .d2-3069999377 .fill-N2{fill:#676C7E;} - .d2-3069999377 .fill-N3{fill:#9499AB;} - .d2-3069999377 .fill-N4{fill:#CFD2DD;} - .d2-3069999377 .fill-N5{fill:#DEE1EB;} - .d2-3069999377 .fill-N6{fill:#EEF1F8;} - .d2-3069999377 .fill-N7{fill:#FFFFFF;} - .d2-3069999377 .fill-B1{fill:#0D32B2;} - .d2-3069999377 .fill-B2{fill:#0D32B2;} - .d2-3069999377 .fill-B3{fill:#E3E9FD;} - .d2-3069999377 .fill-B4{fill:#E3E9FD;} - .d2-3069999377 .fill-B5{fill:#EDF0FD;} - .d2-3069999377 .fill-B6{fill:#F7F8FE;} - .d2-3069999377 .fill-AA2{fill:#4A6FF3;} - .d2-3069999377 .fill-AA4{fill:#EDF0FD;} - .d2-3069999377 .fill-AA5{fill:#F7F8FE;} - .d2-3069999377 .fill-AB4{fill:#EDF0FD;} - .d2-3069999377 .fill-AB5{fill:#F7F8FE;} - .d2-3069999377 .stroke-N1{stroke:#0A0F25;} - .d2-3069999377 .stroke-N2{stroke:#676C7E;} - .d2-3069999377 .stroke-N3{stroke:#9499AB;} - .d2-3069999377 .stroke-N4{stroke:#CFD2DD;} - .d2-3069999377 .stroke-N5{stroke:#DEE1EB;} - .d2-3069999377 .stroke-N6{stroke:#EEF1F8;} - .d2-3069999377 .stroke-N7{stroke:#FFFFFF;} - .d2-3069999377 .stroke-B1{stroke:#0D32B2;} - .d2-3069999377 .stroke-B2{stroke:#0D32B2;} - .d2-3069999377 .stroke-B3{stroke:#E3E9FD;} - .d2-3069999377 .stroke-B4{stroke:#E3E9FD;} - .d2-3069999377 .stroke-B5{stroke:#EDF0FD;} - .d2-3069999377 .stroke-B6{stroke:#F7F8FE;} - .d2-3069999377 .stroke-AA2{stroke:#4A6FF3;} - .d2-3069999377 .stroke-AA4{stroke:#EDF0FD;} - .d2-3069999377 .stroke-AA5{stroke:#F7F8FE;} - .d2-3069999377 .stroke-AB4{stroke:#EDF0FD;} - .d2-3069999377 .stroke-AB5{stroke:#F7F8FE;} - .d2-3069999377 .background-color-N1{background-color:#0A0F25;} - .d2-3069999377 .background-color-N2{background-color:#676C7E;} - .d2-3069999377 .background-color-N3{background-color:#9499AB;} - .d2-3069999377 .background-color-N4{background-color:#CFD2DD;} - .d2-3069999377 .background-color-N5{background-color:#DEE1EB;} - .d2-3069999377 .background-color-N6{background-color:#EEF1F8;} - .d2-3069999377 .background-color-N7{background-color:#FFFFFF;} - .d2-3069999377 .background-color-B1{background-color:#0D32B2;} - .d2-3069999377 .background-color-B2{background-color:#0D32B2;} - .d2-3069999377 .background-color-B3{background-color:#E3E9FD;} - .d2-3069999377 .background-color-B4{background-color:#E3E9FD;} - .d2-3069999377 .background-color-B5{background-color:#EDF0FD;} - .d2-3069999377 .background-color-B6{background-color:#F7F8FE;} - .d2-3069999377 .background-color-AA2{background-color:#4A6FF3;} - .d2-3069999377 .background-color-AA4{background-color:#EDF0FD;} - .d2-3069999377 .background-color-AA5{background-color:#F7F8FE;} - .d2-3069999377 .background-color-AB4{background-color:#EDF0FD;} - .d2-3069999377 .background-color-AB5{background-color:#F7F8FE;} - .d2-3069999377 .color-N1{color:#0A0F25;} - .d2-3069999377 .color-N2{color:#676C7E;} - .d2-3069999377 .color-N3{color:#9499AB;} - .d2-3069999377 .color-N4{color:#CFD2DD;} - .d2-3069999377 .color-N5{color:#DEE1EB;} - .d2-3069999377 .color-N6{color:#EEF1F8;} - .d2-3069999377 .color-N7{color:#FFFFFF;} - .d2-3069999377 .color-B1{color:#0D32B2;} - .d2-3069999377 .color-B2{color:#0D32B2;} - .d2-3069999377 .color-B3{color:#E3E9FD;} - .d2-3069999377 .color-B4{color:#E3E9FD;} - .d2-3069999377 .color-B5{color:#EDF0FD;} - .d2-3069999377 .color-B6{color:#F7F8FE;} - .d2-3069999377 .color-AA2{color:#4A6FF3;} - .d2-3069999377 .color-AA4{color:#EDF0FD;} - .d2-3069999377 .color-AA5{color:#F7F8FE;} - .d2-3069999377 .color-AB4{color:#EDF0FD;} - .d2-3069999377 .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}]]>trianglenonearrowdiamondfilled diamondcirclefilled circlecf onecf one requiredcf manycf many requiredabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcd 11 111111 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 -======= .d2-1521764101 .fill-N1{fill:#0A0F25;} .d2-1521764101 .fill-N2{fill:#676C7E;} .d2-1521764101 .fill-N3{fill:#9499AB;} @@ -266,8 +103,7 @@ .d2-1521764101 .color-AA4{color:#EDF0FD;} .d2-1521764101 .color-AA5{color:#F7F8FE;} .d2-1521764101 .color-AB4{color:#EDF0FD;} - .d2-1521764101 .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}]]>trianglenonearrowdiamondfilled diamondcirclefilled circlecf onecf one requiredcf manycf many requiredabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcd 11 111111 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-1521764101 .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}]]>trianglenonearrowdiamondfilled diamondcirclefilled circlecf onecf one requiredcf manycf many requiredabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcd 11 111111 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 diff --git a/e2etests/testdata/regression/arrowhead_sizes_with_labels/elk/sketch.exp.svg b/e2etests/testdata/regression/arrowhead_sizes_with_labels/elk/sketch.exp.svg index 64e741db1..d34218c7d 100644 --- a/e2etests/testdata/regression/arrowhead_sizes_with_labels/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/arrowhead_sizes_with_labels/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -trianglenonearrowdiamondfilled diamondcirclefilled circlecf onecf one requiredcf manycf many requiredabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcd 11 111111 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-2455158177 .fill-N1{fill:#0A0F25;} - .d2-2455158177 .fill-N2{fill:#676C7E;} - .d2-2455158177 .fill-N3{fill:#9499AB;} - .d2-2455158177 .fill-N4{fill:#CFD2DD;} - .d2-2455158177 .fill-N5{fill:#DEE1EB;} - .d2-2455158177 .fill-N6{fill:#EEF1F8;} - .d2-2455158177 .fill-N7{fill:#FFFFFF;} - .d2-2455158177 .fill-B1{fill:#0D32B2;} - .d2-2455158177 .fill-B2{fill:#0D32B2;} - .d2-2455158177 .fill-B3{fill:#E3E9FD;} - .d2-2455158177 .fill-B4{fill:#E3E9FD;} - .d2-2455158177 .fill-B5{fill:#EDF0FD;} - .d2-2455158177 .fill-B6{fill:#F7F8FE;} - .d2-2455158177 .fill-AA2{fill:#4A6FF3;} - .d2-2455158177 .fill-AA4{fill:#EDF0FD;} - .d2-2455158177 .fill-AA5{fill:#F7F8FE;} - .d2-2455158177 .fill-AB4{fill:#EDF0FD;} - .d2-2455158177 .fill-AB5{fill:#F7F8FE;} - .d2-2455158177 .stroke-N1{stroke:#0A0F25;} - .d2-2455158177 .stroke-N2{stroke:#676C7E;} - .d2-2455158177 .stroke-N3{stroke:#9499AB;} - .d2-2455158177 .stroke-N4{stroke:#CFD2DD;} - .d2-2455158177 .stroke-N5{stroke:#DEE1EB;} - .d2-2455158177 .stroke-N6{stroke:#EEF1F8;} - .d2-2455158177 .stroke-N7{stroke:#FFFFFF;} - .d2-2455158177 .stroke-B1{stroke:#0D32B2;} - .d2-2455158177 .stroke-B2{stroke:#0D32B2;} - .d2-2455158177 .stroke-B3{stroke:#E3E9FD;} - .d2-2455158177 .stroke-B4{stroke:#E3E9FD;} - .d2-2455158177 .stroke-B5{stroke:#EDF0FD;} - .d2-2455158177 .stroke-B6{stroke:#F7F8FE;} - .d2-2455158177 .stroke-AA2{stroke:#4A6FF3;} - .d2-2455158177 .stroke-AA4{stroke:#EDF0FD;} - .d2-2455158177 .stroke-AA5{stroke:#F7F8FE;} - .d2-2455158177 .stroke-AB4{stroke:#EDF0FD;} - .d2-2455158177 .stroke-AB5{stroke:#F7F8FE;} - .d2-2455158177 .background-color-N1{background-color:#0A0F25;} - .d2-2455158177 .background-color-N2{background-color:#676C7E;} - .d2-2455158177 .background-color-N3{background-color:#9499AB;} - .d2-2455158177 .background-color-N4{background-color:#CFD2DD;} - .d2-2455158177 .background-color-N5{background-color:#DEE1EB;} - .d2-2455158177 .background-color-N6{background-color:#EEF1F8;} - .d2-2455158177 .background-color-N7{background-color:#FFFFFF;} - .d2-2455158177 .background-color-B1{background-color:#0D32B2;} - .d2-2455158177 .background-color-B2{background-color:#0D32B2;} - .d2-2455158177 .background-color-B3{background-color:#E3E9FD;} - .d2-2455158177 .background-color-B4{background-color:#E3E9FD;} - .d2-2455158177 .background-color-B5{background-color:#EDF0FD;} - .d2-2455158177 .background-color-B6{background-color:#F7F8FE;} - .d2-2455158177 .background-color-AA2{background-color:#4A6FF3;} - .d2-2455158177 .background-color-AA4{background-color:#EDF0FD;} - .d2-2455158177 .background-color-AA5{background-color:#F7F8FE;} - .d2-2455158177 .background-color-AB4{background-color:#EDF0FD;} - .d2-2455158177 .background-color-AB5{background-color:#F7F8FE;} - .d2-2455158177 .color-N1{color:#0A0F25;} - .d2-2455158177 .color-N2{color:#676C7E;} - .d2-2455158177 .color-N3{color:#9499AB;} - .d2-2455158177 .color-N4{color:#CFD2DD;} - .d2-2455158177 .color-N5{color:#DEE1EB;} - .d2-2455158177 .color-N6{color:#EEF1F8;} - .d2-2455158177 .color-N7{color:#FFFFFF;} - .d2-2455158177 .color-B1{color:#0D32B2;} - .d2-2455158177 .color-B2{color:#0D32B2;} - .d2-2455158177 .color-B3{color:#E3E9FD;} - .d2-2455158177 .color-B4{color:#E3E9FD;} - .d2-2455158177 .color-B5{color:#EDF0FD;} - .d2-2455158177 .color-B6{color:#F7F8FE;} - .d2-2455158177 .color-AA2{color:#4A6FF3;} - .d2-2455158177 .color-AA4{color:#EDF0FD;} - .d2-2455158177 .color-AA5{color:#F7F8FE;} - .d2-2455158177 .color-AB4{color:#EDF0FD;} - .d2-2455158177 .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}]]>trianglenonearrowdiamondfilled diamondcirclefilled circlecf onecf one requiredcf manycf many requiredabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcd 11 111111 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 -======= .d2-3556569361 .fill-N1{fill:#0A0F25;} .d2-3556569361 .fill-N2{fill:#676C7E;} .d2-3556569361 .fill-N3{fill:#9499AB;} @@ -266,8 +103,7 @@ .d2-3556569361 .color-AA4{color:#EDF0FD;} .d2-3556569361 .color-AA5{color:#F7F8FE;} .d2-3556569361 .color-AB4{color:#EDF0FD;} - .d2-3556569361 .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}]]>trianglenonearrowdiamondfilled diamondcirclefilled circlecf onecf one requiredcf manycf many requiredabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcd 11 111111 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-3556569361 .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}]]>trianglenonearrowdiamondfilled diamondcirclefilled circlecf onecf one requiredcf manycf many requiredabcdabcdabcdabcdabcdabcdabcdabcdabcdabcdabcd 11 111111 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 11 diff --git a/e2etests/testdata/regression/bold_edge_label/dagre/sketch.exp.svg b/e2etests/testdata/regression/bold_edge_label/dagre/sketch.exp.svg index 646748461..0c6a9d78c 100644 --- a/e2etests/testdata/regression/bold_edge_label/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/bold_edge_label/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -xyz syncsync -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-3295824007 .fill-N1{fill:#0A0F25;} - .d2-3295824007 .fill-N2{fill:#676C7E;} - .d2-3295824007 .fill-N3{fill:#9499AB;} - .d2-3295824007 .fill-N4{fill:#CFD2DD;} - .d2-3295824007 .fill-N5{fill:#DEE1EB;} - .d2-3295824007 .fill-N6{fill:#EEF1F8;} - .d2-3295824007 .fill-N7{fill:#FFFFFF;} - .d2-3295824007 .fill-B1{fill:#0D32B2;} - .d2-3295824007 .fill-B2{fill:#0D32B2;} - .d2-3295824007 .fill-B3{fill:#E3E9FD;} - .d2-3295824007 .fill-B4{fill:#E3E9FD;} - .d2-3295824007 .fill-B5{fill:#EDF0FD;} - .d2-3295824007 .fill-B6{fill:#F7F8FE;} - .d2-3295824007 .fill-AA2{fill:#4A6FF3;} - .d2-3295824007 .fill-AA4{fill:#EDF0FD;} - .d2-3295824007 .fill-AA5{fill:#F7F8FE;} - .d2-3295824007 .fill-AB4{fill:#EDF0FD;} - .d2-3295824007 .fill-AB5{fill:#F7F8FE;} - .d2-3295824007 .stroke-N1{stroke:#0A0F25;} - .d2-3295824007 .stroke-N2{stroke:#676C7E;} - .d2-3295824007 .stroke-N3{stroke:#9499AB;} - .d2-3295824007 .stroke-N4{stroke:#CFD2DD;} - .d2-3295824007 .stroke-N5{stroke:#DEE1EB;} - .d2-3295824007 .stroke-N6{stroke:#EEF1F8;} - .d2-3295824007 .stroke-N7{stroke:#FFFFFF;} - .d2-3295824007 .stroke-B1{stroke:#0D32B2;} - .d2-3295824007 .stroke-B2{stroke:#0D32B2;} - .d2-3295824007 .stroke-B3{stroke:#E3E9FD;} - .d2-3295824007 .stroke-B4{stroke:#E3E9FD;} - .d2-3295824007 .stroke-B5{stroke:#EDF0FD;} - .d2-3295824007 .stroke-B6{stroke:#F7F8FE;} - .d2-3295824007 .stroke-AA2{stroke:#4A6FF3;} - .d2-3295824007 .stroke-AA4{stroke:#EDF0FD;} - .d2-3295824007 .stroke-AA5{stroke:#F7F8FE;} - .d2-3295824007 .stroke-AB4{stroke:#EDF0FD;} - .d2-3295824007 .stroke-AB5{stroke:#F7F8FE;} - .d2-3295824007 .background-color-N1{background-color:#0A0F25;} - .d2-3295824007 .background-color-N2{background-color:#676C7E;} - .d2-3295824007 .background-color-N3{background-color:#9499AB;} - .d2-3295824007 .background-color-N4{background-color:#CFD2DD;} - .d2-3295824007 .background-color-N5{background-color:#DEE1EB;} - .d2-3295824007 .background-color-N6{background-color:#EEF1F8;} - .d2-3295824007 .background-color-N7{background-color:#FFFFFF;} - .d2-3295824007 .background-color-B1{background-color:#0D32B2;} - .d2-3295824007 .background-color-B2{background-color:#0D32B2;} - .d2-3295824007 .background-color-B3{background-color:#E3E9FD;} - .d2-3295824007 .background-color-B4{background-color:#E3E9FD;} - .d2-3295824007 .background-color-B5{background-color:#EDF0FD;} - .d2-3295824007 .background-color-B6{background-color:#F7F8FE;} - .d2-3295824007 .background-color-AA2{background-color:#4A6FF3;} - .d2-3295824007 .background-color-AA4{background-color:#EDF0FD;} - .d2-3295824007 .background-color-AA5{background-color:#F7F8FE;} - .d2-3295824007 .background-color-AB4{background-color:#EDF0FD;} - .d2-3295824007 .background-color-AB5{background-color:#F7F8FE;} - .d2-3295824007 .color-N1{color:#0A0F25;} - .d2-3295824007 .color-N2{color:#676C7E;} - .d2-3295824007 .color-N3{color:#9499AB;} - .d2-3295824007 .color-N4{color:#CFD2DD;} - .d2-3295824007 .color-N5{color:#DEE1EB;} - .d2-3295824007 .color-N6{color:#EEF1F8;} - .d2-3295824007 .color-N7{color:#FFFFFF;} - .d2-3295824007 .color-B1{color:#0D32B2;} - .d2-3295824007 .color-B2{color:#0D32B2;} - .d2-3295824007 .color-B3{color:#E3E9FD;} - .d2-3295824007 .color-B4{color:#E3E9FD;} - .d2-3295824007 .color-B5{color:#EDF0FD;} - .d2-3295824007 .color-B6{color:#F7F8FE;} - .d2-3295824007 .color-AA2{color:#4A6FF3;} - .d2-3295824007 .color-AA4{color:#EDF0FD;} - .d2-3295824007 .color-AA5{color:#F7F8FE;} - .d2-3295824007 .color-AB4{color:#EDF0FD;} - .d2-3295824007 .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}]]>xyz syncsync -======= .d2-1239787471 .fill-N1{fill:#0A0F25;} .d2-1239787471 .fill-N2{fill:#676C7E;} .d2-1239787471 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-1239787471 .color-AA4{color:#EDF0FD;} .d2-1239787471 .color-AA5{color:#F7F8FE;} .d2-1239787471 .color-AB4{color:#EDF0FD;} - .d2-1239787471 .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}]]>xyz syncsync ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-1239787471 .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}]]>xyz syncsync diff --git a/e2etests/testdata/regression/bold_edge_label/elk/sketch.exp.svg b/e2etests/testdata/regression/bold_edge_label/elk/sketch.exp.svg index 07a2dd44f..705578e2a 100644 --- a/e2etests/testdata/regression/bold_edge_label/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/bold_edge_label/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -xyz syncsync -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-1721623843 .fill-N1{fill:#0A0F25;} - .d2-1721623843 .fill-N2{fill:#676C7E;} - .d2-1721623843 .fill-N3{fill:#9499AB;} - .d2-1721623843 .fill-N4{fill:#CFD2DD;} - .d2-1721623843 .fill-N5{fill:#DEE1EB;} - .d2-1721623843 .fill-N6{fill:#EEF1F8;} - .d2-1721623843 .fill-N7{fill:#FFFFFF;} - .d2-1721623843 .fill-B1{fill:#0D32B2;} - .d2-1721623843 .fill-B2{fill:#0D32B2;} - .d2-1721623843 .fill-B3{fill:#E3E9FD;} - .d2-1721623843 .fill-B4{fill:#E3E9FD;} - .d2-1721623843 .fill-B5{fill:#EDF0FD;} - .d2-1721623843 .fill-B6{fill:#F7F8FE;} - .d2-1721623843 .fill-AA2{fill:#4A6FF3;} - .d2-1721623843 .fill-AA4{fill:#EDF0FD;} - .d2-1721623843 .fill-AA5{fill:#F7F8FE;} - .d2-1721623843 .fill-AB4{fill:#EDF0FD;} - .d2-1721623843 .fill-AB5{fill:#F7F8FE;} - .d2-1721623843 .stroke-N1{stroke:#0A0F25;} - .d2-1721623843 .stroke-N2{stroke:#676C7E;} - .d2-1721623843 .stroke-N3{stroke:#9499AB;} - .d2-1721623843 .stroke-N4{stroke:#CFD2DD;} - .d2-1721623843 .stroke-N5{stroke:#DEE1EB;} - .d2-1721623843 .stroke-N6{stroke:#EEF1F8;} - .d2-1721623843 .stroke-N7{stroke:#FFFFFF;} - .d2-1721623843 .stroke-B1{stroke:#0D32B2;} - .d2-1721623843 .stroke-B2{stroke:#0D32B2;} - .d2-1721623843 .stroke-B3{stroke:#E3E9FD;} - .d2-1721623843 .stroke-B4{stroke:#E3E9FD;} - .d2-1721623843 .stroke-B5{stroke:#EDF0FD;} - .d2-1721623843 .stroke-B6{stroke:#F7F8FE;} - .d2-1721623843 .stroke-AA2{stroke:#4A6FF3;} - .d2-1721623843 .stroke-AA4{stroke:#EDF0FD;} - .d2-1721623843 .stroke-AA5{stroke:#F7F8FE;} - .d2-1721623843 .stroke-AB4{stroke:#EDF0FD;} - .d2-1721623843 .stroke-AB5{stroke:#F7F8FE;} - .d2-1721623843 .background-color-N1{background-color:#0A0F25;} - .d2-1721623843 .background-color-N2{background-color:#676C7E;} - .d2-1721623843 .background-color-N3{background-color:#9499AB;} - .d2-1721623843 .background-color-N4{background-color:#CFD2DD;} - .d2-1721623843 .background-color-N5{background-color:#DEE1EB;} - .d2-1721623843 .background-color-N6{background-color:#EEF1F8;} - .d2-1721623843 .background-color-N7{background-color:#FFFFFF;} - .d2-1721623843 .background-color-B1{background-color:#0D32B2;} - .d2-1721623843 .background-color-B2{background-color:#0D32B2;} - .d2-1721623843 .background-color-B3{background-color:#E3E9FD;} - .d2-1721623843 .background-color-B4{background-color:#E3E9FD;} - .d2-1721623843 .background-color-B5{background-color:#EDF0FD;} - .d2-1721623843 .background-color-B6{background-color:#F7F8FE;} - .d2-1721623843 .background-color-AA2{background-color:#4A6FF3;} - .d2-1721623843 .background-color-AA4{background-color:#EDF0FD;} - .d2-1721623843 .background-color-AA5{background-color:#F7F8FE;} - .d2-1721623843 .background-color-AB4{background-color:#EDF0FD;} - .d2-1721623843 .background-color-AB5{background-color:#F7F8FE;} - .d2-1721623843 .color-N1{color:#0A0F25;} - .d2-1721623843 .color-N2{color:#676C7E;} - .d2-1721623843 .color-N3{color:#9499AB;} - .d2-1721623843 .color-N4{color:#CFD2DD;} - .d2-1721623843 .color-N5{color:#DEE1EB;} - .d2-1721623843 .color-N6{color:#EEF1F8;} - .d2-1721623843 .color-N7{color:#FFFFFF;} - .d2-1721623843 .color-B1{color:#0D32B2;} - .d2-1721623843 .color-B2{color:#0D32B2;} - .d2-1721623843 .color-B3{color:#E3E9FD;} - .d2-1721623843 .color-B4{color:#E3E9FD;} - .d2-1721623843 .color-B5{color:#EDF0FD;} - .d2-1721623843 .color-B6{color:#F7F8FE;} - .d2-1721623843 .color-AA2{color:#4A6FF3;} - .d2-1721623843 .color-AA4{color:#EDF0FD;} - .d2-1721623843 .color-AA5{color:#F7F8FE;} - .d2-1721623843 .color-AB4{color:#EDF0FD;} - .d2-1721623843 .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}]]>xyz syncsync -======= .d2-2828377911 .fill-N1{fill:#0A0F25;} .d2-2828377911 .fill-N2{fill:#676C7E;} .d2-2828377911 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-2828377911 .color-AA4{color:#EDF0FD;} .d2-2828377911 .color-AA5{color:#F7F8FE;} .d2-2828377911 .color-AB4{color:#EDF0FD;} - .d2-2828377911 .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}]]>xyz syncsync ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-2828377911 .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}]]>xyz syncsync diff --git a/e2etests/testdata/regression/class_font_style_sequence/dagre/sketch.exp.svg b/e2etests/testdata/regression/class_font_style_sequence/dagre/sketch.exp.svg index e9b7cf056..b5a21d61b 100644 --- a/e2etests/testdata/regression/class_font_style_sequence/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/class_font_style_sequence/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -a -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-965117370 .fill-N1{fill:#0A0F25;} - .d2-965117370 .fill-N2{fill:#676C7E;} - .d2-965117370 .fill-N3{fill:#9499AB;} - .d2-965117370 .fill-N4{fill:#CFD2DD;} - .d2-965117370 .fill-N5{fill:#DEE1EB;} - .d2-965117370 .fill-N6{fill:#EEF1F8;} - .d2-965117370 .fill-N7{fill:#FFFFFF;} - .d2-965117370 .fill-B1{fill:#0D32B2;} - .d2-965117370 .fill-B2{fill:#0D32B2;} - .d2-965117370 .fill-B3{fill:#E3E9FD;} - .d2-965117370 .fill-B4{fill:#E3E9FD;} - .d2-965117370 .fill-B5{fill:#EDF0FD;} - .d2-965117370 .fill-B6{fill:#F7F8FE;} - .d2-965117370 .fill-AA2{fill:#4A6FF3;} - .d2-965117370 .fill-AA4{fill:#EDF0FD;} - .d2-965117370 .fill-AA5{fill:#F7F8FE;} - .d2-965117370 .fill-AB4{fill:#EDF0FD;} - .d2-965117370 .fill-AB5{fill:#F7F8FE;} - .d2-965117370 .stroke-N1{stroke:#0A0F25;} - .d2-965117370 .stroke-N2{stroke:#676C7E;} - .d2-965117370 .stroke-N3{stroke:#9499AB;} - .d2-965117370 .stroke-N4{stroke:#CFD2DD;} - .d2-965117370 .stroke-N5{stroke:#DEE1EB;} - .d2-965117370 .stroke-N6{stroke:#EEF1F8;} - .d2-965117370 .stroke-N7{stroke:#FFFFFF;} - .d2-965117370 .stroke-B1{stroke:#0D32B2;} - .d2-965117370 .stroke-B2{stroke:#0D32B2;} - .d2-965117370 .stroke-B3{stroke:#E3E9FD;} - .d2-965117370 .stroke-B4{stroke:#E3E9FD;} - .d2-965117370 .stroke-B5{stroke:#EDF0FD;} - .d2-965117370 .stroke-B6{stroke:#F7F8FE;} - .d2-965117370 .stroke-AA2{stroke:#4A6FF3;} - .d2-965117370 .stroke-AA4{stroke:#EDF0FD;} - .d2-965117370 .stroke-AA5{stroke:#F7F8FE;} - .d2-965117370 .stroke-AB4{stroke:#EDF0FD;} - .d2-965117370 .stroke-AB5{stroke:#F7F8FE;} - .d2-965117370 .background-color-N1{background-color:#0A0F25;} - .d2-965117370 .background-color-N2{background-color:#676C7E;} - .d2-965117370 .background-color-N3{background-color:#9499AB;} - .d2-965117370 .background-color-N4{background-color:#CFD2DD;} - .d2-965117370 .background-color-N5{background-color:#DEE1EB;} - .d2-965117370 .background-color-N6{background-color:#EEF1F8;} - .d2-965117370 .background-color-N7{background-color:#FFFFFF;} - .d2-965117370 .background-color-B1{background-color:#0D32B2;} - .d2-965117370 .background-color-B2{background-color:#0D32B2;} - .d2-965117370 .background-color-B3{background-color:#E3E9FD;} - .d2-965117370 .background-color-B4{background-color:#E3E9FD;} - .d2-965117370 .background-color-B5{background-color:#EDF0FD;} - .d2-965117370 .background-color-B6{background-color:#F7F8FE;} - .d2-965117370 .background-color-AA2{background-color:#4A6FF3;} - .d2-965117370 .background-color-AA4{background-color:#EDF0FD;} - .d2-965117370 .background-color-AA5{background-color:#F7F8FE;} - .d2-965117370 .background-color-AB4{background-color:#EDF0FD;} - .d2-965117370 .background-color-AB5{background-color:#F7F8FE;} - .d2-965117370 .color-N1{color:#0A0F25;} - .d2-965117370 .color-N2{color:#676C7E;} - .d2-965117370 .color-N3{color:#9499AB;} - .d2-965117370 .color-N4{color:#CFD2DD;} - .d2-965117370 .color-N5{color:#DEE1EB;} - .d2-965117370 .color-N6{color:#EEF1F8;} - .d2-965117370 .color-N7{color:#FFFFFF;} - .d2-965117370 .color-B1{color:#0D32B2;} - .d2-965117370 .color-B2{color:#0D32B2;} - .d2-965117370 .color-B3{color:#E3E9FD;} - .d2-965117370 .color-B4{color:#E3E9FD;} - .d2-965117370 .color-B5{color:#EDF0FD;} - .d2-965117370 .color-B6{color:#F7F8FE;} - .d2-965117370 .color-AA2{color:#4A6FF3;} - .d2-965117370 .color-AA4{color:#EDF0FD;} - .d2-965117370 .color-AA5{color:#F7F8FE;} - .d2-965117370 .color-AB4{color:#EDF0FD;} - .d2-965117370 .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 .fill-N1{fill:#0A0F25;} .d2-4091838784 .fill-N2{fill:#676C7E;} .d2-4091838784 .fill-N3{fill:#9499AB;} @@ -252,14 +89,7 @@ .d2-4091838784 .color-AA4{color:#EDF0FD;} .d2-4091838784 .color-AA5{color:#F7F8FE;} .d2-4091838784 .color-AB4{color:#EDF0FD;} -<<<<<<< HEAD - .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 ->>>>>>> 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) + .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 \ 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 e9b7cf056..b5a21d61b 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,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -a -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-965117370 .fill-N1{fill:#0A0F25;} - .d2-965117370 .fill-N2{fill:#676C7E;} - .d2-965117370 .fill-N3{fill:#9499AB;} - .d2-965117370 .fill-N4{fill:#CFD2DD;} - .d2-965117370 .fill-N5{fill:#DEE1EB;} - .d2-965117370 .fill-N6{fill:#EEF1F8;} - .d2-965117370 .fill-N7{fill:#FFFFFF;} - .d2-965117370 .fill-B1{fill:#0D32B2;} - .d2-965117370 .fill-B2{fill:#0D32B2;} - .d2-965117370 .fill-B3{fill:#E3E9FD;} - .d2-965117370 .fill-B4{fill:#E3E9FD;} - .d2-965117370 .fill-B5{fill:#EDF0FD;} - .d2-965117370 .fill-B6{fill:#F7F8FE;} - .d2-965117370 .fill-AA2{fill:#4A6FF3;} - .d2-965117370 .fill-AA4{fill:#EDF0FD;} - .d2-965117370 .fill-AA5{fill:#F7F8FE;} - .d2-965117370 .fill-AB4{fill:#EDF0FD;} - .d2-965117370 .fill-AB5{fill:#F7F8FE;} - .d2-965117370 .stroke-N1{stroke:#0A0F25;} - .d2-965117370 .stroke-N2{stroke:#676C7E;} - .d2-965117370 .stroke-N3{stroke:#9499AB;} - .d2-965117370 .stroke-N4{stroke:#CFD2DD;} - .d2-965117370 .stroke-N5{stroke:#DEE1EB;} - .d2-965117370 .stroke-N6{stroke:#EEF1F8;} - .d2-965117370 .stroke-N7{stroke:#FFFFFF;} - .d2-965117370 .stroke-B1{stroke:#0D32B2;} - .d2-965117370 .stroke-B2{stroke:#0D32B2;} - .d2-965117370 .stroke-B3{stroke:#E3E9FD;} - .d2-965117370 .stroke-B4{stroke:#E3E9FD;} - .d2-965117370 .stroke-B5{stroke:#EDF0FD;} - .d2-965117370 .stroke-B6{stroke:#F7F8FE;} - .d2-965117370 .stroke-AA2{stroke:#4A6FF3;} - .d2-965117370 .stroke-AA4{stroke:#EDF0FD;} - .d2-965117370 .stroke-AA5{stroke:#F7F8FE;} - .d2-965117370 .stroke-AB4{stroke:#EDF0FD;} - .d2-965117370 .stroke-AB5{stroke:#F7F8FE;} - .d2-965117370 .background-color-N1{background-color:#0A0F25;} - .d2-965117370 .background-color-N2{background-color:#676C7E;} - .d2-965117370 .background-color-N3{background-color:#9499AB;} - .d2-965117370 .background-color-N4{background-color:#CFD2DD;} - .d2-965117370 .background-color-N5{background-color:#DEE1EB;} - .d2-965117370 .background-color-N6{background-color:#EEF1F8;} - .d2-965117370 .background-color-N7{background-color:#FFFFFF;} - .d2-965117370 .background-color-B1{background-color:#0D32B2;} - .d2-965117370 .background-color-B2{background-color:#0D32B2;} - .d2-965117370 .background-color-B3{background-color:#E3E9FD;} - .d2-965117370 .background-color-B4{background-color:#E3E9FD;} - .d2-965117370 .background-color-B5{background-color:#EDF0FD;} - .d2-965117370 .background-color-B6{background-color:#F7F8FE;} - .d2-965117370 .background-color-AA2{background-color:#4A6FF3;} - .d2-965117370 .background-color-AA4{background-color:#EDF0FD;} - .d2-965117370 .background-color-AA5{background-color:#F7F8FE;} - .d2-965117370 .background-color-AB4{background-color:#EDF0FD;} - .d2-965117370 .background-color-AB5{background-color:#F7F8FE;} - .d2-965117370 .color-N1{color:#0A0F25;} - .d2-965117370 .color-N2{color:#676C7E;} - .d2-965117370 .color-N3{color:#9499AB;} - .d2-965117370 .color-N4{color:#CFD2DD;} - .d2-965117370 .color-N5{color:#DEE1EB;} - .d2-965117370 .color-N6{color:#EEF1F8;} - .d2-965117370 .color-N7{color:#FFFFFF;} - .d2-965117370 .color-B1{color:#0D32B2;} - .d2-965117370 .color-B2{color:#0D32B2;} - .d2-965117370 .color-B3{color:#E3E9FD;} - .d2-965117370 .color-B4{color:#E3E9FD;} - .d2-965117370 .color-B5{color:#EDF0FD;} - .d2-965117370 .color-B6{color:#F7F8FE;} - .d2-965117370 .color-AA2{color:#4A6FF3;} - .d2-965117370 .color-AA4{color:#EDF0FD;} - .d2-965117370 .color-AA5{color:#F7F8FE;} - .d2-965117370 .color-AB4{color:#EDF0FD;} - .d2-965117370 .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 .fill-N1{fill:#0A0F25;} .d2-4091838784 .fill-N2{fill:#676C7E;} .d2-4091838784 .fill-N3{fill:#9499AB;} @@ -252,14 +89,7 @@ .d2-4091838784 .color-AA4{color:#EDF0FD;} .d2-4091838784 .color-AA5{color:#F7F8FE;} .d2-4091838784 .color-AB4{color:#EDF0FD;} -<<<<<<< HEAD - .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 ->>>>>>> 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) + .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 \ 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 dc51640d3..cbfd2ce12 100644 --- a/e2etests/testdata/regression/code_font_size/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/code_font_size/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -DatayxTesting 001:        AAA -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-1305390466 .fill-N1{fill:#0A0F25;} - .d2-1305390466 .fill-N2{fill:#676C7E;} - .d2-1305390466 .fill-N3{fill:#9499AB;} - .d2-1305390466 .fill-N4{fill:#CFD2DD;} - .d2-1305390466 .fill-N5{fill:#DEE1EB;} - .d2-1305390466 .fill-N6{fill:#EEF1F8;} - .d2-1305390466 .fill-N7{fill:#FFFFFF;} - .d2-1305390466 .fill-B1{fill:#0D32B2;} - .d2-1305390466 .fill-B2{fill:#0D32B2;} - .d2-1305390466 .fill-B3{fill:#E3E9FD;} - .d2-1305390466 .fill-B4{fill:#E3E9FD;} - .d2-1305390466 .fill-B5{fill:#EDF0FD;} - .d2-1305390466 .fill-B6{fill:#F7F8FE;} - .d2-1305390466 .fill-AA2{fill:#4A6FF3;} - .d2-1305390466 .fill-AA4{fill:#EDF0FD;} - .d2-1305390466 .fill-AA5{fill:#F7F8FE;} - .d2-1305390466 .fill-AB4{fill:#EDF0FD;} - .d2-1305390466 .fill-AB5{fill:#F7F8FE;} - .d2-1305390466 .stroke-N1{stroke:#0A0F25;} - .d2-1305390466 .stroke-N2{stroke:#676C7E;} - .d2-1305390466 .stroke-N3{stroke:#9499AB;} - .d2-1305390466 .stroke-N4{stroke:#CFD2DD;} - .d2-1305390466 .stroke-N5{stroke:#DEE1EB;} - .d2-1305390466 .stroke-N6{stroke:#EEF1F8;} - .d2-1305390466 .stroke-N7{stroke:#FFFFFF;} - .d2-1305390466 .stroke-B1{stroke:#0D32B2;} - .d2-1305390466 .stroke-B2{stroke:#0D32B2;} - .d2-1305390466 .stroke-B3{stroke:#E3E9FD;} - .d2-1305390466 .stroke-B4{stroke:#E3E9FD;} - .d2-1305390466 .stroke-B5{stroke:#EDF0FD;} - .d2-1305390466 .stroke-B6{stroke:#F7F8FE;} - .d2-1305390466 .stroke-AA2{stroke:#4A6FF3;} - .d2-1305390466 .stroke-AA4{stroke:#EDF0FD;} - .d2-1305390466 .stroke-AA5{stroke:#F7F8FE;} - .d2-1305390466 .stroke-AB4{stroke:#EDF0FD;} - .d2-1305390466 .stroke-AB5{stroke:#F7F8FE;} - .d2-1305390466 .background-color-N1{background-color:#0A0F25;} - .d2-1305390466 .background-color-N2{background-color:#676C7E;} - .d2-1305390466 .background-color-N3{background-color:#9499AB;} - .d2-1305390466 .background-color-N4{background-color:#CFD2DD;} - .d2-1305390466 .background-color-N5{background-color:#DEE1EB;} - .d2-1305390466 .background-color-N6{background-color:#EEF1F8;} - .d2-1305390466 .background-color-N7{background-color:#FFFFFF;} - .d2-1305390466 .background-color-B1{background-color:#0D32B2;} - .d2-1305390466 .background-color-B2{background-color:#0D32B2;} - .d2-1305390466 .background-color-B3{background-color:#E3E9FD;} - .d2-1305390466 .background-color-B4{background-color:#E3E9FD;} - .d2-1305390466 .background-color-B5{background-color:#EDF0FD;} - .d2-1305390466 .background-color-B6{background-color:#F7F8FE;} - .d2-1305390466 .background-color-AA2{background-color:#4A6FF3;} - .d2-1305390466 .background-color-AA4{background-color:#EDF0FD;} - .d2-1305390466 .background-color-AA5{background-color:#F7F8FE;} - .d2-1305390466 .background-color-AB4{background-color:#EDF0FD;} - .d2-1305390466 .background-color-AB5{background-color:#F7F8FE;} - .d2-1305390466 .color-N1{color:#0A0F25;} - .d2-1305390466 .color-N2{color:#676C7E;} - .d2-1305390466 .color-N3{color:#9499AB;} - .d2-1305390466 .color-N4{color:#CFD2DD;} - .d2-1305390466 .color-N5{color:#DEE1EB;} - .d2-1305390466 .color-N6{color:#EEF1F8;} - .d2-1305390466 .color-N7{color:#FFFFFF;} - .d2-1305390466 .color-B1{color:#0D32B2;} - .d2-1305390466 .color-B2{color:#0D32B2;} - .d2-1305390466 .color-B3{color:#E3E9FD;} - .d2-1305390466 .color-B4{color:#E3E9FD;} - .d2-1305390466 .color-B5{color:#EDF0FD;} - .d2-1305390466 .color-B6{color:#F7F8FE;} - .d2-1305390466 .color-AA2{color:#4A6FF3;} - .d2-1305390466 .color-AA4{color:#EDF0FD;} - .d2-1305390466 .color-AA5{color:#F7F8FE;} - .d2-1305390466 .color-AB4{color:#EDF0FD;} - .d2-1305390466 .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}]]>DatayxTesting 001:        AAA -======= .d2-747351070 .fill-N1{fill:#0A0F25;} .d2-747351070 .fill-N2{fill:#676C7E;} .d2-747351070 .fill-N3{fill:#9499AB;} @@ -266,8 +103,7 @@ .d2-747351070 .color-AA4{color:#EDF0FD;} .d2-747351070 .color-AA5{color:#F7F8FE;} .d2-747351070 .color-AB4{color:#EDF0FD;} - .d2-747351070 .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}]]>DatayxTesting 001:        AAA ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-747351070 .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}]]>DatayxTesting 001:        AAA Testing 002:        BBB Testing 003:        CCC Testing 004:        DDD @@ -281,7 +117,6 @@ Testing 012:        LLL Testing 013:        MMM Testing 014:        NNN -<<<<<<< HEAD Testing 015:        OOOTesting 001:        AAA Testing 002:        BBB Testing 003:        CCC @@ -296,40 +131,7 @@ Testing 012:        LLL Testing 013:        MMM Testing 014:        NNN -Testing 015:        OOO -||||||| parent of 33280fed5 (fixed e2e tests) -Testing 015:        OOOTesting 001:        AAA -Testing 002:        BBB -Testing 003:        CCC -Testing 004:        DDD -Testing 005:        EEE -Testing 006:        FFF -Testing 007:        GGG -Testing 008:        HHH -Testing 009:        III -Testing 010:        JJJ -Testing 011:        KKK -Testing 012:        LLL -Testing 013:        MMM -Testing 014:        NNN -Testing 015:        OOO -======= -Testing 015:        OOOTesting 001:        AAA -Testing 002:        BBB -Testing 003:        CCC -Testing 004:        DDD -Testing 005:        EEE -Testing 006:        FFF -Testing 007:        GGG -Testing 008:        HHH -Testing 009:        III -Testing 010:        JJJ -Testing 011:        KKK -Testing 012:        LLL -Testing 013:        MMM -Testing 014:        NNN -Testing 015:        OOO ->>>>>>> 33280fed5 (fixed e2e tests) +Testing 015:        OOO diff --git a/e2etests/testdata/regression/code_font_size/elk/sketch.exp.svg b/e2etests/testdata/regression/code_font_size/elk/sketch.exp.svg index 9548a3f52..a844bcb51 100644 --- a/e2etests/testdata/regression/code_font_size/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/code_font_size/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -DatayxTesting 001:        AAA -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-3010012946 .fill-N1{fill:#0A0F25;} - .d2-3010012946 .fill-N2{fill:#676C7E;} - .d2-3010012946 .fill-N3{fill:#9499AB;} - .d2-3010012946 .fill-N4{fill:#CFD2DD;} - .d2-3010012946 .fill-N5{fill:#DEE1EB;} - .d2-3010012946 .fill-N6{fill:#EEF1F8;} - .d2-3010012946 .fill-N7{fill:#FFFFFF;} - .d2-3010012946 .fill-B1{fill:#0D32B2;} - .d2-3010012946 .fill-B2{fill:#0D32B2;} - .d2-3010012946 .fill-B3{fill:#E3E9FD;} - .d2-3010012946 .fill-B4{fill:#E3E9FD;} - .d2-3010012946 .fill-B5{fill:#EDF0FD;} - .d2-3010012946 .fill-B6{fill:#F7F8FE;} - .d2-3010012946 .fill-AA2{fill:#4A6FF3;} - .d2-3010012946 .fill-AA4{fill:#EDF0FD;} - .d2-3010012946 .fill-AA5{fill:#F7F8FE;} - .d2-3010012946 .fill-AB4{fill:#EDF0FD;} - .d2-3010012946 .fill-AB5{fill:#F7F8FE;} - .d2-3010012946 .stroke-N1{stroke:#0A0F25;} - .d2-3010012946 .stroke-N2{stroke:#676C7E;} - .d2-3010012946 .stroke-N3{stroke:#9499AB;} - .d2-3010012946 .stroke-N4{stroke:#CFD2DD;} - .d2-3010012946 .stroke-N5{stroke:#DEE1EB;} - .d2-3010012946 .stroke-N6{stroke:#EEF1F8;} - .d2-3010012946 .stroke-N7{stroke:#FFFFFF;} - .d2-3010012946 .stroke-B1{stroke:#0D32B2;} - .d2-3010012946 .stroke-B2{stroke:#0D32B2;} - .d2-3010012946 .stroke-B3{stroke:#E3E9FD;} - .d2-3010012946 .stroke-B4{stroke:#E3E9FD;} - .d2-3010012946 .stroke-B5{stroke:#EDF0FD;} - .d2-3010012946 .stroke-B6{stroke:#F7F8FE;} - .d2-3010012946 .stroke-AA2{stroke:#4A6FF3;} - .d2-3010012946 .stroke-AA4{stroke:#EDF0FD;} - .d2-3010012946 .stroke-AA5{stroke:#F7F8FE;} - .d2-3010012946 .stroke-AB4{stroke:#EDF0FD;} - .d2-3010012946 .stroke-AB5{stroke:#F7F8FE;} - .d2-3010012946 .background-color-N1{background-color:#0A0F25;} - .d2-3010012946 .background-color-N2{background-color:#676C7E;} - .d2-3010012946 .background-color-N3{background-color:#9499AB;} - .d2-3010012946 .background-color-N4{background-color:#CFD2DD;} - .d2-3010012946 .background-color-N5{background-color:#DEE1EB;} - .d2-3010012946 .background-color-N6{background-color:#EEF1F8;} - .d2-3010012946 .background-color-N7{background-color:#FFFFFF;} - .d2-3010012946 .background-color-B1{background-color:#0D32B2;} - .d2-3010012946 .background-color-B2{background-color:#0D32B2;} - .d2-3010012946 .background-color-B3{background-color:#E3E9FD;} - .d2-3010012946 .background-color-B4{background-color:#E3E9FD;} - .d2-3010012946 .background-color-B5{background-color:#EDF0FD;} - .d2-3010012946 .background-color-B6{background-color:#F7F8FE;} - .d2-3010012946 .background-color-AA2{background-color:#4A6FF3;} - .d2-3010012946 .background-color-AA4{background-color:#EDF0FD;} - .d2-3010012946 .background-color-AA5{background-color:#F7F8FE;} - .d2-3010012946 .background-color-AB4{background-color:#EDF0FD;} - .d2-3010012946 .background-color-AB5{background-color:#F7F8FE;} - .d2-3010012946 .color-N1{color:#0A0F25;} - .d2-3010012946 .color-N2{color:#676C7E;} - .d2-3010012946 .color-N3{color:#9499AB;} - .d2-3010012946 .color-N4{color:#CFD2DD;} - .d2-3010012946 .color-N5{color:#DEE1EB;} - .d2-3010012946 .color-N6{color:#EEF1F8;} - .d2-3010012946 .color-N7{color:#FFFFFF;} - .d2-3010012946 .color-B1{color:#0D32B2;} - .d2-3010012946 .color-B2{color:#0D32B2;} - .d2-3010012946 .color-B3{color:#E3E9FD;} - .d2-3010012946 .color-B4{color:#E3E9FD;} - .d2-3010012946 .color-B5{color:#EDF0FD;} - .d2-3010012946 .color-B6{color:#F7F8FE;} - .d2-3010012946 .color-AA2{color:#4A6FF3;} - .d2-3010012946 .color-AA4{color:#EDF0FD;} - .d2-3010012946 .color-AA5{color:#F7F8FE;} - .d2-3010012946 .color-AB4{color:#EDF0FD;} - .d2-3010012946 .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}]]>DatayxTesting 001:        AAA -======= .d2-119284118 .fill-N1{fill:#0A0F25;} .d2-119284118 .fill-N2{fill:#676C7E;} .d2-119284118 .fill-N3{fill:#9499AB;} @@ -266,8 +103,7 @@ .d2-119284118 .color-AA4{color:#EDF0FD;} .d2-119284118 .color-AA5{color:#F7F8FE;} .d2-119284118 .color-AB4{color:#EDF0FD;} - .d2-119284118 .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}]]>DatayxTesting 001:        AAA ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-119284118 .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}]]>DatayxTesting 001:        AAA Testing 002:        BBB Testing 003:        CCC Testing 004:        DDD @@ -281,7 +117,6 @@ Testing 012:        LLL Testing 013:        MMM Testing 014:        NNN -<<<<<<< HEAD Testing 015:        OOOTesting 001:        AAA Testing 002:        BBB Testing 003:        CCC @@ -296,40 +131,7 @@ Testing 012:        LLL Testing 013:        MMM Testing 014:        NNN -Testing 015:        OOO -||||||| parent of 33280fed5 (fixed e2e tests) -Testing 015:        OOOTesting 001:        AAA -Testing 002:        BBB -Testing 003:        CCC -Testing 004:        DDD -Testing 005:        EEE -Testing 006:        FFF -Testing 007:        GGG -Testing 008:        HHH -Testing 009:        III -Testing 010:        JJJ -Testing 011:        KKK -Testing 012:        LLL -Testing 013:        MMM -Testing 014:        NNN -Testing 015:        OOO -======= -Testing 015:        OOOTesting 001:        AAA -Testing 002:        BBB -Testing 003:        CCC -Testing 004:        DDD -Testing 005:        EEE -Testing 006:        FFF -Testing 007:        GGG -Testing 008:        HHH -Testing 009:        III -Testing 010:        JJJ -Testing 011:        KKK -Testing 012:        LLL -Testing 013:        MMM -Testing 014:        NNN -Testing 015:        OOO ->>>>>>> 33280fed5 (fixed e2e tests) +Testing 015:        OOO diff --git a/e2etests/testdata/regression/dagre-disconnect/dagre/sketch.exp.svg b/e2etests/testdata/regression/dagre-disconnect/dagre/sketch.exp.svg index 34de4deaa..6c38b71b6 100644 --- a/e2etests/testdata/regression/dagre-disconnect/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/dagre-disconnect/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -askuhykfnsomsczrgtigsjjcfi 1234 -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-870597429 .fill-N1{fill:#0A0F25;} - .d2-870597429 .fill-N2{fill:#676C7E;} - .d2-870597429 .fill-N3{fill:#9499AB;} - .d2-870597429 .fill-N4{fill:#CFD2DD;} - .d2-870597429 .fill-N5{fill:#DEE1EB;} - .d2-870597429 .fill-N6{fill:#EEF1F8;} - .d2-870597429 .fill-N7{fill:#FFFFFF;} - .d2-870597429 .fill-B1{fill:#0D32B2;} - .d2-870597429 .fill-B2{fill:#0D32B2;} - .d2-870597429 .fill-B3{fill:#E3E9FD;} - .d2-870597429 .fill-B4{fill:#E3E9FD;} - .d2-870597429 .fill-B5{fill:#EDF0FD;} - .d2-870597429 .fill-B6{fill:#F7F8FE;} - .d2-870597429 .fill-AA2{fill:#4A6FF3;} - .d2-870597429 .fill-AA4{fill:#EDF0FD;} - .d2-870597429 .fill-AA5{fill:#F7F8FE;} - .d2-870597429 .fill-AB4{fill:#EDF0FD;} - .d2-870597429 .fill-AB5{fill:#F7F8FE;} - .d2-870597429 .stroke-N1{stroke:#0A0F25;} - .d2-870597429 .stroke-N2{stroke:#676C7E;} - .d2-870597429 .stroke-N3{stroke:#9499AB;} - .d2-870597429 .stroke-N4{stroke:#CFD2DD;} - .d2-870597429 .stroke-N5{stroke:#DEE1EB;} - .d2-870597429 .stroke-N6{stroke:#EEF1F8;} - .d2-870597429 .stroke-N7{stroke:#FFFFFF;} - .d2-870597429 .stroke-B1{stroke:#0D32B2;} - .d2-870597429 .stroke-B2{stroke:#0D32B2;} - .d2-870597429 .stroke-B3{stroke:#E3E9FD;} - .d2-870597429 .stroke-B4{stroke:#E3E9FD;} - .d2-870597429 .stroke-B5{stroke:#EDF0FD;} - .d2-870597429 .stroke-B6{stroke:#F7F8FE;} - .d2-870597429 .stroke-AA2{stroke:#4A6FF3;} - .d2-870597429 .stroke-AA4{stroke:#EDF0FD;} - .d2-870597429 .stroke-AA5{stroke:#F7F8FE;} - .d2-870597429 .stroke-AB4{stroke:#EDF0FD;} - .d2-870597429 .stroke-AB5{stroke:#F7F8FE;} - .d2-870597429 .background-color-N1{background-color:#0A0F25;} - .d2-870597429 .background-color-N2{background-color:#676C7E;} - .d2-870597429 .background-color-N3{background-color:#9499AB;} - .d2-870597429 .background-color-N4{background-color:#CFD2DD;} - .d2-870597429 .background-color-N5{background-color:#DEE1EB;} - .d2-870597429 .background-color-N6{background-color:#EEF1F8;} - .d2-870597429 .background-color-N7{background-color:#FFFFFF;} - .d2-870597429 .background-color-B1{background-color:#0D32B2;} - .d2-870597429 .background-color-B2{background-color:#0D32B2;} - .d2-870597429 .background-color-B3{background-color:#E3E9FD;} - .d2-870597429 .background-color-B4{background-color:#E3E9FD;} - .d2-870597429 .background-color-B5{background-color:#EDF0FD;} - .d2-870597429 .background-color-B6{background-color:#F7F8FE;} - .d2-870597429 .background-color-AA2{background-color:#4A6FF3;} - .d2-870597429 .background-color-AA4{background-color:#EDF0FD;} - .d2-870597429 .background-color-AA5{background-color:#F7F8FE;} - .d2-870597429 .background-color-AB4{background-color:#EDF0FD;} - .d2-870597429 .background-color-AB5{background-color:#F7F8FE;} - .d2-870597429 .color-N1{color:#0A0F25;} - .d2-870597429 .color-N2{color:#676C7E;} - .d2-870597429 .color-N3{color:#9499AB;} - .d2-870597429 .color-N4{color:#CFD2DD;} - .d2-870597429 .color-N5{color:#DEE1EB;} - .d2-870597429 .color-N6{color:#EEF1F8;} - .d2-870597429 .color-N7{color:#FFFFFF;} - .d2-870597429 .color-B1{color:#0D32B2;} - .d2-870597429 .color-B2{color:#0D32B2;} - .d2-870597429 .color-B3{color:#E3E9FD;} - .d2-870597429 .color-B4{color:#E3E9FD;} - .d2-870597429 .color-B5{color:#EDF0FD;} - .d2-870597429 .color-B6{color:#F7F8FE;} - .d2-870597429 .color-AA2{color:#4A6FF3;} - .d2-870597429 .color-AA4{color:#EDF0FD;} - .d2-870597429 .color-AA5{color:#F7F8FE;} - .d2-870597429 .color-AB4{color:#EDF0FD;} - .d2-870597429 .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}]]>askuhykfnsomsczrgtigsjjcfi 1234 -======= .d2-943304765 .fill-N1{fill:#0A0F25;} .d2-943304765 .fill-N2{fill:#676C7E;} .d2-943304765 .fill-N3{fill:#9499AB;} @@ -266,8 +103,7 @@ .d2-943304765 .color-AA4{color:#EDF0FD;} .d2-943304765 .color-AA5{color:#F7F8FE;} .d2-943304765 .color-AB4{color:#EDF0FD;} - .d2-943304765 .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}]]>askuhykfnsomsczrgtigsjjcfi 1234 ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-943304765 .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}]]>askuhykfnsomsczrgtigsjjcfi 1234 diff --git a/e2etests/testdata/regression/dagre-disconnect/elk/sketch.exp.svg b/e2etests/testdata/regression/dagre-disconnect/elk/sketch.exp.svg index da404bb9c..11d8f2512 100644 --- a/e2etests/testdata/regression/dagre-disconnect/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/dagre-disconnect/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -askuhykfnsomsczrgtigsjjcfi 1234 -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-1904899960 .fill-N1{fill:#0A0F25;} - .d2-1904899960 .fill-N2{fill:#676C7E;} - .d2-1904899960 .fill-N3{fill:#9499AB;} - .d2-1904899960 .fill-N4{fill:#CFD2DD;} - .d2-1904899960 .fill-N5{fill:#DEE1EB;} - .d2-1904899960 .fill-N6{fill:#EEF1F8;} - .d2-1904899960 .fill-N7{fill:#FFFFFF;} - .d2-1904899960 .fill-B1{fill:#0D32B2;} - .d2-1904899960 .fill-B2{fill:#0D32B2;} - .d2-1904899960 .fill-B3{fill:#E3E9FD;} - .d2-1904899960 .fill-B4{fill:#E3E9FD;} - .d2-1904899960 .fill-B5{fill:#EDF0FD;} - .d2-1904899960 .fill-B6{fill:#F7F8FE;} - .d2-1904899960 .fill-AA2{fill:#4A6FF3;} - .d2-1904899960 .fill-AA4{fill:#EDF0FD;} - .d2-1904899960 .fill-AA5{fill:#F7F8FE;} - .d2-1904899960 .fill-AB4{fill:#EDF0FD;} - .d2-1904899960 .fill-AB5{fill:#F7F8FE;} - .d2-1904899960 .stroke-N1{stroke:#0A0F25;} - .d2-1904899960 .stroke-N2{stroke:#676C7E;} - .d2-1904899960 .stroke-N3{stroke:#9499AB;} - .d2-1904899960 .stroke-N4{stroke:#CFD2DD;} - .d2-1904899960 .stroke-N5{stroke:#DEE1EB;} - .d2-1904899960 .stroke-N6{stroke:#EEF1F8;} - .d2-1904899960 .stroke-N7{stroke:#FFFFFF;} - .d2-1904899960 .stroke-B1{stroke:#0D32B2;} - .d2-1904899960 .stroke-B2{stroke:#0D32B2;} - .d2-1904899960 .stroke-B3{stroke:#E3E9FD;} - .d2-1904899960 .stroke-B4{stroke:#E3E9FD;} - .d2-1904899960 .stroke-B5{stroke:#EDF0FD;} - .d2-1904899960 .stroke-B6{stroke:#F7F8FE;} - .d2-1904899960 .stroke-AA2{stroke:#4A6FF3;} - .d2-1904899960 .stroke-AA4{stroke:#EDF0FD;} - .d2-1904899960 .stroke-AA5{stroke:#F7F8FE;} - .d2-1904899960 .stroke-AB4{stroke:#EDF0FD;} - .d2-1904899960 .stroke-AB5{stroke:#F7F8FE;} - .d2-1904899960 .background-color-N1{background-color:#0A0F25;} - .d2-1904899960 .background-color-N2{background-color:#676C7E;} - .d2-1904899960 .background-color-N3{background-color:#9499AB;} - .d2-1904899960 .background-color-N4{background-color:#CFD2DD;} - .d2-1904899960 .background-color-N5{background-color:#DEE1EB;} - .d2-1904899960 .background-color-N6{background-color:#EEF1F8;} - .d2-1904899960 .background-color-N7{background-color:#FFFFFF;} - .d2-1904899960 .background-color-B1{background-color:#0D32B2;} - .d2-1904899960 .background-color-B2{background-color:#0D32B2;} - .d2-1904899960 .background-color-B3{background-color:#E3E9FD;} - .d2-1904899960 .background-color-B4{background-color:#E3E9FD;} - .d2-1904899960 .background-color-B5{background-color:#EDF0FD;} - .d2-1904899960 .background-color-B6{background-color:#F7F8FE;} - .d2-1904899960 .background-color-AA2{background-color:#4A6FF3;} - .d2-1904899960 .background-color-AA4{background-color:#EDF0FD;} - .d2-1904899960 .background-color-AA5{background-color:#F7F8FE;} - .d2-1904899960 .background-color-AB4{background-color:#EDF0FD;} - .d2-1904899960 .background-color-AB5{background-color:#F7F8FE;} - .d2-1904899960 .color-N1{color:#0A0F25;} - .d2-1904899960 .color-N2{color:#676C7E;} - .d2-1904899960 .color-N3{color:#9499AB;} - .d2-1904899960 .color-N4{color:#CFD2DD;} - .d2-1904899960 .color-N5{color:#DEE1EB;} - .d2-1904899960 .color-N6{color:#EEF1F8;} - .d2-1904899960 .color-N7{color:#FFFFFF;} - .d2-1904899960 .color-B1{color:#0D32B2;} - .d2-1904899960 .color-B2{color:#0D32B2;} - .d2-1904899960 .color-B3{color:#E3E9FD;} - .d2-1904899960 .color-B4{color:#E3E9FD;} - .d2-1904899960 .color-B5{color:#EDF0FD;} - .d2-1904899960 .color-B6{color:#F7F8FE;} - .d2-1904899960 .color-AA2{color:#4A6FF3;} - .d2-1904899960 .color-AA4{color:#EDF0FD;} - .d2-1904899960 .color-AA5{color:#F7F8FE;} - .d2-1904899960 .color-AB4{color:#EDF0FD;} - .d2-1904899960 .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}]]>askuhykfnsomsczrgtigsjjcfi 1234 -======= .d2-2390731328 .fill-N1{fill:#0A0F25;} .d2-2390731328 .fill-N2{fill:#676C7E;} .d2-2390731328 .fill-N3{fill:#9499AB;} @@ -266,8 +103,7 @@ .d2-2390731328 .color-AA4{color:#EDF0FD;} .d2-2390731328 .color-AA5{color:#F7F8FE;} .d2-2390731328 .color-AB4{color:#EDF0FD;} - .d2-2390731328 .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}]]>askuhykfnsomsczrgtigsjjcfi 1234 ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-2390731328 .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}]]>askuhykfnsomsczrgtigsjjcfi 1234 diff --git a/e2etests/testdata/regression/dagre_broken_arrowhead/dagre/sketch.exp.svg b/e2etests/testdata/regression/dagre_broken_arrowhead/dagre/sketch.exp.svg index 4e6ca3e1e..a410fba6c 100644 --- a/e2etests/testdata/regression/dagre_broken_arrowhead/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/dagre_broken_arrowhead/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -abc12d line 1line 2line 3line 4 -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-991260467 .fill-N1{fill:#0A0F25;} - .d2-991260467 .fill-N2{fill:#676C7E;} - .d2-991260467 .fill-N3{fill:#9499AB;} - .d2-991260467 .fill-N4{fill:#CFD2DD;} - .d2-991260467 .fill-N5{fill:#DEE1EB;} - .d2-991260467 .fill-N6{fill:#EEF1F8;} - .d2-991260467 .fill-N7{fill:#FFFFFF;} - .d2-991260467 .fill-B1{fill:#0D32B2;} - .d2-991260467 .fill-B2{fill:#0D32B2;} - .d2-991260467 .fill-B3{fill:#E3E9FD;} - .d2-991260467 .fill-B4{fill:#E3E9FD;} - .d2-991260467 .fill-B5{fill:#EDF0FD;} - .d2-991260467 .fill-B6{fill:#F7F8FE;} - .d2-991260467 .fill-AA2{fill:#4A6FF3;} - .d2-991260467 .fill-AA4{fill:#EDF0FD;} - .d2-991260467 .fill-AA5{fill:#F7F8FE;} - .d2-991260467 .fill-AB4{fill:#EDF0FD;} - .d2-991260467 .fill-AB5{fill:#F7F8FE;} - .d2-991260467 .stroke-N1{stroke:#0A0F25;} - .d2-991260467 .stroke-N2{stroke:#676C7E;} - .d2-991260467 .stroke-N3{stroke:#9499AB;} - .d2-991260467 .stroke-N4{stroke:#CFD2DD;} - .d2-991260467 .stroke-N5{stroke:#DEE1EB;} - .d2-991260467 .stroke-N6{stroke:#EEF1F8;} - .d2-991260467 .stroke-N7{stroke:#FFFFFF;} - .d2-991260467 .stroke-B1{stroke:#0D32B2;} - .d2-991260467 .stroke-B2{stroke:#0D32B2;} - .d2-991260467 .stroke-B3{stroke:#E3E9FD;} - .d2-991260467 .stroke-B4{stroke:#E3E9FD;} - .d2-991260467 .stroke-B5{stroke:#EDF0FD;} - .d2-991260467 .stroke-B6{stroke:#F7F8FE;} - .d2-991260467 .stroke-AA2{stroke:#4A6FF3;} - .d2-991260467 .stroke-AA4{stroke:#EDF0FD;} - .d2-991260467 .stroke-AA5{stroke:#F7F8FE;} - .d2-991260467 .stroke-AB4{stroke:#EDF0FD;} - .d2-991260467 .stroke-AB5{stroke:#F7F8FE;} - .d2-991260467 .background-color-N1{background-color:#0A0F25;} - .d2-991260467 .background-color-N2{background-color:#676C7E;} - .d2-991260467 .background-color-N3{background-color:#9499AB;} - .d2-991260467 .background-color-N4{background-color:#CFD2DD;} - .d2-991260467 .background-color-N5{background-color:#DEE1EB;} - .d2-991260467 .background-color-N6{background-color:#EEF1F8;} - .d2-991260467 .background-color-N7{background-color:#FFFFFF;} - .d2-991260467 .background-color-B1{background-color:#0D32B2;} - .d2-991260467 .background-color-B2{background-color:#0D32B2;} - .d2-991260467 .background-color-B3{background-color:#E3E9FD;} - .d2-991260467 .background-color-B4{background-color:#E3E9FD;} - .d2-991260467 .background-color-B5{background-color:#EDF0FD;} - .d2-991260467 .background-color-B6{background-color:#F7F8FE;} - .d2-991260467 .background-color-AA2{background-color:#4A6FF3;} - .d2-991260467 .background-color-AA4{background-color:#EDF0FD;} - .d2-991260467 .background-color-AA5{background-color:#F7F8FE;} - .d2-991260467 .background-color-AB4{background-color:#EDF0FD;} - .d2-991260467 .background-color-AB5{background-color:#F7F8FE;} - .d2-991260467 .color-N1{color:#0A0F25;} - .d2-991260467 .color-N2{color:#676C7E;} - .d2-991260467 .color-N3{color:#9499AB;} - .d2-991260467 .color-N4{color:#CFD2DD;} - .d2-991260467 .color-N5{color:#DEE1EB;} - .d2-991260467 .color-N6{color:#EEF1F8;} - .d2-991260467 .color-N7{color:#FFFFFF;} - .d2-991260467 .color-B1{color:#0D32B2;} - .d2-991260467 .color-B2{color:#0D32B2;} - .d2-991260467 .color-B3{color:#E3E9FD;} - .d2-991260467 .color-B4{color:#E3E9FD;} - .d2-991260467 .color-B5{color:#EDF0FD;} - .d2-991260467 .color-B6{color:#F7F8FE;} - .d2-991260467 .color-AA2{color:#4A6FF3;} - .d2-991260467 .color-AA4{color:#EDF0FD;} - .d2-991260467 .color-AA5{color:#F7F8FE;} - .d2-991260467 .color-AB4{color:#EDF0FD;} - .d2-991260467 .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}]]>abc12d line 1line 2line 3line 4 -======= .d2-3759113337 .fill-N1{fill:#0A0F25;} .d2-3759113337 .fill-N2{fill:#676C7E;} .d2-3759113337 .fill-N3{fill:#9499AB;} @@ -266,8 +103,7 @@ .d2-3759113337 .color-AA4{color:#EDF0FD;} .d2-3759113337 .color-AA5{color:#F7F8FE;} .d2-3759113337 .color-AB4{color:#EDF0FD;} - .d2-3759113337 .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}]]>abc12d line 1line 2line 3line 4 ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-3759113337 .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}]]>abc12d line 1line 2line 3line 4 diff --git a/e2etests/testdata/regression/dagre_broken_arrowhead/elk/sketch.exp.svg b/e2etests/testdata/regression/dagre_broken_arrowhead/elk/sketch.exp.svg index bd76edb0c..d20286d6a 100644 --- a/e2etests/testdata/regression/dagre_broken_arrowhead/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/dagre_broken_arrowhead/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -abc12d line 1line 2line 3line 4 -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-3319507261 .fill-N1{fill:#0A0F25;} - .d2-3319507261 .fill-N2{fill:#676C7E;} - .d2-3319507261 .fill-N3{fill:#9499AB;} - .d2-3319507261 .fill-N4{fill:#CFD2DD;} - .d2-3319507261 .fill-N5{fill:#DEE1EB;} - .d2-3319507261 .fill-N6{fill:#EEF1F8;} - .d2-3319507261 .fill-N7{fill:#FFFFFF;} - .d2-3319507261 .fill-B1{fill:#0D32B2;} - .d2-3319507261 .fill-B2{fill:#0D32B2;} - .d2-3319507261 .fill-B3{fill:#E3E9FD;} - .d2-3319507261 .fill-B4{fill:#E3E9FD;} - .d2-3319507261 .fill-B5{fill:#EDF0FD;} - .d2-3319507261 .fill-B6{fill:#F7F8FE;} - .d2-3319507261 .fill-AA2{fill:#4A6FF3;} - .d2-3319507261 .fill-AA4{fill:#EDF0FD;} - .d2-3319507261 .fill-AA5{fill:#F7F8FE;} - .d2-3319507261 .fill-AB4{fill:#EDF0FD;} - .d2-3319507261 .fill-AB5{fill:#F7F8FE;} - .d2-3319507261 .stroke-N1{stroke:#0A0F25;} - .d2-3319507261 .stroke-N2{stroke:#676C7E;} - .d2-3319507261 .stroke-N3{stroke:#9499AB;} - .d2-3319507261 .stroke-N4{stroke:#CFD2DD;} - .d2-3319507261 .stroke-N5{stroke:#DEE1EB;} - .d2-3319507261 .stroke-N6{stroke:#EEF1F8;} - .d2-3319507261 .stroke-N7{stroke:#FFFFFF;} - .d2-3319507261 .stroke-B1{stroke:#0D32B2;} - .d2-3319507261 .stroke-B2{stroke:#0D32B2;} - .d2-3319507261 .stroke-B3{stroke:#E3E9FD;} - .d2-3319507261 .stroke-B4{stroke:#E3E9FD;} - .d2-3319507261 .stroke-B5{stroke:#EDF0FD;} - .d2-3319507261 .stroke-B6{stroke:#F7F8FE;} - .d2-3319507261 .stroke-AA2{stroke:#4A6FF3;} - .d2-3319507261 .stroke-AA4{stroke:#EDF0FD;} - .d2-3319507261 .stroke-AA5{stroke:#F7F8FE;} - .d2-3319507261 .stroke-AB4{stroke:#EDF0FD;} - .d2-3319507261 .stroke-AB5{stroke:#F7F8FE;} - .d2-3319507261 .background-color-N1{background-color:#0A0F25;} - .d2-3319507261 .background-color-N2{background-color:#676C7E;} - .d2-3319507261 .background-color-N3{background-color:#9499AB;} - .d2-3319507261 .background-color-N4{background-color:#CFD2DD;} - .d2-3319507261 .background-color-N5{background-color:#DEE1EB;} - .d2-3319507261 .background-color-N6{background-color:#EEF1F8;} - .d2-3319507261 .background-color-N7{background-color:#FFFFFF;} - .d2-3319507261 .background-color-B1{background-color:#0D32B2;} - .d2-3319507261 .background-color-B2{background-color:#0D32B2;} - .d2-3319507261 .background-color-B3{background-color:#E3E9FD;} - .d2-3319507261 .background-color-B4{background-color:#E3E9FD;} - .d2-3319507261 .background-color-B5{background-color:#EDF0FD;} - .d2-3319507261 .background-color-B6{background-color:#F7F8FE;} - .d2-3319507261 .background-color-AA2{background-color:#4A6FF3;} - .d2-3319507261 .background-color-AA4{background-color:#EDF0FD;} - .d2-3319507261 .background-color-AA5{background-color:#F7F8FE;} - .d2-3319507261 .background-color-AB4{background-color:#EDF0FD;} - .d2-3319507261 .background-color-AB5{background-color:#F7F8FE;} - .d2-3319507261 .color-N1{color:#0A0F25;} - .d2-3319507261 .color-N2{color:#676C7E;} - .d2-3319507261 .color-N3{color:#9499AB;} - .d2-3319507261 .color-N4{color:#CFD2DD;} - .d2-3319507261 .color-N5{color:#DEE1EB;} - .d2-3319507261 .color-N6{color:#EEF1F8;} - .d2-3319507261 .color-N7{color:#FFFFFF;} - .d2-3319507261 .color-B1{color:#0D32B2;} - .d2-3319507261 .color-B2{color:#0D32B2;} - .d2-3319507261 .color-B3{color:#E3E9FD;} - .d2-3319507261 .color-B4{color:#E3E9FD;} - .d2-3319507261 .color-B5{color:#EDF0FD;} - .d2-3319507261 .color-B6{color:#F7F8FE;} - .d2-3319507261 .color-AA2{color:#4A6FF3;} - .d2-3319507261 .color-AA4{color:#EDF0FD;} - .d2-3319507261 .color-AA5{color:#F7F8FE;} - .d2-3319507261 .color-AB4{color:#EDF0FD;} - .d2-3319507261 .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}]]>abc12d line 1line 2line 3line 4 -======= .d2-1955283115 .fill-N1{fill:#0A0F25;} .d2-1955283115 .fill-N2{fill:#676C7E;} .d2-1955283115 .fill-N3{fill:#9499AB;} @@ -266,8 +103,7 @@ .d2-1955283115 .color-AA4{color:#EDF0FD;} .d2-1955283115 .color-AA5{color:#F7F8FE;} .d2-1955283115 .color-AB4{color:#EDF0FD;} - .d2-1955283115 .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}]]>abc12d line 1line 2line 3line 4 ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-1955283115 .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}]]>abc12d line 1line 2line 3line 4 diff --git a/e2etests/testdata/regression/dagre_child_id_id/dagre/sketch.exp.svg b/e2etests/testdata/regression/dagre_child_id_id/dagre/sketch.exp.svg index e0a420592..4e1230587 100644 --- a/e2etests/testdata/regression/dagre_child_id_id/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/dagre_child_id_id/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -idxyidzid -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-4115810162 .fill-N1{fill:#0A0F25;} - .d2-4115810162 .fill-N2{fill:#676C7E;} - .d2-4115810162 .fill-N3{fill:#9499AB;} - .d2-4115810162 .fill-N4{fill:#CFD2DD;} - .d2-4115810162 .fill-N5{fill:#DEE1EB;} - .d2-4115810162 .fill-N6{fill:#EEF1F8;} - .d2-4115810162 .fill-N7{fill:#FFFFFF;} - .d2-4115810162 .fill-B1{fill:#0D32B2;} - .d2-4115810162 .fill-B2{fill:#0D32B2;} - .d2-4115810162 .fill-B3{fill:#E3E9FD;} - .d2-4115810162 .fill-B4{fill:#E3E9FD;} - .d2-4115810162 .fill-B5{fill:#EDF0FD;} - .d2-4115810162 .fill-B6{fill:#F7F8FE;} - .d2-4115810162 .fill-AA2{fill:#4A6FF3;} - .d2-4115810162 .fill-AA4{fill:#EDF0FD;} - .d2-4115810162 .fill-AA5{fill:#F7F8FE;} - .d2-4115810162 .fill-AB4{fill:#EDF0FD;} - .d2-4115810162 .fill-AB5{fill:#F7F8FE;} - .d2-4115810162 .stroke-N1{stroke:#0A0F25;} - .d2-4115810162 .stroke-N2{stroke:#676C7E;} - .d2-4115810162 .stroke-N3{stroke:#9499AB;} - .d2-4115810162 .stroke-N4{stroke:#CFD2DD;} - .d2-4115810162 .stroke-N5{stroke:#DEE1EB;} - .d2-4115810162 .stroke-N6{stroke:#EEF1F8;} - .d2-4115810162 .stroke-N7{stroke:#FFFFFF;} - .d2-4115810162 .stroke-B1{stroke:#0D32B2;} - .d2-4115810162 .stroke-B2{stroke:#0D32B2;} - .d2-4115810162 .stroke-B3{stroke:#E3E9FD;} - .d2-4115810162 .stroke-B4{stroke:#E3E9FD;} - .d2-4115810162 .stroke-B5{stroke:#EDF0FD;} - .d2-4115810162 .stroke-B6{stroke:#F7F8FE;} - .d2-4115810162 .stroke-AA2{stroke:#4A6FF3;} - .d2-4115810162 .stroke-AA4{stroke:#EDF0FD;} - .d2-4115810162 .stroke-AA5{stroke:#F7F8FE;} - .d2-4115810162 .stroke-AB4{stroke:#EDF0FD;} - .d2-4115810162 .stroke-AB5{stroke:#F7F8FE;} - .d2-4115810162 .background-color-N1{background-color:#0A0F25;} - .d2-4115810162 .background-color-N2{background-color:#676C7E;} - .d2-4115810162 .background-color-N3{background-color:#9499AB;} - .d2-4115810162 .background-color-N4{background-color:#CFD2DD;} - .d2-4115810162 .background-color-N5{background-color:#DEE1EB;} - .d2-4115810162 .background-color-N6{background-color:#EEF1F8;} - .d2-4115810162 .background-color-N7{background-color:#FFFFFF;} - .d2-4115810162 .background-color-B1{background-color:#0D32B2;} - .d2-4115810162 .background-color-B2{background-color:#0D32B2;} - .d2-4115810162 .background-color-B3{background-color:#E3E9FD;} - .d2-4115810162 .background-color-B4{background-color:#E3E9FD;} - .d2-4115810162 .background-color-B5{background-color:#EDF0FD;} - .d2-4115810162 .background-color-B6{background-color:#F7F8FE;} - .d2-4115810162 .background-color-AA2{background-color:#4A6FF3;} - .d2-4115810162 .background-color-AA4{background-color:#EDF0FD;} - .d2-4115810162 .background-color-AA5{background-color:#F7F8FE;} - .d2-4115810162 .background-color-AB4{background-color:#EDF0FD;} - .d2-4115810162 .background-color-AB5{background-color:#F7F8FE;} - .d2-4115810162 .color-N1{color:#0A0F25;} - .d2-4115810162 .color-N2{color:#676C7E;} - .d2-4115810162 .color-N3{color:#9499AB;} - .d2-4115810162 .color-N4{color:#CFD2DD;} - .d2-4115810162 .color-N5{color:#DEE1EB;} - .d2-4115810162 .color-N6{color:#EEF1F8;} - .d2-4115810162 .color-N7{color:#FFFFFF;} - .d2-4115810162 .color-B1{color:#0D32B2;} - .d2-4115810162 .color-B2{color:#0D32B2;} - .d2-4115810162 .color-B3{color:#E3E9FD;} - .d2-4115810162 .color-B4{color:#E3E9FD;} - .d2-4115810162 .color-B5{color:#EDF0FD;} - .d2-4115810162 .color-B6{color:#F7F8FE;} - .d2-4115810162 .color-AA2{color:#4A6FF3;} - .d2-4115810162 .color-AA4{color:#EDF0FD;} - .d2-4115810162 .color-AA5{color:#F7F8FE;} - .d2-4115810162 .color-AB4{color:#EDF0FD;} - .d2-4115810162 .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}]]>idxyidzid -======= .d2-966517206 .fill-N1{fill:#0A0F25;} .d2-966517206 .fill-N2{fill:#676C7E;} .d2-966517206 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-966517206 .color-AA4{color:#EDF0FD;} .d2-966517206 .color-AA5{color:#F7F8FE;} .d2-966517206 .color-AB4{color:#EDF0FD;} - .d2-966517206 .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}]]>idxyidzid ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-966517206 .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}]]>idxyidzid diff --git a/e2etests/testdata/regression/dagre_child_id_id/elk/sketch.exp.svg b/e2etests/testdata/regression/dagre_child_id_id/elk/sketch.exp.svg index 4aafdf67d..cd4694c06 100644 --- a/e2etests/testdata/regression/dagre_child_id_id/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/dagre_child_id_id/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -idxyidzid -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-1613854675 .fill-N1{fill:#0A0F25;} - .d2-1613854675 .fill-N2{fill:#676C7E;} - .d2-1613854675 .fill-N3{fill:#9499AB;} - .d2-1613854675 .fill-N4{fill:#CFD2DD;} - .d2-1613854675 .fill-N5{fill:#DEE1EB;} - .d2-1613854675 .fill-N6{fill:#EEF1F8;} - .d2-1613854675 .fill-N7{fill:#FFFFFF;} - .d2-1613854675 .fill-B1{fill:#0D32B2;} - .d2-1613854675 .fill-B2{fill:#0D32B2;} - .d2-1613854675 .fill-B3{fill:#E3E9FD;} - .d2-1613854675 .fill-B4{fill:#E3E9FD;} - .d2-1613854675 .fill-B5{fill:#EDF0FD;} - .d2-1613854675 .fill-B6{fill:#F7F8FE;} - .d2-1613854675 .fill-AA2{fill:#4A6FF3;} - .d2-1613854675 .fill-AA4{fill:#EDF0FD;} - .d2-1613854675 .fill-AA5{fill:#F7F8FE;} - .d2-1613854675 .fill-AB4{fill:#EDF0FD;} - .d2-1613854675 .fill-AB5{fill:#F7F8FE;} - .d2-1613854675 .stroke-N1{stroke:#0A0F25;} - .d2-1613854675 .stroke-N2{stroke:#676C7E;} - .d2-1613854675 .stroke-N3{stroke:#9499AB;} - .d2-1613854675 .stroke-N4{stroke:#CFD2DD;} - .d2-1613854675 .stroke-N5{stroke:#DEE1EB;} - .d2-1613854675 .stroke-N6{stroke:#EEF1F8;} - .d2-1613854675 .stroke-N7{stroke:#FFFFFF;} - .d2-1613854675 .stroke-B1{stroke:#0D32B2;} - .d2-1613854675 .stroke-B2{stroke:#0D32B2;} - .d2-1613854675 .stroke-B3{stroke:#E3E9FD;} - .d2-1613854675 .stroke-B4{stroke:#E3E9FD;} - .d2-1613854675 .stroke-B5{stroke:#EDF0FD;} - .d2-1613854675 .stroke-B6{stroke:#F7F8FE;} - .d2-1613854675 .stroke-AA2{stroke:#4A6FF3;} - .d2-1613854675 .stroke-AA4{stroke:#EDF0FD;} - .d2-1613854675 .stroke-AA5{stroke:#F7F8FE;} - .d2-1613854675 .stroke-AB4{stroke:#EDF0FD;} - .d2-1613854675 .stroke-AB5{stroke:#F7F8FE;} - .d2-1613854675 .background-color-N1{background-color:#0A0F25;} - .d2-1613854675 .background-color-N2{background-color:#676C7E;} - .d2-1613854675 .background-color-N3{background-color:#9499AB;} - .d2-1613854675 .background-color-N4{background-color:#CFD2DD;} - .d2-1613854675 .background-color-N5{background-color:#DEE1EB;} - .d2-1613854675 .background-color-N6{background-color:#EEF1F8;} - .d2-1613854675 .background-color-N7{background-color:#FFFFFF;} - .d2-1613854675 .background-color-B1{background-color:#0D32B2;} - .d2-1613854675 .background-color-B2{background-color:#0D32B2;} - .d2-1613854675 .background-color-B3{background-color:#E3E9FD;} - .d2-1613854675 .background-color-B4{background-color:#E3E9FD;} - .d2-1613854675 .background-color-B5{background-color:#EDF0FD;} - .d2-1613854675 .background-color-B6{background-color:#F7F8FE;} - .d2-1613854675 .background-color-AA2{background-color:#4A6FF3;} - .d2-1613854675 .background-color-AA4{background-color:#EDF0FD;} - .d2-1613854675 .background-color-AA5{background-color:#F7F8FE;} - .d2-1613854675 .background-color-AB4{background-color:#EDF0FD;} - .d2-1613854675 .background-color-AB5{background-color:#F7F8FE;} - .d2-1613854675 .color-N1{color:#0A0F25;} - .d2-1613854675 .color-N2{color:#676C7E;} - .d2-1613854675 .color-N3{color:#9499AB;} - .d2-1613854675 .color-N4{color:#CFD2DD;} - .d2-1613854675 .color-N5{color:#DEE1EB;} - .d2-1613854675 .color-N6{color:#EEF1F8;} - .d2-1613854675 .color-N7{color:#FFFFFF;} - .d2-1613854675 .color-B1{color:#0D32B2;} - .d2-1613854675 .color-B2{color:#0D32B2;} - .d2-1613854675 .color-B3{color:#E3E9FD;} - .d2-1613854675 .color-B4{color:#E3E9FD;} - .d2-1613854675 .color-B5{color:#EDF0FD;} - .d2-1613854675 .color-B6{color:#F7F8FE;} - .d2-1613854675 .color-AA2{color:#4A6FF3;} - .d2-1613854675 .color-AA4{color:#EDF0FD;} - .d2-1613854675 .color-AA5{color:#F7F8FE;} - .d2-1613854675 .color-AB4{color:#EDF0FD;} - .d2-1613854675 .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}]]>idxyidzid -======= .d2-1783928571 .fill-N1{fill:#0A0F25;} .d2-1783928571 .fill-N2{fill:#676C7E;} .d2-1783928571 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-1783928571 .color-AA4{color:#EDF0FD;} .d2-1783928571 .color-AA5{color:#F7F8FE;} .d2-1783928571 .color-AB4{color:#EDF0FD;} - .d2-1783928571 .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}]]>idxyidzid ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-1783928571 .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}]]>idxyidzid diff --git a/e2etests/testdata/regression/dagre_disconnected_edge/dagre/sketch.exp.svg b/e2etests/testdata/regression/dagre_disconnected_edge/dagre/sketch.exp.svg index 4accff000..ab901224b 100644 --- a/e2etests/testdata/regression/dagre_disconnected_edge/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/dagre_disconnected_edge/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -programprofits -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-1021923722 .fill-N1{fill:#0A0F25;} - .d2-1021923722 .fill-N2{fill:#676C7E;} - .d2-1021923722 .fill-N3{fill:#9499AB;} - .d2-1021923722 .fill-N4{fill:#CFD2DD;} - .d2-1021923722 .fill-N5{fill:#DEE1EB;} - .d2-1021923722 .fill-N6{fill:#EEF1F8;} - .d2-1021923722 .fill-N7{fill:#FFFFFF;} - .d2-1021923722 .fill-B1{fill:#0D32B2;} - .d2-1021923722 .fill-B2{fill:#0D32B2;} - .d2-1021923722 .fill-B3{fill:#E3E9FD;} - .d2-1021923722 .fill-B4{fill:#E3E9FD;} - .d2-1021923722 .fill-B5{fill:#EDF0FD;} - .d2-1021923722 .fill-B6{fill:#F7F8FE;} - .d2-1021923722 .fill-AA2{fill:#4A6FF3;} - .d2-1021923722 .fill-AA4{fill:#EDF0FD;} - .d2-1021923722 .fill-AA5{fill:#F7F8FE;} - .d2-1021923722 .fill-AB4{fill:#EDF0FD;} - .d2-1021923722 .fill-AB5{fill:#F7F8FE;} - .d2-1021923722 .stroke-N1{stroke:#0A0F25;} - .d2-1021923722 .stroke-N2{stroke:#676C7E;} - .d2-1021923722 .stroke-N3{stroke:#9499AB;} - .d2-1021923722 .stroke-N4{stroke:#CFD2DD;} - .d2-1021923722 .stroke-N5{stroke:#DEE1EB;} - .d2-1021923722 .stroke-N6{stroke:#EEF1F8;} - .d2-1021923722 .stroke-N7{stroke:#FFFFFF;} - .d2-1021923722 .stroke-B1{stroke:#0D32B2;} - .d2-1021923722 .stroke-B2{stroke:#0D32B2;} - .d2-1021923722 .stroke-B3{stroke:#E3E9FD;} - .d2-1021923722 .stroke-B4{stroke:#E3E9FD;} - .d2-1021923722 .stroke-B5{stroke:#EDF0FD;} - .d2-1021923722 .stroke-B6{stroke:#F7F8FE;} - .d2-1021923722 .stroke-AA2{stroke:#4A6FF3;} - .d2-1021923722 .stroke-AA4{stroke:#EDF0FD;} - .d2-1021923722 .stroke-AA5{stroke:#F7F8FE;} - .d2-1021923722 .stroke-AB4{stroke:#EDF0FD;} - .d2-1021923722 .stroke-AB5{stroke:#F7F8FE;} - .d2-1021923722 .background-color-N1{background-color:#0A0F25;} - .d2-1021923722 .background-color-N2{background-color:#676C7E;} - .d2-1021923722 .background-color-N3{background-color:#9499AB;} - .d2-1021923722 .background-color-N4{background-color:#CFD2DD;} - .d2-1021923722 .background-color-N5{background-color:#DEE1EB;} - .d2-1021923722 .background-color-N6{background-color:#EEF1F8;} - .d2-1021923722 .background-color-N7{background-color:#FFFFFF;} - .d2-1021923722 .background-color-B1{background-color:#0D32B2;} - .d2-1021923722 .background-color-B2{background-color:#0D32B2;} - .d2-1021923722 .background-color-B3{background-color:#E3E9FD;} - .d2-1021923722 .background-color-B4{background-color:#E3E9FD;} - .d2-1021923722 .background-color-B5{background-color:#EDF0FD;} - .d2-1021923722 .background-color-B6{background-color:#F7F8FE;} - .d2-1021923722 .background-color-AA2{background-color:#4A6FF3;} - .d2-1021923722 .background-color-AA4{background-color:#EDF0FD;} - .d2-1021923722 .background-color-AA5{background-color:#F7F8FE;} - .d2-1021923722 .background-color-AB4{background-color:#EDF0FD;} - .d2-1021923722 .background-color-AB5{background-color:#F7F8FE;} - .d2-1021923722 .color-N1{color:#0A0F25;} - .d2-1021923722 .color-N2{color:#676C7E;} - .d2-1021923722 .color-N3{color:#9499AB;} - .d2-1021923722 .color-N4{color:#CFD2DD;} - .d2-1021923722 .color-N5{color:#DEE1EB;} - .d2-1021923722 .color-N6{color:#EEF1F8;} - .d2-1021923722 .color-N7{color:#FFFFFF;} - .d2-1021923722 .color-B1{color:#0D32B2;} - .d2-1021923722 .color-B2{color:#0D32B2;} - .d2-1021923722 .color-B3{color:#E3E9FD;} - .d2-1021923722 .color-B4{color:#E3E9FD;} - .d2-1021923722 .color-B5{color:#EDF0FD;} - .d2-1021923722 .color-B6{color:#F7F8FE;} - .d2-1021923722 .color-AA2{color:#4A6FF3;} - .d2-1021923722 .color-AA4{color:#EDF0FD;} - .d2-1021923722 .color-AA5{color:#F7F8FE;} - .d2-1021923722 .color-AB4{color:#EDF0FD;} - .d2-1021923722 .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}]]>programprofits -======= .d2-2564580976 .fill-N1{fill:#0A0F25;} .d2-2564580976 .fill-N2{fill:#676C7E;} .d2-2564580976 .fill-N3{fill:#9499AB;} @@ -252,8 +89,7 @@ .d2-2564580976 .color-AA4{color:#EDF0FD;} .d2-2564580976 .color-AA5{color:#F7F8FE;} .d2-2564580976 .color-AB4{color:#EDF0FD;} - .d2-2564580976 .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}]]>programprofits ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-2564580976 .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}]]>programprofits diff --git a/e2etests/testdata/regression/dagre_disconnected_edge/elk/sketch.exp.svg b/e2etests/testdata/regression/dagre_disconnected_edge/elk/sketch.exp.svg index 69de11ef9..d8e6557dc 100644 --- a/e2etests/testdata/regression/dagre_disconnected_edge/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/dagre_disconnected_edge/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -programprofits -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-1296623166 .fill-N1{fill:#0A0F25;} - .d2-1296623166 .fill-N2{fill:#676C7E;} - .d2-1296623166 .fill-N3{fill:#9499AB;} - .d2-1296623166 .fill-N4{fill:#CFD2DD;} - .d2-1296623166 .fill-N5{fill:#DEE1EB;} - .d2-1296623166 .fill-N6{fill:#EEF1F8;} - .d2-1296623166 .fill-N7{fill:#FFFFFF;} - .d2-1296623166 .fill-B1{fill:#0D32B2;} - .d2-1296623166 .fill-B2{fill:#0D32B2;} - .d2-1296623166 .fill-B3{fill:#E3E9FD;} - .d2-1296623166 .fill-B4{fill:#E3E9FD;} - .d2-1296623166 .fill-B5{fill:#EDF0FD;} - .d2-1296623166 .fill-B6{fill:#F7F8FE;} - .d2-1296623166 .fill-AA2{fill:#4A6FF3;} - .d2-1296623166 .fill-AA4{fill:#EDF0FD;} - .d2-1296623166 .fill-AA5{fill:#F7F8FE;} - .d2-1296623166 .fill-AB4{fill:#EDF0FD;} - .d2-1296623166 .fill-AB5{fill:#F7F8FE;} - .d2-1296623166 .stroke-N1{stroke:#0A0F25;} - .d2-1296623166 .stroke-N2{stroke:#676C7E;} - .d2-1296623166 .stroke-N3{stroke:#9499AB;} - .d2-1296623166 .stroke-N4{stroke:#CFD2DD;} - .d2-1296623166 .stroke-N5{stroke:#DEE1EB;} - .d2-1296623166 .stroke-N6{stroke:#EEF1F8;} - .d2-1296623166 .stroke-N7{stroke:#FFFFFF;} - .d2-1296623166 .stroke-B1{stroke:#0D32B2;} - .d2-1296623166 .stroke-B2{stroke:#0D32B2;} - .d2-1296623166 .stroke-B3{stroke:#E3E9FD;} - .d2-1296623166 .stroke-B4{stroke:#E3E9FD;} - .d2-1296623166 .stroke-B5{stroke:#EDF0FD;} - .d2-1296623166 .stroke-B6{stroke:#F7F8FE;} - .d2-1296623166 .stroke-AA2{stroke:#4A6FF3;} - .d2-1296623166 .stroke-AA4{stroke:#EDF0FD;} - .d2-1296623166 .stroke-AA5{stroke:#F7F8FE;} - .d2-1296623166 .stroke-AB4{stroke:#EDF0FD;} - .d2-1296623166 .stroke-AB5{stroke:#F7F8FE;} - .d2-1296623166 .background-color-N1{background-color:#0A0F25;} - .d2-1296623166 .background-color-N2{background-color:#676C7E;} - .d2-1296623166 .background-color-N3{background-color:#9499AB;} - .d2-1296623166 .background-color-N4{background-color:#CFD2DD;} - .d2-1296623166 .background-color-N5{background-color:#DEE1EB;} - .d2-1296623166 .background-color-N6{background-color:#EEF1F8;} - .d2-1296623166 .background-color-N7{background-color:#FFFFFF;} - .d2-1296623166 .background-color-B1{background-color:#0D32B2;} - .d2-1296623166 .background-color-B2{background-color:#0D32B2;} - .d2-1296623166 .background-color-B3{background-color:#E3E9FD;} - .d2-1296623166 .background-color-B4{background-color:#E3E9FD;} - .d2-1296623166 .background-color-B5{background-color:#EDF0FD;} - .d2-1296623166 .background-color-B6{background-color:#F7F8FE;} - .d2-1296623166 .background-color-AA2{background-color:#4A6FF3;} - .d2-1296623166 .background-color-AA4{background-color:#EDF0FD;} - .d2-1296623166 .background-color-AA5{background-color:#F7F8FE;} - .d2-1296623166 .background-color-AB4{background-color:#EDF0FD;} - .d2-1296623166 .background-color-AB5{background-color:#F7F8FE;} - .d2-1296623166 .color-N1{color:#0A0F25;} - .d2-1296623166 .color-N2{color:#676C7E;} - .d2-1296623166 .color-N3{color:#9499AB;} - .d2-1296623166 .color-N4{color:#CFD2DD;} - .d2-1296623166 .color-N5{color:#DEE1EB;} - .d2-1296623166 .color-N6{color:#EEF1F8;} - .d2-1296623166 .color-N7{color:#FFFFFF;} - .d2-1296623166 .color-B1{color:#0D32B2;} - .d2-1296623166 .color-B2{color:#0D32B2;} - .d2-1296623166 .color-B3{color:#E3E9FD;} - .d2-1296623166 .color-B4{color:#E3E9FD;} - .d2-1296623166 .color-B5{color:#EDF0FD;} - .d2-1296623166 .color-B6{color:#F7F8FE;} - .d2-1296623166 .color-AA2{color:#4A6FF3;} - .d2-1296623166 .color-AA4{color:#EDF0FD;} - .d2-1296623166 .color-AA5{color:#F7F8FE;} - .d2-1296623166 .color-AB4{color:#EDF0FD;} - .d2-1296623166 .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}]]>programprofits -======= .d2-788656292 .fill-N1{fill:#0A0F25;} .d2-788656292 .fill-N2{fill:#676C7E;} .d2-788656292 .fill-N3{fill:#9499AB;} @@ -252,8 +89,7 @@ .d2-788656292 .color-AA4{color:#EDF0FD;} .d2-788656292 .color-AA5{color:#F7F8FE;} .d2-788656292 .color-AB4{color:#EDF0FD;} - .d2-788656292 .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}]]>programprofits ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-788656292 .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}]]>programprofits diff --git a/e2etests/testdata/regression/dagre_edge_label_spacing/dagre/sketch.exp.svg b/e2etests/testdata/regression/dagre_edge_label_spacing/dagre/sketch.exp.svg index 9f8c56c50..5ded353de 100644 --- a/e2etests/testdata/regression/dagre_edge_label_spacing/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/dagre_edge_label_spacing/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -lambda-build.yamlPush to main branchGitHub ActionsS3TerraformAWS TriggersBuilds zip & pushes it Pulls zip to deployChanges the live lambdas -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-586779041 .fill-N1{fill:#0A0F25;} - .d2-586779041 .fill-N2{fill:#676C7E;} - .d2-586779041 .fill-N3{fill:#9499AB;} - .d2-586779041 .fill-N4{fill:#CFD2DD;} - .d2-586779041 .fill-N5{fill:#DEE1EB;} - .d2-586779041 .fill-N6{fill:#EEF1F8;} - .d2-586779041 .fill-N7{fill:#FFFFFF;} - .d2-586779041 .fill-B1{fill:#0D32B2;} - .d2-586779041 .fill-B2{fill:#0D32B2;} - .d2-586779041 .fill-B3{fill:#E3E9FD;} - .d2-586779041 .fill-B4{fill:#E3E9FD;} - .d2-586779041 .fill-B5{fill:#EDF0FD;} - .d2-586779041 .fill-B6{fill:#F7F8FE;} - .d2-586779041 .fill-AA2{fill:#4A6FF3;} - .d2-586779041 .fill-AA4{fill:#EDF0FD;} - .d2-586779041 .fill-AA5{fill:#F7F8FE;} - .d2-586779041 .fill-AB4{fill:#EDF0FD;} - .d2-586779041 .fill-AB5{fill:#F7F8FE;} - .d2-586779041 .stroke-N1{stroke:#0A0F25;} - .d2-586779041 .stroke-N2{stroke:#676C7E;} - .d2-586779041 .stroke-N3{stroke:#9499AB;} - .d2-586779041 .stroke-N4{stroke:#CFD2DD;} - .d2-586779041 .stroke-N5{stroke:#DEE1EB;} - .d2-586779041 .stroke-N6{stroke:#EEF1F8;} - .d2-586779041 .stroke-N7{stroke:#FFFFFF;} - .d2-586779041 .stroke-B1{stroke:#0D32B2;} - .d2-586779041 .stroke-B2{stroke:#0D32B2;} - .d2-586779041 .stroke-B3{stroke:#E3E9FD;} - .d2-586779041 .stroke-B4{stroke:#E3E9FD;} - .d2-586779041 .stroke-B5{stroke:#EDF0FD;} - .d2-586779041 .stroke-B6{stroke:#F7F8FE;} - .d2-586779041 .stroke-AA2{stroke:#4A6FF3;} - .d2-586779041 .stroke-AA4{stroke:#EDF0FD;} - .d2-586779041 .stroke-AA5{stroke:#F7F8FE;} - .d2-586779041 .stroke-AB4{stroke:#EDF0FD;} - .d2-586779041 .stroke-AB5{stroke:#F7F8FE;} - .d2-586779041 .background-color-N1{background-color:#0A0F25;} - .d2-586779041 .background-color-N2{background-color:#676C7E;} - .d2-586779041 .background-color-N3{background-color:#9499AB;} - .d2-586779041 .background-color-N4{background-color:#CFD2DD;} - .d2-586779041 .background-color-N5{background-color:#DEE1EB;} - .d2-586779041 .background-color-N6{background-color:#EEF1F8;} - .d2-586779041 .background-color-N7{background-color:#FFFFFF;} - .d2-586779041 .background-color-B1{background-color:#0D32B2;} - .d2-586779041 .background-color-B2{background-color:#0D32B2;} - .d2-586779041 .background-color-B3{background-color:#E3E9FD;} - .d2-586779041 .background-color-B4{background-color:#E3E9FD;} - .d2-586779041 .background-color-B5{background-color:#EDF0FD;} - .d2-586779041 .background-color-B6{background-color:#F7F8FE;} - .d2-586779041 .background-color-AA2{background-color:#4A6FF3;} - .d2-586779041 .background-color-AA4{background-color:#EDF0FD;} - .d2-586779041 .background-color-AA5{background-color:#F7F8FE;} - .d2-586779041 .background-color-AB4{background-color:#EDF0FD;} - .d2-586779041 .background-color-AB5{background-color:#F7F8FE;} - .d2-586779041 .color-N1{color:#0A0F25;} - .d2-586779041 .color-N2{color:#676C7E;} - .d2-586779041 .color-N3{color:#9499AB;} - .d2-586779041 .color-N4{color:#CFD2DD;} - .d2-586779041 .color-N5{color:#DEE1EB;} - .d2-586779041 .color-N6{color:#EEF1F8;} - .d2-586779041 .color-N7{color:#FFFFFF;} - .d2-586779041 .color-B1{color:#0D32B2;} - .d2-586779041 .color-B2{color:#0D32B2;} - .d2-586779041 .color-B3{color:#E3E9FD;} - .d2-586779041 .color-B4{color:#E3E9FD;} - .d2-586779041 .color-B5{color:#EDF0FD;} - .d2-586779041 .color-B6{color:#F7F8FE;} - .d2-586779041 .color-AA2{color:#4A6FF3;} - .d2-586779041 .color-AA4{color:#EDF0FD;} - .d2-586779041 .color-AA5{color:#F7F8FE;} - .d2-586779041 .color-AB4{color:#EDF0FD;} - .d2-586779041 .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}]]>lambda-build.yamlPush to main branchGitHub ActionsS3TerraformAWS TriggersBuilds zip & pushes it Pulls zip to deployChanges the live lambdas -======= .d2-2078406637 .fill-N1{fill:#0A0F25;} .d2-2078406637 .fill-N2{fill:#676C7E;} .d2-2078406637 .fill-N3{fill:#9499AB;} @@ -266,8 +103,7 @@ .d2-2078406637 .color-AA4{color:#EDF0FD;} .d2-2078406637 .color-AA5{color:#F7F8FE;} .d2-2078406637 .color-AB4{color:#EDF0FD;} - .d2-2078406637 .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}]]>lambda-build.yamlPush to main branchGitHub ActionsS3TerraformAWS TriggersBuilds zip & pushes it Pulls zip to deployChanges the live lambdas ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-2078406637 .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}]]>lambda-build.yamlPush to main branchGitHub ActionsS3TerraformAWS TriggersBuilds zip & pushes it Pulls zip to deployChanges the live lambdas diff --git a/e2etests/testdata/regression/dagre_edge_label_spacing/elk/sketch.exp.svg b/e2etests/testdata/regression/dagre_edge_label_spacing/elk/sketch.exp.svg index e8ce42ba4..c946b7476 100644 --- a/e2etests/testdata/regression/dagre_edge_label_spacing/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/dagre_edge_label_spacing/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -lambda-build.yamlPush to main branchGitHub ActionsS3TerraformAWS TriggersBuilds zip & pushes it Pulls zip to deployChanges the live lambdas -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-2111939939 .fill-N1{fill:#0A0F25;} - .d2-2111939939 .fill-N2{fill:#676C7E;} - .d2-2111939939 .fill-N3{fill:#9499AB;} - .d2-2111939939 .fill-N4{fill:#CFD2DD;} - .d2-2111939939 .fill-N5{fill:#DEE1EB;} - .d2-2111939939 .fill-N6{fill:#EEF1F8;} - .d2-2111939939 .fill-N7{fill:#FFFFFF;} - .d2-2111939939 .fill-B1{fill:#0D32B2;} - .d2-2111939939 .fill-B2{fill:#0D32B2;} - .d2-2111939939 .fill-B3{fill:#E3E9FD;} - .d2-2111939939 .fill-B4{fill:#E3E9FD;} - .d2-2111939939 .fill-B5{fill:#EDF0FD;} - .d2-2111939939 .fill-B6{fill:#F7F8FE;} - .d2-2111939939 .fill-AA2{fill:#4A6FF3;} - .d2-2111939939 .fill-AA4{fill:#EDF0FD;} - .d2-2111939939 .fill-AA5{fill:#F7F8FE;} - .d2-2111939939 .fill-AB4{fill:#EDF0FD;} - .d2-2111939939 .fill-AB5{fill:#F7F8FE;} - .d2-2111939939 .stroke-N1{stroke:#0A0F25;} - .d2-2111939939 .stroke-N2{stroke:#676C7E;} - .d2-2111939939 .stroke-N3{stroke:#9499AB;} - .d2-2111939939 .stroke-N4{stroke:#CFD2DD;} - .d2-2111939939 .stroke-N5{stroke:#DEE1EB;} - .d2-2111939939 .stroke-N6{stroke:#EEF1F8;} - .d2-2111939939 .stroke-N7{stroke:#FFFFFF;} - .d2-2111939939 .stroke-B1{stroke:#0D32B2;} - .d2-2111939939 .stroke-B2{stroke:#0D32B2;} - .d2-2111939939 .stroke-B3{stroke:#E3E9FD;} - .d2-2111939939 .stroke-B4{stroke:#E3E9FD;} - .d2-2111939939 .stroke-B5{stroke:#EDF0FD;} - .d2-2111939939 .stroke-B6{stroke:#F7F8FE;} - .d2-2111939939 .stroke-AA2{stroke:#4A6FF3;} - .d2-2111939939 .stroke-AA4{stroke:#EDF0FD;} - .d2-2111939939 .stroke-AA5{stroke:#F7F8FE;} - .d2-2111939939 .stroke-AB4{stroke:#EDF0FD;} - .d2-2111939939 .stroke-AB5{stroke:#F7F8FE;} - .d2-2111939939 .background-color-N1{background-color:#0A0F25;} - .d2-2111939939 .background-color-N2{background-color:#676C7E;} - .d2-2111939939 .background-color-N3{background-color:#9499AB;} - .d2-2111939939 .background-color-N4{background-color:#CFD2DD;} - .d2-2111939939 .background-color-N5{background-color:#DEE1EB;} - .d2-2111939939 .background-color-N6{background-color:#EEF1F8;} - .d2-2111939939 .background-color-N7{background-color:#FFFFFF;} - .d2-2111939939 .background-color-B1{background-color:#0D32B2;} - .d2-2111939939 .background-color-B2{background-color:#0D32B2;} - .d2-2111939939 .background-color-B3{background-color:#E3E9FD;} - .d2-2111939939 .background-color-B4{background-color:#E3E9FD;} - .d2-2111939939 .background-color-B5{background-color:#EDF0FD;} - .d2-2111939939 .background-color-B6{background-color:#F7F8FE;} - .d2-2111939939 .background-color-AA2{background-color:#4A6FF3;} - .d2-2111939939 .background-color-AA4{background-color:#EDF0FD;} - .d2-2111939939 .background-color-AA5{background-color:#F7F8FE;} - .d2-2111939939 .background-color-AB4{background-color:#EDF0FD;} - .d2-2111939939 .background-color-AB5{background-color:#F7F8FE;} - .d2-2111939939 .color-N1{color:#0A0F25;} - .d2-2111939939 .color-N2{color:#676C7E;} - .d2-2111939939 .color-N3{color:#9499AB;} - .d2-2111939939 .color-N4{color:#CFD2DD;} - .d2-2111939939 .color-N5{color:#DEE1EB;} - .d2-2111939939 .color-N6{color:#EEF1F8;} - .d2-2111939939 .color-N7{color:#FFFFFF;} - .d2-2111939939 .color-B1{color:#0D32B2;} - .d2-2111939939 .color-B2{color:#0D32B2;} - .d2-2111939939 .color-B3{color:#E3E9FD;} - .d2-2111939939 .color-B4{color:#E3E9FD;} - .d2-2111939939 .color-B5{color:#EDF0FD;} - .d2-2111939939 .color-B6{color:#F7F8FE;} - .d2-2111939939 .color-AA2{color:#4A6FF3;} - .d2-2111939939 .color-AA4{color:#EDF0FD;} - .d2-2111939939 .color-AA5{color:#F7F8FE;} - .d2-2111939939 .color-AB4{color:#EDF0FD;} - .d2-2111939939 .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}]]>lambda-build.yamlPush to main branchGitHub ActionsS3TerraformAWS TriggersBuilds zip & pushes it Pulls zip to deployChanges the live lambdas -======= .d2-625343851 .fill-N1{fill:#0A0F25;} .d2-625343851 .fill-N2{fill:#676C7E;} .d2-625343851 .fill-N3{fill:#9499AB;} @@ -266,8 +103,7 @@ .d2-625343851 .color-AA4{color:#EDF0FD;} .d2-625343851 .color-AA5{color:#F7F8FE;} .d2-625343851 .color-AB4{color:#EDF0FD;} - .d2-625343851 .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}]]>lambda-build.yamlPush to main branchGitHub ActionsS3TerraformAWS TriggersBuilds zip & pushes it Pulls zip to deployChanges the live lambdas ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-625343851 .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}]]>lambda-build.yamlPush to main branchGitHub ActionsS3TerraformAWS TriggersBuilds zip & pushes it Pulls zip to deployChanges the live lambdas diff --git a/e2etests/testdata/regression/dagre_special_ids/dagre/sketch.exp.svg b/e2etests/testdata/regression/dagre_special_ids/dagre/sketch.exp.svg index 9d78e4981..7cc16f3a6 100644 --- a/e2etests/testdata/regression/dagre_special_ids/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/dagre_special_ids/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -ninetynineeighty eightseventy sevena\yodetherea\"odea\node -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-1607318345 .fill-N1{fill:#0A0F25;} - .d2-1607318345 .fill-N2{fill:#676C7E;} - .d2-1607318345 .fill-N3{fill:#9499AB;} - .d2-1607318345 .fill-N4{fill:#CFD2DD;} - .d2-1607318345 .fill-N5{fill:#DEE1EB;} - .d2-1607318345 .fill-N6{fill:#EEF1F8;} - .d2-1607318345 .fill-N7{fill:#FFFFFF;} - .d2-1607318345 .fill-B1{fill:#0D32B2;} - .d2-1607318345 .fill-B2{fill:#0D32B2;} - .d2-1607318345 .fill-B3{fill:#E3E9FD;} - .d2-1607318345 .fill-B4{fill:#E3E9FD;} - .d2-1607318345 .fill-B5{fill:#EDF0FD;} - .d2-1607318345 .fill-B6{fill:#F7F8FE;} - .d2-1607318345 .fill-AA2{fill:#4A6FF3;} - .d2-1607318345 .fill-AA4{fill:#EDF0FD;} - .d2-1607318345 .fill-AA5{fill:#F7F8FE;} - .d2-1607318345 .fill-AB4{fill:#EDF0FD;} - .d2-1607318345 .fill-AB5{fill:#F7F8FE;} - .d2-1607318345 .stroke-N1{stroke:#0A0F25;} - .d2-1607318345 .stroke-N2{stroke:#676C7E;} - .d2-1607318345 .stroke-N3{stroke:#9499AB;} - .d2-1607318345 .stroke-N4{stroke:#CFD2DD;} - .d2-1607318345 .stroke-N5{stroke:#DEE1EB;} - .d2-1607318345 .stroke-N6{stroke:#EEF1F8;} - .d2-1607318345 .stroke-N7{stroke:#FFFFFF;} - .d2-1607318345 .stroke-B1{stroke:#0D32B2;} - .d2-1607318345 .stroke-B2{stroke:#0D32B2;} - .d2-1607318345 .stroke-B3{stroke:#E3E9FD;} - .d2-1607318345 .stroke-B4{stroke:#E3E9FD;} - .d2-1607318345 .stroke-B5{stroke:#EDF0FD;} - .d2-1607318345 .stroke-B6{stroke:#F7F8FE;} - .d2-1607318345 .stroke-AA2{stroke:#4A6FF3;} - .d2-1607318345 .stroke-AA4{stroke:#EDF0FD;} - .d2-1607318345 .stroke-AA5{stroke:#F7F8FE;} - .d2-1607318345 .stroke-AB4{stroke:#EDF0FD;} - .d2-1607318345 .stroke-AB5{stroke:#F7F8FE;} - .d2-1607318345 .background-color-N1{background-color:#0A0F25;} - .d2-1607318345 .background-color-N2{background-color:#676C7E;} - .d2-1607318345 .background-color-N3{background-color:#9499AB;} - .d2-1607318345 .background-color-N4{background-color:#CFD2DD;} - .d2-1607318345 .background-color-N5{background-color:#DEE1EB;} - .d2-1607318345 .background-color-N6{background-color:#EEF1F8;} - .d2-1607318345 .background-color-N7{background-color:#FFFFFF;} - .d2-1607318345 .background-color-B1{background-color:#0D32B2;} - .d2-1607318345 .background-color-B2{background-color:#0D32B2;} - .d2-1607318345 .background-color-B3{background-color:#E3E9FD;} - .d2-1607318345 .background-color-B4{background-color:#E3E9FD;} - .d2-1607318345 .background-color-B5{background-color:#EDF0FD;} - .d2-1607318345 .background-color-B6{background-color:#F7F8FE;} - .d2-1607318345 .background-color-AA2{background-color:#4A6FF3;} - .d2-1607318345 .background-color-AA4{background-color:#EDF0FD;} - .d2-1607318345 .background-color-AA5{background-color:#F7F8FE;} - .d2-1607318345 .background-color-AB4{background-color:#EDF0FD;} - .d2-1607318345 .background-color-AB5{background-color:#F7F8FE;} - .d2-1607318345 .color-N1{color:#0A0F25;} - .d2-1607318345 .color-N2{color:#676C7E;} - .d2-1607318345 .color-N3{color:#9499AB;} - .d2-1607318345 .color-N4{color:#CFD2DD;} - .d2-1607318345 .color-N5{color:#DEE1EB;} - .d2-1607318345 .color-N6{color:#EEF1F8;} - .d2-1607318345 .color-N7{color:#FFFFFF;} - .d2-1607318345 .color-B1{color:#0D32B2;} - .d2-1607318345 .color-B2{color:#0D32B2;} - .d2-1607318345 .color-B3{color:#E3E9FD;} - .d2-1607318345 .color-B4{color:#E3E9FD;} - .d2-1607318345 .color-B5{color:#EDF0FD;} - .d2-1607318345 .color-B6{color:#F7F8FE;} - .d2-1607318345 .color-AA2{color:#4A6FF3;} - .d2-1607318345 .color-AA4{color:#EDF0FD;} - .d2-1607318345 .color-AA5{color:#F7F8FE;} - .d2-1607318345 .color-AB4{color:#EDF0FD;} - .d2-1607318345 .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}]]>ninetynineeighty eightseventy sevena\yodetherea\"odea\node -======= .d2-276060075 .fill-N1{fill:#0A0F25;} .d2-276060075 .fill-N2{fill:#676C7E;} .d2-276060075 .fill-N3{fill:#9499AB;} @@ -252,8 +89,7 @@ .d2-276060075 .color-AA4{color:#EDF0FD;} .d2-276060075 .color-AA5{color:#F7F8FE;} .d2-276060075 .color-AB4{color:#EDF0FD;} - .d2-276060075 .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}]]>ninetynineeighty eightseventy sevena\yodetherea\"odea\node ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-276060075 .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}]]>ninetynineeighty eightseventy sevena\yodetherea\"odea\node diff --git a/e2etests/testdata/regression/dagre_special_ids/elk/sketch.exp.svg b/e2etests/testdata/regression/dagre_special_ids/elk/sketch.exp.svg index 948a6534b..69f49f8d3 100644 --- a/e2etests/testdata/regression/dagre_special_ids/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/dagre_special_ids/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -ninetynineeighty eightseventy sevena\yodetherea\"odea\node -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-679618464 .fill-N1{fill:#0A0F25;} - .d2-679618464 .fill-N2{fill:#676C7E;} - .d2-679618464 .fill-N3{fill:#9499AB;} - .d2-679618464 .fill-N4{fill:#CFD2DD;} - .d2-679618464 .fill-N5{fill:#DEE1EB;} - .d2-679618464 .fill-N6{fill:#EEF1F8;} - .d2-679618464 .fill-N7{fill:#FFFFFF;} - .d2-679618464 .fill-B1{fill:#0D32B2;} - .d2-679618464 .fill-B2{fill:#0D32B2;} - .d2-679618464 .fill-B3{fill:#E3E9FD;} - .d2-679618464 .fill-B4{fill:#E3E9FD;} - .d2-679618464 .fill-B5{fill:#EDF0FD;} - .d2-679618464 .fill-B6{fill:#F7F8FE;} - .d2-679618464 .fill-AA2{fill:#4A6FF3;} - .d2-679618464 .fill-AA4{fill:#EDF0FD;} - .d2-679618464 .fill-AA5{fill:#F7F8FE;} - .d2-679618464 .fill-AB4{fill:#EDF0FD;} - .d2-679618464 .fill-AB5{fill:#F7F8FE;} - .d2-679618464 .stroke-N1{stroke:#0A0F25;} - .d2-679618464 .stroke-N2{stroke:#676C7E;} - .d2-679618464 .stroke-N3{stroke:#9499AB;} - .d2-679618464 .stroke-N4{stroke:#CFD2DD;} - .d2-679618464 .stroke-N5{stroke:#DEE1EB;} - .d2-679618464 .stroke-N6{stroke:#EEF1F8;} - .d2-679618464 .stroke-N7{stroke:#FFFFFF;} - .d2-679618464 .stroke-B1{stroke:#0D32B2;} - .d2-679618464 .stroke-B2{stroke:#0D32B2;} - .d2-679618464 .stroke-B3{stroke:#E3E9FD;} - .d2-679618464 .stroke-B4{stroke:#E3E9FD;} - .d2-679618464 .stroke-B5{stroke:#EDF0FD;} - .d2-679618464 .stroke-B6{stroke:#F7F8FE;} - .d2-679618464 .stroke-AA2{stroke:#4A6FF3;} - .d2-679618464 .stroke-AA4{stroke:#EDF0FD;} - .d2-679618464 .stroke-AA5{stroke:#F7F8FE;} - .d2-679618464 .stroke-AB4{stroke:#EDF0FD;} - .d2-679618464 .stroke-AB5{stroke:#F7F8FE;} - .d2-679618464 .background-color-N1{background-color:#0A0F25;} - .d2-679618464 .background-color-N2{background-color:#676C7E;} - .d2-679618464 .background-color-N3{background-color:#9499AB;} - .d2-679618464 .background-color-N4{background-color:#CFD2DD;} - .d2-679618464 .background-color-N5{background-color:#DEE1EB;} - .d2-679618464 .background-color-N6{background-color:#EEF1F8;} - .d2-679618464 .background-color-N7{background-color:#FFFFFF;} - .d2-679618464 .background-color-B1{background-color:#0D32B2;} - .d2-679618464 .background-color-B2{background-color:#0D32B2;} - .d2-679618464 .background-color-B3{background-color:#E3E9FD;} - .d2-679618464 .background-color-B4{background-color:#E3E9FD;} - .d2-679618464 .background-color-B5{background-color:#EDF0FD;} - .d2-679618464 .background-color-B6{background-color:#F7F8FE;} - .d2-679618464 .background-color-AA2{background-color:#4A6FF3;} - .d2-679618464 .background-color-AA4{background-color:#EDF0FD;} - .d2-679618464 .background-color-AA5{background-color:#F7F8FE;} - .d2-679618464 .background-color-AB4{background-color:#EDF0FD;} - .d2-679618464 .background-color-AB5{background-color:#F7F8FE;} - .d2-679618464 .color-N1{color:#0A0F25;} - .d2-679618464 .color-N2{color:#676C7E;} - .d2-679618464 .color-N3{color:#9499AB;} - .d2-679618464 .color-N4{color:#CFD2DD;} - .d2-679618464 .color-N5{color:#DEE1EB;} - .d2-679618464 .color-N6{color:#EEF1F8;} - .d2-679618464 .color-N7{color:#FFFFFF;} - .d2-679618464 .color-B1{color:#0D32B2;} - .d2-679618464 .color-B2{color:#0D32B2;} - .d2-679618464 .color-B3{color:#E3E9FD;} - .d2-679618464 .color-B4{color:#E3E9FD;} - .d2-679618464 .color-B5{color:#EDF0FD;} - .d2-679618464 .color-B6{color:#F7F8FE;} - .d2-679618464 .color-AA2{color:#4A6FF3;} - .d2-679618464 .color-AA4{color:#EDF0FD;} - .d2-679618464 .color-AA5{color:#F7F8FE;} - .d2-679618464 .color-AB4{color:#EDF0FD;} - .d2-679618464 .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}]]>ninetynineeighty eightseventy sevena\yodetherea\"odea\node -======= .d2-1047469682 .fill-N1{fill:#0A0F25;} .d2-1047469682 .fill-N2{fill:#676C7E;} .d2-1047469682 .fill-N3{fill:#9499AB;} @@ -252,8 +89,7 @@ .d2-1047469682 .color-AA4{color:#EDF0FD;} .d2-1047469682 .color-AA5{color:#F7F8FE;} .d2-1047469682 .color-AB4{color:#EDF0FD;} - .d2-1047469682 .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}]]>ninetynineeighty eightseventy sevena\yodetherea\"odea\node ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-1047469682 .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}]]>ninetynineeighty eightseventy sevena\yodetherea\"odea\node diff --git a/e2etests/testdata/regression/disconnect_direction_right/dagre/sketch.exp.svg b/e2etests/testdata/regression/disconnect_direction_right/dagre/sketch.exp.svg index 53701fb64..dec5549c8 100644 --- a/e2etests/testdata/regression/disconnect_direction_right/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/disconnect_direction_right/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -acebdf -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-881173092 .fill-N1{fill:#0A0F25;} - .d2-881173092 .fill-N2{fill:#676C7E;} - .d2-881173092 .fill-N3{fill:#9499AB;} - .d2-881173092 .fill-N4{fill:#CFD2DD;} - .d2-881173092 .fill-N5{fill:#DEE1EB;} - .d2-881173092 .fill-N6{fill:#EEF1F8;} - .d2-881173092 .fill-N7{fill:#FFFFFF;} - .d2-881173092 .fill-B1{fill:#0D32B2;} - .d2-881173092 .fill-B2{fill:#0D32B2;} - .d2-881173092 .fill-B3{fill:#E3E9FD;} - .d2-881173092 .fill-B4{fill:#E3E9FD;} - .d2-881173092 .fill-B5{fill:#EDF0FD;} - .d2-881173092 .fill-B6{fill:#F7F8FE;} - .d2-881173092 .fill-AA2{fill:#4A6FF3;} - .d2-881173092 .fill-AA4{fill:#EDF0FD;} - .d2-881173092 .fill-AA5{fill:#F7F8FE;} - .d2-881173092 .fill-AB4{fill:#EDF0FD;} - .d2-881173092 .fill-AB5{fill:#F7F8FE;} - .d2-881173092 .stroke-N1{stroke:#0A0F25;} - .d2-881173092 .stroke-N2{stroke:#676C7E;} - .d2-881173092 .stroke-N3{stroke:#9499AB;} - .d2-881173092 .stroke-N4{stroke:#CFD2DD;} - .d2-881173092 .stroke-N5{stroke:#DEE1EB;} - .d2-881173092 .stroke-N6{stroke:#EEF1F8;} - .d2-881173092 .stroke-N7{stroke:#FFFFFF;} - .d2-881173092 .stroke-B1{stroke:#0D32B2;} - .d2-881173092 .stroke-B2{stroke:#0D32B2;} - .d2-881173092 .stroke-B3{stroke:#E3E9FD;} - .d2-881173092 .stroke-B4{stroke:#E3E9FD;} - .d2-881173092 .stroke-B5{stroke:#EDF0FD;} - .d2-881173092 .stroke-B6{stroke:#F7F8FE;} - .d2-881173092 .stroke-AA2{stroke:#4A6FF3;} - .d2-881173092 .stroke-AA4{stroke:#EDF0FD;} - .d2-881173092 .stroke-AA5{stroke:#F7F8FE;} - .d2-881173092 .stroke-AB4{stroke:#EDF0FD;} - .d2-881173092 .stroke-AB5{stroke:#F7F8FE;} - .d2-881173092 .background-color-N1{background-color:#0A0F25;} - .d2-881173092 .background-color-N2{background-color:#676C7E;} - .d2-881173092 .background-color-N3{background-color:#9499AB;} - .d2-881173092 .background-color-N4{background-color:#CFD2DD;} - .d2-881173092 .background-color-N5{background-color:#DEE1EB;} - .d2-881173092 .background-color-N6{background-color:#EEF1F8;} - .d2-881173092 .background-color-N7{background-color:#FFFFFF;} - .d2-881173092 .background-color-B1{background-color:#0D32B2;} - .d2-881173092 .background-color-B2{background-color:#0D32B2;} - .d2-881173092 .background-color-B3{background-color:#E3E9FD;} - .d2-881173092 .background-color-B4{background-color:#E3E9FD;} - .d2-881173092 .background-color-B5{background-color:#EDF0FD;} - .d2-881173092 .background-color-B6{background-color:#F7F8FE;} - .d2-881173092 .background-color-AA2{background-color:#4A6FF3;} - .d2-881173092 .background-color-AA4{background-color:#EDF0FD;} - .d2-881173092 .background-color-AA5{background-color:#F7F8FE;} - .d2-881173092 .background-color-AB4{background-color:#EDF0FD;} - .d2-881173092 .background-color-AB5{background-color:#F7F8FE;} - .d2-881173092 .color-N1{color:#0A0F25;} - .d2-881173092 .color-N2{color:#676C7E;} - .d2-881173092 .color-N3{color:#9499AB;} - .d2-881173092 .color-N4{color:#CFD2DD;} - .d2-881173092 .color-N5{color:#DEE1EB;} - .d2-881173092 .color-N6{color:#EEF1F8;} - .d2-881173092 .color-N7{color:#FFFFFF;} - .d2-881173092 .color-B1{color:#0D32B2;} - .d2-881173092 .color-B2{color:#0D32B2;} - .d2-881173092 .color-B3{color:#E3E9FD;} - .d2-881173092 .color-B4{color:#E3E9FD;} - .d2-881173092 .color-B5{color:#EDF0FD;} - .d2-881173092 .color-B6{color:#F7F8FE;} - .d2-881173092 .color-AA2{color:#4A6FF3;} - .d2-881173092 .color-AA4{color:#EDF0FD;} - .d2-881173092 .color-AA5{color:#F7F8FE;} - .d2-881173092 .color-AB4{color:#EDF0FD;} - .d2-881173092 .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}]]>acebdf -======= .d2-634827364 .fill-N1{fill:#0A0F25;} .d2-634827364 .fill-N2{fill:#676C7E;} .d2-634827364 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-634827364 .color-AA4{color:#EDF0FD;} .d2-634827364 .color-AA5{color:#F7F8FE;} .d2-634827364 .color-AB4{color:#EDF0FD;} - .d2-634827364 .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}]]>acebdf ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-634827364 .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}]]>acebdf diff --git a/e2etests/testdata/regression/disconnect_direction_right/elk/sketch.exp.svg b/e2etests/testdata/regression/disconnect_direction_right/elk/sketch.exp.svg index 6f826c885..5f10b50f9 100644 --- a/e2etests/testdata/regression/disconnect_direction_right/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/disconnect_direction_right/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -acebdf -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-3982314900 .fill-N1{fill:#0A0F25;} - .d2-3982314900 .fill-N2{fill:#676C7E;} - .d2-3982314900 .fill-N3{fill:#9499AB;} - .d2-3982314900 .fill-N4{fill:#CFD2DD;} - .d2-3982314900 .fill-N5{fill:#DEE1EB;} - .d2-3982314900 .fill-N6{fill:#EEF1F8;} - .d2-3982314900 .fill-N7{fill:#FFFFFF;} - .d2-3982314900 .fill-B1{fill:#0D32B2;} - .d2-3982314900 .fill-B2{fill:#0D32B2;} - .d2-3982314900 .fill-B3{fill:#E3E9FD;} - .d2-3982314900 .fill-B4{fill:#E3E9FD;} - .d2-3982314900 .fill-B5{fill:#EDF0FD;} - .d2-3982314900 .fill-B6{fill:#F7F8FE;} - .d2-3982314900 .fill-AA2{fill:#4A6FF3;} - .d2-3982314900 .fill-AA4{fill:#EDF0FD;} - .d2-3982314900 .fill-AA5{fill:#F7F8FE;} - .d2-3982314900 .fill-AB4{fill:#EDF0FD;} - .d2-3982314900 .fill-AB5{fill:#F7F8FE;} - .d2-3982314900 .stroke-N1{stroke:#0A0F25;} - .d2-3982314900 .stroke-N2{stroke:#676C7E;} - .d2-3982314900 .stroke-N3{stroke:#9499AB;} - .d2-3982314900 .stroke-N4{stroke:#CFD2DD;} - .d2-3982314900 .stroke-N5{stroke:#DEE1EB;} - .d2-3982314900 .stroke-N6{stroke:#EEF1F8;} - .d2-3982314900 .stroke-N7{stroke:#FFFFFF;} - .d2-3982314900 .stroke-B1{stroke:#0D32B2;} - .d2-3982314900 .stroke-B2{stroke:#0D32B2;} - .d2-3982314900 .stroke-B3{stroke:#E3E9FD;} - .d2-3982314900 .stroke-B4{stroke:#E3E9FD;} - .d2-3982314900 .stroke-B5{stroke:#EDF0FD;} - .d2-3982314900 .stroke-B6{stroke:#F7F8FE;} - .d2-3982314900 .stroke-AA2{stroke:#4A6FF3;} - .d2-3982314900 .stroke-AA4{stroke:#EDF0FD;} - .d2-3982314900 .stroke-AA5{stroke:#F7F8FE;} - .d2-3982314900 .stroke-AB4{stroke:#EDF0FD;} - .d2-3982314900 .stroke-AB5{stroke:#F7F8FE;} - .d2-3982314900 .background-color-N1{background-color:#0A0F25;} - .d2-3982314900 .background-color-N2{background-color:#676C7E;} - .d2-3982314900 .background-color-N3{background-color:#9499AB;} - .d2-3982314900 .background-color-N4{background-color:#CFD2DD;} - .d2-3982314900 .background-color-N5{background-color:#DEE1EB;} - .d2-3982314900 .background-color-N6{background-color:#EEF1F8;} - .d2-3982314900 .background-color-N7{background-color:#FFFFFF;} - .d2-3982314900 .background-color-B1{background-color:#0D32B2;} - .d2-3982314900 .background-color-B2{background-color:#0D32B2;} - .d2-3982314900 .background-color-B3{background-color:#E3E9FD;} - .d2-3982314900 .background-color-B4{background-color:#E3E9FD;} - .d2-3982314900 .background-color-B5{background-color:#EDF0FD;} - .d2-3982314900 .background-color-B6{background-color:#F7F8FE;} - .d2-3982314900 .background-color-AA2{background-color:#4A6FF3;} - .d2-3982314900 .background-color-AA4{background-color:#EDF0FD;} - .d2-3982314900 .background-color-AA5{background-color:#F7F8FE;} - .d2-3982314900 .background-color-AB4{background-color:#EDF0FD;} - .d2-3982314900 .background-color-AB5{background-color:#F7F8FE;} - .d2-3982314900 .color-N1{color:#0A0F25;} - .d2-3982314900 .color-N2{color:#676C7E;} - .d2-3982314900 .color-N3{color:#9499AB;} - .d2-3982314900 .color-N4{color:#CFD2DD;} - .d2-3982314900 .color-N5{color:#DEE1EB;} - .d2-3982314900 .color-N6{color:#EEF1F8;} - .d2-3982314900 .color-N7{color:#FFFFFF;} - .d2-3982314900 .color-B1{color:#0D32B2;} - .d2-3982314900 .color-B2{color:#0D32B2;} - .d2-3982314900 .color-B3{color:#E3E9FD;} - .d2-3982314900 .color-B4{color:#E3E9FD;} - .d2-3982314900 .color-B5{color:#EDF0FD;} - .d2-3982314900 .color-B6{color:#F7F8FE;} - .d2-3982314900 .color-AA2{color:#4A6FF3;} - .d2-3982314900 .color-AA4{color:#EDF0FD;} - .d2-3982314900 .color-AA5{color:#F7F8FE;} - .d2-3982314900 .color-AB4{color:#EDF0FD;} - .d2-3982314900 .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}]]>acebdf -======= .d2-1569895272 .fill-N1{fill:#0A0F25;} .d2-1569895272 .fill-N2{fill:#676C7E;} .d2-1569895272 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-1569895272 .color-AA4{color:#EDF0FD;} .d2-1569895272 .color-AA5{color:#F7F8FE;} .d2-1569895272 .color-AB4{color:#EDF0FD;} - .d2-1569895272 .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}]]>acebdf ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-1569895272 .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}]]>acebdf diff --git a/e2etests/testdata/regression/elk_alignment/dagre/sketch.exp.svg b/e2etests/testdata/regression/elk_alignment/dagre/sketch.exp.svg index 63d0cd262..b06312c7d 100644 --- a/e2etests/testdata/regression/elk_alignment/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/elk_alignment/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -lambda-build.yamllambda-deploy.yamlapollo-deploy.yamlPush to main branchGitHub ActionsS3TerraformAWSManual TriggerGitHub ActionsAWSApollo RepoGitHub ActionsAWS TriggersBuilds zip and pushes it Pulls zip to deployChanges live lambdasLaunchesBuilds zippushes them to S3. Deploys lambdasusing TerraformTriggered manually/push to master test test test test test test testtest -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-2496202090 .fill-N1{fill:#0A0F25;} - .d2-2496202090 .fill-N2{fill:#676C7E;} - .d2-2496202090 .fill-N3{fill:#9499AB;} - .d2-2496202090 .fill-N4{fill:#CFD2DD;} - .d2-2496202090 .fill-N5{fill:#DEE1EB;} - .d2-2496202090 .fill-N6{fill:#EEF1F8;} - .d2-2496202090 .fill-N7{fill:#FFFFFF;} - .d2-2496202090 .fill-B1{fill:#0D32B2;} - .d2-2496202090 .fill-B2{fill:#0D32B2;} - .d2-2496202090 .fill-B3{fill:#E3E9FD;} - .d2-2496202090 .fill-B4{fill:#E3E9FD;} - .d2-2496202090 .fill-B5{fill:#EDF0FD;} - .d2-2496202090 .fill-B6{fill:#F7F8FE;} - .d2-2496202090 .fill-AA2{fill:#4A6FF3;} - .d2-2496202090 .fill-AA4{fill:#EDF0FD;} - .d2-2496202090 .fill-AA5{fill:#F7F8FE;} - .d2-2496202090 .fill-AB4{fill:#EDF0FD;} - .d2-2496202090 .fill-AB5{fill:#F7F8FE;} - .d2-2496202090 .stroke-N1{stroke:#0A0F25;} - .d2-2496202090 .stroke-N2{stroke:#676C7E;} - .d2-2496202090 .stroke-N3{stroke:#9499AB;} - .d2-2496202090 .stroke-N4{stroke:#CFD2DD;} - .d2-2496202090 .stroke-N5{stroke:#DEE1EB;} - .d2-2496202090 .stroke-N6{stroke:#EEF1F8;} - .d2-2496202090 .stroke-N7{stroke:#FFFFFF;} - .d2-2496202090 .stroke-B1{stroke:#0D32B2;} - .d2-2496202090 .stroke-B2{stroke:#0D32B2;} - .d2-2496202090 .stroke-B3{stroke:#E3E9FD;} - .d2-2496202090 .stroke-B4{stroke:#E3E9FD;} - .d2-2496202090 .stroke-B5{stroke:#EDF0FD;} - .d2-2496202090 .stroke-B6{stroke:#F7F8FE;} - .d2-2496202090 .stroke-AA2{stroke:#4A6FF3;} - .d2-2496202090 .stroke-AA4{stroke:#EDF0FD;} - .d2-2496202090 .stroke-AA5{stroke:#F7F8FE;} - .d2-2496202090 .stroke-AB4{stroke:#EDF0FD;} - .d2-2496202090 .stroke-AB5{stroke:#F7F8FE;} - .d2-2496202090 .background-color-N1{background-color:#0A0F25;} - .d2-2496202090 .background-color-N2{background-color:#676C7E;} - .d2-2496202090 .background-color-N3{background-color:#9499AB;} - .d2-2496202090 .background-color-N4{background-color:#CFD2DD;} - .d2-2496202090 .background-color-N5{background-color:#DEE1EB;} - .d2-2496202090 .background-color-N6{background-color:#EEF1F8;} - .d2-2496202090 .background-color-N7{background-color:#FFFFFF;} - .d2-2496202090 .background-color-B1{background-color:#0D32B2;} - .d2-2496202090 .background-color-B2{background-color:#0D32B2;} - .d2-2496202090 .background-color-B3{background-color:#E3E9FD;} - .d2-2496202090 .background-color-B4{background-color:#E3E9FD;} - .d2-2496202090 .background-color-B5{background-color:#EDF0FD;} - .d2-2496202090 .background-color-B6{background-color:#F7F8FE;} - .d2-2496202090 .background-color-AA2{background-color:#4A6FF3;} - .d2-2496202090 .background-color-AA4{background-color:#EDF0FD;} - .d2-2496202090 .background-color-AA5{background-color:#F7F8FE;} - .d2-2496202090 .background-color-AB4{background-color:#EDF0FD;} - .d2-2496202090 .background-color-AB5{background-color:#F7F8FE;} - .d2-2496202090 .color-N1{color:#0A0F25;} - .d2-2496202090 .color-N2{color:#676C7E;} - .d2-2496202090 .color-N3{color:#9499AB;} - .d2-2496202090 .color-N4{color:#CFD2DD;} - .d2-2496202090 .color-N5{color:#DEE1EB;} - .d2-2496202090 .color-N6{color:#EEF1F8;} - .d2-2496202090 .color-N7{color:#FFFFFF;} - .d2-2496202090 .color-B1{color:#0D32B2;} - .d2-2496202090 .color-B2{color:#0D32B2;} - .d2-2496202090 .color-B3{color:#E3E9FD;} - .d2-2496202090 .color-B4{color:#E3E9FD;} - .d2-2496202090 .color-B5{color:#EDF0FD;} - .d2-2496202090 .color-B6{color:#F7F8FE;} - .d2-2496202090 .color-AA2{color:#4A6FF3;} - .d2-2496202090 .color-AA4{color:#EDF0FD;} - .d2-2496202090 .color-AA5{color:#F7F8FE;} - .d2-2496202090 .color-AB4{color:#EDF0FD;} - .d2-2496202090 .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}]]>lambda-build.yamllambda-deploy.yamlapollo-deploy.yamlPush to main branchGitHub ActionsS3TerraformAWSManual TriggerGitHub ActionsAWSApollo RepoGitHub ActionsAWS TriggersBuilds zip and pushes it Pulls zip to deployChanges live lambdasLaunchesBuilds zippushes them to S3. Deploys lambdasusing TerraformTriggered manually/push to master test test test test test test testtest -======= .d2-3780985022 .fill-N1{fill:#0A0F25;} .d2-3780985022 .fill-N2{fill:#676C7E;} .d2-3780985022 .fill-N3{fill:#9499AB;} @@ -266,8 +103,7 @@ .d2-3780985022 .color-AA4{color:#EDF0FD;} .d2-3780985022 .color-AA5{color:#F7F8FE;} .d2-3780985022 .color-AB4{color:#EDF0FD;} - .d2-3780985022 .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}]]>lambda-build.yamllambda-deploy.yamlapollo-deploy.yamlPush to main branchGitHub ActionsS3TerraformAWSManual TriggerGitHub ActionsAWSApollo RepoGitHub ActionsAWS TriggersBuilds zip and pushes it Pulls zip to deployChanges live lambdasLaunchesBuilds zippushes them to S3. Deploys lambdasusing TerraformTriggered manually/push to master test test test test test test testtest ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-3780985022 .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}]]>lambda-build.yamllambda-deploy.yamlapollo-deploy.yamlPush to main branchGitHub ActionsS3TerraformAWSManual TriggerGitHub ActionsAWSApollo RepoGitHub ActionsAWS TriggersBuilds zip and pushes it Pulls zip to deployChanges live lambdasLaunchesBuilds zippushes them to S3. Deploys lambdasusing TerraformTriggered manually/push to master test test test test test test testtest diff --git a/e2etests/testdata/regression/elk_alignment/elk/sketch.exp.svg b/e2etests/testdata/regression/elk_alignment/elk/sketch.exp.svg index 1895cdb27..543d10848 100644 --- a/e2etests/testdata/regression/elk_alignment/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/elk_alignment/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -lambda-build.yamllambda-deploy.yamlapollo-deploy.yamlPush to main branchGitHub ActionsS3TerraformAWSManual TriggerGitHub ActionsAWSApollo RepoGitHub ActionsAWS TriggersBuilds zip and pushes it Pulls zip to deployChanges live lambdasLaunchesBuilds zippushes them to S3. Deploys lambdasusing TerraformTriggered manually/push to master test test test test test test testtest -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-4227073958 .fill-N1{fill:#0A0F25;} - .d2-4227073958 .fill-N2{fill:#676C7E;} - .d2-4227073958 .fill-N3{fill:#9499AB;} - .d2-4227073958 .fill-N4{fill:#CFD2DD;} - .d2-4227073958 .fill-N5{fill:#DEE1EB;} - .d2-4227073958 .fill-N6{fill:#EEF1F8;} - .d2-4227073958 .fill-N7{fill:#FFFFFF;} - .d2-4227073958 .fill-B1{fill:#0D32B2;} - .d2-4227073958 .fill-B2{fill:#0D32B2;} - .d2-4227073958 .fill-B3{fill:#E3E9FD;} - .d2-4227073958 .fill-B4{fill:#E3E9FD;} - .d2-4227073958 .fill-B5{fill:#EDF0FD;} - .d2-4227073958 .fill-B6{fill:#F7F8FE;} - .d2-4227073958 .fill-AA2{fill:#4A6FF3;} - .d2-4227073958 .fill-AA4{fill:#EDF0FD;} - .d2-4227073958 .fill-AA5{fill:#F7F8FE;} - .d2-4227073958 .fill-AB4{fill:#EDF0FD;} - .d2-4227073958 .fill-AB5{fill:#F7F8FE;} - .d2-4227073958 .stroke-N1{stroke:#0A0F25;} - .d2-4227073958 .stroke-N2{stroke:#676C7E;} - .d2-4227073958 .stroke-N3{stroke:#9499AB;} - .d2-4227073958 .stroke-N4{stroke:#CFD2DD;} - .d2-4227073958 .stroke-N5{stroke:#DEE1EB;} - .d2-4227073958 .stroke-N6{stroke:#EEF1F8;} - .d2-4227073958 .stroke-N7{stroke:#FFFFFF;} - .d2-4227073958 .stroke-B1{stroke:#0D32B2;} - .d2-4227073958 .stroke-B2{stroke:#0D32B2;} - .d2-4227073958 .stroke-B3{stroke:#E3E9FD;} - .d2-4227073958 .stroke-B4{stroke:#E3E9FD;} - .d2-4227073958 .stroke-B5{stroke:#EDF0FD;} - .d2-4227073958 .stroke-B6{stroke:#F7F8FE;} - .d2-4227073958 .stroke-AA2{stroke:#4A6FF3;} - .d2-4227073958 .stroke-AA4{stroke:#EDF0FD;} - .d2-4227073958 .stroke-AA5{stroke:#F7F8FE;} - .d2-4227073958 .stroke-AB4{stroke:#EDF0FD;} - .d2-4227073958 .stroke-AB5{stroke:#F7F8FE;} - .d2-4227073958 .background-color-N1{background-color:#0A0F25;} - .d2-4227073958 .background-color-N2{background-color:#676C7E;} - .d2-4227073958 .background-color-N3{background-color:#9499AB;} - .d2-4227073958 .background-color-N4{background-color:#CFD2DD;} - .d2-4227073958 .background-color-N5{background-color:#DEE1EB;} - .d2-4227073958 .background-color-N6{background-color:#EEF1F8;} - .d2-4227073958 .background-color-N7{background-color:#FFFFFF;} - .d2-4227073958 .background-color-B1{background-color:#0D32B2;} - .d2-4227073958 .background-color-B2{background-color:#0D32B2;} - .d2-4227073958 .background-color-B3{background-color:#E3E9FD;} - .d2-4227073958 .background-color-B4{background-color:#E3E9FD;} - .d2-4227073958 .background-color-B5{background-color:#EDF0FD;} - .d2-4227073958 .background-color-B6{background-color:#F7F8FE;} - .d2-4227073958 .background-color-AA2{background-color:#4A6FF3;} - .d2-4227073958 .background-color-AA4{background-color:#EDF0FD;} - .d2-4227073958 .background-color-AA5{background-color:#F7F8FE;} - .d2-4227073958 .background-color-AB4{background-color:#EDF0FD;} - .d2-4227073958 .background-color-AB5{background-color:#F7F8FE;} - .d2-4227073958 .color-N1{color:#0A0F25;} - .d2-4227073958 .color-N2{color:#676C7E;} - .d2-4227073958 .color-N3{color:#9499AB;} - .d2-4227073958 .color-N4{color:#CFD2DD;} - .d2-4227073958 .color-N5{color:#DEE1EB;} - .d2-4227073958 .color-N6{color:#EEF1F8;} - .d2-4227073958 .color-N7{color:#FFFFFF;} - .d2-4227073958 .color-B1{color:#0D32B2;} - .d2-4227073958 .color-B2{color:#0D32B2;} - .d2-4227073958 .color-B3{color:#E3E9FD;} - .d2-4227073958 .color-B4{color:#E3E9FD;} - .d2-4227073958 .color-B5{color:#EDF0FD;} - .d2-4227073958 .color-B6{color:#F7F8FE;} - .d2-4227073958 .color-AA2{color:#4A6FF3;} - .d2-4227073958 .color-AA4{color:#EDF0FD;} - .d2-4227073958 .color-AA5{color:#F7F8FE;} - .d2-4227073958 .color-AB4{color:#EDF0FD;} - .d2-4227073958 .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}]]>lambda-build.yamllambda-deploy.yamlapollo-deploy.yamlPush to main branchGitHub ActionsS3TerraformAWSManual TriggerGitHub ActionsAWSApollo RepoGitHub ActionsAWS TriggersBuilds zip and pushes it Pulls zip to deployChanges live lambdasLaunchesBuilds zippushes them to S3. Deploys lambdasusing TerraformTriggered manually/push to master test test test test test test testtest -======= .d2-117687050 .fill-N1{fill:#0A0F25;} .d2-117687050 .fill-N2{fill:#676C7E;} .d2-117687050 .fill-N3{fill:#9499AB;} @@ -266,8 +103,7 @@ .d2-117687050 .color-AA4{color:#EDF0FD;} .d2-117687050 .color-AA5{color:#F7F8FE;} .d2-117687050 .color-AB4{color:#EDF0FD;} - .d2-117687050 .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}]]>lambda-build.yamllambda-deploy.yamlapollo-deploy.yamlPush to main branchGitHub ActionsS3TerraformAWSManual TriggerGitHub ActionsAWSApollo RepoGitHub ActionsAWS TriggersBuilds zip and pushes it Pulls zip to deployChanges live lambdasLaunchesBuilds zippushes them to S3. Deploys lambdasusing TerraformTriggered manually/push to master test test test test test test testtest ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-117687050 .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}]]>lambda-build.yamllambda-deploy.yamlapollo-deploy.yamlPush to main branchGitHub ActionsS3TerraformAWSManual TriggerGitHub ActionsAWSApollo RepoGitHub ActionsAWS TriggersBuilds zip and pushes it Pulls zip to deployChanges live lambdasLaunchesBuilds zippushes them to S3. Deploys lambdasusing TerraformTriggered manually/push to master test test test test test test testtest diff --git a/e2etests/testdata/regression/elk_loop_panic/dagre/sketch.exp.svg b/e2etests/testdata/regression/elk_loop_panic/dagre/sketch.exp.svg index 6d3dea105..e68ef18a7 100644 --- a/e2etests/testdata/regression/elk_loop_panic/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/elk_loop_panic/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -xab -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-3696763502 .fill-N1{fill:#0A0F25;} - .d2-3696763502 .fill-N2{fill:#676C7E;} - .d2-3696763502 .fill-N3{fill:#9499AB;} - .d2-3696763502 .fill-N4{fill:#CFD2DD;} - .d2-3696763502 .fill-N5{fill:#DEE1EB;} - .d2-3696763502 .fill-N6{fill:#EEF1F8;} - .d2-3696763502 .fill-N7{fill:#FFFFFF;} - .d2-3696763502 .fill-B1{fill:#0D32B2;} - .d2-3696763502 .fill-B2{fill:#0D32B2;} - .d2-3696763502 .fill-B3{fill:#E3E9FD;} - .d2-3696763502 .fill-B4{fill:#E3E9FD;} - .d2-3696763502 .fill-B5{fill:#EDF0FD;} - .d2-3696763502 .fill-B6{fill:#F7F8FE;} - .d2-3696763502 .fill-AA2{fill:#4A6FF3;} - .d2-3696763502 .fill-AA4{fill:#EDF0FD;} - .d2-3696763502 .fill-AA5{fill:#F7F8FE;} - .d2-3696763502 .fill-AB4{fill:#EDF0FD;} - .d2-3696763502 .fill-AB5{fill:#F7F8FE;} - .d2-3696763502 .stroke-N1{stroke:#0A0F25;} - .d2-3696763502 .stroke-N2{stroke:#676C7E;} - .d2-3696763502 .stroke-N3{stroke:#9499AB;} - .d2-3696763502 .stroke-N4{stroke:#CFD2DD;} - .d2-3696763502 .stroke-N5{stroke:#DEE1EB;} - .d2-3696763502 .stroke-N6{stroke:#EEF1F8;} - .d2-3696763502 .stroke-N7{stroke:#FFFFFF;} - .d2-3696763502 .stroke-B1{stroke:#0D32B2;} - .d2-3696763502 .stroke-B2{stroke:#0D32B2;} - .d2-3696763502 .stroke-B3{stroke:#E3E9FD;} - .d2-3696763502 .stroke-B4{stroke:#E3E9FD;} - .d2-3696763502 .stroke-B5{stroke:#EDF0FD;} - .d2-3696763502 .stroke-B6{stroke:#F7F8FE;} - .d2-3696763502 .stroke-AA2{stroke:#4A6FF3;} - .d2-3696763502 .stroke-AA4{stroke:#EDF0FD;} - .d2-3696763502 .stroke-AA5{stroke:#F7F8FE;} - .d2-3696763502 .stroke-AB4{stroke:#EDF0FD;} - .d2-3696763502 .stroke-AB5{stroke:#F7F8FE;} - .d2-3696763502 .background-color-N1{background-color:#0A0F25;} - .d2-3696763502 .background-color-N2{background-color:#676C7E;} - .d2-3696763502 .background-color-N3{background-color:#9499AB;} - .d2-3696763502 .background-color-N4{background-color:#CFD2DD;} - .d2-3696763502 .background-color-N5{background-color:#DEE1EB;} - .d2-3696763502 .background-color-N6{background-color:#EEF1F8;} - .d2-3696763502 .background-color-N7{background-color:#FFFFFF;} - .d2-3696763502 .background-color-B1{background-color:#0D32B2;} - .d2-3696763502 .background-color-B2{background-color:#0D32B2;} - .d2-3696763502 .background-color-B3{background-color:#E3E9FD;} - .d2-3696763502 .background-color-B4{background-color:#E3E9FD;} - .d2-3696763502 .background-color-B5{background-color:#EDF0FD;} - .d2-3696763502 .background-color-B6{background-color:#F7F8FE;} - .d2-3696763502 .background-color-AA2{background-color:#4A6FF3;} - .d2-3696763502 .background-color-AA4{background-color:#EDF0FD;} - .d2-3696763502 .background-color-AA5{background-color:#F7F8FE;} - .d2-3696763502 .background-color-AB4{background-color:#EDF0FD;} - .d2-3696763502 .background-color-AB5{background-color:#F7F8FE;} - .d2-3696763502 .color-N1{color:#0A0F25;} - .d2-3696763502 .color-N2{color:#676C7E;} - .d2-3696763502 .color-N3{color:#9499AB;} - .d2-3696763502 .color-N4{color:#CFD2DD;} - .d2-3696763502 .color-N5{color:#DEE1EB;} - .d2-3696763502 .color-N6{color:#EEF1F8;} - .d2-3696763502 .color-N7{color:#FFFFFF;} - .d2-3696763502 .color-B1{color:#0D32B2;} - .d2-3696763502 .color-B2{color:#0D32B2;} - .d2-3696763502 .color-B3{color:#E3E9FD;} - .d2-3696763502 .color-B4{color:#E3E9FD;} - .d2-3696763502 .color-B5{color:#EDF0FD;} - .d2-3696763502 .color-B6{color:#F7F8FE;} - .d2-3696763502 .color-AA2{color:#4A6FF3;} - .d2-3696763502 .color-AA4{color:#EDF0FD;} - .d2-3696763502 .color-AA5{color:#F7F8FE;} - .d2-3696763502 .color-AB4{color:#EDF0FD;} - .d2-3696763502 .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}]]>xab -======= .d2-1110461100 .fill-N1{fill:#0A0F25;} .d2-1110461100 .fill-N2{fill:#676C7E;} .d2-1110461100 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-1110461100 .color-AA4{color:#EDF0FD;} .d2-1110461100 .color-AA5{color:#F7F8FE;} .d2-1110461100 .color-AB4{color:#EDF0FD;} - .d2-1110461100 .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}]]>xab ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-1110461100 .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}]]>xab diff --git a/e2etests/testdata/regression/elk_loop_panic/elk/sketch.exp.svg b/e2etests/testdata/regression/elk_loop_panic/elk/sketch.exp.svg index d3848c3bc..d958a2d7f 100644 --- a/e2etests/testdata/regression/elk_loop_panic/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/elk_loop_panic/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -xab -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-3690897739 .fill-N1{fill:#0A0F25;} - .d2-3690897739 .fill-N2{fill:#676C7E;} - .d2-3690897739 .fill-N3{fill:#9499AB;} - .d2-3690897739 .fill-N4{fill:#CFD2DD;} - .d2-3690897739 .fill-N5{fill:#DEE1EB;} - .d2-3690897739 .fill-N6{fill:#EEF1F8;} - .d2-3690897739 .fill-N7{fill:#FFFFFF;} - .d2-3690897739 .fill-B1{fill:#0D32B2;} - .d2-3690897739 .fill-B2{fill:#0D32B2;} - .d2-3690897739 .fill-B3{fill:#E3E9FD;} - .d2-3690897739 .fill-B4{fill:#E3E9FD;} - .d2-3690897739 .fill-B5{fill:#EDF0FD;} - .d2-3690897739 .fill-B6{fill:#F7F8FE;} - .d2-3690897739 .fill-AA2{fill:#4A6FF3;} - .d2-3690897739 .fill-AA4{fill:#EDF0FD;} - .d2-3690897739 .fill-AA5{fill:#F7F8FE;} - .d2-3690897739 .fill-AB4{fill:#EDF0FD;} - .d2-3690897739 .fill-AB5{fill:#F7F8FE;} - .d2-3690897739 .stroke-N1{stroke:#0A0F25;} - .d2-3690897739 .stroke-N2{stroke:#676C7E;} - .d2-3690897739 .stroke-N3{stroke:#9499AB;} - .d2-3690897739 .stroke-N4{stroke:#CFD2DD;} - .d2-3690897739 .stroke-N5{stroke:#DEE1EB;} - .d2-3690897739 .stroke-N6{stroke:#EEF1F8;} - .d2-3690897739 .stroke-N7{stroke:#FFFFFF;} - .d2-3690897739 .stroke-B1{stroke:#0D32B2;} - .d2-3690897739 .stroke-B2{stroke:#0D32B2;} - .d2-3690897739 .stroke-B3{stroke:#E3E9FD;} - .d2-3690897739 .stroke-B4{stroke:#E3E9FD;} - .d2-3690897739 .stroke-B5{stroke:#EDF0FD;} - .d2-3690897739 .stroke-B6{stroke:#F7F8FE;} - .d2-3690897739 .stroke-AA2{stroke:#4A6FF3;} - .d2-3690897739 .stroke-AA4{stroke:#EDF0FD;} - .d2-3690897739 .stroke-AA5{stroke:#F7F8FE;} - .d2-3690897739 .stroke-AB4{stroke:#EDF0FD;} - .d2-3690897739 .stroke-AB5{stroke:#F7F8FE;} - .d2-3690897739 .background-color-N1{background-color:#0A0F25;} - .d2-3690897739 .background-color-N2{background-color:#676C7E;} - .d2-3690897739 .background-color-N3{background-color:#9499AB;} - .d2-3690897739 .background-color-N4{background-color:#CFD2DD;} - .d2-3690897739 .background-color-N5{background-color:#DEE1EB;} - .d2-3690897739 .background-color-N6{background-color:#EEF1F8;} - .d2-3690897739 .background-color-N7{background-color:#FFFFFF;} - .d2-3690897739 .background-color-B1{background-color:#0D32B2;} - .d2-3690897739 .background-color-B2{background-color:#0D32B2;} - .d2-3690897739 .background-color-B3{background-color:#E3E9FD;} - .d2-3690897739 .background-color-B4{background-color:#E3E9FD;} - .d2-3690897739 .background-color-B5{background-color:#EDF0FD;} - .d2-3690897739 .background-color-B6{background-color:#F7F8FE;} - .d2-3690897739 .background-color-AA2{background-color:#4A6FF3;} - .d2-3690897739 .background-color-AA4{background-color:#EDF0FD;} - .d2-3690897739 .background-color-AA5{background-color:#F7F8FE;} - .d2-3690897739 .background-color-AB4{background-color:#EDF0FD;} - .d2-3690897739 .background-color-AB5{background-color:#F7F8FE;} - .d2-3690897739 .color-N1{color:#0A0F25;} - .d2-3690897739 .color-N2{color:#676C7E;} - .d2-3690897739 .color-N3{color:#9499AB;} - .d2-3690897739 .color-N4{color:#CFD2DD;} - .d2-3690897739 .color-N5{color:#DEE1EB;} - .d2-3690897739 .color-N6{color:#EEF1F8;} - .d2-3690897739 .color-N7{color:#FFFFFF;} - .d2-3690897739 .color-B1{color:#0D32B2;} - .d2-3690897739 .color-B2{color:#0D32B2;} - .d2-3690897739 .color-B3{color:#E3E9FD;} - .d2-3690897739 .color-B4{color:#E3E9FD;} - .d2-3690897739 .color-B5{color:#EDF0FD;} - .d2-3690897739 .color-B6{color:#F7F8FE;} - .d2-3690897739 .color-AA2{color:#4A6FF3;} - .d2-3690897739 .color-AA4{color:#EDF0FD;} - .d2-3690897739 .color-AA5{color:#F7F8FE;} - .d2-3690897739 .color-AB4{color:#EDF0FD;} - .d2-3690897739 .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}]]>xab -======= .d2-582755485 .fill-N1{fill:#0A0F25;} .d2-582755485 .fill-N2{fill:#676C7E;} .d2-582755485 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-582755485 .color-AA4{color:#EDF0FD;} .d2-582755485 .color-AA5{color:#F7F8FE;} .d2-582755485 .color-AB4{color:#EDF0FD;} - .d2-582755485 .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}]]>xab ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-582755485 .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}]]>xab diff --git a/e2etests/testdata/regression/elk_order/dagre/sketch.exp.svg b/e2etests/testdata/regression/elk_order/dagre/sketch.exp.svg index 72fe85f29..63542572f 100644 --- a/e2etests/testdata/regression/elk_order/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/elk_order/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -hellogoodbye -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-3421221401 .fill-N1{fill:#0A0F25;} - .d2-3421221401 .fill-N2{fill:#676C7E;} - .d2-3421221401 .fill-N3{fill:#9499AB;} - .d2-3421221401 .fill-N4{fill:#CFD2DD;} - .d2-3421221401 .fill-N5{fill:#DEE1EB;} - .d2-3421221401 .fill-N6{fill:#EEF1F8;} - .d2-3421221401 .fill-N7{fill:#FFFFFF;} - .d2-3421221401 .fill-B1{fill:#0D32B2;} - .d2-3421221401 .fill-B2{fill:#0D32B2;} - .d2-3421221401 .fill-B3{fill:#E3E9FD;} - .d2-3421221401 .fill-B4{fill:#E3E9FD;} - .d2-3421221401 .fill-B5{fill:#EDF0FD;} - .d2-3421221401 .fill-B6{fill:#F7F8FE;} - .d2-3421221401 .fill-AA2{fill:#4A6FF3;} - .d2-3421221401 .fill-AA4{fill:#EDF0FD;} - .d2-3421221401 .fill-AA5{fill:#F7F8FE;} - .d2-3421221401 .fill-AB4{fill:#EDF0FD;} - .d2-3421221401 .fill-AB5{fill:#F7F8FE;} - .d2-3421221401 .stroke-N1{stroke:#0A0F25;} - .d2-3421221401 .stroke-N2{stroke:#676C7E;} - .d2-3421221401 .stroke-N3{stroke:#9499AB;} - .d2-3421221401 .stroke-N4{stroke:#CFD2DD;} - .d2-3421221401 .stroke-N5{stroke:#DEE1EB;} - .d2-3421221401 .stroke-N6{stroke:#EEF1F8;} - .d2-3421221401 .stroke-N7{stroke:#FFFFFF;} - .d2-3421221401 .stroke-B1{stroke:#0D32B2;} - .d2-3421221401 .stroke-B2{stroke:#0D32B2;} - .d2-3421221401 .stroke-B3{stroke:#E3E9FD;} - .d2-3421221401 .stroke-B4{stroke:#E3E9FD;} - .d2-3421221401 .stroke-B5{stroke:#EDF0FD;} - .d2-3421221401 .stroke-B6{stroke:#F7F8FE;} - .d2-3421221401 .stroke-AA2{stroke:#4A6FF3;} - .d2-3421221401 .stroke-AA4{stroke:#EDF0FD;} - .d2-3421221401 .stroke-AA5{stroke:#F7F8FE;} - .d2-3421221401 .stroke-AB4{stroke:#EDF0FD;} - .d2-3421221401 .stroke-AB5{stroke:#F7F8FE;} - .d2-3421221401 .background-color-N1{background-color:#0A0F25;} - .d2-3421221401 .background-color-N2{background-color:#676C7E;} - .d2-3421221401 .background-color-N3{background-color:#9499AB;} - .d2-3421221401 .background-color-N4{background-color:#CFD2DD;} - .d2-3421221401 .background-color-N5{background-color:#DEE1EB;} - .d2-3421221401 .background-color-N6{background-color:#EEF1F8;} - .d2-3421221401 .background-color-N7{background-color:#FFFFFF;} - .d2-3421221401 .background-color-B1{background-color:#0D32B2;} - .d2-3421221401 .background-color-B2{background-color:#0D32B2;} - .d2-3421221401 .background-color-B3{background-color:#E3E9FD;} - .d2-3421221401 .background-color-B4{background-color:#E3E9FD;} - .d2-3421221401 .background-color-B5{background-color:#EDF0FD;} - .d2-3421221401 .background-color-B6{background-color:#F7F8FE;} - .d2-3421221401 .background-color-AA2{background-color:#4A6FF3;} - .d2-3421221401 .background-color-AA4{background-color:#EDF0FD;} - .d2-3421221401 .background-color-AA5{background-color:#F7F8FE;} - .d2-3421221401 .background-color-AB4{background-color:#EDF0FD;} - .d2-3421221401 .background-color-AB5{background-color:#F7F8FE;} - .d2-3421221401 .color-N1{color:#0A0F25;} - .d2-3421221401 .color-N2{color:#676C7E;} - .d2-3421221401 .color-N3{color:#9499AB;} - .d2-3421221401 .color-N4{color:#CFD2DD;} - .d2-3421221401 .color-N5{color:#DEE1EB;} - .d2-3421221401 .color-N6{color:#EEF1F8;} - .d2-3421221401 .color-N7{color:#FFFFFF;} - .d2-3421221401 .color-B1{color:#0D32B2;} - .d2-3421221401 .color-B2{color:#0D32B2;} - .d2-3421221401 .color-B3{color:#E3E9FD;} - .d2-3421221401 .color-B4{color:#E3E9FD;} - .d2-3421221401 .color-B5{color:#EDF0FD;} - .d2-3421221401 .color-B6{color:#F7F8FE;} - .d2-3421221401 .color-AA2{color:#4A6FF3;} - .d2-3421221401 .color-AA4{color:#EDF0FD;} - .d2-3421221401 .color-AA5{color:#F7F8FE;} - .d2-3421221401 .color-AB4{color:#EDF0FD;} - .d2-3421221401 .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}]]>hellogoodbye -======= .d2-2986276831 .fill-N1{fill:#0A0F25;} .d2-2986276831 .fill-N2{fill:#676C7E;} .d2-2986276831 .fill-N3{fill:#9499AB;} @@ -252,8 +89,7 @@ .d2-2986276831 .color-AA4{color:#EDF0FD;} .d2-2986276831 .color-AA5{color:#F7F8FE;} .d2-2986276831 .color-AB4{color:#EDF0FD;} - .d2-2986276831 .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}]]>hellogoodbye ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-2986276831 .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}]]>hellogoodbye diff --git a/e2etests/testdata/regression/empty_sequence/elk/sketch.exp.svg b/e2etests/testdata/regression/empty_sequence/elk/sketch.exp.svg index 231676d9a..46b183ba0 100644 --- a/e2etests/testdata/regression/empty_sequence/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/empty_sequence/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -hellogoodbye -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-4171250924 .fill-N1{fill:#0A0F25;} - .d2-4171250924 .fill-N2{fill:#676C7E;} - .d2-4171250924 .fill-N3{fill:#9499AB;} - .d2-4171250924 .fill-N4{fill:#CFD2DD;} - .d2-4171250924 .fill-N5{fill:#DEE1EB;} - .d2-4171250924 .fill-N6{fill:#EEF1F8;} - .d2-4171250924 .fill-N7{fill:#FFFFFF;} - .d2-4171250924 .fill-B1{fill:#0D32B2;} - .d2-4171250924 .fill-B2{fill:#0D32B2;} - .d2-4171250924 .fill-B3{fill:#E3E9FD;} - .d2-4171250924 .fill-B4{fill:#E3E9FD;} - .d2-4171250924 .fill-B5{fill:#EDF0FD;} - .d2-4171250924 .fill-B6{fill:#F7F8FE;} - .d2-4171250924 .fill-AA2{fill:#4A6FF3;} - .d2-4171250924 .fill-AA4{fill:#EDF0FD;} - .d2-4171250924 .fill-AA5{fill:#F7F8FE;} - .d2-4171250924 .fill-AB4{fill:#EDF0FD;} - .d2-4171250924 .fill-AB5{fill:#F7F8FE;} - .d2-4171250924 .stroke-N1{stroke:#0A0F25;} - .d2-4171250924 .stroke-N2{stroke:#676C7E;} - .d2-4171250924 .stroke-N3{stroke:#9499AB;} - .d2-4171250924 .stroke-N4{stroke:#CFD2DD;} - .d2-4171250924 .stroke-N5{stroke:#DEE1EB;} - .d2-4171250924 .stroke-N6{stroke:#EEF1F8;} - .d2-4171250924 .stroke-N7{stroke:#FFFFFF;} - .d2-4171250924 .stroke-B1{stroke:#0D32B2;} - .d2-4171250924 .stroke-B2{stroke:#0D32B2;} - .d2-4171250924 .stroke-B3{stroke:#E3E9FD;} - .d2-4171250924 .stroke-B4{stroke:#E3E9FD;} - .d2-4171250924 .stroke-B5{stroke:#EDF0FD;} - .d2-4171250924 .stroke-B6{stroke:#F7F8FE;} - .d2-4171250924 .stroke-AA2{stroke:#4A6FF3;} - .d2-4171250924 .stroke-AA4{stroke:#EDF0FD;} - .d2-4171250924 .stroke-AA5{stroke:#F7F8FE;} - .d2-4171250924 .stroke-AB4{stroke:#EDF0FD;} - .d2-4171250924 .stroke-AB5{stroke:#F7F8FE;} - .d2-4171250924 .background-color-N1{background-color:#0A0F25;} - .d2-4171250924 .background-color-N2{background-color:#676C7E;} - .d2-4171250924 .background-color-N3{background-color:#9499AB;} - .d2-4171250924 .background-color-N4{background-color:#CFD2DD;} - .d2-4171250924 .background-color-N5{background-color:#DEE1EB;} - .d2-4171250924 .background-color-N6{background-color:#EEF1F8;} - .d2-4171250924 .background-color-N7{background-color:#FFFFFF;} - .d2-4171250924 .background-color-B1{background-color:#0D32B2;} - .d2-4171250924 .background-color-B2{background-color:#0D32B2;} - .d2-4171250924 .background-color-B3{background-color:#E3E9FD;} - .d2-4171250924 .background-color-B4{background-color:#E3E9FD;} - .d2-4171250924 .background-color-B5{background-color:#EDF0FD;} - .d2-4171250924 .background-color-B6{background-color:#F7F8FE;} - .d2-4171250924 .background-color-AA2{background-color:#4A6FF3;} - .d2-4171250924 .background-color-AA4{background-color:#EDF0FD;} - .d2-4171250924 .background-color-AA5{background-color:#F7F8FE;} - .d2-4171250924 .background-color-AB4{background-color:#EDF0FD;} - .d2-4171250924 .background-color-AB5{background-color:#F7F8FE;} - .d2-4171250924 .color-N1{color:#0A0F25;} - .d2-4171250924 .color-N2{color:#676C7E;} - .d2-4171250924 .color-N3{color:#9499AB;} - .d2-4171250924 .color-N4{color:#CFD2DD;} - .d2-4171250924 .color-N5{color:#DEE1EB;} - .d2-4171250924 .color-N6{color:#EEF1F8;} - .d2-4171250924 .color-N7{color:#FFFFFF;} - .d2-4171250924 .color-B1{color:#0D32B2;} - .d2-4171250924 .color-B2{color:#0D32B2;} - .d2-4171250924 .color-B3{color:#E3E9FD;} - .d2-4171250924 .color-B4{color:#E3E9FD;} - .d2-4171250924 .color-B5{color:#EDF0FD;} - .d2-4171250924 .color-B6{color:#F7F8FE;} - .d2-4171250924 .color-AA2{color:#4A6FF3;} - .d2-4171250924 .color-AA4{color:#EDF0FD;} - .d2-4171250924 .color-AA5{color:#F7F8FE;} - .d2-4171250924 .color-AB4{color:#EDF0FD;} - .d2-4171250924 .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}]]>hellogoodbye -======= .d2-3267986010 .fill-N1{fill:#0A0F25;} .d2-3267986010 .fill-N2{fill:#676C7E;} .d2-3267986010 .fill-N3{fill:#9499AB;} @@ -252,8 +89,7 @@ .d2-3267986010 .color-AA4{color:#EDF0FD;} .d2-3267986010 .color-AA5{color:#F7F8FE;} .d2-3267986010 .color-AB4{color:#EDF0FD;} - .d2-3267986010 .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}]]>hellogoodbye ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-3267986010 .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}]]>hellogoodbye diff --git a/e2etests/testdata/regression/glob_dimensions/dagre/sketch.exp.svg b/e2etests/testdata/regression/glob_dimensions/dagre/sketch.exp.svg index 6830875ff..faa91f9c5 100644 --- a/e2etests/testdata/regression/glob_dimensions/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/glob_dimensions/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -Check PINSearch NetworkReadyOffEnter PIN /check PIN[pin invalid][pin OK][pin OK]network foundpower offpower offpower off -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-2887586175 .fill-N1{fill:#0A0F25;} - .d2-2887586175 .fill-N2{fill:#676C7E;} - .d2-2887586175 .fill-N3{fill:#9499AB;} - .d2-2887586175 .fill-N4{fill:#CFD2DD;} - .d2-2887586175 .fill-N5{fill:#DEE1EB;} - .d2-2887586175 .fill-N6{fill:#EEF1F8;} - .d2-2887586175 .fill-N7{fill:#FFFFFF;} - .d2-2887586175 .fill-B1{fill:#0D32B2;} - .d2-2887586175 .fill-B2{fill:#0D32B2;} - .d2-2887586175 .fill-B3{fill:#E3E9FD;} - .d2-2887586175 .fill-B4{fill:#E3E9FD;} - .d2-2887586175 .fill-B5{fill:#EDF0FD;} - .d2-2887586175 .fill-B6{fill:#F7F8FE;} - .d2-2887586175 .fill-AA2{fill:#4A6FF3;} - .d2-2887586175 .fill-AA4{fill:#EDF0FD;} - .d2-2887586175 .fill-AA5{fill:#F7F8FE;} - .d2-2887586175 .fill-AB4{fill:#EDF0FD;} - .d2-2887586175 .fill-AB5{fill:#F7F8FE;} - .d2-2887586175 .stroke-N1{stroke:#0A0F25;} - .d2-2887586175 .stroke-N2{stroke:#676C7E;} - .d2-2887586175 .stroke-N3{stroke:#9499AB;} - .d2-2887586175 .stroke-N4{stroke:#CFD2DD;} - .d2-2887586175 .stroke-N5{stroke:#DEE1EB;} - .d2-2887586175 .stroke-N6{stroke:#EEF1F8;} - .d2-2887586175 .stroke-N7{stroke:#FFFFFF;} - .d2-2887586175 .stroke-B1{stroke:#0D32B2;} - .d2-2887586175 .stroke-B2{stroke:#0D32B2;} - .d2-2887586175 .stroke-B3{stroke:#E3E9FD;} - .d2-2887586175 .stroke-B4{stroke:#E3E9FD;} - .d2-2887586175 .stroke-B5{stroke:#EDF0FD;} - .d2-2887586175 .stroke-B6{stroke:#F7F8FE;} - .d2-2887586175 .stroke-AA2{stroke:#4A6FF3;} - .d2-2887586175 .stroke-AA4{stroke:#EDF0FD;} - .d2-2887586175 .stroke-AA5{stroke:#F7F8FE;} - .d2-2887586175 .stroke-AB4{stroke:#EDF0FD;} - .d2-2887586175 .stroke-AB5{stroke:#F7F8FE;} - .d2-2887586175 .background-color-N1{background-color:#0A0F25;} - .d2-2887586175 .background-color-N2{background-color:#676C7E;} - .d2-2887586175 .background-color-N3{background-color:#9499AB;} - .d2-2887586175 .background-color-N4{background-color:#CFD2DD;} - .d2-2887586175 .background-color-N5{background-color:#DEE1EB;} - .d2-2887586175 .background-color-N6{background-color:#EEF1F8;} - .d2-2887586175 .background-color-N7{background-color:#FFFFFF;} - .d2-2887586175 .background-color-B1{background-color:#0D32B2;} - .d2-2887586175 .background-color-B2{background-color:#0D32B2;} - .d2-2887586175 .background-color-B3{background-color:#E3E9FD;} - .d2-2887586175 .background-color-B4{background-color:#E3E9FD;} - .d2-2887586175 .background-color-B5{background-color:#EDF0FD;} - .d2-2887586175 .background-color-B6{background-color:#F7F8FE;} - .d2-2887586175 .background-color-AA2{background-color:#4A6FF3;} - .d2-2887586175 .background-color-AA4{background-color:#EDF0FD;} - .d2-2887586175 .background-color-AA5{background-color:#F7F8FE;} - .d2-2887586175 .background-color-AB4{background-color:#EDF0FD;} - .d2-2887586175 .background-color-AB5{background-color:#F7F8FE;} - .d2-2887586175 .color-N1{color:#0A0F25;} - .d2-2887586175 .color-N2{color:#676C7E;} - .d2-2887586175 .color-N3{color:#9499AB;} - .d2-2887586175 .color-N4{color:#CFD2DD;} - .d2-2887586175 .color-N5{color:#DEE1EB;} - .d2-2887586175 .color-N6{color:#EEF1F8;} - .d2-2887586175 .color-N7{color:#FFFFFF;} - .d2-2887586175 .color-B1{color:#0D32B2;} - .d2-2887586175 .color-B2{color:#0D32B2;} - .d2-2887586175 .color-B3{color:#E3E9FD;} - .d2-2887586175 .color-B4{color:#E3E9FD;} - .d2-2887586175 .color-B5{color:#EDF0FD;} - .d2-2887586175 .color-B6{color:#F7F8FE;} - .d2-2887586175 .color-AA2{color:#4A6FF3;} - .d2-2887586175 .color-AA4{color:#EDF0FD;} - .d2-2887586175 .color-AA5{color:#F7F8FE;} - .d2-2887586175 .color-AB4{color:#EDF0FD;} - .d2-2887586175 .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}]]>Check PINSearch NetworkReadyOffEnter PIN /check PIN[pin invalid][pin OK][pin OK]network foundpower offpower offpower off -======= .d2-4179043663 .fill-N1{fill:#0A0F25;} .d2-4179043663 .fill-N2{fill:#676C7E;} .d2-4179043663 .fill-N3{fill:#9499AB;} @@ -266,8 +103,7 @@ .d2-4179043663 .color-AA4{color:#EDF0FD;} .d2-4179043663 .color-AA5{color:#F7F8FE;} .d2-4179043663 .color-AB4{color:#EDF0FD;} - .d2-4179043663 .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}]]>Check PINSearch NetworkReadyOffEnter PIN /check PIN[pin invalid][pin OK][pin OK]network foundpower offpower offpower off ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-4179043663 .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}]]>Check PINSearch NetworkReadyOffEnter PIN /check PIN[pin invalid][pin OK][pin OK]network foundpower offpower offpower off diff --git a/e2etests/testdata/regression/glob_dimensions/elk/sketch.exp.svg b/e2etests/testdata/regression/glob_dimensions/elk/sketch.exp.svg index cad30f6fb..f8aa4316e 100644 --- a/e2etests/testdata/regression/glob_dimensions/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/glob_dimensions/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -Check PINSearch NetworkReadyOffEnter PIN /check PIN[pin invalid][pin OK][pin OK]network foundpower offpower offpower off -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-1524816052 .fill-N1{fill:#0A0F25;} - .d2-1524816052 .fill-N2{fill:#676C7E;} - .d2-1524816052 .fill-N3{fill:#9499AB;} - .d2-1524816052 .fill-N4{fill:#CFD2DD;} - .d2-1524816052 .fill-N5{fill:#DEE1EB;} - .d2-1524816052 .fill-N6{fill:#EEF1F8;} - .d2-1524816052 .fill-N7{fill:#FFFFFF;} - .d2-1524816052 .fill-B1{fill:#0D32B2;} - .d2-1524816052 .fill-B2{fill:#0D32B2;} - .d2-1524816052 .fill-B3{fill:#E3E9FD;} - .d2-1524816052 .fill-B4{fill:#E3E9FD;} - .d2-1524816052 .fill-B5{fill:#EDF0FD;} - .d2-1524816052 .fill-B6{fill:#F7F8FE;} - .d2-1524816052 .fill-AA2{fill:#4A6FF3;} - .d2-1524816052 .fill-AA4{fill:#EDF0FD;} - .d2-1524816052 .fill-AA5{fill:#F7F8FE;} - .d2-1524816052 .fill-AB4{fill:#EDF0FD;} - .d2-1524816052 .fill-AB5{fill:#F7F8FE;} - .d2-1524816052 .stroke-N1{stroke:#0A0F25;} - .d2-1524816052 .stroke-N2{stroke:#676C7E;} - .d2-1524816052 .stroke-N3{stroke:#9499AB;} - .d2-1524816052 .stroke-N4{stroke:#CFD2DD;} - .d2-1524816052 .stroke-N5{stroke:#DEE1EB;} - .d2-1524816052 .stroke-N6{stroke:#EEF1F8;} - .d2-1524816052 .stroke-N7{stroke:#FFFFFF;} - .d2-1524816052 .stroke-B1{stroke:#0D32B2;} - .d2-1524816052 .stroke-B2{stroke:#0D32B2;} - .d2-1524816052 .stroke-B3{stroke:#E3E9FD;} - .d2-1524816052 .stroke-B4{stroke:#E3E9FD;} - .d2-1524816052 .stroke-B5{stroke:#EDF0FD;} - .d2-1524816052 .stroke-B6{stroke:#F7F8FE;} - .d2-1524816052 .stroke-AA2{stroke:#4A6FF3;} - .d2-1524816052 .stroke-AA4{stroke:#EDF0FD;} - .d2-1524816052 .stroke-AA5{stroke:#F7F8FE;} - .d2-1524816052 .stroke-AB4{stroke:#EDF0FD;} - .d2-1524816052 .stroke-AB5{stroke:#F7F8FE;} - .d2-1524816052 .background-color-N1{background-color:#0A0F25;} - .d2-1524816052 .background-color-N2{background-color:#676C7E;} - .d2-1524816052 .background-color-N3{background-color:#9499AB;} - .d2-1524816052 .background-color-N4{background-color:#CFD2DD;} - .d2-1524816052 .background-color-N5{background-color:#DEE1EB;} - .d2-1524816052 .background-color-N6{background-color:#EEF1F8;} - .d2-1524816052 .background-color-N7{background-color:#FFFFFF;} - .d2-1524816052 .background-color-B1{background-color:#0D32B2;} - .d2-1524816052 .background-color-B2{background-color:#0D32B2;} - .d2-1524816052 .background-color-B3{background-color:#E3E9FD;} - .d2-1524816052 .background-color-B4{background-color:#E3E9FD;} - .d2-1524816052 .background-color-B5{background-color:#EDF0FD;} - .d2-1524816052 .background-color-B6{background-color:#F7F8FE;} - .d2-1524816052 .background-color-AA2{background-color:#4A6FF3;} - .d2-1524816052 .background-color-AA4{background-color:#EDF0FD;} - .d2-1524816052 .background-color-AA5{background-color:#F7F8FE;} - .d2-1524816052 .background-color-AB4{background-color:#EDF0FD;} - .d2-1524816052 .background-color-AB5{background-color:#F7F8FE;} - .d2-1524816052 .color-N1{color:#0A0F25;} - .d2-1524816052 .color-N2{color:#676C7E;} - .d2-1524816052 .color-N3{color:#9499AB;} - .d2-1524816052 .color-N4{color:#CFD2DD;} - .d2-1524816052 .color-N5{color:#DEE1EB;} - .d2-1524816052 .color-N6{color:#EEF1F8;} - .d2-1524816052 .color-N7{color:#FFFFFF;} - .d2-1524816052 .color-B1{color:#0D32B2;} - .d2-1524816052 .color-B2{color:#0D32B2;} - .d2-1524816052 .color-B3{color:#E3E9FD;} - .d2-1524816052 .color-B4{color:#E3E9FD;} - .d2-1524816052 .color-B5{color:#EDF0FD;} - .d2-1524816052 .color-B6{color:#F7F8FE;} - .d2-1524816052 .color-AA2{color:#4A6FF3;} - .d2-1524816052 .color-AA4{color:#EDF0FD;} - .d2-1524816052 .color-AA5{color:#F7F8FE;} - .d2-1524816052 .color-AB4{color:#EDF0FD;} - .d2-1524816052 .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}]]>Check PINSearch NetworkReadyOffEnter PIN /check PIN[pin invalid][pin OK][pin OK]network foundpower offpower offpower off -======= .d2-1833690584 .fill-N1{fill:#0A0F25;} .d2-1833690584 .fill-N2{fill:#676C7E;} .d2-1833690584 .fill-N3{fill:#9499AB;} @@ -266,8 +103,7 @@ .d2-1833690584 .color-AA4{color:#EDF0FD;} .d2-1833690584 .color-AA5{color:#F7F8FE;} .d2-1833690584 .color-AB4{color:#EDF0FD;} - .d2-1833690584 .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}]]>Check PINSearch NetworkReadyOffEnter PIN /check PIN[pin invalid][pin OK][pin OK]network foundpower offpower offpower off ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-1833690584 .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}]]>Check PINSearch NetworkReadyOffEnter PIN /check PIN[pin invalid][pin OK][pin OK]network foundpower offpower offpower off diff --git a/e2etests/testdata/regression/long_arrowhead_label/dagre/sketch.exp.svg b/e2etests/testdata/regression/long_arrowhead_label/dagre/sketch.exp.svg index b70f0ab19..1d4148995 100644 --- a/e2etests/testdata/regression/long_arrowhead_label/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/long_arrowhead_label/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -ab a to b with unexpectedly long target arrowhead label -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-3350411599 .fill-N1{fill:#0A0F25;} - .d2-3350411599 .fill-N2{fill:#676C7E;} - .d2-3350411599 .fill-N3{fill:#9499AB;} - .d2-3350411599 .fill-N4{fill:#CFD2DD;} - .d2-3350411599 .fill-N5{fill:#DEE1EB;} - .d2-3350411599 .fill-N6{fill:#EEF1F8;} - .d2-3350411599 .fill-N7{fill:#FFFFFF;} - .d2-3350411599 .fill-B1{fill:#0D32B2;} - .d2-3350411599 .fill-B2{fill:#0D32B2;} - .d2-3350411599 .fill-B3{fill:#E3E9FD;} - .d2-3350411599 .fill-B4{fill:#E3E9FD;} - .d2-3350411599 .fill-B5{fill:#EDF0FD;} - .d2-3350411599 .fill-B6{fill:#F7F8FE;} - .d2-3350411599 .fill-AA2{fill:#4A6FF3;} - .d2-3350411599 .fill-AA4{fill:#EDF0FD;} - .d2-3350411599 .fill-AA5{fill:#F7F8FE;} - .d2-3350411599 .fill-AB4{fill:#EDF0FD;} - .d2-3350411599 .fill-AB5{fill:#F7F8FE;} - .d2-3350411599 .stroke-N1{stroke:#0A0F25;} - .d2-3350411599 .stroke-N2{stroke:#676C7E;} - .d2-3350411599 .stroke-N3{stroke:#9499AB;} - .d2-3350411599 .stroke-N4{stroke:#CFD2DD;} - .d2-3350411599 .stroke-N5{stroke:#DEE1EB;} - .d2-3350411599 .stroke-N6{stroke:#EEF1F8;} - .d2-3350411599 .stroke-N7{stroke:#FFFFFF;} - .d2-3350411599 .stroke-B1{stroke:#0D32B2;} - .d2-3350411599 .stroke-B2{stroke:#0D32B2;} - .d2-3350411599 .stroke-B3{stroke:#E3E9FD;} - .d2-3350411599 .stroke-B4{stroke:#E3E9FD;} - .d2-3350411599 .stroke-B5{stroke:#EDF0FD;} - .d2-3350411599 .stroke-B6{stroke:#F7F8FE;} - .d2-3350411599 .stroke-AA2{stroke:#4A6FF3;} - .d2-3350411599 .stroke-AA4{stroke:#EDF0FD;} - .d2-3350411599 .stroke-AA5{stroke:#F7F8FE;} - .d2-3350411599 .stroke-AB4{stroke:#EDF0FD;} - .d2-3350411599 .stroke-AB5{stroke:#F7F8FE;} - .d2-3350411599 .background-color-N1{background-color:#0A0F25;} - .d2-3350411599 .background-color-N2{background-color:#676C7E;} - .d2-3350411599 .background-color-N3{background-color:#9499AB;} - .d2-3350411599 .background-color-N4{background-color:#CFD2DD;} - .d2-3350411599 .background-color-N5{background-color:#DEE1EB;} - .d2-3350411599 .background-color-N6{background-color:#EEF1F8;} - .d2-3350411599 .background-color-N7{background-color:#FFFFFF;} - .d2-3350411599 .background-color-B1{background-color:#0D32B2;} - .d2-3350411599 .background-color-B2{background-color:#0D32B2;} - .d2-3350411599 .background-color-B3{background-color:#E3E9FD;} - .d2-3350411599 .background-color-B4{background-color:#E3E9FD;} - .d2-3350411599 .background-color-B5{background-color:#EDF0FD;} - .d2-3350411599 .background-color-B6{background-color:#F7F8FE;} - .d2-3350411599 .background-color-AA2{background-color:#4A6FF3;} - .d2-3350411599 .background-color-AA4{background-color:#EDF0FD;} - .d2-3350411599 .background-color-AA5{background-color:#F7F8FE;} - .d2-3350411599 .background-color-AB4{background-color:#EDF0FD;} - .d2-3350411599 .background-color-AB5{background-color:#F7F8FE;} - .d2-3350411599 .color-N1{color:#0A0F25;} - .d2-3350411599 .color-N2{color:#676C7E;} - .d2-3350411599 .color-N3{color:#9499AB;} - .d2-3350411599 .color-N4{color:#CFD2DD;} - .d2-3350411599 .color-N5{color:#DEE1EB;} - .d2-3350411599 .color-N6{color:#EEF1F8;} - .d2-3350411599 .color-N7{color:#FFFFFF;} - .d2-3350411599 .color-B1{color:#0D32B2;} - .d2-3350411599 .color-B2{color:#0D32B2;} - .d2-3350411599 .color-B3{color:#E3E9FD;} - .d2-3350411599 .color-B4{color:#E3E9FD;} - .d2-3350411599 .color-B5{color:#EDF0FD;} - .d2-3350411599 .color-B6{color:#F7F8FE;} - .d2-3350411599 .color-AA2{color:#4A6FF3;} - .d2-3350411599 .color-AA4{color:#EDF0FD;} - .d2-3350411599 .color-AA5{color:#F7F8FE;} - .d2-3350411599 .color-AB4{color:#EDF0FD;} - .d2-3350411599 .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 to b with unexpectedly long target arrowhead label -======= .d2-370076573 .fill-N1{fill:#0A0F25;} .d2-370076573 .fill-N2{fill:#676C7E;} .d2-370076573 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-370076573 .color-AA4{color:#EDF0FD;} .d2-370076573 .color-AA5{color:#F7F8FE;} .d2-370076573 .color-AB4{color:#EDF0FD;} - .d2-370076573 .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 to b with unexpectedly long target arrowhead label ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-370076573 .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 to b with unexpectedly long target arrowhead label diff --git a/e2etests/testdata/regression/long_arrowhead_label/elk/sketch.exp.svg b/e2etests/testdata/regression/long_arrowhead_label/elk/sketch.exp.svg index e38408a77..f8051a8cc 100644 --- a/e2etests/testdata/regression/long_arrowhead_label/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/long_arrowhead_label/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -ab a to b with unexpectedly long target arrowhead label -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-784248580 .fill-N1{fill:#0A0F25;} - .d2-784248580 .fill-N2{fill:#676C7E;} - .d2-784248580 .fill-N3{fill:#9499AB;} - .d2-784248580 .fill-N4{fill:#CFD2DD;} - .d2-784248580 .fill-N5{fill:#DEE1EB;} - .d2-784248580 .fill-N6{fill:#EEF1F8;} - .d2-784248580 .fill-N7{fill:#FFFFFF;} - .d2-784248580 .fill-B1{fill:#0D32B2;} - .d2-784248580 .fill-B2{fill:#0D32B2;} - .d2-784248580 .fill-B3{fill:#E3E9FD;} - .d2-784248580 .fill-B4{fill:#E3E9FD;} - .d2-784248580 .fill-B5{fill:#EDF0FD;} - .d2-784248580 .fill-B6{fill:#F7F8FE;} - .d2-784248580 .fill-AA2{fill:#4A6FF3;} - .d2-784248580 .fill-AA4{fill:#EDF0FD;} - .d2-784248580 .fill-AA5{fill:#F7F8FE;} - .d2-784248580 .fill-AB4{fill:#EDF0FD;} - .d2-784248580 .fill-AB5{fill:#F7F8FE;} - .d2-784248580 .stroke-N1{stroke:#0A0F25;} - .d2-784248580 .stroke-N2{stroke:#676C7E;} - .d2-784248580 .stroke-N3{stroke:#9499AB;} - .d2-784248580 .stroke-N4{stroke:#CFD2DD;} - .d2-784248580 .stroke-N5{stroke:#DEE1EB;} - .d2-784248580 .stroke-N6{stroke:#EEF1F8;} - .d2-784248580 .stroke-N7{stroke:#FFFFFF;} - .d2-784248580 .stroke-B1{stroke:#0D32B2;} - .d2-784248580 .stroke-B2{stroke:#0D32B2;} - .d2-784248580 .stroke-B3{stroke:#E3E9FD;} - .d2-784248580 .stroke-B4{stroke:#E3E9FD;} - .d2-784248580 .stroke-B5{stroke:#EDF0FD;} - .d2-784248580 .stroke-B6{stroke:#F7F8FE;} - .d2-784248580 .stroke-AA2{stroke:#4A6FF3;} - .d2-784248580 .stroke-AA4{stroke:#EDF0FD;} - .d2-784248580 .stroke-AA5{stroke:#F7F8FE;} - .d2-784248580 .stroke-AB4{stroke:#EDF0FD;} - .d2-784248580 .stroke-AB5{stroke:#F7F8FE;} - .d2-784248580 .background-color-N1{background-color:#0A0F25;} - .d2-784248580 .background-color-N2{background-color:#676C7E;} - .d2-784248580 .background-color-N3{background-color:#9499AB;} - .d2-784248580 .background-color-N4{background-color:#CFD2DD;} - .d2-784248580 .background-color-N5{background-color:#DEE1EB;} - .d2-784248580 .background-color-N6{background-color:#EEF1F8;} - .d2-784248580 .background-color-N7{background-color:#FFFFFF;} - .d2-784248580 .background-color-B1{background-color:#0D32B2;} - .d2-784248580 .background-color-B2{background-color:#0D32B2;} - .d2-784248580 .background-color-B3{background-color:#E3E9FD;} - .d2-784248580 .background-color-B4{background-color:#E3E9FD;} - .d2-784248580 .background-color-B5{background-color:#EDF0FD;} - .d2-784248580 .background-color-B6{background-color:#F7F8FE;} - .d2-784248580 .background-color-AA2{background-color:#4A6FF3;} - .d2-784248580 .background-color-AA4{background-color:#EDF0FD;} - .d2-784248580 .background-color-AA5{background-color:#F7F8FE;} - .d2-784248580 .background-color-AB4{background-color:#EDF0FD;} - .d2-784248580 .background-color-AB5{background-color:#F7F8FE;} - .d2-784248580 .color-N1{color:#0A0F25;} - .d2-784248580 .color-N2{color:#676C7E;} - .d2-784248580 .color-N3{color:#9499AB;} - .d2-784248580 .color-N4{color:#CFD2DD;} - .d2-784248580 .color-N5{color:#DEE1EB;} - .d2-784248580 .color-N6{color:#EEF1F8;} - .d2-784248580 .color-N7{color:#FFFFFF;} - .d2-784248580 .color-B1{color:#0D32B2;} - .d2-784248580 .color-B2{color:#0D32B2;} - .d2-784248580 .color-B3{color:#E3E9FD;} - .d2-784248580 .color-B4{color:#E3E9FD;} - .d2-784248580 .color-B5{color:#EDF0FD;} - .d2-784248580 .color-B6{color:#F7F8FE;} - .d2-784248580 .color-AA2{color:#4A6FF3;} - .d2-784248580 .color-AA4{color:#EDF0FD;} - .d2-784248580 .color-AA5{color:#F7F8FE;} - .d2-784248580 .color-AB4{color:#EDF0FD;} - .d2-784248580 .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 to b with unexpectedly long target arrowhead label -======= .d2-4260858234 .fill-N1{fill:#0A0F25;} .d2-4260858234 .fill-N2{fill:#676C7E;} .d2-4260858234 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-4260858234 .color-AA4{color:#EDF0FD;} .d2-4260858234 .color-AA5{color:#F7F8FE;} .d2-4260858234 .color-AB4{color:#EDF0FD;} - .d2-4260858234 .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 to b with unexpectedly long target arrowhead label ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-4260858234 .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 to b with unexpectedly long target arrowhead label diff --git a/e2etests/testdata/regression/md_h1_li_li/dagre/sketch.exp.svg b/e2etests/testdata/regression/md_h1_li_li/dagre/sketch.exp.svg index 3882262ea..048fa7ab3 100644 --- a/e2etests/testdata/regression/md_h1_li_li/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/md_h1_li_li/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -abc12311112222 -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-114303792 .fill-N1{fill:#0A0F25;} - .d2-114303792 .fill-N2{fill:#676C7E;} - .d2-114303792 .fill-N3{fill:#9499AB;} - .d2-114303792 .fill-N4{fill:#CFD2DD;} - .d2-114303792 .fill-N5{fill:#DEE1EB;} - .d2-114303792 .fill-N6{fill:#EEF1F8;} - .d2-114303792 .fill-N7{fill:#FFFFFF;} - .d2-114303792 .fill-B1{fill:#0D32B2;} - .d2-114303792 .fill-B2{fill:#0D32B2;} - .d2-114303792 .fill-B3{fill:#E3E9FD;} - .d2-114303792 .fill-B4{fill:#E3E9FD;} - .d2-114303792 .fill-B5{fill:#EDF0FD;} - .d2-114303792 .fill-B6{fill:#F7F8FE;} - .d2-114303792 .fill-AA2{fill:#4A6FF3;} - .d2-114303792 .fill-AA4{fill:#EDF0FD;} - .d2-114303792 .fill-AA5{fill:#F7F8FE;} - .d2-114303792 .fill-AB4{fill:#EDF0FD;} - .d2-114303792 .fill-AB5{fill:#F7F8FE;} - .d2-114303792 .stroke-N1{stroke:#0A0F25;} - .d2-114303792 .stroke-N2{stroke:#676C7E;} - .d2-114303792 .stroke-N3{stroke:#9499AB;} - .d2-114303792 .stroke-N4{stroke:#CFD2DD;} - .d2-114303792 .stroke-N5{stroke:#DEE1EB;} - .d2-114303792 .stroke-N6{stroke:#EEF1F8;} - .d2-114303792 .stroke-N7{stroke:#FFFFFF;} - .d2-114303792 .stroke-B1{stroke:#0D32B2;} - .d2-114303792 .stroke-B2{stroke:#0D32B2;} - .d2-114303792 .stroke-B3{stroke:#E3E9FD;} - .d2-114303792 .stroke-B4{stroke:#E3E9FD;} - .d2-114303792 .stroke-B5{stroke:#EDF0FD;} - .d2-114303792 .stroke-B6{stroke:#F7F8FE;} - .d2-114303792 .stroke-AA2{stroke:#4A6FF3;} - .d2-114303792 .stroke-AA4{stroke:#EDF0FD;} - .d2-114303792 .stroke-AA5{stroke:#F7F8FE;} - .d2-114303792 .stroke-AB4{stroke:#EDF0FD;} - .d2-114303792 .stroke-AB5{stroke:#F7F8FE;} - .d2-114303792 .background-color-N1{background-color:#0A0F25;} - .d2-114303792 .background-color-N2{background-color:#676C7E;} - .d2-114303792 .background-color-N3{background-color:#9499AB;} - .d2-114303792 .background-color-N4{background-color:#CFD2DD;} - .d2-114303792 .background-color-N5{background-color:#DEE1EB;} - .d2-114303792 .background-color-N6{background-color:#EEF1F8;} - .d2-114303792 .background-color-N7{background-color:#FFFFFF;} - .d2-114303792 .background-color-B1{background-color:#0D32B2;} - .d2-114303792 .background-color-B2{background-color:#0D32B2;} - .d2-114303792 .background-color-B3{background-color:#E3E9FD;} - .d2-114303792 .background-color-B4{background-color:#E3E9FD;} - .d2-114303792 .background-color-B5{background-color:#EDF0FD;} - .d2-114303792 .background-color-B6{background-color:#F7F8FE;} - .d2-114303792 .background-color-AA2{background-color:#4A6FF3;} - .d2-114303792 .background-color-AA4{background-color:#EDF0FD;} - .d2-114303792 .background-color-AA5{background-color:#F7F8FE;} - .d2-114303792 .background-color-AB4{background-color:#EDF0FD;} - .d2-114303792 .background-color-AB5{background-color:#F7F8FE;} - .d2-114303792 .color-N1{color:#0A0F25;} - .d2-114303792 .color-N2{color:#676C7E;} - .d2-114303792 .color-N3{color:#9499AB;} - .d2-114303792 .color-N4{color:#CFD2DD;} - .d2-114303792 .color-N5{color:#DEE1EB;} - .d2-114303792 .color-N6{color:#EEF1F8;} - .d2-114303792 .color-N7{color:#FFFFFF;} - .d2-114303792 .color-B1{color:#0D32B2;} - .d2-114303792 .color-B2{color:#0D32B2;} - .d2-114303792 .color-B3{color:#E3E9FD;} - .d2-114303792 .color-B4{color:#E3E9FD;} - .d2-114303792 .color-B5{color:#EDF0FD;} - .d2-114303792 .color-B6{color:#F7F8FE;} - .d2-114303792 .color-AA2{color:#4A6FF3;} - .d2-114303792 .color-AA4{color:#EDF0FD;} - .d2-114303792 .color-AA5{color:#F7F8FE;} - .d2-114303792 .color-AB4{color:#EDF0FD;} - .d2-114303792 .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}]]>abc12311112222 -======= .d2-3075709646 .fill-N1{fill:#0A0F25;} .d2-3075709646 .fill-N2{fill:#676C7E;} .d2-3075709646 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-3075709646 .color-AA4{color:#EDF0FD;} .d2-3075709646 .color-AA5{color:#F7F8FE;} .d2-3075709646 .color-AB4{color:#EDF0FD;} - .d2-3075709646 .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}]]>abc12311112222 ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-3075709646 .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}]]>abc12311112222 diff --git a/e2etests/testdata/regression/multiple_constant_nears/elk/sketch.exp.svg b/e2etests/testdata/regression/multiple_constant_nears/elk/sketch.exp.svg index efa42bf0c..53ce743c1 100644 --- a/e2etests/testdata/regression/multiple_constant_nears/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/multiple_constant_nears/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -abc12311112222 -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-1840765879 .fill-N1{fill:#0A0F25;} - .d2-1840765879 .fill-N2{fill:#676C7E;} - .d2-1840765879 .fill-N3{fill:#9499AB;} - .d2-1840765879 .fill-N4{fill:#CFD2DD;} - .d2-1840765879 .fill-N5{fill:#DEE1EB;} - .d2-1840765879 .fill-N6{fill:#EEF1F8;} - .d2-1840765879 .fill-N7{fill:#FFFFFF;} - .d2-1840765879 .fill-B1{fill:#0D32B2;} - .d2-1840765879 .fill-B2{fill:#0D32B2;} - .d2-1840765879 .fill-B3{fill:#E3E9FD;} - .d2-1840765879 .fill-B4{fill:#E3E9FD;} - .d2-1840765879 .fill-B5{fill:#EDF0FD;} - .d2-1840765879 .fill-B6{fill:#F7F8FE;} - .d2-1840765879 .fill-AA2{fill:#4A6FF3;} - .d2-1840765879 .fill-AA4{fill:#EDF0FD;} - .d2-1840765879 .fill-AA5{fill:#F7F8FE;} - .d2-1840765879 .fill-AB4{fill:#EDF0FD;} - .d2-1840765879 .fill-AB5{fill:#F7F8FE;} - .d2-1840765879 .stroke-N1{stroke:#0A0F25;} - .d2-1840765879 .stroke-N2{stroke:#676C7E;} - .d2-1840765879 .stroke-N3{stroke:#9499AB;} - .d2-1840765879 .stroke-N4{stroke:#CFD2DD;} - .d2-1840765879 .stroke-N5{stroke:#DEE1EB;} - .d2-1840765879 .stroke-N6{stroke:#EEF1F8;} - .d2-1840765879 .stroke-N7{stroke:#FFFFFF;} - .d2-1840765879 .stroke-B1{stroke:#0D32B2;} - .d2-1840765879 .stroke-B2{stroke:#0D32B2;} - .d2-1840765879 .stroke-B3{stroke:#E3E9FD;} - .d2-1840765879 .stroke-B4{stroke:#E3E9FD;} - .d2-1840765879 .stroke-B5{stroke:#EDF0FD;} - .d2-1840765879 .stroke-B6{stroke:#F7F8FE;} - .d2-1840765879 .stroke-AA2{stroke:#4A6FF3;} - .d2-1840765879 .stroke-AA4{stroke:#EDF0FD;} - .d2-1840765879 .stroke-AA5{stroke:#F7F8FE;} - .d2-1840765879 .stroke-AB4{stroke:#EDF0FD;} - .d2-1840765879 .stroke-AB5{stroke:#F7F8FE;} - .d2-1840765879 .background-color-N1{background-color:#0A0F25;} - .d2-1840765879 .background-color-N2{background-color:#676C7E;} - .d2-1840765879 .background-color-N3{background-color:#9499AB;} - .d2-1840765879 .background-color-N4{background-color:#CFD2DD;} - .d2-1840765879 .background-color-N5{background-color:#DEE1EB;} - .d2-1840765879 .background-color-N6{background-color:#EEF1F8;} - .d2-1840765879 .background-color-N7{background-color:#FFFFFF;} - .d2-1840765879 .background-color-B1{background-color:#0D32B2;} - .d2-1840765879 .background-color-B2{background-color:#0D32B2;} - .d2-1840765879 .background-color-B3{background-color:#E3E9FD;} - .d2-1840765879 .background-color-B4{background-color:#E3E9FD;} - .d2-1840765879 .background-color-B5{background-color:#EDF0FD;} - .d2-1840765879 .background-color-B6{background-color:#F7F8FE;} - .d2-1840765879 .background-color-AA2{background-color:#4A6FF3;} - .d2-1840765879 .background-color-AA4{background-color:#EDF0FD;} - .d2-1840765879 .background-color-AA5{background-color:#F7F8FE;} - .d2-1840765879 .background-color-AB4{background-color:#EDF0FD;} - .d2-1840765879 .background-color-AB5{background-color:#F7F8FE;} - .d2-1840765879 .color-N1{color:#0A0F25;} - .d2-1840765879 .color-N2{color:#676C7E;} - .d2-1840765879 .color-N3{color:#9499AB;} - .d2-1840765879 .color-N4{color:#CFD2DD;} - .d2-1840765879 .color-N5{color:#DEE1EB;} - .d2-1840765879 .color-N6{color:#EEF1F8;} - .d2-1840765879 .color-N7{color:#FFFFFF;} - .d2-1840765879 .color-B1{color:#0D32B2;} - .d2-1840765879 .color-B2{color:#0D32B2;} - .d2-1840765879 .color-B3{color:#E3E9FD;} - .d2-1840765879 .color-B4{color:#E3E9FD;} - .d2-1840765879 .color-B5{color:#EDF0FD;} - .d2-1840765879 .color-B6{color:#F7F8FE;} - .d2-1840765879 .color-AA2{color:#4A6FF3;} - .d2-1840765879 .color-AA4{color:#EDF0FD;} - .d2-1840765879 .color-AA5{color:#F7F8FE;} - .d2-1840765879 .color-AB4{color:#EDF0FD;} - .d2-1840765879 .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}]]>abc12311112222 -======= .d2-2710455609 .fill-N1{fill:#0A0F25;} .d2-2710455609 .fill-N2{fill:#676C7E;} .d2-2710455609 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-2710455609 .color-AA4{color:#EDF0FD;} .d2-2710455609 .color-AA5{color:#F7F8FE;} .d2-2710455609 .color-AB4{color:#EDF0FD;} - .d2-2710455609 .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}]]>abc12311112222 ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-2710455609 .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}]]>abc12311112222 diff --git a/e2etests/testdata/regression/nested_layout_bug/dagre/sketch.exp.svg b/e2etests/testdata/regression/nested_layout_bug/dagre/sketch.exp.svg index 5819e41df..c393ca192 100644 --- a/e2etests/testdata/regression/nested_layout_bug/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/nested_layout_bug/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -abAABB -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-2545174705 .fill-N1{fill:#0A0F25;} - .d2-2545174705 .fill-N2{fill:#676C7E;} - .d2-2545174705 .fill-N3{fill:#9499AB;} - .d2-2545174705 .fill-N4{fill:#CFD2DD;} - .d2-2545174705 .fill-N5{fill:#DEE1EB;} - .d2-2545174705 .fill-N6{fill:#EEF1F8;} - .d2-2545174705 .fill-N7{fill:#FFFFFF;} - .d2-2545174705 .fill-B1{fill:#0D32B2;} - .d2-2545174705 .fill-B2{fill:#0D32B2;} - .d2-2545174705 .fill-B3{fill:#E3E9FD;} - .d2-2545174705 .fill-B4{fill:#E3E9FD;} - .d2-2545174705 .fill-B5{fill:#EDF0FD;} - .d2-2545174705 .fill-B6{fill:#F7F8FE;} - .d2-2545174705 .fill-AA2{fill:#4A6FF3;} - .d2-2545174705 .fill-AA4{fill:#EDF0FD;} - .d2-2545174705 .fill-AA5{fill:#F7F8FE;} - .d2-2545174705 .fill-AB4{fill:#EDF0FD;} - .d2-2545174705 .fill-AB5{fill:#F7F8FE;} - .d2-2545174705 .stroke-N1{stroke:#0A0F25;} - .d2-2545174705 .stroke-N2{stroke:#676C7E;} - .d2-2545174705 .stroke-N3{stroke:#9499AB;} - .d2-2545174705 .stroke-N4{stroke:#CFD2DD;} - .d2-2545174705 .stroke-N5{stroke:#DEE1EB;} - .d2-2545174705 .stroke-N6{stroke:#EEF1F8;} - .d2-2545174705 .stroke-N7{stroke:#FFFFFF;} - .d2-2545174705 .stroke-B1{stroke:#0D32B2;} - .d2-2545174705 .stroke-B2{stroke:#0D32B2;} - .d2-2545174705 .stroke-B3{stroke:#E3E9FD;} - .d2-2545174705 .stroke-B4{stroke:#E3E9FD;} - .d2-2545174705 .stroke-B5{stroke:#EDF0FD;} - .d2-2545174705 .stroke-B6{stroke:#F7F8FE;} - .d2-2545174705 .stroke-AA2{stroke:#4A6FF3;} - .d2-2545174705 .stroke-AA4{stroke:#EDF0FD;} - .d2-2545174705 .stroke-AA5{stroke:#F7F8FE;} - .d2-2545174705 .stroke-AB4{stroke:#EDF0FD;} - .d2-2545174705 .stroke-AB5{stroke:#F7F8FE;} - .d2-2545174705 .background-color-N1{background-color:#0A0F25;} - .d2-2545174705 .background-color-N2{background-color:#676C7E;} - .d2-2545174705 .background-color-N3{background-color:#9499AB;} - .d2-2545174705 .background-color-N4{background-color:#CFD2DD;} - .d2-2545174705 .background-color-N5{background-color:#DEE1EB;} - .d2-2545174705 .background-color-N6{background-color:#EEF1F8;} - .d2-2545174705 .background-color-N7{background-color:#FFFFFF;} - .d2-2545174705 .background-color-B1{background-color:#0D32B2;} - .d2-2545174705 .background-color-B2{background-color:#0D32B2;} - .d2-2545174705 .background-color-B3{background-color:#E3E9FD;} - .d2-2545174705 .background-color-B4{background-color:#E3E9FD;} - .d2-2545174705 .background-color-B5{background-color:#EDF0FD;} - .d2-2545174705 .background-color-B6{background-color:#F7F8FE;} - .d2-2545174705 .background-color-AA2{background-color:#4A6FF3;} - .d2-2545174705 .background-color-AA4{background-color:#EDF0FD;} - .d2-2545174705 .background-color-AA5{background-color:#F7F8FE;} - .d2-2545174705 .background-color-AB4{background-color:#EDF0FD;} - .d2-2545174705 .background-color-AB5{background-color:#F7F8FE;} - .d2-2545174705 .color-N1{color:#0A0F25;} - .d2-2545174705 .color-N2{color:#676C7E;} - .d2-2545174705 .color-N3{color:#9499AB;} - .d2-2545174705 .color-N4{color:#CFD2DD;} - .d2-2545174705 .color-N5{color:#DEE1EB;} - .d2-2545174705 .color-N6{color:#EEF1F8;} - .d2-2545174705 .color-N7{color:#FFFFFF;} - .d2-2545174705 .color-B1{color:#0D32B2;} - .d2-2545174705 .color-B2{color:#0D32B2;} - .d2-2545174705 .color-B3{color:#E3E9FD;} - .d2-2545174705 .color-B4{color:#E3E9FD;} - .d2-2545174705 .color-B5{color:#EDF0FD;} - .d2-2545174705 .color-B6{color:#F7F8FE;} - .d2-2545174705 .color-AA2{color:#4A6FF3;} - .d2-2545174705 .color-AA4{color:#EDF0FD;} - .d2-2545174705 .color-AA5{color:#F7F8FE;} - .d2-2545174705 .color-AB4{color:#EDF0FD;} - .d2-2545174705 .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}]]>abAABB -======= .d2-3712551575 .fill-N1{fill:#0A0F25;} .d2-3712551575 .fill-N2{fill:#676C7E;} .d2-3712551575 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-3712551575 .color-AA4{color:#EDF0FD;} .d2-3712551575 .color-AA5{color:#F7F8FE;} .d2-3712551575 .color-AB4{color:#EDF0FD;} - .d2-3712551575 .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}]]>abAABB ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-3712551575 .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}]]>abAABB diff --git a/e2etests/testdata/regression/nested_layout_bug/elk/sketch.exp.svg b/e2etests/testdata/regression/nested_layout_bug/elk/sketch.exp.svg index 676a986e7..210dd3015 100644 --- a/e2etests/testdata/regression/nested_layout_bug/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/nested_layout_bug/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -abAABB -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-3372388599 .fill-N1{fill:#0A0F25;} - .d2-3372388599 .fill-N2{fill:#676C7E;} - .d2-3372388599 .fill-N3{fill:#9499AB;} - .d2-3372388599 .fill-N4{fill:#CFD2DD;} - .d2-3372388599 .fill-N5{fill:#DEE1EB;} - .d2-3372388599 .fill-N6{fill:#EEF1F8;} - .d2-3372388599 .fill-N7{fill:#FFFFFF;} - .d2-3372388599 .fill-B1{fill:#0D32B2;} - .d2-3372388599 .fill-B2{fill:#0D32B2;} - .d2-3372388599 .fill-B3{fill:#E3E9FD;} - .d2-3372388599 .fill-B4{fill:#E3E9FD;} - .d2-3372388599 .fill-B5{fill:#EDF0FD;} - .d2-3372388599 .fill-B6{fill:#F7F8FE;} - .d2-3372388599 .fill-AA2{fill:#4A6FF3;} - .d2-3372388599 .fill-AA4{fill:#EDF0FD;} - .d2-3372388599 .fill-AA5{fill:#F7F8FE;} - .d2-3372388599 .fill-AB4{fill:#EDF0FD;} - .d2-3372388599 .fill-AB5{fill:#F7F8FE;} - .d2-3372388599 .stroke-N1{stroke:#0A0F25;} - .d2-3372388599 .stroke-N2{stroke:#676C7E;} - .d2-3372388599 .stroke-N3{stroke:#9499AB;} - .d2-3372388599 .stroke-N4{stroke:#CFD2DD;} - .d2-3372388599 .stroke-N5{stroke:#DEE1EB;} - .d2-3372388599 .stroke-N6{stroke:#EEF1F8;} - .d2-3372388599 .stroke-N7{stroke:#FFFFFF;} - .d2-3372388599 .stroke-B1{stroke:#0D32B2;} - .d2-3372388599 .stroke-B2{stroke:#0D32B2;} - .d2-3372388599 .stroke-B3{stroke:#E3E9FD;} - .d2-3372388599 .stroke-B4{stroke:#E3E9FD;} - .d2-3372388599 .stroke-B5{stroke:#EDF0FD;} - .d2-3372388599 .stroke-B6{stroke:#F7F8FE;} - .d2-3372388599 .stroke-AA2{stroke:#4A6FF3;} - .d2-3372388599 .stroke-AA4{stroke:#EDF0FD;} - .d2-3372388599 .stroke-AA5{stroke:#F7F8FE;} - .d2-3372388599 .stroke-AB4{stroke:#EDF0FD;} - .d2-3372388599 .stroke-AB5{stroke:#F7F8FE;} - .d2-3372388599 .background-color-N1{background-color:#0A0F25;} - .d2-3372388599 .background-color-N2{background-color:#676C7E;} - .d2-3372388599 .background-color-N3{background-color:#9499AB;} - .d2-3372388599 .background-color-N4{background-color:#CFD2DD;} - .d2-3372388599 .background-color-N5{background-color:#DEE1EB;} - .d2-3372388599 .background-color-N6{background-color:#EEF1F8;} - .d2-3372388599 .background-color-N7{background-color:#FFFFFF;} - .d2-3372388599 .background-color-B1{background-color:#0D32B2;} - .d2-3372388599 .background-color-B2{background-color:#0D32B2;} - .d2-3372388599 .background-color-B3{background-color:#E3E9FD;} - .d2-3372388599 .background-color-B4{background-color:#E3E9FD;} - .d2-3372388599 .background-color-B5{background-color:#EDF0FD;} - .d2-3372388599 .background-color-B6{background-color:#F7F8FE;} - .d2-3372388599 .background-color-AA2{background-color:#4A6FF3;} - .d2-3372388599 .background-color-AA4{background-color:#EDF0FD;} - .d2-3372388599 .background-color-AA5{background-color:#F7F8FE;} - .d2-3372388599 .background-color-AB4{background-color:#EDF0FD;} - .d2-3372388599 .background-color-AB5{background-color:#F7F8FE;} - .d2-3372388599 .color-N1{color:#0A0F25;} - .d2-3372388599 .color-N2{color:#676C7E;} - .d2-3372388599 .color-N3{color:#9499AB;} - .d2-3372388599 .color-N4{color:#CFD2DD;} - .d2-3372388599 .color-N5{color:#DEE1EB;} - .d2-3372388599 .color-N6{color:#EEF1F8;} - .d2-3372388599 .color-N7{color:#FFFFFF;} - .d2-3372388599 .color-B1{color:#0D32B2;} - .d2-3372388599 .color-B2{color:#0D32B2;} - .d2-3372388599 .color-B3{color:#E3E9FD;} - .d2-3372388599 .color-B4{color:#E3E9FD;} - .d2-3372388599 .color-B5{color:#EDF0FD;} - .d2-3372388599 .color-B6{color:#F7F8FE;} - .d2-3372388599 .color-AA2{color:#4A6FF3;} - .d2-3372388599 .color-AA4{color:#EDF0FD;} - .d2-3372388599 .color-AA5{color:#F7F8FE;} - .d2-3372388599 .color-AB4{color:#EDF0FD;} - .d2-3372388599 .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}]]>abAABB -======= .d2-579376013 .fill-N1{fill:#0A0F25;} .d2-579376013 .fill-N2{fill:#676C7E;} .d2-579376013 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-579376013 .color-AA4{color:#EDF0FD;} .d2-579376013 .color-AA5{color:#F7F8FE;} .d2-579376013 .color-AB4{color:#EDF0FD;} - .d2-579376013 .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}]]>abAABB ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-579376013 .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}]]>abAABB diff --git a/e2etests/testdata/regression/nested_steps/dagre/sketch.exp.svg b/e2etests/testdata/regression/nested_steps/dagre/sketch.exp.svg index 712dbde8b..78adf3e2f 100644 --- a/e2etests/testdata/regression/nested_steps/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/nested_steps/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -acdab -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-1386879104 .fill-N1{fill:#0A0F25;} - .d2-1386879104 .fill-N2{fill:#676C7E;} - .d2-1386879104 .fill-N3{fill:#9499AB;} - .d2-1386879104 .fill-N4{fill:#CFD2DD;} - .d2-1386879104 .fill-N5{fill:#DEE1EB;} - .d2-1386879104 .fill-N6{fill:#EEF1F8;} - .d2-1386879104 .fill-N7{fill:#FFFFFF;} - .d2-1386879104 .fill-B1{fill:#0D32B2;} - .d2-1386879104 .fill-B2{fill:#0D32B2;} - .d2-1386879104 .fill-B3{fill:#E3E9FD;} - .d2-1386879104 .fill-B4{fill:#E3E9FD;} - .d2-1386879104 .fill-B5{fill:#EDF0FD;} - .d2-1386879104 .fill-B6{fill:#F7F8FE;} - .d2-1386879104 .fill-AA2{fill:#4A6FF3;} - .d2-1386879104 .fill-AA4{fill:#EDF0FD;} - .d2-1386879104 .fill-AA5{fill:#F7F8FE;} - .d2-1386879104 .fill-AB4{fill:#EDF0FD;} - .d2-1386879104 .fill-AB5{fill:#F7F8FE;} - .d2-1386879104 .stroke-N1{stroke:#0A0F25;} - .d2-1386879104 .stroke-N2{stroke:#676C7E;} - .d2-1386879104 .stroke-N3{stroke:#9499AB;} - .d2-1386879104 .stroke-N4{stroke:#CFD2DD;} - .d2-1386879104 .stroke-N5{stroke:#DEE1EB;} - .d2-1386879104 .stroke-N6{stroke:#EEF1F8;} - .d2-1386879104 .stroke-N7{stroke:#FFFFFF;} - .d2-1386879104 .stroke-B1{stroke:#0D32B2;} - .d2-1386879104 .stroke-B2{stroke:#0D32B2;} - .d2-1386879104 .stroke-B3{stroke:#E3E9FD;} - .d2-1386879104 .stroke-B4{stroke:#E3E9FD;} - .d2-1386879104 .stroke-B5{stroke:#EDF0FD;} - .d2-1386879104 .stroke-B6{stroke:#F7F8FE;} - .d2-1386879104 .stroke-AA2{stroke:#4A6FF3;} - .d2-1386879104 .stroke-AA4{stroke:#EDF0FD;} - .d2-1386879104 .stroke-AA5{stroke:#F7F8FE;} - .d2-1386879104 .stroke-AB4{stroke:#EDF0FD;} - .d2-1386879104 .stroke-AB5{stroke:#F7F8FE;} - .d2-1386879104 .background-color-N1{background-color:#0A0F25;} - .d2-1386879104 .background-color-N2{background-color:#676C7E;} - .d2-1386879104 .background-color-N3{background-color:#9499AB;} - .d2-1386879104 .background-color-N4{background-color:#CFD2DD;} - .d2-1386879104 .background-color-N5{background-color:#DEE1EB;} - .d2-1386879104 .background-color-N6{background-color:#EEF1F8;} - .d2-1386879104 .background-color-N7{background-color:#FFFFFF;} - .d2-1386879104 .background-color-B1{background-color:#0D32B2;} - .d2-1386879104 .background-color-B2{background-color:#0D32B2;} - .d2-1386879104 .background-color-B3{background-color:#E3E9FD;} - .d2-1386879104 .background-color-B4{background-color:#E3E9FD;} - .d2-1386879104 .background-color-B5{background-color:#EDF0FD;} - .d2-1386879104 .background-color-B6{background-color:#F7F8FE;} - .d2-1386879104 .background-color-AA2{background-color:#4A6FF3;} - .d2-1386879104 .background-color-AA4{background-color:#EDF0FD;} - .d2-1386879104 .background-color-AA5{background-color:#F7F8FE;} - .d2-1386879104 .background-color-AB4{background-color:#EDF0FD;} - .d2-1386879104 .background-color-AB5{background-color:#F7F8FE;} - .d2-1386879104 .color-N1{color:#0A0F25;} - .d2-1386879104 .color-N2{color:#676C7E;} - .d2-1386879104 .color-N3{color:#9499AB;} - .d2-1386879104 .color-N4{color:#CFD2DD;} - .d2-1386879104 .color-N5{color:#DEE1EB;} - .d2-1386879104 .color-N6{color:#EEF1F8;} - .d2-1386879104 .color-N7{color:#FFFFFF;} - .d2-1386879104 .color-B1{color:#0D32B2;} - .d2-1386879104 .color-B2{color:#0D32B2;} - .d2-1386879104 .color-B3{color:#E3E9FD;} - .d2-1386879104 .color-B4{color:#E3E9FD;} - .d2-1386879104 .color-B5{color:#EDF0FD;} - .d2-1386879104 .color-B6{color:#F7F8FE;} - .d2-1386879104 .color-AA2{color:#4A6FF3;} - .d2-1386879104 .color-AA4{color:#EDF0FD;} - .d2-1386879104 .color-AA5{color:#F7F8FE;} - .d2-1386879104 .color-AB4{color:#EDF0FD;} - .d2-1386879104 .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}]]>acdab -======= .d2-1141560556 .fill-N1{fill:#0A0F25;} .d2-1141560556 .fill-N2{fill:#676C7E;} .d2-1141560556 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-1141560556 .color-AA4{color:#EDF0FD;} .d2-1141560556 .color-AA5{color:#F7F8FE;} .d2-1141560556 .color-AB4{color:#EDF0FD;} - .d2-1141560556 .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}]]>acdab ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-1141560556 .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}]]>acdab diff --git a/e2etests/testdata/regression/nested_steps/elk/sketch.exp.svg b/e2etests/testdata/regression/nested_steps/elk/sketch.exp.svg index 44dfd247f..289f5b529 100644 --- a/e2etests/testdata/regression/nested_steps/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/nested_steps/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -acdab -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-1351697728 .fill-N1{fill:#0A0F25;} - .d2-1351697728 .fill-N2{fill:#676C7E;} - .d2-1351697728 .fill-N3{fill:#9499AB;} - .d2-1351697728 .fill-N4{fill:#CFD2DD;} - .d2-1351697728 .fill-N5{fill:#DEE1EB;} - .d2-1351697728 .fill-N6{fill:#EEF1F8;} - .d2-1351697728 .fill-N7{fill:#FFFFFF;} - .d2-1351697728 .fill-B1{fill:#0D32B2;} - .d2-1351697728 .fill-B2{fill:#0D32B2;} - .d2-1351697728 .fill-B3{fill:#E3E9FD;} - .d2-1351697728 .fill-B4{fill:#E3E9FD;} - .d2-1351697728 .fill-B5{fill:#EDF0FD;} - .d2-1351697728 .fill-B6{fill:#F7F8FE;} - .d2-1351697728 .fill-AA2{fill:#4A6FF3;} - .d2-1351697728 .fill-AA4{fill:#EDF0FD;} - .d2-1351697728 .fill-AA5{fill:#F7F8FE;} - .d2-1351697728 .fill-AB4{fill:#EDF0FD;} - .d2-1351697728 .fill-AB5{fill:#F7F8FE;} - .d2-1351697728 .stroke-N1{stroke:#0A0F25;} - .d2-1351697728 .stroke-N2{stroke:#676C7E;} - .d2-1351697728 .stroke-N3{stroke:#9499AB;} - .d2-1351697728 .stroke-N4{stroke:#CFD2DD;} - .d2-1351697728 .stroke-N5{stroke:#DEE1EB;} - .d2-1351697728 .stroke-N6{stroke:#EEF1F8;} - .d2-1351697728 .stroke-N7{stroke:#FFFFFF;} - .d2-1351697728 .stroke-B1{stroke:#0D32B2;} - .d2-1351697728 .stroke-B2{stroke:#0D32B2;} - .d2-1351697728 .stroke-B3{stroke:#E3E9FD;} - .d2-1351697728 .stroke-B4{stroke:#E3E9FD;} - .d2-1351697728 .stroke-B5{stroke:#EDF0FD;} - .d2-1351697728 .stroke-B6{stroke:#F7F8FE;} - .d2-1351697728 .stroke-AA2{stroke:#4A6FF3;} - .d2-1351697728 .stroke-AA4{stroke:#EDF0FD;} - .d2-1351697728 .stroke-AA5{stroke:#F7F8FE;} - .d2-1351697728 .stroke-AB4{stroke:#EDF0FD;} - .d2-1351697728 .stroke-AB5{stroke:#F7F8FE;} - .d2-1351697728 .background-color-N1{background-color:#0A0F25;} - .d2-1351697728 .background-color-N2{background-color:#676C7E;} - .d2-1351697728 .background-color-N3{background-color:#9499AB;} - .d2-1351697728 .background-color-N4{background-color:#CFD2DD;} - .d2-1351697728 .background-color-N5{background-color:#DEE1EB;} - .d2-1351697728 .background-color-N6{background-color:#EEF1F8;} - .d2-1351697728 .background-color-N7{background-color:#FFFFFF;} - .d2-1351697728 .background-color-B1{background-color:#0D32B2;} - .d2-1351697728 .background-color-B2{background-color:#0D32B2;} - .d2-1351697728 .background-color-B3{background-color:#E3E9FD;} - .d2-1351697728 .background-color-B4{background-color:#E3E9FD;} - .d2-1351697728 .background-color-B5{background-color:#EDF0FD;} - .d2-1351697728 .background-color-B6{background-color:#F7F8FE;} - .d2-1351697728 .background-color-AA2{background-color:#4A6FF3;} - .d2-1351697728 .background-color-AA4{background-color:#EDF0FD;} - .d2-1351697728 .background-color-AA5{background-color:#F7F8FE;} - .d2-1351697728 .background-color-AB4{background-color:#EDF0FD;} - .d2-1351697728 .background-color-AB5{background-color:#F7F8FE;} - .d2-1351697728 .color-N1{color:#0A0F25;} - .d2-1351697728 .color-N2{color:#676C7E;} - .d2-1351697728 .color-N3{color:#9499AB;} - .d2-1351697728 .color-N4{color:#CFD2DD;} - .d2-1351697728 .color-N5{color:#DEE1EB;} - .d2-1351697728 .color-N6{color:#EEF1F8;} - .d2-1351697728 .color-N7{color:#FFFFFF;} - .d2-1351697728 .color-B1{color:#0D32B2;} - .d2-1351697728 .color-B2{color:#0D32B2;} - .d2-1351697728 .color-B3{color:#E3E9FD;} - .d2-1351697728 .color-B4{color:#E3E9FD;} - .d2-1351697728 .color-B5{color:#EDF0FD;} - .d2-1351697728 .color-B6{color:#F7F8FE;} - .d2-1351697728 .color-AA2{color:#4A6FF3;} - .d2-1351697728 .color-AA4{color:#EDF0FD;} - .d2-1351697728 .color-AA5{color:#F7F8FE;} - .d2-1351697728 .color-AB4{color:#EDF0FD;} - .d2-1351697728 .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}]]>acdab -======= .d2-135479044 .fill-N1{fill:#0A0F25;} .d2-135479044 .fill-N2{fill:#676C7E;} .d2-135479044 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-135479044 .color-AA4{color:#EDF0FD;} .d2-135479044 .color-AA5{color:#F7F8FE;} .d2-135479044 .color-AB4{color:#EDF0FD;} - .d2-135479044 .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}]]>acdab ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-135479044 .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}]]>acdab diff --git a/e2etests/testdata/regression/only_header_class_table/dagre/sketch.exp.svg b/e2etests/testdata/regression/only_header_class_table/dagre/sketch.exp.svg index eeaf9106a..a297511cf 100644 --- a/e2etests/testdata/regression/only_header_class_table/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/only_header_class_table/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -RefreshAuthorizationPolicyProtocolServerSideTranslatorProtocolBufferRefreshAuthorizationPolicyCacheRefreshAuthorizationPolicyCacheok -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-3631666954 .fill-N1{fill:#0A0F25;} - .d2-3631666954 .fill-N2{fill:#676C7E;} - .d2-3631666954 .fill-N3{fill:#9499AB;} - .d2-3631666954 .fill-N4{fill:#CFD2DD;} - .d2-3631666954 .fill-N5{fill:#DEE1EB;} - .d2-3631666954 .fill-N6{fill:#EEF1F8;} - .d2-3631666954 .fill-N7{fill:#FFFFFF;} - .d2-3631666954 .fill-B1{fill:#0D32B2;} - .d2-3631666954 .fill-B2{fill:#0D32B2;} - .d2-3631666954 .fill-B3{fill:#E3E9FD;} - .d2-3631666954 .fill-B4{fill:#E3E9FD;} - .d2-3631666954 .fill-B5{fill:#EDF0FD;} - .d2-3631666954 .fill-B6{fill:#F7F8FE;} - .d2-3631666954 .fill-AA2{fill:#4A6FF3;} - .d2-3631666954 .fill-AA4{fill:#EDF0FD;} - .d2-3631666954 .fill-AA5{fill:#F7F8FE;} - .d2-3631666954 .fill-AB4{fill:#EDF0FD;} - .d2-3631666954 .fill-AB5{fill:#F7F8FE;} - .d2-3631666954 .stroke-N1{stroke:#0A0F25;} - .d2-3631666954 .stroke-N2{stroke:#676C7E;} - .d2-3631666954 .stroke-N3{stroke:#9499AB;} - .d2-3631666954 .stroke-N4{stroke:#CFD2DD;} - .d2-3631666954 .stroke-N5{stroke:#DEE1EB;} - .d2-3631666954 .stroke-N6{stroke:#EEF1F8;} - .d2-3631666954 .stroke-N7{stroke:#FFFFFF;} - .d2-3631666954 .stroke-B1{stroke:#0D32B2;} - .d2-3631666954 .stroke-B2{stroke:#0D32B2;} - .d2-3631666954 .stroke-B3{stroke:#E3E9FD;} - .d2-3631666954 .stroke-B4{stroke:#E3E9FD;} - .d2-3631666954 .stroke-B5{stroke:#EDF0FD;} - .d2-3631666954 .stroke-B6{stroke:#F7F8FE;} - .d2-3631666954 .stroke-AA2{stroke:#4A6FF3;} - .d2-3631666954 .stroke-AA4{stroke:#EDF0FD;} - .d2-3631666954 .stroke-AA5{stroke:#F7F8FE;} - .d2-3631666954 .stroke-AB4{stroke:#EDF0FD;} - .d2-3631666954 .stroke-AB5{stroke:#F7F8FE;} - .d2-3631666954 .background-color-N1{background-color:#0A0F25;} - .d2-3631666954 .background-color-N2{background-color:#676C7E;} - .d2-3631666954 .background-color-N3{background-color:#9499AB;} - .d2-3631666954 .background-color-N4{background-color:#CFD2DD;} - .d2-3631666954 .background-color-N5{background-color:#DEE1EB;} - .d2-3631666954 .background-color-N6{background-color:#EEF1F8;} - .d2-3631666954 .background-color-N7{background-color:#FFFFFF;} - .d2-3631666954 .background-color-B1{background-color:#0D32B2;} - .d2-3631666954 .background-color-B2{background-color:#0D32B2;} - .d2-3631666954 .background-color-B3{background-color:#E3E9FD;} - .d2-3631666954 .background-color-B4{background-color:#E3E9FD;} - .d2-3631666954 .background-color-B5{background-color:#EDF0FD;} - .d2-3631666954 .background-color-B6{background-color:#F7F8FE;} - .d2-3631666954 .background-color-AA2{background-color:#4A6FF3;} - .d2-3631666954 .background-color-AA4{background-color:#EDF0FD;} - .d2-3631666954 .background-color-AA5{background-color:#F7F8FE;} - .d2-3631666954 .background-color-AB4{background-color:#EDF0FD;} - .d2-3631666954 .background-color-AB5{background-color:#F7F8FE;} - .d2-3631666954 .color-N1{color:#0A0F25;} - .d2-3631666954 .color-N2{color:#676C7E;} - .d2-3631666954 .color-N3{color:#9499AB;} - .d2-3631666954 .color-N4{color:#CFD2DD;} - .d2-3631666954 .color-N5{color:#DEE1EB;} - .d2-3631666954 .color-N6{color:#EEF1F8;} - .d2-3631666954 .color-N7{color:#FFFFFF;} - .d2-3631666954 .color-B1{color:#0D32B2;} - .d2-3631666954 .color-B2{color:#0D32B2;} - .d2-3631666954 .color-B3{color:#E3E9FD;} - .d2-3631666954 .color-B4{color:#E3E9FD;} - .d2-3631666954 .color-B5{color:#EDF0FD;} - .d2-3631666954 .color-B6{color:#F7F8FE;} - .d2-3631666954 .color-AA2{color:#4A6FF3;} - .d2-3631666954 .color-AA4{color:#EDF0FD;} - .d2-3631666954 .color-AA5{color:#F7F8FE;} - .d2-3631666954 .color-AB4{color:#EDF0FD;} - .d2-3631666954 .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 .fill-N1{fill:#0A0F25;} .d2-135452814 .fill-N2{fill:#676C7E;} .d2-135452814 .fill-N3{fill:#9499AB;} @@ -259,14 +96,7 @@ .d2-135452814 .color-AA4{color:#EDF0FD;} .d2-135452814 .color-AA5{color:#F7F8FE;} .d2-135452814 .color-AB4{color:#EDF0FD;} -<<<<<<< HEAD - .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 ->>>>>>> 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) + .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 \ 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 0bcdb9e99..0991ba801 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,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -RefreshAuthorizationPolicyProtocolServerSideTranslatorProtocolBufferRefreshAuthorizationPolicyCacheRefreshAuthorizationPolicyCacheok -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-505883705 .fill-N1{fill:#0A0F25;} - .d2-505883705 .fill-N2{fill:#676C7E;} - .d2-505883705 .fill-N3{fill:#9499AB;} - .d2-505883705 .fill-N4{fill:#CFD2DD;} - .d2-505883705 .fill-N5{fill:#DEE1EB;} - .d2-505883705 .fill-N6{fill:#EEF1F8;} - .d2-505883705 .fill-N7{fill:#FFFFFF;} - .d2-505883705 .fill-B1{fill:#0D32B2;} - .d2-505883705 .fill-B2{fill:#0D32B2;} - .d2-505883705 .fill-B3{fill:#E3E9FD;} - .d2-505883705 .fill-B4{fill:#E3E9FD;} - .d2-505883705 .fill-B5{fill:#EDF0FD;} - .d2-505883705 .fill-B6{fill:#F7F8FE;} - .d2-505883705 .fill-AA2{fill:#4A6FF3;} - .d2-505883705 .fill-AA4{fill:#EDF0FD;} - .d2-505883705 .fill-AA5{fill:#F7F8FE;} - .d2-505883705 .fill-AB4{fill:#EDF0FD;} - .d2-505883705 .fill-AB5{fill:#F7F8FE;} - .d2-505883705 .stroke-N1{stroke:#0A0F25;} - .d2-505883705 .stroke-N2{stroke:#676C7E;} - .d2-505883705 .stroke-N3{stroke:#9499AB;} - .d2-505883705 .stroke-N4{stroke:#CFD2DD;} - .d2-505883705 .stroke-N5{stroke:#DEE1EB;} - .d2-505883705 .stroke-N6{stroke:#EEF1F8;} - .d2-505883705 .stroke-N7{stroke:#FFFFFF;} - .d2-505883705 .stroke-B1{stroke:#0D32B2;} - .d2-505883705 .stroke-B2{stroke:#0D32B2;} - .d2-505883705 .stroke-B3{stroke:#E3E9FD;} - .d2-505883705 .stroke-B4{stroke:#E3E9FD;} - .d2-505883705 .stroke-B5{stroke:#EDF0FD;} - .d2-505883705 .stroke-B6{stroke:#F7F8FE;} - .d2-505883705 .stroke-AA2{stroke:#4A6FF3;} - .d2-505883705 .stroke-AA4{stroke:#EDF0FD;} - .d2-505883705 .stroke-AA5{stroke:#F7F8FE;} - .d2-505883705 .stroke-AB4{stroke:#EDF0FD;} - .d2-505883705 .stroke-AB5{stroke:#F7F8FE;} - .d2-505883705 .background-color-N1{background-color:#0A0F25;} - .d2-505883705 .background-color-N2{background-color:#676C7E;} - .d2-505883705 .background-color-N3{background-color:#9499AB;} - .d2-505883705 .background-color-N4{background-color:#CFD2DD;} - .d2-505883705 .background-color-N5{background-color:#DEE1EB;} - .d2-505883705 .background-color-N6{background-color:#EEF1F8;} - .d2-505883705 .background-color-N7{background-color:#FFFFFF;} - .d2-505883705 .background-color-B1{background-color:#0D32B2;} - .d2-505883705 .background-color-B2{background-color:#0D32B2;} - .d2-505883705 .background-color-B3{background-color:#E3E9FD;} - .d2-505883705 .background-color-B4{background-color:#E3E9FD;} - .d2-505883705 .background-color-B5{background-color:#EDF0FD;} - .d2-505883705 .background-color-B6{background-color:#F7F8FE;} - .d2-505883705 .background-color-AA2{background-color:#4A6FF3;} - .d2-505883705 .background-color-AA4{background-color:#EDF0FD;} - .d2-505883705 .background-color-AA5{background-color:#F7F8FE;} - .d2-505883705 .background-color-AB4{background-color:#EDF0FD;} - .d2-505883705 .background-color-AB5{background-color:#F7F8FE;} - .d2-505883705 .color-N1{color:#0A0F25;} - .d2-505883705 .color-N2{color:#676C7E;} - .d2-505883705 .color-N3{color:#9499AB;} - .d2-505883705 .color-N4{color:#CFD2DD;} - .d2-505883705 .color-N5{color:#DEE1EB;} - .d2-505883705 .color-N6{color:#EEF1F8;} - .d2-505883705 .color-N7{color:#FFFFFF;} - .d2-505883705 .color-B1{color:#0D32B2;} - .d2-505883705 .color-B2{color:#0D32B2;} - .d2-505883705 .color-B3{color:#E3E9FD;} - .d2-505883705 .color-B4{color:#E3E9FD;} - .d2-505883705 .color-B5{color:#EDF0FD;} - .d2-505883705 .color-B6{color:#F7F8FE;} - .d2-505883705 .color-AA2{color:#4A6FF3;} - .d2-505883705 .color-AA4{color:#EDF0FD;} - .d2-505883705 .color-AA5{color:#F7F8FE;} - .d2-505883705 .color-AB4{color:#EDF0FD;} - .d2-505883705 .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 .fill-N1{fill:#0A0F25;} .d2-266917553 .fill-N2{fill:#676C7E;} .d2-266917553 .fill-N3{fill:#9499AB;} @@ -259,14 +96,7 @@ .d2-266917553 .color-AA4{color:#EDF0FD;} .d2-266917553 .color-AA5{color:#F7F8FE;} .d2-266917553 .color-AB4{color:#EDF0FD;} -<<<<<<< HEAD - .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 ->>>>>>> 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) + .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 \ 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 c088b260a..949d5a836 100644 --- a/e2etests/testdata/regression/opacity-on-label/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/opacity-on-label/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -Kubernetesopensvck8s-master1k8s-master2k8s-master3k8s-worker1k8s-worker2k8s-worker3VM1VM2 keycloakheptapodharborvault -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-863162224 .fill-N1{fill:#0A0F25;} - .d2-863162224 .fill-N2{fill:#676C7E;} - .d2-863162224 .fill-N3{fill:#9499AB;} - .d2-863162224 .fill-N4{fill:#CFD2DD;} - .d2-863162224 .fill-N5{fill:#DEE1EB;} - .d2-863162224 .fill-N6{fill:#EEF1F8;} - .d2-863162224 .fill-N7{fill:#FFFFFF;} - .d2-863162224 .fill-B1{fill:#0D32B2;} - .d2-863162224 .fill-B2{fill:#0D32B2;} - .d2-863162224 .fill-B3{fill:#E3E9FD;} - .d2-863162224 .fill-B4{fill:#E3E9FD;} - .d2-863162224 .fill-B5{fill:#EDF0FD;} - .d2-863162224 .fill-B6{fill:#F7F8FE;} - .d2-863162224 .fill-AA2{fill:#4A6FF3;} - .d2-863162224 .fill-AA4{fill:#EDF0FD;} - .d2-863162224 .fill-AA5{fill:#F7F8FE;} - .d2-863162224 .fill-AB4{fill:#EDF0FD;} - .d2-863162224 .fill-AB5{fill:#F7F8FE;} - .d2-863162224 .stroke-N1{stroke:#0A0F25;} - .d2-863162224 .stroke-N2{stroke:#676C7E;} - .d2-863162224 .stroke-N3{stroke:#9499AB;} - .d2-863162224 .stroke-N4{stroke:#CFD2DD;} - .d2-863162224 .stroke-N5{stroke:#DEE1EB;} - .d2-863162224 .stroke-N6{stroke:#EEF1F8;} - .d2-863162224 .stroke-N7{stroke:#FFFFFF;} - .d2-863162224 .stroke-B1{stroke:#0D32B2;} - .d2-863162224 .stroke-B2{stroke:#0D32B2;} - .d2-863162224 .stroke-B3{stroke:#E3E9FD;} - .d2-863162224 .stroke-B4{stroke:#E3E9FD;} - .d2-863162224 .stroke-B5{stroke:#EDF0FD;} - .d2-863162224 .stroke-B6{stroke:#F7F8FE;} - .d2-863162224 .stroke-AA2{stroke:#4A6FF3;} - .d2-863162224 .stroke-AA4{stroke:#EDF0FD;} - .d2-863162224 .stroke-AA5{stroke:#F7F8FE;} - .d2-863162224 .stroke-AB4{stroke:#EDF0FD;} - .d2-863162224 .stroke-AB5{stroke:#F7F8FE;} - .d2-863162224 .background-color-N1{background-color:#0A0F25;} - .d2-863162224 .background-color-N2{background-color:#676C7E;} - .d2-863162224 .background-color-N3{background-color:#9499AB;} - .d2-863162224 .background-color-N4{background-color:#CFD2DD;} - .d2-863162224 .background-color-N5{background-color:#DEE1EB;} - .d2-863162224 .background-color-N6{background-color:#EEF1F8;} - .d2-863162224 .background-color-N7{background-color:#FFFFFF;} - .d2-863162224 .background-color-B1{background-color:#0D32B2;} - .d2-863162224 .background-color-B2{background-color:#0D32B2;} - .d2-863162224 .background-color-B3{background-color:#E3E9FD;} - .d2-863162224 .background-color-B4{background-color:#E3E9FD;} - .d2-863162224 .background-color-B5{background-color:#EDF0FD;} - .d2-863162224 .background-color-B6{background-color:#F7F8FE;} - .d2-863162224 .background-color-AA2{background-color:#4A6FF3;} - .d2-863162224 .background-color-AA4{background-color:#EDF0FD;} - .d2-863162224 .background-color-AA5{background-color:#F7F8FE;} - .d2-863162224 .background-color-AB4{background-color:#EDF0FD;} - .d2-863162224 .background-color-AB5{background-color:#F7F8FE;} - .d2-863162224 .color-N1{color:#0A0F25;} - .d2-863162224 .color-N2{color:#676C7E;} - .d2-863162224 .color-N3{color:#9499AB;} - .d2-863162224 .color-N4{color:#CFD2DD;} - .d2-863162224 .color-N5{color:#DEE1EB;} - .d2-863162224 .color-N6{color:#EEF1F8;} - .d2-863162224 .color-N7{color:#FFFFFF;} - .d2-863162224 .color-B1{color:#0D32B2;} - .d2-863162224 .color-B2{color:#0D32B2;} - .d2-863162224 .color-B3{color:#E3E9FD;} - .d2-863162224 .color-B4{color:#E3E9FD;} - .d2-863162224 .color-B5{color:#EDF0FD;} - .d2-863162224 .color-B6{color:#F7F8FE;} - .d2-863162224 .color-AA2{color:#4A6FF3;} - .d2-863162224 .color-AA4{color:#EDF0FD;} - .d2-863162224 .color-AA5{color:#F7F8FE;} - .d2-863162224 .color-AB4{color:#EDF0FD;} - .d2-863162224 .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}]]>Kubernetesopensvck8s-master1k8s-master2k8s-master3k8s-worker1k8s-worker2k8s-worker3VM1VM2 keycloakheptapodharborvault -======= .d2-1084299464 .fill-N1{fill:#0A0F25;} .d2-1084299464 .fill-N2{fill:#676C7E;} .d2-1084299464 .fill-N3{fill:#9499AB;} @@ -266,8 +103,7 @@ .d2-1084299464 .color-AA4{color:#EDF0FD;} .d2-1084299464 .color-AA5{color:#F7F8FE;} .d2-1084299464 .color-AB4{color:#EDF0FD;} - .d2-1084299464 .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}]]>Kubernetesopensvck8s-master1k8s-master2k8s-master3k8s-worker1k8s-worker2k8s-worker3VM1VM2 keycloakheptapodharborvault ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-1084299464 .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}]]>Kubernetesopensvck8s-master1k8s-master2k8s-master3k8s-worker1k8s-worker2k8s-worker3VM1VM2 keycloakheptapodharborvault diff --git a/e2etests/testdata/regression/overlapping-edge-label/elk/sketch.exp.svg b/e2etests/testdata/regression/overlapping-edge-label/elk/sketch.exp.svg index f82bcfbd0..689808a70 100644 --- a/e2etests/testdata/regression/overlapping-edge-label/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/overlapping-edge-label/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -Kubernetesopensvck8s-master1k8s-master2k8s-master3k8s-worker1k8s-worker2k8s-worker3VM1VM2 keycloakheptapodharborvault -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-1180036549 .fill-N1{fill:#0A0F25;} - .d2-1180036549 .fill-N2{fill:#676C7E;} - .d2-1180036549 .fill-N3{fill:#9499AB;} - .d2-1180036549 .fill-N4{fill:#CFD2DD;} - .d2-1180036549 .fill-N5{fill:#DEE1EB;} - .d2-1180036549 .fill-N6{fill:#EEF1F8;} - .d2-1180036549 .fill-N7{fill:#FFFFFF;} - .d2-1180036549 .fill-B1{fill:#0D32B2;} - .d2-1180036549 .fill-B2{fill:#0D32B2;} - .d2-1180036549 .fill-B3{fill:#E3E9FD;} - .d2-1180036549 .fill-B4{fill:#E3E9FD;} - .d2-1180036549 .fill-B5{fill:#EDF0FD;} - .d2-1180036549 .fill-B6{fill:#F7F8FE;} - .d2-1180036549 .fill-AA2{fill:#4A6FF3;} - .d2-1180036549 .fill-AA4{fill:#EDF0FD;} - .d2-1180036549 .fill-AA5{fill:#F7F8FE;} - .d2-1180036549 .fill-AB4{fill:#EDF0FD;} - .d2-1180036549 .fill-AB5{fill:#F7F8FE;} - .d2-1180036549 .stroke-N1{stroke:#0A0F25;} - .d2-1180036549 .stroke-N2{stroke:#676C7E;} - .d2-1180036549 .stroke-N3{stroke:#9499AB;} - .d2-1180036549 .stroke-N4{stroke:#CFD2DD;} - .d2-1180036549 .stroke-N5{stroke:#DEE1EB;} - .d2-1180036549 .stroke-N6{stroke:#EEF1F8;} - .d2-1180036549 .stroke-N7{stroke:#FFFFFF;} - .d2-1180036549 .stroke-B1{stroke:#0D32B2;} - .d2-1180036549 .stroke-B2{stroke:#0D32B2;} - .d2-1180036549 .stroke-B3{stroke:#E3E9FD;} - .d2-1180036549 .stroke-B4{stroke:#E3E9FD;} - .d2-1180036549 .stroke-B5{stroke:#EDF0FD;} - .d2-1180036549 .stroke-B6{stroke:#F7F8FE;} - .d2-1180036549 .stroke-AA2{stroke:#4A6FF3;} - .d2-1180036549 .stroke-AA4{stroke:#EDF0FD;} - .d2-1180036549 .stroke-AA5{stroke:#F7F8FE;} - .d2-1180036549 .stroke-AB4{stroke:#EDF0FD;} - .d2-1180036549 .stroke-AB5{stroke:#F7F8FE;} - .d2-1180036549 .background-color-N1{background-color:#0A0F25;} - .d2-1180036549 .background-color-N2{background-color:#676C7E;} - .d2-1180036549 .background-color-N3{background-color:#9499AB;} - .d2-1180036549 .background-color-N4{background-color:#CFD2DD;} - .d2-1180036549 .background-color-N5{background-color:#DEE1EB;} - .d2-1180036549 .background-color-N6{background-color:#EEF1F8;} - .d2-1180036549 .background-color-N7{background-color:#FFFFFF;} - .d2-1180036549 .background-color-B1{background-color:#0D32B2;} - .d2-1180036549 .background-color-B2{background-color:#0D32B2;} - .d2-1180036549 .background-color-B3{background-color:#E3E9FD;} - .d2-1180036549 .background-color-B4{background-color:#E3E9FD;} - .d2-1180036549 .background-color-B5{background-color:#EDF0FD;} - .d2-1180036549 .background-color-B6{background-color:#F7F8FE;} - .d2-1180036549 .background-color-AA2{background-color:#4A6FF3;} - .d2-1180036549 .background-color-AA4{background-color:#EDF0FD;} - .d2-1180036549 .background-color-AA5{background-color:#F7F8FE;} - .d2-1180036549 .background-color-AB4{background-color:#EDF0FD;} - .d2-1180036549 .background-color-AB5{background-color:#F7F8FE;} - .d2-1180036549 .color-N1{color:#0A0F25;} - .d2-1180036549 .color-N2{color:#676C7E;} - .d2-1180036549 .color-N3{color:#9499AB;} - .d2-1180036549 .color-N4{color:#CFD2DD;} - .d2-1180036549 .color-N5{color:#DEE1EB;} - .d2-1180036549 .color-N6{color:#EEF1F8;} - .d2-1180036549 .color-N7{color:#FFFFFF;} - .d2-1180036549 .color-B1{color:#0D32B2;} - .d2-1180036549 .color-B2{color:#0D32B2;} - .d2-1180036549 .color-B3{color:#E3E9FD;} - .d2-1180036549 .color-B4{color:#E3E9FD;} - .d2-1180036549 .color-B5{color:#EDF0FD;} - .d2-1180036549 .color-B6{color:#F7F8FE;} - .d2-1180036549 .color-AA2{color:#4A6FF3;} - .d2-1180036549 .color-AA4{color:#EDF0FD;} - .d2-1180036549 .color-AA5{color:#F7F8FE;} - .d2-1180036549 .color-AB4{color:#EDF0FD;} - .d2-1180036549 .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}]]>Kubernetesopensvck8s-master1k8s-master2k8s-master3k8s-worker1k8s-worker2k8s-worker3VM1VM2 keycloakheptapodharborvault -======= .d2-2491348673 .fill-N1{fill:#0A0F25;} .d2-2491348673 .fill-N2{fill:#676C7E;} .d2-2491348673 .fill-N3{fill:#9499AB;} @@ -266,8 +103,7 @@ .d2-2491348673 .color-AA4{color:#EDF0FD;} .d2-2491348673 .color-AA5{color:#F7F8FE;} .d2-2491348673 .color-AB4{color:#EDF0FD;} - .d2-2491348673 .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}]]>Kubernetesopensvck8s-master1k8s-master2k8s-master3k8s-worker1k8s-worker2k8s-worker3VM1VM2 keycloakheptapodharborvault ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-2491348673 .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}]]>Kubernetesopensvck8s-master1k8s-master2k8s-master3k8s-worker1k8s-worker2k8s-worker3VM1VM2 keycloakheptapodharborvault diff --git a/e2etests/testdata/regression/root-container/dagre/sketch.exp.svg b/e2etests/testdata/regression/root-container/dagre/sketch.exp.svg index 39e0ea9f6..44d40a74a 100644 --- a/e2etests/testdata/regression/root-container/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/root-container/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -mainrootxyzxyz -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-2569152134 .fill-N1{fill:#0A0F25;} - .d2-2569152134 .fill-N2{fill:#676C7E;} - .d2-2569152134 .fill-N3{fill:#9499AB;} - .d2-2569152134 .fill-N4{fill:#CFD2DD;} - .d2-2569152134 .fill-N5{fill:#DEE1EB;} - .d2-2569152134 .fill-N6{fill:#EEF1F8;} - .d2-2569152134 .fill-N7{fill:#FFFFFF;} - .d2-2569152134 .fill-B1{fill:#0D32B2;} - .d2-2569152134 .fill-B2{fill:#0D32B2;} - .d2-2569152134 .fill-B3{fill:#E3E9FD;} - .d2-2569152134 .fill-B4{fill:#E3E9FD;} - .d2-2569152134 .fill-B5{fill:#EDF0FD;} - .d2-2569152134 .fill-B6{fill:#F7F8FE;} - .d2-2569152134 .fill-AA2{fill:#4A6FF3;} - .d2-2569152134 .fill-AA4{fill:#EDF0FD;} - .d2-2569152134 .fill-AA5{fill:#F7F8FE;} - .d2-2569152134 .fill-AB4{fill:#EDF0FD;} - .d2-2569152134 .fill-AB5{fill:#F7F8FE;} - .d2-2569152134 .stroke-N1{stroke:#0A0F25;} - .d2-2569152134 .stroke-N2{stroke:#676C7E;} - .d2-2569152134 .stroke-N3{stroke:#9499AB;} - .d2-2569152134 .stroke-N4{stroke:#CFD2DD;} - .d2-2569152134 .stroke-N5{stroke:#DEE1EB;} - .d2-2569152134 .stroke-N6{stroke:#EEF1F8;} - .d2-2569152134 .stroke-N7{stroke:#FFFFFF;} - .d2-2569152134 .stroke-B1{stroke:#0D32B2;} - .d2-2569152134 .stroke-B2{stroke:#0D32B2;} - .d2-2569152134 .stroke-B3{stroke:#E3E9FD;} - .d2-2569152134 .stroke-B4{stroke:#E3E9FD;} - .d2-2569152134 .stroke-B5{stroke:#EDF0FD;} - .d2-2569152134 .stroke-B6{stroke:#F7F8FE;} - .d2-2569152134 .stroke-AA2{stroke:#4A6FF3;} - .d2-2569152134 .stroke-AA4{stroke:#EDF0FD;} - .d2-2569152134 .stroke-AA5{stroke:#F7F8FE;} - .d2-2569152134 .stroke-AB4{stroke:#EDF0FD;} - .d2-2569152134 .stroke-AB5{stroke:#F7F8FE;} - .d2-2569152134 .background-color-N1{background-color:#0A0F25;} - .d2-2569152134 .background-color-N2{background-color:#676C7E;} - .d2-2569152134 .background-color-N3{background-color:#9499AB;} - .d2-2569152134 .background-color-N4{background-color:#CFD2DD;} - .d2-2569152134 .background-color-N5{background-color:#DEE1EB;} - .d2-2569152134 .background-color-N6{background-color:#EEF1F8;} - .d2-2569152134 .background-color-N7{background-color:#FFFFFF;} - .d2-2569152134 .background-color-B1{background-color:#0D32B2;} - .d2-2569152134 .background-color-B2{background-color:#0D32B2;} - .d2-2569152134 .background-color-B3{background-color:#E3E9FD;} - .d2-2569152134 .background-color-B4{background-color:#E3E9FD;} - .d2-2569152134 .background-color-B5{background-color:#EDF0FD;} - .d2-2569152134 .background-color-B6{background-color:#F7F8FE;} - .d2-2569152134 .background-color-AA2{background-color:#4A6FF3;} - .d2-2569152134 .background-color-AA4{background-color:#EDF0FD;} - .d2-2569152134 .background-color-AA5{background-color:#F7F8FE;} - .d2-2569152134 .background-color-AB4{background-color:#EDF0FD;} - .d2-2569152134 .background-color-AB5{background-color:#F7F8FE;} - .d2-2569152134 .color-N1{color:#0A0F25;} - .d2-2569152134 .color-N2{color:#676C7E;} - .d2-2569152134 .color-N3{color:#9499AB;} - .d2-2569152134 .color-N4{color:#CFD2DD;} - .d2-2569152134 .color-N5{color:#DEE1EB;} - .d2-2569152134 .color-N6{color:#EEF1F8;} - .d2-2569152134 .color-N7{color:#FFFFFF;} - .d2-2569152134 .color-B1{color:#0D32B2;} - .d2-2569152134 .color-B2{color:#0D32B2;} - .d2-2569152134 .color-B3{color:#E3E9FD;} - .d2-2569152134 .color-B4{color:#E3E9FD;} - .d2-2569152134 .color-B5{color:#EDF0FD;} - .d2-2569152134 .color-B6{color:#F7F8FE;} - .d2-2569152134 .color-AA2{color:#4A6FF3;} - .d2-2569152134 .color-AA4{color:#EDF0FD;} - .d2-2569152134 .color-AA5{color:#F7F8FE;} - .d2-2569152134 .color-AB4{color:#EDF0FD;} - .d2-2569152134 .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}]]>mainrootxyzxyz -======= .d2-3260597002 .fill-N1{fill:#0A0F25;} .d2-3260597002 .fill-N2{fill:#676C7E;} .d2-3260597002 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-3260597002 .color-AA4{color:#EDF0FD;} .d2-3260597002 .color-AA5{color:#F7F8FE;} .d2-3260597002 .color-AB4{color:#EDF0FD;} - .d2-3260597002 .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}]]>mainrootxyzxyz ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-3260597002 .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}]]>mainrootxyzxyz diff --git a/e2etests/testdata/regression/root-container/elk/sketch.exp.svg b/e2etests/testdata/regression/root-container/elk/sketch.exp.svg index 7cd18db2a..7b4b00931 100644 --- a/e2etests/testdata/regression/root-container/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/root-container/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -mainrootxyzxyz -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-16415280 .fill-N1{fill:#0A0F25;} - .d2-16415280 .fill-N2{fill:#676C7E;} - .d2-16415280 .fill-N3{fill:#9499AB;} - .d2-16415280 .fill-N4{fill:#CFD2DD;} - .d2-16415280 .fill-N5{fill:#DEE1EB;} - .d2-16415280 .fill-N6{fill:#EEF1F8;} - .d2-16415280 .fill-N7{fill:#FFFFFF;} - .d2-16415280 .fill-B1{fill:#0D32B2;} - .d2-16415280 .fill-B2{fill:#0D32B2;} - .d2-16415280 .fill-B3{fill:#E3E9FD;} - .d2-16415280 .fill-B4{fill:#E3E9FD;} - .d2-16415280 .fill-B5{fill:#EDF0FD;} - .d2-16415280 .fill-B6{fill:#F7F8FE;} - .d2-16415280 .fill-AA2{fill:#4A6FF3;} - .d2-16415280 .fill-AA4{fill:#EDF0FD;} - .d2-16415280 .fill-AA5{fill:#F7F8FE;} - .d2-16415280 .fill-AB4{fill:#EDF0FD;} - .d2-16415280 .fill-AB5{fill:#F7F8FE;} - .d2-16415280 .stroke-N1{stroke:#0A0F25;} - .d2-16415280 .stroke-N2{stroke:#676C7E;} - .d2-16415280 .stroke-N3{stroke:#9499AB;} - .d2-16415280 .stroke-N4{stroke:#CFD2DD;} - .d2-16415280 .stroke-N5{stroke:#DEE1EB;} - .d2-16415280 .stroke-N6{stroke:#EEF1F8;} - .d2-16415280 .stroke-N7{stroke:#FFFFFF;} - .d2-16415280 .stroke-B1{stroke:#0D32B2;} - .d2-16415280 .stroke-B2{stroke:#0D32B2;} - .d2-16415280 .stroke-B3{stroke:#E3E9FD;} - .d2-16415280 .stroke-B4{stroke:#E3E9FD;} - .d2-16415280 .stroke-B5{stroke:#EDF0FD;} - .d2-16415280 .stroke-B6{stroke:#F7F8FE;} - .d2-16415280 .stroke-AA2{stroke:#4A6FF3;} - .d2-16415280 .stroke-AA4{stroke:#EDF0FD;} - .d2-16415280 .stroke-AA5{stroke:#F7F8FE;} - .d2-16415280 .stroke-AB4{stroke:#EDF0FD;} - .d2-16415280 .stroke-AB5{stroke:#F7F8FE;} - .d2-16415280 .background-color-N1{background-color:#0A0F25;} - .d2-16415280 .background-color-N2{background-color:#676C7E;} - .d2-16415280 .background-color-N3{background-color:#9499AB;} - .d2-16415280 .background-color-N4{background-color:#CFD2DD;} - .d2-16415280 .background-color-N5{background-color:#DEE1EB;} - .d2-16415280 .background-color-N6{background-color:#EEF1F8;} - .d2-16415280 .background-color-N7{background-color:#FFFFFF;} - .d2-16415280 .background-color-B1{background-color:#0D32B2;} - .d2-16415280 .background-color-B2{background-color:#0D32B2;} - .d2-16415280 .background-color-B3{background-color:#E3E9FD;} - .d2-16415280 .background-color-B4{background-color:#E3E9FD;} - .d2-16415280 .background-color-B5{background-color:#EDF0FD;} - .d2-16415280 .background-color-B6{background-color:#F7F8FE;} - .d2-16415280 .background-color-AA2{background-color:#4A6FF3;} - .d2-16415280 .background-color-AA4{background-color:#EDF0FD;} - .d2-16415280 .background-color-AA5{background-color:#F7F8FE;} - .d2-16415280 .background-color-AB4{background-color:#EDF0FD;} - .d2-16415280 .background-color-AB5{background-color:#F7F8FE;} - .d2-16415280 .color-N1{color:#0A0F25;} - .d2-16415280 .color-N2{color:#676C7E;} - .d2-16415280 .color-N3{color:#9499AB;} - .d2-16415280 .color-N4{color:#CFD2DD;} - .d2-16415280 .color-N5{color:#DEE1EB;} - .d2-16415280 .color-N6{color:#EEF1F8;} - .d2-16415280 .color-N7{color:#FFFFFF;} - .d2-16415280 .color-B1{color:#0D32B2;} - .d2-16415280 .color-B2{color:#0D32B2;} - .d2-16415280 .color-B3{color:#E3E9FD;} - .d2-16415280 .color-B4{color:#E3E9FD;} - .d2-16415280 .color-B5{color:#EDF0FD;} - .d2-16415280 .color-B6{color:#F7F8FE;} - .d2-16415280 .color-AA2{color:#4A6FF3;} - .d2-16415280 .color-AA4{color:#EDF0FD;} - .d2-16415280 .color-AA5{color:#F7F8FE;} - .d2-16415280 .color-AB4{color:#EDF0FD;} - .d2-16415280 .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}]]>mainrootxyzxyz -======= .d2-1085390292 .fill-N1{fill:#0A0F25;} .d2-1085390292 .fill-N2{fill:#676C7E;} .d2-1085390292 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-1085390292 .color-AA4{color:#EDF0FD;} .d2-1085390292 .color-AA5{color:#F7F8FE;} .d2-1085390292 .color-AB4{color:#EDF0FD;} - .d2-1085390292 .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}]]>mainrootxyzxyz ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-1085390292 .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}]]>mainrootxyzxyz diff --git a/e2etests/testdata/regression/sequence-note-escape-group/dagre/sketch.exp.svg b/e2etests/testdata/regression/sequence-note-escape-group/dagre/sketch.exp.svg index f56498c16..ff3404ca0 100644 --- a/e2etests/testdata/regression/sequence-note-escape-group/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/sequence-note-escape-group/dagre/sketch.exp.svg @@ -1,26 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -ab04:20,11:20loop through each table start_time = datetime.datetime.now - -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-3300528218 .fill-N1{fill:#0A0F25;} - .d2-3300528218 .fill-N2{fill:#676C7E;} - .d2-3300528218 .fill-N3{fill:#9499AB;} - .d2-3300528218 .fill-N4{fill:#CFD2DD;} - .d2-3300528218 .fill-N5{fill:#DEE1EB;} - .d2-3300528218 .fill-N6{fill:#EEF1F8;} - .d2-3300528218 .fill-N7{fill:#FFFFFF;} - .d2-3300528218 .fill-B1{fill:#0D32B2;} - .d2-3300528218 .fill-B2{fill:#0D32B2;} - .d2-3300528218 .fill-B3{fill:#E3E9FD;} - .d2-3300528218 .fill-B4{fill:#E3E9FD;} - .d2-3300528218 .fill-B5{fill:#EDF0FD;} - .d2-3300528218 .fill-B6{fill:#F7F8FE;} - .d2-3300528218 .fill-AA2{fill:#4A6FF3;} - .d2-3300528218 .fill-AA4{fill:#EDF0FD;} - .d2-3300528218 .fill-AA5{fill:#F7F8FE;} - .d2-3300528218 .fill-AB4{fill:#EDF0FD;} - .d2-3300528218 .fill-AB5{fill:#F7F8FE;} - .d2-3300528218 .stroke-N1{stroke:#0A0F25;} - .d2-3300528218 .stroke-N2{stroke:#676C7E;} - .d2-3300528218 .stroke-N3{stroke:#9499AB;} - .d2-3300528218 .stroke-N4{stroke:#CFD2DD;} - .d2-3300528218 .stroke-N5{stroke:#DEE1EB;} - .d2-3300528218 .stroke-N6{stroke:#EEF1F8;} - .d2-3300528218 .stroke-N7{stroke:#FFFFFF;} - .d2-3300528218 .stroke-B1{stroke:#0D32B2;} - .d2-3300528218 .stroke-B2{stroke:#0D32B2;} - .d2-3300528218 .stroke-B3{stroke:#E3E9FD;} - .d2-3300528218 .stroke-B4{stroke:#E3E9FD;} - .d2-3300528218 .stroke-B5{stroke:#EDF0FD;} - .d2-3300528218 .stroke-B6{stroke:#F7F8FE;} - .d2-3300528218 .stroke-AA2{stroke:#4A6FF3;} - .d2-3300528218 .stroke-AA4{stroke:#EDF0FD;} - .d2-3300528218 .stroke-AA5{stroke:#F7F8FE;} - .d2-3300528218 .stroke-AB4{stroke:#EDF0FD;} - .d2-3300528218 .stroke-AB5{stroke:#F7F8FE;} - .d2-3300528218 .background-color-N1{background-color:#0A0F25;} - .d2-3300528218 .background-color-N2{background-color:#676C7E;} - .d2-3300528218 .background-color-N3{background-color:#9499AB;} - .d2-3300528218 .background-color-N4{background-color:#CFD2DD;} - .d2-3300528218 .background-color-N5{background-color:#DEE1EB;} - .d2-3300528218 .background-color-N6{background-color:#EEF1F8;} - .d2-3300528218 .background-color-N7{background-color:#FFFFFF;} - .d2-3300528218 .background-color-B1{background-color:#0D32B2;} - .d2-3300528218 .background-color-B2{background-color:#0D32B2;} - .d2-3300528218 .background-color-B3{background-color:#E3E9FD;} - .d2-3300528218 .background-color-B4{background-color:#E3E9FD;} - .d2-3300528218 .background-color-B5{background-color:#EDF0FD;} - .d2-3300528218 .background-color-B6{background-color:#F7F8FE;} - .d2-3300528218 .background-color-AA2{background-color:#4A6FF3;} - .d2-3300528218 .background-color-AA4{background-color:#EDF0FD;} - .d2-3300528218 .background-color-AA5{background-color:#F7F8FE;} - .d2-3300528218 .background-color-AB4{background-color:#EDF0FD;} - .d2-3300528218 .background-color-AB5{background-color:#F7F8FE;} - .d2-3300528218 .color-N1{color:#0A0F25;} - .d2-3300528218 .color-N2{color:#676C7E;} - .d2-3300528218 .color-N3{color:#9499AB;} - .d2-3300528218 .color-N4{color:#CFD2DD;} - .d2-3300528218 .color-N5{color:#DEE1EB;} - .d2-3300528218 .color-N6{color:#EEF1F8;} - .d2-3300528218 .color-N7{color:#FFFFFF;} - .d2-3300528218 .color-B1{color:#0D32B2;} - .d2-3300528218 .color-B2{color:#0D32B2;} - .d2-3300528218 .color-B3{color:#E3E9FD;} - .d2-3300528218 .color-B4{color:#E3E9FD;} - .d2-3300528218 .color-B5{color:#EDF0FD;} - .d2-3300528218 .color-B6{color:#F7F8FE;} - .d2-3300528218 .color-AA2{color:#4A6FF3;} - .d2-3300528218 .color-AA4{color:#EDF0FD;} - .d2-3300528218 .color-AA5{color:#F7F8FE;} - .d2-3300528218 .color-AB4{color:#EDF0FD;} - .d2-3300528218 .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-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 - ->>>>>>> 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;} @@ -408,9 +89,8 @@ .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 + .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) 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 f56498c16..ff3404ca0 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,26 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -ab04:20,11:20loop through each table start_time = datetime.datetime.now - -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-3300528218 .fill-N1{fill:#0A0F25;} - .d2-3300528218 .fill-N2{fill:#676C7E;} - .d2-3300528218 .fill-N3{fill:#9499AB;} - .d2-3300528218 .fill-N4{fill:#CFD2DD;} - .d2-3300528218 .fill-N5{fill:#DEE1EB;} - .d2-3300528218 .fill-N6{fill:#EEF1F8;} - .d2-3300528218 .fill-N7{fill:#FFFFFF;} - .d2-3300528218 .fill-B1{fill:#0D32B2;} - .d2-3300528218 .fill-B2{fill:#0D32B2;} - .d2-3300528218 .fill-B3{fill:#E3E9FD;} - .d2-3300528218 .fill-B4{fill:#E3E9FD;} - .d2-3300528218 .fill-B5{fill:#EDF0FD;} - .d2-3300528218 .fill-B6{fill:#F7F8FE;} - .d2-3300528218 .fill-AA2{fill:#4A6FF3;} - .d2-3300528218 .fill-AA4{fill:#EDF0FD;} - .d2-3300528218 .fill-AA5{fill:#F7F8FE;} - .d2-3300528218 .fill-AB4{fill:#EDF0FD;} - .d2-3300528218 .fill-AB5{fill:#F7F8FE;} - .d2-3300528218 .stroke-N1{stroke:#0A0F25;} - .d2-3300528218 .stroke-N2{stroke:#676C7E;} - .d2-3300528218 .stroke-N3{stroke:#9499AB;} - .d2-3300528218 .stroke-N4{stroke:#CFD2DD;} - .d2-3300528218 .stroke-N5{stroke:#DEE1EB;} - .d2-3300528218 .stroke-N6{stroke:#EEF1F8;} - .d2-3300528218 .stroke-N7{stroke:#FFFFFF;} - .d2-3300528218 .stroke-B1{stroke:#0D32B2;} - .d2-3300528218 .stroke-B2{stroke:#0D32B2;} - .d2-3300528218 .stroke-B3{stroke:#E3E9FD;} - .d2-3300528218 .stroke-B4{stroke:#E3E9FD;} - .d2-3300528218 .stroke-B5{stroke:#EDF0FD;} - .d2-3300528218 .stroke-B6{stroke:#F7F8FE;} - .d2-3300528218 .stroke-AA2{stroke:#4A6FF3;} - .d2-3300528218 .stroke-AA4{stroke:#EDF0FD;} - .d2-3300528218 .stroke-AA5{stroke:#F7F8FE;} - .d2-3300528218 .stroke-AB4{stroke:#EDF0FD;} - .d2-3300528218 .stroke-AB5{stroke:#F7F8FE;} - .d2-3300528218 .background-color-N1{background-color:#0A0F25;} - .d2-3300528218 .background-color-N2{background-color:#676C7E;} - .d2-3300528218 .background-color-N3{background-color:#9499AB;} - .d2-3300528218 .background-color-N4{background-color:#CFD2DD;} - .d2-3300528218 .background-color-N5{background-color:#DEE1EB;} - .d2-3300528218 .background-color-N6{background-color:#EEF1F8;} - .d2-3300528218 .background-color-N7{background-color:#FFFFFF;} - .d2-3300528218 .background-color-B1{background-color:#0D32B2;} - .d2-3300528218 .background-color-B2{background-color:#0D32B2;} - .d2-3300528218 .background-color-B3{background-color:#E3E9FD;} - .d2-3300528218 .background-color-B4{background-color:#E3E9FD;} - .d2-3300528218 .background-color-B5{background-color:#EDF0FD;} - .d2-3300528218 .background-color-B6{background-color:#F7F8FE;} - .d2-3300528218 .background-color-AA2{background-color:#4A6FF3;} - .d2-3300528218 .background-color-AA4{background-color:#EDF0FD;} - .d2-3300528218 .background-color-AA5{background-color:#F7F8FE;} - .d2-3300528218 .background-color-AB4{background-color:#EDF0FD;} - .d2-3300528218 .background-color-AB5{background-color:#F7F8FE;} - .d2-3300528218 .color-N1{color:#0A0F25;} - .d2-3300528218 .color-N2{color:#676C7E;} - .d2-3300528218 .color-N3{color:#9499AB;} - .d2-3300528218 .color-N4{color:#CFD2DD;} - .d2-3300528218 .color-N5{color:#DEE1EB;} - .d2-3300528218 .color-N6{color:#EEF1F8;} - .d2-3300528218 .color-N7{color:#FFFFFF;} - .d2-3300528218 .color-B1{color:#0D32B2;} - .d2-3300528218 .color-B2{color:#0D32B2;} - .d2-3300528218 .color-B3{color:#E3E9FD;} - .d2-3300528218 .color-B4{color:#E3E9FD;} - .d2-3300528218 .color-B5{color:#EDF0FD;} - .d2-3300528218 .color-B6{color:#F7F8FE;} - .d2-3300528218 .color-AA2{color:#4A6FF3;} - .d2-3300528218 .color-AA4{color:#EDF0FD;} - .d2-3300528218 .color-AA5{color:#F7F8FE;} - .d2-3300528218 .color-AB4{color:#EDF0FD;} - .d2-3300528218 .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-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 - ->>>>>>> 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;} @@ -408,9 +89,8 @@ .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 + .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) 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 61d0796e8..7f057014b 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,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -foofoobarabcd -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-3416172057 .fill-N1{fill:#0A0F25;} - .d2-3416172057 .fill-N2{fill:#676C7E;} - .d2-3416172057 .fill-N3{fill:#9499AB;} - .d2-3416172057 .fill-N4{fill:#CFD2DD;} - .d2-3416172057 .fill-N5{fill:#DEE1EB;} - .d2-3416172057 .fill-N6{fill:#EEF1F8;} - .d2-3416172057 .fill-N7{fill:#FFFFFF;} - .d2-3416172057 .fill-B1{fill:#0D32B2;} - .d2-3416172057 .fill-B2{fill:#0D32B2;} - .d2-3416172057 .fill-B3{fill:#E3E9FD;} - .d2-3416172057 .fill-B4{fill:#E3E9FD;} - .d2-3416172057 .fill-B5{fill:#EDF0FD;} - .d2-3416172057 .fill-B6{fill:#F7F8FE;} - .d2-3416172057 .fill-AA2{fill:#4A6FF3;} - .d2-3416172057 .fill-AA4{fill:#EDF0FD;} - .d2-3416172057 .fill-AA5{fill:#F7F8FE;} - .d2-3416172057 .fill-AB4{fill:#EDF0FD;} - .d2-3416172057 .fill-AB5{fill:#F7F8FE;} - .d2-3416172057 .stroke-N1{stroke:#0A0F25;} - .d2-3416172057 .stroke-N2{stroke:#676C7E;} - .d2-3416172057 .stroke-N3{stroke:#9499AB;} - .d2-3416172057 .stroke-N4{stroke:#CFD2DD;} - .d2-3416172057 .stroke-N5{stroke:#DEE1EB;} - .d2-3416172057 .stroke-N6{stroke:#EEF1F8;} - .d2-3416172057 .stroke-N7{stroke:#FFFFFF;} - .d2-3416172057 .stroke-B1{stroke:#0D32B2;} - .d2-3416172057 .stroke-B2{stroke:#0D32B2;} - .d2-3416172057 .stroke-B3{stroke:#E3E9FD;} - .d2-3416172057 .stroke-B4{stroke:#E3E9FD;} - .d2-3416172057 .stroke-B5{stroke:#EDF0FD;} - .d2-3416172057 .stroke-B6{stroke:#F7F8FE;} - .d2-3416172057 .stroke-AA2{stroke:#4A6FF3;} - .d2-3416172057 .stroke-AA4{stroke:#EDF0FD;} - .d2-3416172057 .stroke-AA5{stroke:#F7F8FE;} - .d2-3416172057 .stroke-AB4{stroke:#EDF0FD;} - .d2-3416172057 .stroke-AB5{stroke:#F7F8FE;} - .d2-3416172057 .background-color-N1{background-color:#0A0F25;} - .d2-3416172057 .background-color-N2{background-color:#676C7E;} - .d2-3416172057 .background-color-N3{background-color:#9499AB;} - .d2-3416172057 .background-color-N4{background-color:#CFD2DD;} - .d2-3416172057 .background-color-N5{background-color:#DEE1EB;} - .d2-3416172057 .background-color-N6{background-color:#EEF1F8;} - .d2-3416172057 .background-color-N7{background-color:#FFFFFF;} - .d2-3416172057 .background-color-B1{background-color:#0D32B2;} - .d2-3416172057 .background-color-B2{background-color:#0D32B2;} - .d2-3416172057 .background-color-B3{background-color:#E3E9FD;} - .d2-3416172057 .background-color-B4{background-color:#E3E9FD;} - .d2-3416172057 .background-color-B5{background-color:#EDF0FD;} - .d2-3416172057 .background-color-B6{background-color:#F7F8FE;} - .d2-3416172057 .background-color-AA2{background-color:#4A6FF3;} - .d2-3416172057 .background-color-AA4{background-color:#EDF0FD;} - .d2-3416172057 .background-color-AA5{background-color:#F7F8FE;} - .d2-3416172057 .background-color-AB4{background-color:#EDF0FD;} - .d2-3416172057 .background-color-AB5{background-color:#F7F8FE;} - .d2-3416172057 .color-N1{color:#0A0F25;} - .d2-3416172057 .color-N2{color:#676C7E;} - .d2-3416172057 .color-N3{color:#9499AB;} - .d2-3416172057 .color-N4{color:#CFD2DD;} - .d2-3416172057 .color-N5{color:#DEE1EB;} - .d2-3416172057 .color-N6{color:#EEF1F8;} - .d2-3416172057 .color-N7{color:#FFFFFF;} - .d2-3416172057 .color-B1{color:#0D32B2;} - .d2-3416172057 .color-B2{color:#0D32B2;} - .d2-3416172057 .color-B3{color:#E3E9FD;} - .d2-3416172057 .color-B4{color:#E3E9FD;} - .d2-3416172057 .color-B5{color:#EDF0FD;} - .d2-3416172057 .color-B6{color:#F7F8FE;} - .d2-3416172057 .color-AA2{color:#4A6FF3;} - .d2-3416172057 .color-AA4{color:#EDF0FD;} - .d2-3416172057 .color-AA5{color:#F7F8FE;} - .d2-3416172057 .color-AB4{color:#EDF0FD;} - .d2-3416172057 .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}]]>foofoobarabcd -======= .d2-645264819 .fill-N1{fill:#0A0F25;} .d2-645264819 .fill-N2{fill:#676C7E;} .d2-645264819 .fill-N3{fill:#9499AB;} @@ -252,8 +89,7 @@ .d2-645264819 .color-AA4{color:#EDF0FD;} .d2-645264819 .color-AA5{color:#F7F8FE;} .d2-645264819 .color-AB4{color:#EDF0FD;} - .d2-645264819 .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}]]>foofoobarabcd ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-645264819 .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}]]>foofoobarabcd diff --git a/e2etests/testdata/regression/sequence_diagram_name_crash/elk/sketch.exp.svg b/e2etests/testdata/regression/sequence_diagram_name_crash/elk/sketch.exp.svg index e4d144d8f..e14ec17c9 100644 --- a/e2etests/testdata/regression/sequence_diagram_name_crash/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/sequence_diagram_name_crash/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -foofoobarabcd -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-3438069034 .fill-N1{fill:#0A0F25;} - .d2-3438069034 .fill-N2{fill:#676C7E;} - .d2-3438069034 .fill-N3{fill:#9499AB;} - .d2-3438069034 .fill-N4{fill:#CFD2DD;} - .d2-3438069034 .fill-N5{fill:#DEE1EB;} - .d2-3438069034 .fill-N6{fill:#EEF1F8;} - .d2-3438069034 .fill-N7{fill:#FFFFFF;} - .d2-3438069034 .fill-B1{fill:#0D32B2;} - .d2-3438069034 .fill-B2{fill:#0D32B2;} - .d2-3438069034 .fill-B3{fill:#E3E9FD;} - .d2-3438069034 .fill-B4{fill:#E3E9FD;} - .d2-3438069034 .fill-B5{fill:#EDF0FD;} - .d2-3438069034 .fill-B6{fill:#F7F8FE;} - .d2-3438069034 .fill-AA2{fill:#4A6FF3;} - .d2-3438069034 .fill-AA4{fill:#EDF0FD;} - .d2-3438069034 .fill-AA5{fill:#F7F8FE;} - .d2-3438069034 .fill-AB4{fill:#EDF0FD;} - .d2-3438069034 .fill-AB5{fill:#F7F8FE;} - .d2-3438069034 .stroke-N1{stroke:#0A0F25;} - .d2-3438069034 .stroke-N2{stroke:#676C7E;} - .d2-3438069034 .stroke-N3{stroke:#9499AB;} - .d2-3438069034 .stroke-N4{stroke:#CFD2DD;} - .d2-3438069034 .stroke-N5{stroke:#DEE1EB;} - .d2-3438069034 .stroke-N6{stroke:#EEF1F8;} - .d2-3438069034 .stroke-N7{stroke:#FFFFFF;} - .d2-3438069034 .stroke-B1{stroke:#0D32B2;} - .d2-3438069034 .stroke-B2{stroke:#0D32B2;} - .d2-3438069034 .stroke-B3{stroke:#E3E9FD;} - .d2-3438069034 .stroke-B4{stroke:#E3E9FD;} - .d2-3438069034 .stroke-B5{stroke:#EDF0FD;} - .d2-3438069034 .stroke-B6{stroke:#F7F8FE;} - .d2-3438069034 .stroke-AA2{stroke:#4A6FF3;} - .d2-3438069034 .stroke-AA4{stroke:#EDF0FD;} - .d2-3438069034 .stroke-AA5{stroke:#F7F8FE;} - .d2-3438069034 .stroke-AB4{stroke:#EDF0FD;} - .d2-3438069034 .stroke-AB5{stroke:#F7F8FE;} - .d2-3438069034 .background-color-N1{background-color:#0A0F25;} - .d2-3438069034 .background-color-N2{background-color:#676C7E;} - .d2-3438069034 .background-color-N3{background-color:#9499AB;} - .d2-3438069034 .background-color-N4{background-color:#CFD2DD;} - .d2-3438069034 .background-color-N5{background-color:#DEE1EB;} - .d2-3438069034 .background-color-N6{background-color:#EEF1F8;} - .d2-3438069034 .background-color-N7{background-color:#FFFFFF;} - .d2-3438069034 .background-color-B1{background-color:#0D32B2;} - .d2-3438069034 .background-color-B2{background-color:#0D32B2;} - .d2-3438069034 .background-color-B3{background-color:#E3E9FD;} - .d2-3438069034 .background-color-B4{background-color:#E3E9FD;} - .d2-3438069034 .background-color-B5{background-color:#EDF0FD;} - .d2-3438069034 .background-color-B6{background-color:#F7F8FE;} - .d2-3438069034 .background-color-AA2{background-color:#4A6FF3;} - .d2-3438069034 .background-color-AA4{background-color:#EDF0FD;} - .d2-3438069034 .background-color-AA5{background-color:#F7F8FE;} - .d2-3438069034 .background-color-AB4{background-color:#EDF0FD;} - .d2-3438069034 .background-color-AB5{background-color:#F7F8FE;} - .d2-3438069034 .color-N1{color:#0A0F25;} - .d2-3438069034 .color-N2{color:#676C7E;} - .d2-3438069034 .color-N3{color:#9499AB;} - .d2-3438069034 .color-N4{color:#CFD2DD;} - .d2-3438069034 .color-N5{color:#DEE1EB;} - .d2-3438069034 .color-N6{color:#EEF1F8;} - .d2-3438069034 .color-N7{color:#FFFFFF;} - .d2-3438069034 .color-B1{color:#0D32B2;} - .d2-3438069034 .color-B2{color:#0D32B2;} - .d2-3438069034 .color-B3{color:#E3E9FD;} - .d2-3438069034 .color-B4{color:#E3E9FD;} - .d2-3438069034 .color-B5{color:#EDF0FD;} - .d2-3438069034 .color-B6{color:#F7F8FE;} - .d2-3438069034 .color-AA2{color:#4A6FF3;} - .d2-3438069034 .color-AA4{color:#EDF0FD;} - .d2-3438069034 .color-AA5{color:#F7F8FE;} - .d2-3438069034 .color-AB4{color:#EDF0FD;} - .d2-3438069034 .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}]]>foofoobarabcd -======= .d2-3754475100 .fill-N1{fill:#0A0F25;} .d2-3754475100 .fill-N2{fill:#676C7E;} .d2-3754475100 .fill-N3{fill:#9499AB;} @@ -252,8 +89,7 @@ .d2-3754475100 .color-AA4{color:#EDF0FD;} .d2-3754475100 .color-AA5{color:#F7F8FE;} .d2-3754475100 .color-AB4{color:#EDF0FD;} - .d2-3754475100 .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}]]>foofoobarabcd ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-3754475100 .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}]]>foofoobarabcd diff --git a/e2etests/testdata/regression/sequence_diagram_no_message/dagre/sketch.exp.svg b/e2etests/testdata/regression/sequence_diagram_no_message/dagre/sketch.exp.svg index b7e206b22..91a1560c9 100644 --- a/e2etests/testdata/regression/sequence_diagram_no_message/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/sequence_diagram_no_message/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -AB -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-3122002250 .fill-N1{fill:#0A0F25;} - .d2-3122002250 .fill-N2{fill:#676C7E;} - .d2-3122002250 .fill-N3{fill:#9499AB;} - .d2-3122002250 .fill-N4{fill:#CFD2DD;} - .d2-3122002250 .fill-N5{fill:#DEE1EB;} - .d2-3122002250 .fill-N6{fill:#EEF1F8;} - .d2-3122002250 .fill-N7{fill:#FFFFFF;} - .d2-3122002250 .fill-B1{fill:#0D32B2;} - .d2-3122002250 .fill-B2{fill:#0D32B2;} - .d2-3122002250 .fill-B3{fill:#E3E9FD;} - .d2-3122002250 .fill-B4{fill:#E3E9FD;} - .d2-3122002250 .fill-B5{fill:#EDF0FD;} - .d2-3122002250 .fill-B6{fill:#F7F8FE;} - .d2-3122002250 .fill-AA2{fill:#4A6FF3;} - .d2-3122002250 .fill-AA4{fill:#EDF0FD;} - .d2-3122002250 .fill-AA5{fill:#F7F8FE;} - .d2-3122002250 .fill-AB4{fill:#EDF0FD;} - .d2-3122002250 .fill-AB5{fill:#F7F8FE;} - .d2-3122002250 .stroke-N1{stroke:#0A0F25;} - .d2-3122002250 .stroke-N2{stroke:#676C7E;} - .d2-3122002250 .stroke-N3{stroke:#9499AB;} - .d2-3122002250 .stroke-N4{stroke:#CFD2DD;} - .d2-3122002250 .stroke-N5{stroke:#DEE1EB;} - .d2-3122002250 .stroke-N6{stroke:#EEF1F8;} - .d2-3122002250 .stroke-N7{stroke:#FFFFFF;} - .d2-3122002250 .stroke-B1{stroke:#0D32B2;} - .d2-3122002250 .stroke-B2{stroke:#0D32B2;} - .d2-3122002250 .stroke-B3{stroke:#E3E9FD;} - .d2-3122002250 .stroke-B4{stroke:#E3E9FD;} - .d2-3122002250 .stroke-B5{stroke:#EDF0FD;} - .d2-3122002250 .stroke-B6{stroke:#F7F8FE;} - .d2-3122002250 .stroke-AA2{stroke:#4A6FF3;} - .d2-3122002250 .stroke-AA4{stroke:#EDF0FD;} - .d2-3122002250 .stroke-AA5{stroke:#F7F8FE;} - .d2-3122002250 .stroke-AB4{stroke:#EDF0FD;} - .d2-3122002250 .stroke-AB5{stroke:#F7F8FE;} - .d2-3122002250 .background-color-N1{background-color:#0A0F25;} - .d2-3122002250 .background-color-N2{background-color:#676C7E;} - .d2-3122002250 .background-color-N3{background-color:#9499AB;} - .d2-3122002250 .background-color-N4{background-color:#CFD2DD;} - .d2-3122002250 .background-color-N5{background-color:#DEE1EB;} - .d2-3122002250 .background-color-N6{background-color:#EEF1F8;} - .d2-3122002250 .background-color-N7{background-color:#FFFFFF;} - .d2-3122002250 .background-color-B1{background-color:#0D32B2;} - .d2-3122002250 .background-color-B2{background-color:#0D32B2;} - .d2-3122002250 .background-color-B3{background-color:#E3E9FD;} - .d2-3122002250 .background-color-B4{background-color:#E3E9FD;} - .d2-3122002250 .background-color-B5{background-color:#EDF0FD;} - .d2-3122002250 .background-color-B6{background-color:#F7F8FE;} - .d2-3122002250 .background-color-AA2{background-color:#4A6FF3;} - .d2-3122002250 .background-color-AA4{background-color:#EDF0FD;} - .d2-3122002250 .background-color-AA5{background-color:#F7F8FE;} - .d2-3122002250 .background-color-AB4{background-color:#EDF0FD;} - .d2-3122002250 .background-color-AB5{background-color:#F7F8FE;} - .d2-3122002250 .color-N1{color:#0A0F25;} - .d2-3122002250 .color-N2{color:#676C7E;} - .d2-3122002250 .color-N3{color:#9499AB;} - .d2-3122002250 .color-N4{color:#CFD2DD;} - .d2-3122002250 .color-N5{color:#DEE1EB;} - .d2-3122002250 .color-N6{color:#EEF1F8;} - .d2-3122002250 .color-N7{color:#FFFFFF;} - .d2-3122002250 .color-B1{color:#0D32B2;} - .d2-3122002250 .color-B2{color:#0D32B2;} - .d2-3122002250 .color-B3{color:#E3E9FD;} - .d2-3122002250 .color-B4{color:#E3E9FD;} - .d2-3122002250 .color-B5{color:#EDF0FD;} - .d2-3122002250 .color-B6{color:#F7F8FE;} - .d2-3122002250 .color-AA2{color:#4A6FF3;} - .d2-3122002250 .color-AA4{color:#EDF0FD;} - .d2-3122002250 .color-AA5{color:#F7F8FE;} - .d2-3122002250 .color-AB4{color:#EDF0FD;} - .d2-3122002250 .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 -======= .d2-843416118 .fill-N1{fill:#0A0F25;} .d2-843416118 .fill-N2{fill:#676C7E;} .d2-843416118 .fill-N3{fill:#9499AB;} @@ -252,8 +89,7 @@ .d2-843416118 .color-AA4{color:#EDF0FD;} .d2-843416118 .color-AA5{color:#F7F8FE;} .d2-843416118 .color-AB4{color:#EDF0FD;} - .d2-843416118 .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 ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-843416118 .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 diff --git a/e2etests/testdata/regression/sequence_diagram_no_message/elk/sketch.exp.svg b/e2etests/testdata/regression/sequence_diagram_no_message/elk/sketch.exp.svg index b7e206b22..91a1560c9 100644 --- a/e2etests/testdata/regression/sequence_diagram_no_message/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/sequence_diagram_no_message/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -AB -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-3122002250 .fill-N1{fill:#0A0F25;} - .d2-3122002250 .fill-N2{fill:#676C7E;} - .d2-3122002250 .fill-N3{fill:#9499AB;} - .d2-3122002250 .fill-N4{fill:#CFD2DD;} - .d2-3122002250 .fill-N5{fill:#DEE1EB;} - .d2-3122002250 .fill-N6{fill:#EEF1F8;} - .d2-3122002250 .fill-N7{fill:#FFFFFF;} - .d2-3122002250 .fill-B1{fill:#0D32B2;} - .d2-3122002250 .fill-B2{fill:#0D32B2;} - .d2-3122002250 .fill-B3{fill:#E3E9FD;} - .d2-3122002250 .fill-B4{fill:#E3E9FD;} - .d2-3122002250 .fill-B5{fill:#EDF0FD;} - .d2-3122002250 .fill-B6{fill:#F7F8FE;} - .d2-3122002250 .fill-AA2{fill:#4A6FF3;} - .d2-3122002250 .fill-AA4{fill:#EDF0FD;} - .d2-3122002250 .fill-AA5{fill:#F7F8FE;} - .d2-3122002250 .fill-AB4{fill:#EDF0FD;} - .d2-3122002250 .fill-AB5{fill:#F7F8FE;} - .d2-3122002250 .stroke-N1{stroke:#0A0F25;} - .d2-3122002250 .stroke-N2{stroke:#676C7E;} - .d2-3122002250 .stroke-N3{stroke:#9499AB;} - .d2-3122002250 .stroke-N4{stroke:#CFD2DD;} - .d2-3122002250 .stroke-N5{stroke:#DEE1EB;} - .d2-3122002250 .stroke-N6{stroke:#EEF1F8;} - .d2-3122002250 .stroke-N7{stroke:#FFFFFF;} - .d2-3122002250 .stroke-B1{stroke:#0D32B2;} - .d2-3122002250 .stroke-B2{stroke:#0D32B2;} - .d2-3122002250 .stroke-B3{stroke:#E3E9FD;} - .d2-3122002250 .stroke-B4{stroke:#E3E9FD;} - .d2-3122002250 .stroke-B5{stroke:#EDF0FD;} - .d2-3122002250 .stroke-B6{stroke:#F7F8FE;} - .d2-3122002250 .stroke-AA2{stroke:#4A6FF3;} - .d2-3122002250 .stroke-AA4{stroke:#EDF0FD;} - .d2-3122002250 .stroke-AA5{stroke:#F7F8FE;} - .d2-3122002250 .stroke-AB4{stroke:#EDF0FD;} - .d2-3122002250 .stroke-AB5{stroke:#F7F8FE;} - .d2-3122002250 .background-color-N1{background-color:#0A0F25;} - .d2-3122002250 .background-color-N2{background-color:#676C7E;} - .d2-3122002250 .background-color-N3{background-color:#9499AB;} - .d2-3122002250 .background-color-N4{background-color:#CFD2DD;} - .d2-3122002250 .background-color-N5{background-color:#DEE1EB;} - .d2-3122002250 .background-color-N6{background-color:#EEF1F8;} - .d2-3122002250 .background-color-N7{background-color:#FFFFFF;} - .d2-3122002250 .background-color-B1{background-color:#0D32B2;} - .d2-3122002250 .background-color-B2{background-color:#0D32B2;} - .d2-3122002250 .background-color-B3{background-color:#E3E9FD;} - .d2-3122002250 .background-color-B4{background-color:#E3E9FD;} - .d2-3122002250 .background-color-B5{background-color:#EDF0FD;} - .d2-3122002250 .background-color-B6{background-color:#F7F8FE;} - .d2-3122002250 .background-color-AA2{background-color:#4A6FF3;} - .d2-3122002250 .background-color-AA4{background-color:#EDF0FD;} - .d2-3122002250 .background-color-AA5{background-color:#F7F8FE;} - .d2-3122002250 .background-color-AB4{background-color:#EDF0FD;} - .d2-3122002250 .background-color-AB5{background-color:#F7F8FE;} - .d2-3122002250 .color-N1{color:#0A0F25;} - .d2-3122002250 .color-N2{color:#676C7E;} - .d2-3122002250 .color-N3{color:#9499AB;} - .d2-3122002250 .color-N4{color:#CFD2DD;} - .d2-3122002250 .color-N5{color:#DEE1EB;} - .d2-3122002250 .color-N6{color:#EEF1F8;} - .d2-3122002250 .color-N7{color:#FFFFFF;} - .d2-3122002250 .color-B1{color:#0D32B2;} - .d2-3122002250 .color-B2{color:#0D32B2;} - .d2-3122002250 .color-B3{color:#E3E9FD;} - .d2-3122002250 .color-B4{color:#E3E9FD;} - .d2-3122002250 .color-B5{color:#EDF0FD;} - .d2-3122002250 .color-B6{color:#F7F8FE;} - .d2-3122002250 .color-AA2{color:#4A6FF3;} - .d2-3122002250 .color-AA4{color:#EDF0FD;} - .d2-3122002250 .color-AA5{color:#F7F8FE;} - .d2-3122002250 .color-AB4{color:#EDF0FD;} - .d2-3122002250 .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 -======= .d2-843416118 .fill-N1{fill:#0A0F25;} .d2-843416118 .fill-N2{fill:#676C7E;} .d2-843416118 .fill-N3{fill:#9499AB;} @@ -252,8 +89,7 @@ .d2-843416118 .color-AA4{color:#EDF0FD;} .d2-843416118 .color-AA5{color:#F7F8FE;} .d2-843416118 .color-AB4{color:#EDF0FD;} - .d2-843416118 .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 ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-843416118 .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 diff --git a/e2etests/testdata/regression/sequence_diagram_self_edge_group_overlap/dagre/sketch.exp.svg b/e2etests/testdata/regression/sequence_diagram_self_edge_group_overlap/dagre/sketch.exp.svg index 01d85bd76..2864680eb 100644 --- a/e2etests/testdata/regression/sequence_diagram_self_edge_group_overlap/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/sequence_diagram_self_edge_group_overlap/dagre/sketch.exp.svg @@ -1,26 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -ABCgroup 1group 2group 3group 4group 5group 6group 7group 8group 9group 10group 11 - -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-1332431490 .fill-N1{fill:#0A0F25;} - .d2-1332431490 .fill-N2{fill:#676C7E;} - .d2-1332431490 .fill-N3{fill:#9499AB;} - .d2-1332431490 .fill-N4{fill:#CFD2DD;} - .d2-1332431490 .fill-N5{fill:#DEE1EB;} - .d2-1332431490 .fill-N6{fill:#EEF1F8;} - .d2-1332431490 .fill-N7{fill:#FFFFFF;} - .d2-1332431490 .fill-B1{fill:#0D32B2;} - .d2-1332431490 .fill-B2{fill:#0D32B2;} - .d2-1332431490 .fill-B3{fill:#E3E9FD;} - .d2-1332431490 .fill-B4{fill:#E3E9FD;} - .d2-1332431490 .fill-B5{fill:#EDF0FD;} - .d2-1332431490 .fill-B6{fill:#F7F8FE;} - .d2-1332431490 .fill-AA2{fill:#4A6FF3;} - .d2-1332431490 .fill-AA4{fill:#EDF0FD;} - .d2-1332431490 .fill-AA5{fill:#F7F8FE;} - .d2-1332431490 .fill-AB4{fill:#EDF0FD;} - .d2-1332431490 .fill-AB5{fill:#F7F8FE;} - .d2-1332431490 .stroke-N1{stroke:#0A0F25;} - .d2-1332431490 .stroke-N2{stroke:#676C7E;} - .d2-1332431490 .stroke-N3{stroke:#9499AB;} - .d2-1332431490 .stroke-N4{stroke:#CFD2DD;} - .d2-1332431490 .stroke-N5{stroke:#DEE1EB;} - .d2-1332431490 .stroke-N6{stroke:#EEF1F8;} - .d2-1332431490 .stroke-N7{stroke:#FFFFFF;} - .d2-1332431490 .stroke-B1{stroke:#0D32B2;} - .d2-1332431490 .stroke-B2{stroke:#0D32B2;} - .d2-1332431490 .stroke-B3{stroke:#E3E9FD;} - .d2-1332431490 .stroke-B4{stroke:#E3E9FD;} - .d2-1332431490 .stroke-B5{stroke:#EDF0FD;} - .d2-1332431490 .stroke-B6{stroke:#F7F8FE;} - .d2-1332431490 .stroke-AA2{stroke:#4A6FF3;} - .d2-1332431490 .stroke-AA4{stroke:#EDF0FD;} - .d2-1332431490 .stroke-AA5{stroke:#F7F8FE;} - .d2-1332431490 .stroke-AB4{stroke:#EDF0FD;} - .d2-1332431490 .stroke-AB5{stroke:#F7F8FE;} - .d2-1332431490 .background-color-N1{background-color:#0A0F25;} - .d2-1332431490 .background-color-N2{background-color:#676C7E;} - .d2-1332431490 .background-color-N3{background-color:#9499AB;} - .d2-1332431490 .background-color-N4{background-color:#CFD2DD;} - .d2-1332431490 .background-color-N5{background-color:#DEE1EB;} - .d2-1332431490 .background-color-N6{background-color:#EEF1F8;} - .d2-1332431490 .background-color-N7{background-color:#FFFFFF;} - .d2-1332431490 .background-color-B1{background-color:#0D32B2;} - .d2-1332431490 .background-color-B2{background-color:#0D32B2;} - .d2-1332431490 .background-color-B3{background-color:#E3E9FD;} - .d2-1332431490 .background-color-B4{background-color:#E3E9FD;} - .d2-1332431490 .background-color-B5{background-color:#EDF0FD;} - .d2-1332431490 .background-color-B6{background-color:#F7F8FE;} - .d2-1332431490 .background-color-AA2{background-color:#4A6FF3;} - .d2-1332431490 .background-color-AA4{background-color:#EDF0FD;} - .d2-1332431490 .background-color-AA5{background-color:#F7F8FE;} - .d2-1332431490 .background-color-AB4{background-color:#EDF0FD;} - .d2-1332431490 .background-color-AB5{background-color:#F7F8FE;} - .d2-1332431490 .color-N1{color:#0A0F25;} - .d2-1332431490 .color-N2{color:#676C7E;} - .d2-1332431490 .color-N3{color:#9499AB;} - .d2-1332431490 .color-N4{color:#CFD2DD;} - .d2-1332431490 .color-N5{color:#DEE1EB;} - .d2-1332431490 .color-N6{color:#EEF1F8;} - .d2-1332431490 .color-N7{color:#FFFFFF;} - .d2-1332431490 .color-B1{color:#0D32B2;} - .d2-1332431490 .color-B2{color:#0D32B2;} - .d2-1332431490 .color-B3{color:#E3E9FD;} - .d2-1332431490 .color-B4{color:#E3E9FD;} - .d2-1332431490 .color-B5{color:#EDF0FD;} - .d2-1332431490 .color-B6{color:#F7F8FE;} - .d2-1332431490 .color-AA2{color:#4A6FF3;} - .d2-1332431490 .color-AA4{color:#EDF0FD;} - .d2-1332431490 .color-AA5{color:#F7F8FE;} - .d2-1332431490 .color-AB4{color:#EDF0FD;} - .d2-1332431490 .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-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 - ->>>>>>> 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;} @@ -408,9 +89,8 @@ .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 + .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) 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 01d85bd76..2864680eb 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,26 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -ABCgroup 1group 2group 3group 4group 5group 6group 7group 8group 9group 10group 11 - -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-1332431490 .fill-N1{fill:#0A0F25;} - .d2-1332431490 .fill-N2{fill:#676C7E;} - .d2-1332431490 .fill-N3{fill:#9499AB;} - .d2-1332431490 .fill-N4{fill:#CFD2DD;} - .d2-1332431490 .fill-N5{fill:#DEE1EB;} - .d2-1332431490 .fill-N6{fill:#EEF1F8;} - .d2-1332431490 .fill-N7{fill:#FFFFFF;} - .d2-1332431490 .fill-B1{fill:#0D32B2;} - .d2-1332431490 .fill-B2{fill:#0D32B2;} - .d2-1332431490 .fill-B3{fill:#E3E9FD;} - .d2-1332431490 .fill-B4{fill:#E3E9FD;} - .d2-1332431490 .fill-B5{fill:#EDF0FD;} - .d2-1332431490 .fill-B6{fill:#F7F8FE;} - .d2-1332431490 .fill-AA2{fill:#4A6FF3;} - .d2-1332431490 .fill-AA4{fill:#EDF0FD;} - .d2-1332431490 .fill-AA5{fill:#F7F8FE;} - .d2-1332431490 .fill-AB4{fill:#EDF0FD;} - .d2-1332431490 .fill-AB5{fill:#F7F8FE;} - .d2-1332431490 .stroke-N1{stroke:#0A0F25;} - .d2-1332431490 .stroke-N2{stroke:#676C7E;} - .d2-1332431490 .stroke-N3{stroke:#9499AB;} - .d2-1332431490 .stroke-N4{stroke:#CFD2DD;} - .d2-1332431490 .stroke-N5{stroke:#DEE1EB;} - .d2-1332431490 .stroke-N6{stroke:#EEF1F8;} - .d2-1332431490 .stroke-N7{stroke:#FFFFFF;} - .d2-1332431490 .stroke-B1{stroke:#0D32B2;} - .d2-1332431490 .stroke-B2{stroke:#0D32B2;} - .d2-1332431490 .stroke-B3{stroke:#E3E9FD;} - .d2-1332431490 .stroke-B4{stroke:#E3E9FD;} - .d2-1332431490 .stroke-B5{stroke:#EDF0FD;} - .d2-1332431490 .stroke-B6{stroke:#F7F8FE;} - .d2-1332431490 .stroke-AA2{stroke:#4A6FF3;} - .d2-1332431490 .stroke-AA4{stroke:#EDF0FD;} - .d2-1332431490 .stroke-AA5{stroke:#F7F8FE;} - .d2-1332431490 .stroke-AB4{stroke:#EDF0FD;} - .d2-1332431490 .stroke-AB5{stroke:#F7F8FE;} - .d2-1332431490 .background-color-N1{background-color:#0A0F25;} - .d2-1332431490 .background-color-N2{background-color:#676C7E;} - .d2-1332431490 .background-color-N3{background-color:#9499AB;} - .d2-1332431490 .background-color-N4{background-color:#CFD2DD;} - .d2-1332431490 .background-color-N5{background-color:#DEE1EB;} - .d2-1332431490 .background-color-N6{background-color:#EEF1F8;} - .d2-1332431490 .background-color-N7{background-color:#FFFFFF;} - .d2-1332431490 .background-color-B1{background-color:#0D32B2;} - .d2-1332431490 .background-color-B2{background-color:#0D32B2;} - .d2-1332431490 .background-color-B3{background-color:#E3E9FD;} - .d2-1332431490 .background-color-B4{background-color:#E3E9FD;} - .d2-1332431490 .background-color-B5{background-color:#EDF0FD;} - .d2-1332431490 .background-color-B6{background-color:#F7F8FE;} - .d2-1332431490 .background-color-AA2{background-color:#4A6FF3;} - .d2-1332431490 .background-color-AA4{background-color:#EDF0FD;} - .d2-1332431490 .background-color-AA5{background-color:#F7F8FE;} - .d2-1332431490 .background-color-AB4{background-color:#EDF0FD;} - .d2-1332431490 .background-color-AB5{background-color:#F7F8FE;} - .d2-1332431490 .color-N1{color:#0A0F25;} - .d2-1332431490 .color-N2{color:#676C7E;} - .d2-1332431490 .color-N3{color:#9499AB;} - .d2-1332431490 .color-N4{color:#CFD2DD;} - .d2-1332431490 .color-N5{color:#DEE1EB;} - .d2-1332431490 .color-N6{color:#EEF1F8;} - .d2-1332431490 .color-N7{color:#FFFFFF;} - .d2-1332431490 .color-B1{color:#0D32B2;} - .d2-1332431490 .color-B2{color:#0D32B2;} - .d2-1332431490 .color-B3{color:#E3E9FD;} - .d2-1332431490 .color-B4{color:#E3E9FD;} - .d2-1332431490 .color-B5{color:#EDF0FD;} - .d2-1332431490 .color-B6{color:#F7F8FE;} - .d2-1332431490 .color-AA2{color:#4A6FF3;} - .d2-1332431490 .color-AA4{color:#EDF0FD;} - .d2-1332431490 .color-AA5{color:#F7F8FE;} - .d2-1332431490 .color-AB4{color:#EDF0FD;} - .d2-1332431490 .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-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 - ->>>>>>> 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;} @@ -408,9 +89,8 @@ .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 + .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) 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 fa53791b1..a683647de 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,26 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -b - -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-3879014770 .fill-N1{fill:#0A0F25;} - .d2-3879014770 .fill-N2{fill:#676C7E;} - .d2-3879014770 .fill-N3{fill:#9499AB;} - .d2-3879014770 .fill-N4{fill:#CFD2DD;} - .d2-3879014770 .fill-N5{fill:#DEE1EB;} - .d2-3879014770 .fill-N6{fill:#EEF1F8;} - .d2-3879014770 .fill-N7{fill:#FFFFFF;} - .d2-3879014770 .fill-B1{fill:#0D32B2;} - .d2-3879014770 .fill-B2{fill:#0D32B2;} - .d2-3879014770 .fill-B3{fill:#E3E9FD;} - .d2-3879014770 .fill-B4{fill:#E3E9FD;} - .d2-3879014770 .fill-B5{fill:#EDF0FD;} - .d2-3879014770 .fill-B6{fill:#F7F8FE;} - .d2-3879014770 .fill-AA2{fill:#4A6FF3;} - .d2-3879014770 .fill-AA4{fill:#EDF0FD;} - .d2-3879014770 .fill-AA5{fill:#F7F8FE;} - .d2-3879014770 .fill-AB4{fill:#EDF0FD;} - .d2-3879014770 .fill-AB5{fill:#F7F8FE;} - .d2-3879014770 .stroke-N1{stroke:#0A0F25;} - .d2-3879014770 .stroke-N2{stroke:#676C7E;} - .d2-3879014770 .stroke-N3{stroke:#9499AB;} - .d2-3879014770 .stroke-N4{stroke:#CFD2DD;} - .d2-3879014770 .stroke-N5{stroke:#DEE1EB;} - .d2-3879014770 .stroke-N6{stroke:#EEF1F8;} - .d2-3879014770 .stroke-N7{stroke:#FFFFFF;} - .d2-3879014770 .stroke-B1{stroke:#0D32B2;} - .d2-3879014770 .stroke-B2{stroke:#0D32B2;} - .d2-3879014770 .stroke-B3{stroke:#E3E9FD;} - .d2-3879014770 .stroke-B4{stroke:#E3E9FD;} - .d2-3879014770 .stroke-B5{stroke:#EDF0FD;} - .d2-3879014770 .stroke-B6{stroke:#F7F8FE;} - .d2-3879014770 .stroke-AA2{stroke:#4A6FF3;} - .d2-3879014770 .stroke-AA4{stroke:#EDF0FD;} - .d2-3879014770 .stroke-AA5{stroke:#F7F8FE;} - .d2-3879014770 .stroke-AB4{stroke:#EDF0FD;} - .d2-3879014770 .stroke-AB5{stroke:#F7F8FE;} - .d2-3879014770 .background-color-N1{background-color:#0A0F25;} - .d2-3879014770 .background-color-N2{background-color:#676C7E;} - .d2-3879014770 .background-color-N3{background-color:#9499AB;} - .d2-3879014770 .background-color-N4{background-color:#CFD2DD;} - .d2-3879014770 .background-color-N5{background-color:#DEE1EB;} - .d2-3879014770 .background-color-N6{background-color:#EEF1F8;} - .d2-3879014770 .background-color-N7{background-color:#FFFFFF;} - .d2-3879014770 .background-color-B1{background-color:#0D32B2;} - .d2-3879014770 .background-color-B2{background-color:#0D32B2;} - .d2-3879014770 .background-color-B3{background-color:#E3E9FD;} - .d2-3879014770 .background-color-B4{background-color:#E3E9FD;} - .d2-3879014770 .background-color-B5{background-color:#EDF0FD;} - .d2-3879014770 .background-color-B6{background-color:#F7F8FE;} - .d2-3879014770 .background-color-AA2{background-color:#4A6FF3;} - .d2-3879014770 .background-color-AA4{background-color:#EDF0FD;} - .d2-3879014770 .background-color-AA5{background-color:#F7F8FE;} - .d2-3879014770 .background-color-AB4{background-color:#EDF0FD;} - .d2-3879014770 .background-color-AB5{background-color:#F7F8FE;} - .d2-3879014770 .color-N1{color:#0A0F25;} - .d2-3879014770 .color-N2{color:#676C7E;} - .d2-3879014770 .color-N3{color:#9499AB;} - .d2-3879014770 .color-N4{color:#CFD2DD;} - .d2-3879014770 .color-N5{color:#DEE1EB;} - .d2-3879014770 .color-N6{color:#EEF1F8;} - .d2-3879014770 .color-N7{color:#FFFFFF;} - .d2-3879014770 .color-B1{color:#0D32B2;} - .d2-3879014770 .color-B2{color:#0D32B2;} - .d2-3879014770 .color-B3{color:#E3E9FD;} - .d2-3879014770 .color-B4{color:#E3E9FD;} - .d2-3879014770 .color-B5{color:#EDF0FD;} - .d2-3879014770 .color-B6{color:#F7F8FE;} - .d2-3879014770 .color-AA2{color:#4A6FF3;} - .d2-3879014770 .color-AA4{color:#EDF0FD;} - .d2-3879014770 .color-AA5{color:#F7F8FE;} - .d2-3879014770 .color-AB4{color:#EDF0FD;} - .d2-3879014770 .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-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 - ->>>>>>> 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;} @@ -408,8 +89,7 @@ .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 + .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 fa53791b1..a683647de 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,26 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -b - -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-3879014770 .fill-N1{fill:#0A0F25;} - .d2-3879014770 .fill-N2{fill:#676C7E;} - .d2-3879014770 .fill-N3{fill:#9499AB;} - .d2-3879014770 .fill-N4{fill:#CFD2DD;} - .d2-3879014770 .fill-N5{fill:#DEE1EB;} - .d2-3879014770 .fill-N6{fill:#EEF1F8;} - .d2-3879014770 .fill-N7{fill:#FFFFFF;} - .d2-3879014770 .fill-B1{fill:#0D32B2;} - .d2-3879014770 .fill-B2{fill:#0D32B2;} - .d2-3879014770 .fill-B3{fill:#E3E9FD;} - .d2-3879014770 .fill-B4{fill:#E3E9FD;} - .d2-3879014770 .fill-B5{fill:#EDF0FD;} - .d2-3879014770 .fill-B6{fill:#F7F8FE;} - .d2-3879014770 .fill-AA2{fill:#4A6FF3;} - .d2-3879014770 .fill-AA4{fill:#EDF0FD;} - .d2-3879014770 .fill-AA5{fill:#F7F8FE;} - .d2-3879014770 .fill-AB4{fill:#EDF0FD;} - .d2-3879014770 .fill-AB5{fill:#F7F8FE;} - .d2-3879014770 .stroke-N1{stroke:#0A0F25;} - .d2-3879014770 .stroke-N2{stroke:#676C7E;} - .d2-3879014770 .stroke-N3{stroke:#9499AB;} - .d2-3879014770 .stroke-N4{stroke:#CFD2DD;} - .d2-3879014770 .stroke-N5{stroke:#DEE1EB;} - .d2-3879014770 .stroke-N6{stroke:#EEF1F8;} - .d2-3879014770 .stroke-N7{stroke:#FFFFFF;} - .d2-3879014770 .stroke-B1{stroke:#0D32B2;} - .d2-3879014770 .stroke-B2{stroke:#0D32B2;} - .d2-3879014770 .stroke-B3{stroke:#E3E9FD;} - .d2-3879014770 .stroke-B4{stroke:#E3E9FD;} - .d2-3879014770 .stroke-B5{stroke:#EDF0FD;} - .d2-3879014770 .stroke-B6{stroke:#F7F8FE;} - .d2-3879014770 .stroke-AA2{stroke:#4A6FF3;} - .d2-3879014770 .stroke-AA4{stroke:#EDF0FD;} - .d2-3879014770 .stroke-AA5{stroke:#F7F8FE;} - .d2-3879014770 .stroke-AB4{stroke:#EDF0FD;} - .d2-3879014770 .stroke-AB5{stroke:#F7F8FE;} - .d2-3879014770 .background-color-N1{background-color:#0A0F25;} - .d2-3879014770 .background-color-N2{background-color:#676C7E;} - .d2-3879014770 .background-color-N3{background-color:#9499AB;} - .d2-3879014770 .background-color-N4{background-color:#CFD2DD;} - .d2-3879014770 .background-color-N5{background-color:#DEE1EB;} - .d2-3879014770 .background-color-N6{background-color:#EEF1F8;} - .d2-3879014770 .background-color-N7{background-color:#FFFFFF;} - .d2-3879014770 .background-color-B1{background-color:#0D32B2;} - .d2-3879014770 .background-color-B2{background-color:#0D32B2;} - .d2-3879014770 .background-color-B3{background-color:#E3E9FD;} - .d2-3879014770 .background-color-B4{background-color:#E3E9FD;} - .d2-3879014770 .background-color-B5{background-color:#EDF0FD;} - .d2-3879014770 .background-color-B6{background-color:#F7F8FE;} - .d2-3879014770 .background-color-AA2{background-color:#4A6FF3;} - .d2-3879014770 .background-color-AA4{background-color:#EDF0FD;} - .d2-3879014770 .background-color-AA5{background-color:#F7F8FE;} - .d2-3879014770 .background-color-AB4{background-color:#EDF0FD;} - .d2-3879014770 .background-color-AB5{background-color:#F7F8FE;} - .d2-3879014770 .color-N1{color:#0A0F25;} - .d2-3879014770 .color-N2{color:#676C7E;} - .d2-3879014770 .color-N3{color:#9499AB;} - .d2-3879014770 .color-N4{color:#CFD2DD;} - .d2-3879014770 .color-N5{color:#DEE1EB;} - .d2-3879014770 .color-N6{color:#EEF1F8;} - .d2-3879014770 .color-N7{color:#FFFFFF;} - .d2-3879014770 .color-B1{color:#0D32B2;} - .d2-3879014770 .color-B2{color:#0D32B2;} - .d2-3879014770 .color-B3{color:#E3E9FD;} - .d2-3879014770 .color-B4{color:#E3E9FD;} - .d2-3879014770 .color-B5{color:#EDF0FD;} - .d2-3879014770 .color-B6{color:#F7F8FE;} - .d2-3879014770 .color-AA2{color:#4A6FF3;} - .d2-3879014770 .color-AA4{color:#EDF0FD;} - .d2-3879014770 .color-AA5{color:#F7F8FE;} - .d2-3879014770 .color-AB4{color:#EDF0FD;} - .d2-3879014770 .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-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 - ->>>>>>> 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;} @@ -408,8 +89,7 @@ .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 + .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 fd2b8fca1..2b649413f 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,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -acbl1l2c1l2c3l2c2l3c1l3c2l4bacacbabcc1c2c3abc -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-3101729912 .fill-N1{fill:#0A0F25;} - .d2-3101729912 .fill-N2{fill:#676C7E;} - .d2-3101729912 .fill-N3{fill:#9499AB;} - .d2-3101729912 .fill-N4{fill:#CFD2DD;} - .d2-3101729912 .fill-N5{fill:#DEE1EB;} - .d2-3101729912 .fill-N6{fill:#EEF1F8;} - .d2-3101729912 .fill-N7{fill:#FFFFFF;} - .d2-3101729912 .fill-B1{fill:#0D32B2;} - .d2-3101729912 .fill-B2{fill:#0D32B2;} - .d2-3101729912 .fill-B3{fill:#E3E9FD;} - .d2-3101729912 .fill-B4{fill:#E3E9FD;} - .d2-3101729912 .fill-B5{fill:#EDF0FD;} - .d2-3101729912 .fill-B6{fill:#F7F8FE;} - .d2-3101729912 .fill-AA2{fill:#4A6FF3;} - .d2-3101729912 .fill-AA4{fill:#EDF0FD;} - .d2-3101729912 .fill-AA5{fill:#F7F8FE;} - .d2-3101729912 .fill-AB4{fill:#EDF0FD;} - .d2-3101729912 .fill-AB5{fill:#F7F8FE;} - .d2-3101729912 .stroke-N1{stroke:#0A0F25;} - .d2-3101729912 .stroke-N2{stroke:#676C7E;} - .d2-3101729912 .stroke-N3{stroke:#9499AB;} - .d2-3101729912 .stroke-N4{stroke:#CFD2DD;} - .d2-3101729912 .stroke-N5{stroke:#DEE1EB;} - .d2-3101729912 .stroke-N6{stroke:#EEF1F8;} - .d2-3101729912 .stroke-N7{stroke:#FFFFFF;} - .d2-3101729912 .stroke-B1{stroke:#0D32B2;} - .d2-3101729912 .stroke-B2{stroke:#0D32B2;} - .d2-3101729912 .stroke-B3{stroke:#E3E9FD;} - .d2-3101729912 .stroke-B4{stroke:#E3E9FD;} - .d2-3101729912 .stroke-B5{stroke:#EDF0FD;} - .d2-3101729912 .stroke-B6{stroke:#F7F8FE;} - .d2-3101729912 .stroke-AA2{stroke:#4A6FF3;} - .d2-3101729912 .stroke-AA4{stroke:#EDF0FD;} - .d2-3101729912 .stroke-AA5{stroke:#F7F8FE;} - .d2-3101729912 .stroke-AB4{stroke:#EDF0FD;} - .d2-3101729912 .stroke-AB5{stroke:#F7F8FE;} - .d2-3101729912 .background-color-N1{background-color:#0A0F25;} - .d2-3101729912 .background-color-N2{background-color:#676C7E;} - .d2-3101729912 .background-color-N3{background-color:#9499AB;} - .d2-3101729912 .background-color-N4{background-color:#CFD2DD;} - .d2-3101729912 .background-color-N5{background-color:#DEE1EB;} - .d2-3101729912 .background-color-N6{background-color:#EEF1F8;} - .d2-3101729912 .background-color-N7{background-color:#FFFFFF;} - .d2-3101729912 .background-color-B1{background-color:#0D32B2;} - .d2-3101729912 .background-color-B2{background-color:#0D32B2;} - .d2-3101729912 .background-color-B3{background-color:#E3E9FD;} - .d2-3101729912 .background-color-B4{background-color:#E3E9FD;} - .d2-3101729912 .background-color-B5{background-color:#EDF0FD;} - .d2-3101729912 .background-color-B6{background-color:#F7F8FE;} - .d2-3101729912 .background-color-AA2{background-color:#4A6FF3;} - .d2-3101729912 .background-color-AA4{background-color:#EDF0FD;} - .d2-3101729912 .background-color-AA5{background-color:#F7F8FE;} - .d2-3101729912 .background-color-AB4{background-color:#EDF0FD;} - .d2-3101729912 .background-color-AB5{background-color:#F7F8FE;} - .d2-3101729912 .color-N1{color:#0A0F25;} - .d2-3101729912 .color-N2{color:#676C7E;} - .d2-3101729912 .color-N3{color:#9499AB;} - .d2-3101729912 .color-N4{color:#CFD2DD;} - .d2-3101729912 .color-N5{color:#DEE1EB;} - .d2-3101729912 .color-N6{color:#EEF1F8;} - .d2-3101729912 .color-N7{color:#FFFFFF;} - .d2-3101729912 .color-B1{color:#0D32B2;} - .d2-3101729912 .color-B2{color:#0D32B2;} - .d2-3101729912 .color-B3{color:#E3E9FD;} - .d2-3101729912 .color-B4{color:#E3E9FD;} - .d2-3101729912 .color-B5{color:#EDF0FD;} - .d2-3101729912 .color-B6{color:#F7F8FE;} - .d2-3101729912 .color-AA2{color:#4A6FF3;} - .d2-3101729912 .color-AA4{color:#EDF0FD;} - .d2-3101729912 .color-AA5{color:#F7F8FE;} - .d2-3101729912 .color-AB4{color:#EDF0FD;} - .d2-3101729912 .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}]]>acbl1l2c1l2c3l2c2l3c1l3c2l4bacacbabcc1c2c3abc -======= .d2-766141488 .fill-N1{fill:#0A0F25;} .d2-766141488 .fill-N2{fill:#676C7E;} .d2-766141488 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-766141488 .color-AA4{color:#EDF0FD;} .d2-766141488 .color-AA5{color:#F7F8FE;} .d2-766141488 .color-AB4{color:#EDF0FD;} - .d2-766141488 .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}]]>acbl1l2c1l2c3l2c2l3c1l3c2l4bacacbabcc1c2c3abc ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-766141488 .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}]]>acbl1l2c1l2c3l2c2l3c1l3c2l4bacacbabcc1c2c3abc diff --git a/e2etests/testdata/regression/straight_hierarchy_container_direction_right/elk/sketch.exp.svg b/e2etests/testdata/regression/straight_hierarchy_container_direction_right/elk/sketch.exp.svg index 5f6e7d163..9dcced511 100644 --- a/e2etests/testdata/regression/straight_hierarchy_container_direction_right/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/straight_hierarchy_container_direction_right/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -acbl1l2c1l2c3l2c2l3c1l3c2l4bacacbabcc1c2c3abc -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-607531947 .fill-N1{fill:#0A0F25;} - .d2-607531947 .fill-N2{fill:#676C7E;} - .d2-607531947 .fill-N3{fill:#9499AB;} - .d2-607531947 .fill-N4{fill:#CFD2DD;} - .d2-607531947 .fill-N5{fill:#DEE1EB;} - .d2-607531947 .fill-N6{fill:#EEF1F8;} - .d2-607531947 .fill-N7{fill:#FFFFFF;} - .d2-607531947 .fill-B1{fill:#0D32B2;} - .d2-607531947 .fill-B2{fill:#0D32B2;} - .d2-607531947 .fill-B3{fill:#E3E9FD;} - .d2-607531947 .fill-B4{fill:#E3E9FD;} - .d2-607531947 .fill-B5{fill:#EDF0FD;} - .d2-607531947 .fill-B6{fill:#F7F8FE;} - .d2-607531947 .fill-AA2{fill:#4A6FF3;} - .d2-607531947 .fill-AA4{fill:#EDF0FD;} - .d2-607531947 .fill-AA5{fill:#F7F8FE;} - .d2-607531947 .fill-AB4{fill:#EDF0FD;} - .d2-607531947 .fill-AB5{fill:#F7F8FE;} - .d2-607531947 .stroke-N1{stroke:#0A0F25;} - .d2-607531947 .stroke-N2{stroke:#676C7E;} - .d2-607531947 .stroke-N3{stroke:#9499AB;} - .d2-607531947 .stroke-N4{stroke:#CFD2DD;} - .d2-607531947 .stroke-N5{stroke:#DEE1EB;} - .d2-607531947 .stroke-N6{stroke:#EEF1F8;} - .d2-607531947 .stroke-N7{stroke:#FFFFFF;} - .d2-607531947 .stroke-B1{stroke:#0D32B2;} - .d2-607531947 .stroke-B2{stroke:#0D32B2;} - .d2-607531947 .stroke-B3{stroke:#E3E9FD;} - .d2-607531947 .stroke-B4{stroke:#E3E9FD;} - .d2-607531947 .stroke-B5{stroke:#EDF0FD;} - .d2-607531947 .stroke-B6{stroke:#F7F8FE;} - .d2-607531947 .stroke-AA2{stroke:#4A6FF3;} - .d2-607531947 .stroke-AA4{stroke:#EDF0FD;} - .d2-607531947 .stroke-AA5{stroke:#F7F8FE;} - .d2-607531947 .stroke-AB4{stroke:#EDF0FD;} - .d2-607531947 .stroke-AB5{stroke:#F7F8FE;} - .d2-607531947 .background-color-N1{background-color:#0A0F25;} - .d2-607531947 .background-color-N2{background-color:#676C7E;} - .d2-607531947 .background-color-N3{background-color:#9499AB;} - .d2-607531947 .background-color-N4{background-color:#CFD2DD;} - .d2-607531947 .background-color-N5{background-color:#DEE1EB;} - .d2-607531947 .background-color-N6{background-color:#EEF1F8;} - .d2-607531947 .background-color-N7{background-color:#FFFFFF;} - .d2-607531947 .background-color-B1{background-color:#0D32B2;} - .d2-607531947 .background-color-B2{background-color:#0D32B2;} - .d2-607531947 .background-color-B3{background-color:#E3E9FD;} - .d2-607531947 .background-color-B4{background-color:#E3E9FD;} - .d2-607531947 .background-color-B5{background-color:#EDF0FD;} - .d2-607531947 .background-color-B6{background-color:#F7F8FE;} - .d2-607531947 .background-color-AA2{background-color:#4A6FF3;} - .d2-607531947 .background-color-AA4{background-color:#EDF0FD;} - .d2-607531947 .background-color-AA5{background-color:#F7F8FE;} - .d2-607531947 .background-color-AB4{background-color:#EDF0FD;} - .d2-607531947 .background-color-AB5{background-color:#F7F8FE;} - .d2-607531947 .color-N1{color:#0A0F25;} - .d2-607531947 .color-N2{color:#676C7E;} - .d2-607531947 .color-N3{color:#9499AB;} - .d2-607531947 .color-N4{color:#CFD2DD;} - .d2-607531947 .color-N5{color:#DEE1EB;} - .d2-607531947 .color-N6{color:#EEF1F8;} - .d2-607531947 .color-N7{color:#FFFFFF;} - .d2-607531947 .color-B1{color:#0D32B2;} - .d2-607531947 .color-B2{color:#0D32B2;} - .d2-607531947 .color-B3{color:#E3E9FD;} - .d2-607531947 .color-B4{color:#E3E9FD;} - .d2-607531947 .color-B5{color:#EDF0FD;} - .d2-607531947 .color-B6{color:#F7F8FE;} - .d2-607531947 .color-AA2{color:#4A6FF3;} - .d2-607531947 .color-AA4{color:#EDF0FD;} - .d2-607531947 .color-AA5{color:#F7F8FE;} - .d2-607531947 .color-AB4{color:#EDF0FD;} - .d2-607531947 .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}]]>acbl1l2c1l2c3l2c2l3c1l3c2l4bacacbabcc1c2c3abc -======= .d2-975789907 .fill-N1{fill:#0A0F25;} .d2-975789907 .fill-N2{fill:#676C7E;} .d2-975789907 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-975789907 .color-AA4{color:#EDF0FD;} .d2-975789907 .color-AA5{color:#F7F8FE;} .d2-975789907 .color-AB4{color:#EDF0FD;} - .d2-975789907 .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}]]>acbl1l2c1l2c3l2c2l3c1l3c2l4bacacbabcc1c2c3abc ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-975789907 .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}]]>acbl1l2c1l2c3l2c2l3c1l3c2l4bacacbabcc1c2c3abc diff --git a/e2etests/testdata/regression/unconnected/dagre/sketch.exp.svg b/e2etests/testdata/regression/unconnected/dagre/sketch.exp.svg index 53e06d501..107911628 100644 --- a/e2etests/testdata/regression/unconnected/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/unconnected/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD --numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetime:= 5 -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-1198633229 .fill-N1{fill:#0A0F25;} - .d2-1198633229 .fill-N2{fill:#676C7E;} - .d2-1198633229 .fill-N3{fill:#9499AB;} - .d2-1198633229 .fill-N4{fill:#CFD2DD;} - .d2-1198633229 .fill-N5{fill:#DEE1EB;} - .d2-1198633229 .fill-N6{fill:#EEF1F8;} - .d2-1198633229 .fill-N7{fill:#FFFFFF;} - .d2-1198633229 .fill-B1{fill:#0D32B2;} - .d2-1198633229 .fill-B2{fill:#0D32B2;} - .d2-1198633229 .fill-B3{fill:#E3E9FD;} - .d2-1198633229 .fill-B4{fill:#E3E9FD;} - .d2-1198633229 .fill-B5{fill:#EDF0FD;} - .d2-1198633229 .fill-B6{fill:#F7F8FE;} - .d2-1198633229 .fill-AA2{fill:#4A6FF3;} - .d2-1198633229 .fill-AA4{fill:#EDF0FD;} - .d2-1198633229 .fill-AA5{fill:#F7F8FE;} - .d2-1198633229 .fill-AB4{fill:#EDF0FD;} - .d2-1198633229 .fill-AB5{fill:#F7F8FE;} - .d2-1198633229 .stroke-N1{stroke:#0A0F25;} - .d2-1198633229 .stroke-N2{stroke:#676C7E;} - .d2-1198633229 .stroke-N3{stroke:#9499AB;} - .d2-1198633229 .stroke-N4{stroke:#CFD2DD;} - .d2-1198633229 .stroke-N5{stroke:#DEE1EB;} - .d2-1198633229 .stroke-N6{stroke:#EEF1F8;} - .d2-1198633229 .stroke-N7{stroke:#FFFFFF;} - .d2-1198633229 .stroke-B1{stroke:#0D32B2;} - .d2-1198633229 .stroke-B2{stroke:#0D32B2;} - .d2-1198633229 .stroke-B3{stroke:#E3E9FD;} - .d2-1198633229 .stroke-B4{stroke:#E3E9FD;} - .d2-1198633229 .stroke-B5{stroke:#EDF0FD;} - .d2-1198633229 .stroke-B6{stroke:#F7F8FE;} - .d2-1198633229 .stroke-AA2{stroke:#4A6FF3;} - .d2-1198633229 .stroke-AA4{stroke:#EDF0FD;} - .d2-1198633229 .stroke-AA5{stroke:#F7F8FE;} - .d2-1198633229 .stroke-AB4{stroke:#EDF0FD;} - .d2-1198633229 .stroke-AB5{stroke:#F7F8FE;} - .d2-1198633229 .background-color-N1{background-color:#0A0F25;} - .d2-1198633229 .background-color-N2{background-color:#676C7E;} - .d2-1198633229 .background-color-N3{background-color:#9499AB;} - .d2-1198633229 .background-color-N4{background-color:#CFD2DD;} - .d2-1198633229 .background-color-N5{background-color:#DEE1EB;} - .d2-1198633229 .background-color-N6{background-color:#EEF1F8;} - .d2-1198633229 .background-color-N7{background-color:#FFFFFF;} - .d2-1198633229 .background-color-B1{background-color:#0D32B2;} - .d2-1198633229 .background-color-B2{background-color:#0D32B2;} - .d2-1198633229 .background-color-B3{background-color:#E3E9FD;} - .d2-1198633229 .background-color-B4{background-color:#E3E9FD;} - .d2-1198633229 .background-color-B5{background-color:#EDF0FD;} - .d2-1198633229 .background-color-B6{background-color:#F7F8FE;} - .d2-1198633229 .background-color-AA2{background-color:#4A6FF3;} - .d2-1198633229 .background-color-AA4{background-color:#EDF0FD;} - .d2-1198633229 .background-color-AA5{background-color:#F7F8FE;} - .d2-1198633229 .background-color-AB4{background-color:#EDF0FD;} - .d2-1198633229 .background-color-AB5{background-color:#F7F8FE;} - .d2-1198633229 .color-N1{color:#0A0F25;} - .d2-1198633229 .color-N2{color:#676C7E;} - .d2-1198633229 .color-N3{color:#9499AB;} - .d2-1198633229 .color-N4{color:#CFD2DD;} - .d2-1198633229 .color-N5{color:#DEE1EB;} - .d2-1198633229 .color-N6{color:#EEF1F8;} - .d2-1198633229 .color-N7{color:#FFFFFF;} - .d2-1198633229 .color-B1{color:#0D32B2;} - .d2-1198633229 .color-B2{color:#0D32B2;} - .d2-1198633229 .color-B3{color:#E3E9FD;} - .d2-1198633229 .color-B4{color:#E3E9FD;} - .d2-1198633229 .color-B5{color:#EDF0FD;} - .d2-1198633229 .color-B6{color:#F7F8FE;} - .d2-1198633229 .color-AA2{color:#4A6FF3;} - .d2-1198633229 .color-AA4{color:#EDF0FD;} - .d2-1198633229 .color-AA5{color:#F7F8FE;} - .d2-1198633229 .color-AB4{color:#EDF0FD;} - .d2-1198633229 .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}]]>-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetime:= 5 -======= .d2-3162692253 .fill-N1{fill:#0A0F25;} .d2-3162692253 .fill-N2{fill:#676C7E;} .d2-3162692253 .fill-N3{fill:#9499AB;} @@ -266,22 +103,11 @@ .d2-3162692253 .color-AA4{color:#EDF0FD;} .d2-3162692253 .color-AA5{color:#F7F8FE;} .d2-3162692253 .color-AB4{color:#EDF0FD;} - .d2-3162692253 .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}]]>-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetime:= 5 ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-3162692253 .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}]]>-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetime:= 5 := a + 7 -<<<<<<< HEAD fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b) -||||||| parent of 33280fed5 (fixed e2e tests) -fmt.Printf("%d", b)a := 5 -b := a + 7 -fmt.Printf("%d", b) -======= -fmt.Printf("%d", b)a := 5 -b := a + 7 -fmt.Printf("%d", b) ->>>>>>> 33280fed5 (fixed e2e tests) +fmt.Printf("%d", b) \ No newline at end of file diff --git a/e2etests/testdata/regression/unnamed_class_table_code/elk/sketch.exp.svg b/e2etests/testdata/regression/unnamed_class_table_code/elk/sketch.exp.svg index 927d9289d..75aa3fefe 100644 --- a/e2etests/testdata/regression/unnamed_class_table_code/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/unnamed_class_table_code/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD --numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetime:= 5 -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-2237614131 .fill-N1{fill:#0A0F25;} - .d2-2237614131 .fill-N2{fill:#676C7E;} - .d2-2237614131 .fill-N3{fill:#9499AB;} - .d2-2237614131 .fill-N4{fill:#CFD2DD;} - .d2-2237614131 .fill-N5{fill:#DEE1EB;} - .d2-2237614131 .fill-N6{fill:#EEF1F8;} - .d2-2237614131 .fill-N7{fill:#FFFFFF;} - .d2-2237614131 .fill-B1{fill:#0D32B2;} - .d2-2237614131 .fill-B2{fill:#0D32B2;} - .d2-2237614131 .fill-B3{fill:#E3E9FD;} - .d2-2237614131 .fill-B4{fill:#E3E9FD;} - .d2-2237614131 .fill-B5{fill:#EDF0FD;} - .d2-2237614131 .fill-B6{fill:#F7F8FE;} - .d2-2237614131 .fill-AA2{fill:#4A6FF3;} - .d2-2237614131 .fill-AA4{fill:#EDF0FD;} - .d2-2237614131 .fill-AA5{fill:#F7F8FE;} - .d2-2237614131 .fill-AB4{fill:#EDF0FD;} - .d2-2237614131 .fill-AB5{fill:#F7F8FE;} - .d2-2237614131 .stroke-N1{stroke:#0A0F25;} - .d2-2237614131 .stroke-N2{stroke:#676C7E;} - .d2-2237614131 .stroke-N3{stroke:#9499AB;} - .d2-2237614131 .stroke-N4{stroke:#CFD2DD;} - .d2-2237614131 .stroke-N5{stroke:#DEE1EB;} - .d2-2237614131 .stroke-N6{stroke:#EEF1F8;} - .d2-2237614131 .stroke-N7{stroke:#FFFFFF;} - .d2-2237614131 .stroke-B1{stroke:#0D32B2;} - .d2-2237614131 .stroke-B2{stroke:#0D32B2;} - .d2-2237614131 .stroke-B3{stroke:#E3E9FD;} - .d2-2237614131 .stroke-B4{stroke:#E3E9FD;} - .d2-2237614131 .stroke-B5{stroke:#EDF0FD;} - .d2-2237614131 .stroke-B6{stroke:#F7F8FE;} - .d2-2237614131 .stroke-AA2{stroke:#4A6FF3;} - .d2-2237614131 .stroke-AA4{stroke:#EDF0FD;} - .d2-2237614131 .stroke-AA5{stroke:#F7F8FE;} - .d2-2237614131 .stroke-AB4{stroke:#EDF0FD;} - .d2-2237614131 .stroke-AB5{stroke:#F7F8FE;} - .d2-2237614131 .background-color-N1{background-color:#0A0F25;} - .d2-2237614131 .background-color-N2{background-color:#676C7E;} - .d2-2237614131 .background-color-N3{background-color:#9499AB;} - .d2-2237614131 .background-color-N4{background-color:#CFD2DD;} - .d2-2237614131 .background-color-N5{background-color:#DEE1EB;} - .d2-2237614131 .background-color-N6{background-color:#EEF1F8;} - .d2-2237614131 .background-color-N7{background-color:#FFFFFF;} - .d2-2237614131 .background-color-B1{background-color:#0D32B2;} - .d2-2237614131 .background-color-B2{background-color:#0D32B2;} - .d2-2237614131 .background-color-B3{background-color:#E3E9FD;} - .d2-2237614131 .background-color-B4{background-color:#E3E9FD;} - .d2-2237614131 .background-color-B5{background-color:#EDF0FD;} - .d2-2237614131 .background-color-B6{background-color:#F7F8FE;} - .d2-2237614131 .background-color-AA2{background-color:#4A6FF3;} - .d2-2237614131 .background-color-AA4{background-color:#EDF0FD;} - .d2-2237614131 .background-color-AA5{background-color:#F7F8FE;} - .d2-2237614131 .background-color-AB4{background-color:#EDF0FD;} - .d2-2237614131 .background-color-AB5{background-color:#F7F8FE;} - .d2-2237614131 .color-N1{color:#0A0F25;} - .d2-2237614131 .color-N2{color:#676C7E;} - .d2-2237614131 .color-N3{color:#9499AB;} - .d2-2237614131 .color-N4{color:#CFD2DD;} - .d2-2237614131 .color-N5{color:#DEE1EB;} - .d2-2237614131 .color-N6{color:#EEF1F8;} - .d2-2237614131 .color-N7{color:#FFFFFF;} - .d2-2237614131 .color-B1{color:#0D32B2;} - .d2-2237614131 .color-B2{color:#0D32B2;} - .d2-2237614131 .color-B3{color:#E3E9FD;} - .d2-2237614131 .color-B4{color:#E3E9FD;} - .d2-2237614131 .color-B5{color:#EDF0FD;} - .d2-2237614131 .color-B6{color:#F7F8FE;} - .d2-2237614131 .color-AA2{color:#4A6FF3;} - .d2-2237614131 .color-AA4{color:#EDF0FD;} - .d2-2237614131 .color-AA5{color:#F7F8FE;} - .d2-2237614131 .color-AB4{color:#EDF0FD;} - .d2-2237614131 .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}]]>-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetime:= 5 -======= .d2-1176019395 .fill-N1{fill:#0A0F25;} .d2-1176019395 .fill-N2{fill:#676C7E;} .d2-1176019395 .fill-N3{fill:#9499AB;} @@ -266,22 +103,11 @@ .d2-1176019395 .color-AA4{color:#EDF0FD;} .d2-1176019395 .color-AA5{color:#F7F8FE;} .d2-1176019395 .color-AB4{color:#EDF0FD;} - .d2-1176019395 .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}]]>-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetime:= 5 ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-1176019395 .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}]]>-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetime:= 5 := a + 7 -<<<<<<< HEAD fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b) -||||||| parent of 33280fed5 (fixed e2e tests) -fmt.Printf("%d", b)a := 5 -b := a + 7 -fmt.Printf("%d", b) -======= -fmt.Printf("%d", b)a := 5 -b := a + 7 -fmt.Printf("%d", b) ->>>>>>> 33280fed5 (fixed e2e tests) +fmt.Printf("%d", b) \ No newline at end of file diff --git a/e2etests/testdata/sanity/1_to_2/dagre/sketch.exp.svg b/e2etests/testdata/sanity/1_to_2/dagre/sketch.exp.svg index c3ff2888e..c5a486706 100644 --- a/e2etests/testdata/sanity/1_to_2/dagre/sketch.exp.svg +++ b/e2etests/testdata/sanity/1_to_2/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -abc -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-3782402987 .fill-N1{fill:#0A0F25;} - .d2-3782402987 .fill-N2{fill:#676C7E;} - .d2-3782402987 .fill-N3{fill:#9499AB;} - .d2-3782402987 .fill-N4{fill:#CFD2DD;} - .d2-3782402987 .fill-N5{fill:#DEE1EB;} - .d2-3782402987 .fill-N6{fill:#EEF1F8;} - .d2-3782402987 .fill-N7{fill:#FFFFFF;} - .d2-3782402987 .fill-B1{fill:#0D32B2;} - .d2-3782402987 .fill-B2{fill:#0D32B2;} - .d2-3782402987 .fill-B3{fill:#E3E9FD;} - .d2-3782402987 .fill-B4{fill:#E3E9FD;} - .d2-3782402987 .fill-B5{fill:#EDF0FD;} - .d2-3782402987 .fill-B6{fill:#F7F8FE;} - .d2-3782402987 .fill-AA2{fill:#4A6FF3;} - .d2-3782402987 .fill-AA4{fill:#EDF0FD;} - .d2-3782402987 .fill-AA5{fill:#F7F8FE;} - .d2-3782402987 .fill-AB4{fill:#EDF0FD;} - .d2-3782402987 .fill-AB5{fill:#F7F8FE;} - .d2-3782402987 .stroke-N1{stroke:#0A0F25;} - .d2-3782402987 .stroke-N2{stroke:#676C7E;} - .d2-3782402987 .stroke-N3{stroke:#9499AB;} - .d2-3782402987 .stroke-N4{stroke:#CFD2DD;} - .d2-3782402987 .stroke-N5{stroke:#DEE1EB;} - .d2-3782402987 .stroke-N6{stroke:#EEF1F8;} - .d2-3782402987 .stroke-N7{stroke:#FFFFFF;} - .d2-3782402987 .stroke-B1{stroke:#0D32B2;} - .d2-3782402987 .stroke-B2{stroke:#0D32B2;} - .d2-3782402987 .stroke-B3{stroke:#E3E9FD;} - .d2-3782402987 .stroke-B4{stroke:#E3E9FD;} - .d2-3782402987 .stroke-B5{stroke:#EDF0FD;} - .d2-3782402987 .stroke-B6{stroke:#F7F8FE;} - .d2-3782402987 .stroke-AA2{stroke:#4A6FF3;} - .d2-3782402987 .stroke-AA4{stroke:#EDF0FD;} - .d2-3782402987 .stroke-AA5{stroke:#F7F8FE;} - .d2-3782402987 .stroke-AB4{stroke:#EDF0FD;} - .d2-3782402987 .stroke-AB5{stroke:#F7F8FE;} - .d2-3782402987 .background-color-N1{background-color:#0A0F25;} - .d2-3782402987 .background-color-N2{background-color:#676C7E;} - .d2-3782402987 .background-color-N3{background-color:#9499AB;} - .d2-3782402987 .background-color-N4{background-color:#CFD2DD;} - .d2-3782402987 .background-color-N5{background-color:#DEE1EB;} - .d2-3782402987 .background-color-N6{background-color:#EEF1F8;} - .d2-3782402987 .background-color-N7{background-color:#FFFFFF;} - .d2-3782402987 .background-color-B1{background-color:#0D32B2;} - .d2-3782402987 .background-color-B2{background-color:#0D32B2;} - .d2-3782402987 .background-color-B3{background-color:#E3E9FD;} - .d2-3782402987 .background-color-B4{background-color:#E3E9FD;} - .d2-3782402987 .background-color-B5{background-color:#EDF0FD;} - .d2-3782402987 .background-color-B6{background-color:#F7F8FE;} - .d2-3782402987 .background-color-AA2{background-color:#4A6FF3;} - .d2-3782402987 .background-color-AA4{background-color:#EDF0FD;} - .d2-3782402987 .background-color-AA5{background-color:#F7F8FE;} - .d2-3782402987 .background-color-AB4{background-color:#EDF0FD;} - .d2-3782402987 .background-color-AB5{background-color:#F7F8FE;} - .d2-3782402987 .color-N1{color:#0A0F25;} - .d2-3782402987 .color-N2{color:#676C7E;} - .d2-3782402987 .color-N3{color:#9499AB;} - .d2-3782402987 .color-N4{color:#CFD2DD;} - .d2-3782402987 .color-N5{color:#DEE1EB;} - .d2-3782402987 .color-N6{color:#EEF1F8;} - .d2-3782402987 .color-N7{color:#FFFFFF;} - .d2-3782402987 .color-B1{color:#0D32B2;} - .d2-3782402987 .color-B2{color:#0D32B2;} - .d2-3782402987 .color-B3{color:#E3E9FD;} - .d2-3782402987 .color-B4{color:#E3E9FD;} - .d2-3782402987 .color-B5{color:#EDF0FD;} - .d2-3782402987 .color-B6{color:#F7F8FE;} - .d2-3782402987 .color-AA2{color:#4A6FF3;} - .d2-3782402987 .color-AA4{color:#EDF0FD;} - .d2-3782402987 .color-AA5{color:#F7F8FE;} - .d2-3782402987 .color-AB4{color:#EDF0FD;} - .d2-3782402987 .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}]]>abc -======= .d2-2910214799 .fill-N1{fill:#0A0F25;} .d2-2910214799 .fill-N2{fill:#676C7E;} .d2-2910214799 .fill-N3{fill:#9499AB;} @@ -252,8 +89,7 @@ .d2-2910214799 .color-AA4{color:#EDF0FD;} .d2-2910214799 .color-AA5{color:#F7F8FE;} .d2-2910214799 .color-AB4{color:#EDF0FD;} - .d2-2910214799 .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}]]>abc ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-2910214799 .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}]]>abc diff --git a/e2etests/testdata/sanity/1_to_2/elk/sketch.exp.svg b/e2etests/testdata/sanity/1_to_2/elk/sketch.exp.svg index 0c939bec2..2c76f2d16 100644 --- a/e2etests/testdata/sanity/1_to_2/elk/sketch.exp.svg +++ b/e2etests/testdata/sanity/1_to_2/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -abc -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-300178533 .fill-N1{fill:#0A0F25;} - .d2-300178533 .fill-N2{fill:#676C7E;} - .d2-300178533 .fill-N3{fill:#9499AB;} - .d2-300178533 .fill-N4{fill:#CFD2DD;} - .d2-300178533 .fill-N5{fill:#DEE1EB;} - .d2-300178533 .fill-N6{fill:#EEF1F8;} - .d2-300178533 .fill-N7{fill:#FFFFFF;} - .d2-300178533 .fill-B1{fill:#0D32B2;} - .d2-300178533 .fill-B2{fill:#0D32B2;} - .d2-300178533 .fill-B3{fill:#E3E9FD;} - .d2-300178533 .fill-B4{fill:#E3E9FD;} - .d2-300178533 .fill-B5{fill:#EDF0FD;} - .d2-300178533 .fill-B6{fill:#F7F8FE;} - .d2-300178533 .fill-AA2{fill:#4A6FF3;} - .d2-300178533 .fill-AA4{fill:#EDF0FD;} - .d2-300178533 .fill-AA5{fill:#F7F8FE;} - .d2-300178533 .fill-AB4{fill:#EDF0FD;} - .d2-300178533 .fill-AB5{fill:#F7F8FE;} - .d2-300178533 .stroke-N1{stroke:#0A0F25;} - .d2-300178533 .stroke-N2{stroke:#676C7E;} - .d2-300178533 .stroke-N3{stroke:#9499AB;} - .d2-300178533 .stroke-N4{stroke:#CFD2DD;} - .d2-300178533 .stroke-N5{stroke:#DEE1EB;} - .d2-300178533 .stroke-N6{stroke:#EEF1F8;} - .d2-300178533 .stroke-N7{stroke:#FFFFFF;} - .d2-300178533 .stroke-B1{stroke:#0D32B2;} - .d2-300178533 .stroke-B2{stroke:#0D32B2;} - .d2-300178533 .stroke-B3{stroke:#E3E9FD;} - .d2-300178533 .stroke-B4{stroke:#E3E9FD;} - .d2-300178533 .stroke-B5{stroke:#EDF0FD;} - .d2-300178533 .stroke-B6{stroke:#F7F8FE;} - .d2-300178533 .stroke-AA2{stroke:#4A6FF3;} - .d2-300178533 .stroke-AA4{stroke:#EDF0FD;} - .d2-300178533 .stroke-AA5{stroke:#F7F8FE;} - .d2-300178533 .stroke-AB4{stroke:#EDF0FD;} - .d2-300178533 .stroke-AB5{stroke:#F7F8FE;} - .d2-300178533 .background-color-N1{background-color:#0A0F25;} - .d2-300178533 .background-color-N2{background-color:#676C7E;} - .d2-300178533 .background-color-N3{background-color:#9499AB;} - .d2-300178533 .background-color-N4{background-color:#CFD2DD;} - .d2-300178533 .background-color-N5{background-color:#DEE1EB;} - .d2-300178533 .background-color-N6{background-color:#EEF1F8;} - .d2-300178533 .background-color-N7{background-color:#FFFFFF;} - .d2-300178533 .background-color-B1{background-color:#0D32B2;} - .d2-300178533 .background-color-B2{background-color:#0D32B2;} - .d2-300178533 .background-color-B3{background-color:#E3E9FD;} - .d2-300178533 .background-color-B4{background-color:#E3E9FD;} - .d2-300178533 .background-color-B5{background-color:#EDF0FD;} - .d2-300178533 .background-color-B6{background-color:#F7F8FE;} - .d2-300178533 .background-color-AA2{background-color:#4A6FF3;} - .d2-300178533 .background-color-AA4{background-color:#EDF0FD;} - .d2-300178533 .background-color-AA5{background-color:#F7F8FE;} - .d2-300178533 .background-color-AB4{background-color:#EDF0FD;} - .d2-300178533 .background-color-AB5{background-color:#F7F8FE;} - .d2-300178533 .color-N1{color:#0A0F25;} - .d2-300178533 .color-N2{color:#676C7E;} - .d2-300178533 .color-N3{color:#9499AB;} - .d2-300178533 .color-N4{color:#CFD2DD;} - .d2-300178533 .color-N5{color:#DEE1EB;} - .d2-300178533 .color-N6{color:#EEF1F8;} - .d2-300178533 .color-N7{color:#FFFFFF;} - .d2-300178533 .color-B1{color:#0D32B2;} - .d2-300178533 .color-B2{color:#0D32B2;} - .d2-300178533 .color-B3{color:#E3E9FD;} - .d2-300178533 .color-B4{color:#E3E9FD;} - .d2-300178533 .color-B5{color:#EDF0FD;} - .d2-300178533 .color-B6{color:#F7F8FE;} - .d2-300178533 .color-AA2{color:#4A6FF3;} - .d2-300178533 .color-AA4{color:#EDF0FD;} - .d2-300178533 .color-AA5{color:#F7F8FE;} - .d2-300178533 .color-AB4{color:#EDF0FD;} - .d2-300178533 .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}]]>abc -======= .d2-925586621 .fill-N1{fill:#0A0F25;} .d2-925586621 .fill-N2{fill:#676C7E;} .d2-925586621 .fill-N3{fill:#9499AB;} @@ -252,8 +89,7 @@ .d2-925586621 .color-AA4{color:#EDF0FD;} .d2-925586621 .color-AA5{color:#F7F8FE;} .d2-925586621 .color-AB4{color:#EDF0FD;} - .d2-925586621 .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}]]>abc ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-925586621 .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}]]>abc diff --git a/e2etests/testdata/sanity/basic/dagre/sketch.exp.svg b/e2etests/testdata/sanity/basic/dagre/sketch.exp.svg index 0328bdbe7..12b615307 100644 --- a/e2etests/testdata/sanity/basic/dagre/sketch.exp.svg +++ b/e2etests/testdata/sanity/basic/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -ab -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-3922440645 .fill-N1{fill:#0A0F25;} - .d2-3922440645 .fill-N2{fill:#676C7E;} - .d2-3922440645 .fill-N3{fill:#9499AB;} - .d2-3922440645 .fill-N4{fill:#CFD2DD;} - .d2-3922440645 .fill-N5{fill:#DEE1EB;} - .d2-3922440645 .fill-N6{fill:#EEF1F8;} - .d2-3922440645 .fill-N7{fill:#FFFFFF;} - .d2-3922440645 .fill-B1{fill:#0D32B2;} - .d2-3922440645 .fill-B2{fill:#0D32B2;} - .d2-3922440645 .fill-B3{fill:#E3E9FD;} - .d2-3922440645 .fill-B4{fill:#E3E9FD;} - .d2-3922440645 .fill-B5{fill:#EDF0FD;} - .d2-3922440645 .fill-B6{fill:#F7F8FE;} - .d2-3922440645 .fill-AA2{fill:#4A6FF3;} - .d2-3922440645 .fill-AA4{fill:#EDF0FD;} - .d2-3922440645 .fill-AA5{fill:#F7F8FE;} - .d2-3922440645 .fill-AB4{fill:#EDF0FD;} - .d2-3922440645 .fill-AB5{fill:#F7F8FE;} - .d2-3922440645 .stroke-N1{stroke:#0A0F25;} - .d2-3922440645 .stroke-N2{stroke:#676C7E;} - .d2-3922440645 .stroke-N3{stroke:#9499AB;} - .d2-3922440645 .stroke-N4{stroke:#CFD2DD;} - .d2-3922440645 .stroke-N5{stroke:#DEE1EB;} - .d2-3922440645 .stroke-N6{stroke:#EEF1F8;} - .d2-3922440645 .stroke-N7{stroke:#FFFFFF;} - .d2-3922440645 .stroke-B1{stroke:#0D32B2;} - .d2-3922440645 .stroke-B2{stroke:#0D32B2;} - .d2-3922440645 .stroke-B3{stroke:#E3E9FD;} - .d2-3922440645 .stroke-B4{stroke:#E3E9FD;} - .d2-3922440645 .stroke-B5{stroke:#EDF0FD;} - .d2-3922440645 .stroke-B6{stroke:#F7F8FE;} - .d2-3922440645 .stroke-AA2{stroke:#4A6FF3;} - .d2-3922440645 .stroke-AA4{stroke:#EDF0FD;} - .d2-3922440645 .stroke-AA5{stroke:#F7F8FE;} - .d2-3922440645 .stroke-AB4{stroke:#EDF0FD;} - .d2-3922440645 .stroke-AB5{stroke:#F7F8FE;} - .d2-3922440645 .background-color-N1{background-color:#0A0F25;} - .d2-3922440645 .background-color-N2{background-color:#676C7E;} - .d2-3922440645 .background-color-N3{background-color:#9499AB;} - .d2-3922440645 .background-color-N4{background-color:#CFD2DD;} - .d2-3922440645 .background-color-N5{background-color:#DEE1EB;} - .d2-3922440645 .background-color-N6{background-color:#EEF1F8;} - .d2-3922440645 .background-color-N7{background-color:#FFFFFF;} - .d2-3922440645 .background-color-B1{background-color:#0D32B2;} - .d2-3922440645 .background-color-B2{background-color:#0D32B2;} - .d2-3922440645 .background-color-B3{background-color:#E3E9FD;} - .d2-3922440645 .background-color-B4{background-color:#E3E9FD;} - .d2-3922440645 .background-color-B5{background-color:#EDF0FD;} - .d2-3922440645 .background-color-B6{background-color:#F7F8FE;} - .d2-3922440645 .background-color-AA2{background-color:#4A6FF3;} - .d2-3922440645 .background-color-AA4{background-color:#EDF0FD;} - .d2-3922440645 .background-color-AA5{background-color:#F7F8FE;} - .d2-3922440645 .background-color-AB4{background-color:#EDF0FD;} - .d2-3922440645 .background-color-AB5{background-color:#F7F8FE;} - .d2-3922440645 .color-N1{color:#0A0F25;} - .d2-3922440645 .color-N2{color:#676C7E;} - .d2-3922440645 .color-N3{color:#9499AB;} - .d2-3922440645 .color-N4{color:#CFD2DD;} - .d2-3922440645 .color-N5{color:#DEE1EB;} - .d2-3922440645 .color-N6{color:#EEF1F8;} - .d2-3922440645 .color-N7{color:#FFFFFF;} - .d2-3922440645 .color-B1{color:#0D32B2;} - .d2-3922440645 .color-B2{color:#0D32B2;} - .d2-3922440645 .color-B3{color:#E3E9FD;} - .d2-3922440645 .color-B4{color:#E3E9FD;} - .d2-3922440645 .color-B5{color:#EDF0FD;} - .d2-3922440645 .color-B6{color:#F7F8FE;} - .d2-3922440645 .color-AA2{color:#4A6FF3;} - .d2-3922440645 .color-AA4{color:#EDF0FD;} - .d2-3922440645 .color-AA5{color:#F7F8FE;} - .d2-3922440645 .color-AB4{color:#EDF0FD;} - .d2-3922440645 .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 -======= .d2-3040958567 .fill-N1{fill:#0A0F25;} .d2-3040958567 .fill-N2{fill:#676C7E;} .d2-3040958567 .fill-N3{fill:#9499AB;} @@ -252,8 +89,7 @@ .d2-3040958567 .color-AA4{color:#EDF0FD;} .d2-3040958567 .color-AA5{color:#F7F8FE;} .d2-3040958567 .color-AB4{color:#EDF0FD;} - .d2-3040958567 .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 ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-3040958567 .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 diff --git a/e2etests/testdata/sanity/basic/elk/sketch.exp.svg b/e2etests/testdata/sanity/basic/elk/sketch.exp.svg index 2c318e42e..5c1a9a39d 100644 --- a/e2etests/testdata/sanity/basic/elk/sketch.exp.svg +++ b/e2etests/testdata/sanity/basic/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -ab -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-2281223062 .fill-N1{fill:#0A0F25;} - .d2-2281223062 .fill-N2{fill:#676C7E;} - .d2-2281223062 .fill-N3{fill:#9499AB;} - .d2-2281223062 .fill-N4{fill:#CFD2DD;} - .d2-2281223062 .fill-N5{fill:#DEE1EB;} - .d2-2281223062 .fill-N6{fill:#EEF1F8;} - .d2-2281223062 .fill-N7{fill:#FFFFFF;} - .d2-2281223062 .fill-B1{fill:#0D32B2;} - .d2-2281223062 .fill-B2{fill:#0D32B2;} - .d2-2281223062 .fill-B3{fill:#E3E9FD;} - .d2-2281223062 .fill-B4{fill:#E3E9FD;} - .d2-2281223062 .fill-B5{fill:#EDF0FD;} - .d2-2281223062 .fill-B6{fill:#F7F8FE;} - .d2-2281223062 .fill-AA2{fill:#4A6FF3;} - .d2-2281223062 .fill-AA4{fill:#EDF0FD;} - .d2-2281223062 .fill-AA5{fill:#F7F8FE;} - .d2-2281223062 .fill-AB4{fill:#EDF0FD;} - .d2-2281223062 .fill-AB5{fill:#F7F8FE;} - .d2-2281223062 .stroke-N1{stroke:#0A0F25;} - .d2-2281223062 .stroke-N2{stroke:#676C7E;} - .d2-2281223062 .stroke-N3{stroke:#9499AB;} - .d2-2281223062 .stroke-N4{stroke:#CFD2DD;} - .d2-2281223062 .stroke-N5{stroke:#DEE1EB;} - .d2-2281223062 .stroke-N6{stroke:#EEF1F8;} - .d2-2281223062 .stroke-N7{stroke:#FFFFFF;} - .d2-2281223062 .stroke-B1{stroke:#0D32B2;} - .d2-2281223062 .stroke-B2{stroke:#0D32B2;} - .d2-2281223062 .stroke-B3{stroke:#E3E9FD;} - .d2-2281223062 .stroke-B4{stroke:#E3E9FD;} - .d2-2281223062 .stroke-B5{stroke:#EDF0FD;} - .d2-2281223062 .stroke-B6{stroke:#F7F8FE;} - .d2-2281223062 .stroke-AA2{stroke:#4A6FF3;} - .d2-2281223062 .stroke-AA4{stroke:#EDF0FD;} - .d2-2281223062 .stroke-AA5{stroke:#F7F8FE;} - .d2-2281223062 .stroke-AB4{stroke:#EDF0FD;} - .d2-2281223062 .stroke-AB5{stroke:#F7F8FE;} - .d2-2281223062 .background-color-N1{background-color:#0A0F25;} - .d2-2281223062 .background-color-N2{background-color:#676C7E;} - .d2-2281223062 .background-color-N3{background-color:#9499AB;} - .d2-2281223062 .background-color-N4{background-color:#CFD2DD;} - .d2-2281223062 .background-color-N5{background-color:#DEE1EB;} - .d2-2281223062 .background-color-N6{background-color:#EEF1F8;} - .d2-2281223062 .background-color-N7{background-color:#FFFFFF;} - .d2-2281223062 .background-color-B1{background-color:#0D32B2;} - .d2-2281223062 .background-color-B2{background-color:#0D32B2;} - .d2-2281223062 .background-color-B3{background-color:#E3E9FD;} - .d2-2281223062 .background-color-B4{background-color:#E3E9FD;} - .d2-2281223062 .background-color-B5{background-color:#EDF0FD;} - .d2-2281223062 .background-color-B6{background-color:#F7F8FE;} - .d2-2281223062 .background-color-AA2{background-color:#4A6FF3;} - .d2-2281223062 .background-color-AA4{background-color:#EDF0FD;} - .d2-2281223062 .background-color-AA5{background-color:#F7F8FE;} - .d2-2281223062 .background-color-AB4{background-color:#EDF0FD;} - .d2-2281223062 .background-color-AB5{background-color:#F7F8FE;} - .d2-2281223062 .color-N1{color:#0A0F25;} - .d2-2281223062 .color-N2{color:#676C7E;} - .d2-2281223062 .color-N3{color:#9499AB;} - .d2-2281223062 .color-N4{color:#CFD2DD;} - .d2-2281223062 .color-N5{color:#DEE1EB;} - .d2-2281223062 .color-N6{color:#EEF1F8;} - .d2-2281223062 .color-N7{color:#FFFFFF;} - .d2-2281223062 .color-B1{color:#0D32B2;} - .d2-2281223062 .color-B2{color:#0D32B2;} - .d2-2281223062 .color-B3{color:#E3E9FD;} - .d2-2281223062 .color-B4{color:#E3E9FD;} - .d2-2281223062 .color-B5{color:#EDF0FD;} - .d2-2281223062 .color-B6{color:#F7F8FE;} - .d2-2281223062 .color-AA2{color:#4A6FF3;} - .d2-2281223062 .color-AA4{color:#EDF0FD;} - .d2-2281223062 .color-AA5{color:#F7F8FE;} - .d2-2281223062 .color-AB4{color:#EDF0FD;} - .d2-2281223062 .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 -======= .d2-592164744 .fill-N1{fill:#0A0F25;} .d2-592164744 .fill-N2{fill:#676C7E;} .d2-592164744 .fill-N3{fill:#9499AB;} @@ -252,8 +89,7 @@ .d2-592164744 .color-AA4{color:#EDF0FD;} .d2-592164744 .color-AA5{color:#F7F8FE;} .d2-592164744 .color-AB4{color:#EDF0FD;} - .d2-592164744 .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 ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-592164744 .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 diff --git a/e2etests/testdata/sanity/child_to_child/dagre/sketch.exp.svg b/e2etests/testdata/sanity/child_to_child/dagre/sketch.exp.svg index bd0e06e22..4ff72adb6 100644 --- a/e2etests/testdata/sanity/child_to_child/dagre/sketch.exp.svg +++ b/e2etests/testdata/sanity/child_to_child/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -acbd -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-3033909617 .fill-N1{fill:#0A0F25;} - .d2-3033909617 .fill-N2{fill:#676C7E;} - .d2-3033909617 .fill-N3{fill:#9499AB;} - .d2-3033909617 .fill-N4{fill:#CFD2DD;} - .d2-3033909617 .fill-N5{fill:#DEE1EB;} - .d2-3033909617 .fill-N6{fill:#EEF1F8;} - .d2-3033909617 .fill-N7{fill:#FFFFFF;} - .d2-3033909617 .fill-B1{fill:#0D32B2;} - .d2-3033909617 .fill-B2{fill:#0D32B2;} - .d2-3033909617 .fill-B3{fill:#E3E9FD;} - .d2-3033909617 .fill-B4{fill:#E3E9FD;} - .d2-3033909617 .fill-B5{fill:#EDF0FD;} - .d2-3033909617 .fill-B6{fill:#F7F8FE;} - .d2-3033909617 .fill-AA2{fill:#4A6FF3;} - .d2-3033909617 .fill-AA4{fill:#EDF0FD;} - .d2-3033909617 .fill-AA5{fill:#F7F8FE;} - .d2-3033909617 .fill-AB4{fill:#EDF0FD;} - .d2-3033909617 .fill-AB5{fill:#F7F8FE;} - .d2-3033909617 .stroke-N1{stroke:#0A0F25;} - .d2-3033909617 .stroke-N2{stroke:#676C7E;} - .d2-3033909617 .stroke-N3{stroke:#9499AB;} - .d2-3033909617 .stroke-N4{stroke:#CFD2DD;} - .d2-3033909617 .stroke-N5{stroke:#DEE1EB;} - .d2-3033909617 .stroke-N6{stroke:#EEF1F8;} - .d2-3033909617 .stroke-N7{stroke:#FFFFFF;} - .d2-3033909617 .stroke-B1{stroke:#0D32B2;} - .d2-3033909617 .stroke-B2{stroke:#0D32B2;} - .d2-3033909617 .stroke-B3{stroke:#E3E9FD;} - .d2-3033909617 .stroke-B4{stroke:#E3E9FD;} - .d2-3033909617 .stroke-B5{stroke:#EDF0FD;} - .d2-3033909617 .stroke-B6{stroke:#F7F8FE;} - .d2-3033909617 .stroke-AA2{stroke:#4A6FF3;} - .d2-3033909617 .stroke-AA4{stroke:#EDF0FD;} - .d2-3033909617 .stroke-AA5{stroke:#F7F8FE;} - .d2-3033909617 .stroke-AB4{stroke:#EDF0FD;} - .d2-3033909617 .stroke-AB5{stroke:#F7F8FE;} - .d2-3033909617 .background-color-N1{background-color:#0A0F25;} - .d2-3033909617 .background-color-N2{background-color:#676C7E;} - .d2-3033909617 .background-color-N3{background-color:#9499AB;} - .d2-3033909617 .background-color-N4{background-color:#CFD2DD;} - .d2-3033909617 .background-color-N5{background-color:#DEE1EB;} - .d2-3033909617 .background-color-N6{background-color:#EEF1F8;} - .d2-3033909617 .background-color-N7{background-color:#FFFFFF;} - .d2-3033909617 .background-color-B1{background-color:#0D32B2;} - .d2-3033909617 .background-color-B2{background-color:#0D32B2;} - .d2-3033909617 .background-color-B3{background-color:#E3E9FD;} - .d2-3033909617 .background-color-B4{background-color:#E3E9FD;} - .d2-3033909617 .background-color-B5{background-color:#EDF0FD;} - .d2-3033909617 .background-color-B6{background-color:#F7F8FE;} - .d2-3033909617 .background-color-AA2{background-color:#4A6FF3;} - .d2-3033909617 .background-color-AA4{background-color:#EDF0FD;} - .d2-3033909617 .background-color-AA5{background-color:#F7F8FE;} - .d2-3033909617 .background-color-AB4{background-color:#EDF0FD;} - .d2-3033909617 .background-color-AB5{background-color:#F7F8FE;} - .d2-3033909617 .color-N1{color:#0A0F25;} - .d2-3033909617 .color-N2{color:#676C7E;} - .d2-3033909617 .color-N3{color:#9499AB;} - .d2-3033909617 .color-N4{color:#CFD2DD;} - .d2-3033909617 .color-N5{color:#DEE1EB;} - .d2-3033909617 .color-N6{color:#EEF1F8;} - .d2-3033909617 .color-N7{color:#FFFFFF;} - .d2-3033909617 .color-B1{color:#0D32B2;} - .d2-3033909617 .color-B2{color:#0D32B2;} - .d2-3033909617 .color-B3{color:#E3E9FD;} - .d2-3033909617 .color-B4{color:#E3E9FD;} - .d2-3033909617 .color-B5{color:#EDF0FD;} - .d2-3033909617 .color-B6{color:#F7F8FE;} - .d2-3033909617 .color-AA2{color:#4A6FF3;} - .d2-3033909617 .color-AA4{color:#EDF0FD;} - .d2-3033909617 .color-AA5{color:#F7F8FE;} - .d2-3033909617 .color-AB4{color:#EDF0FD;} - .d2-3033909617 .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}]]>acbd -======= .d2-59210035 .fill-N1{fill:#0A0F25;} .d2-59210035 .fill-N2{fill:#676C7E;} .d2-59210035 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-59210035 .color-AA4{color:#EDF0FD;} .d2-59210035 .color-AA5{color:#F7F8FE;} .d2-59210035 .color-AB4{color:#EDF0FD;} - .d2-59210035 .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}]]>acbd ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-59210035 .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}]]>acbd diff --git a/e2etests/testdata/sanity/child_to_child/elk/sketch.exp.svg b/e2etests/testdata/sanity/child_to_child/elk/sketch.exp.svg index 27c9bdd1a..e7c921ed2 100644 --- a/e2etests/testdata/sanity/child_to_child/elk/sketch.exp.svg +++ b/e2etests/testdata/sanity/child_to_child/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -acbd -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-916026630 .fill-N1{fill:#0A0F25;} - .d2-916026630 .fill-N2{fill:#676C7E;} - .d2-916026630 .fill-N3{fill:#9499AB;} - .d2-916026630 .fill-N4{fill:#CFD2DD;} - .d2-916026630 .fill-N5{fill:#DEE1EB;} - .d2-916026630 .fill-N6{fill:#EEF1F8;} - .d2-916026630 .fill-N7{fill:#FFFFFF;} - .d2-916026630 .fill-B1{fill:#0D32B2;} - .d2-916026630 .fill-B2{fill:#0D32B2;} - .d2-916026630 .fill-B3{fill:#E3E9FD;} - .d2-916026630 .fill-B4{fill:#E3E9FD;} - .d2-916026630 .fill-B5{fill:#EDF0FD;} - .d2-916026630 .fill-B6{fill:#F7F8FE;} - .d2-916026630 .fill-AA2{fill:#4A6FF3;} - .d2-916026630 .fill-AA4{fill:#EDF0FD;} - .d2-916026630 .fill-AA5{fill:#F7F8FE;} - .d2-916026630 .fill-AB4{fill:#EDF0FD;} - .d2-916026630 .fill-AB5{fill:#F7F8FE;} - .d2-916026630 .stroke-N1{stroke:#0A0F25;} - .d2-916026630 .stroke-N2{stroke:#676C7E;} - .d2-916026630 .stroke-N3{stroke:#9499AB;} - .d2-916026630 .stroke-N4{stroke:#CFD2DD;} - .d2-916026630 .stroke-N5{stroke:#DEE1EB;} - .d2-916026630 .stroke-N6{stroke:#EEF1F8;} - .d2-916026630 .stroke-N7{stroke:#FFFFFF;} - .d2-916026630 .stroke-B1{stroke:#0D32B2;} - .d2-916026630 .stroke-B2{stroke:#0D32B2;} - .d2-916026630 .stroke-B3{stroke:#E3E9FD;} - .d2-916026630 .stroke-B4{stroke:#E3E9FD;} - .d2-916026630 .stroke-B5{stroke:#EDF0FD;} - .d2-916026630 .stroke-B6{stroke:#F7F8FE;} - .d2-916026630 .stroke-AA2{stroke:#4A6FF3;} - .d2-916026630 .stroke-AA4{stroke:#EDF0FD;} - .d2-916026630 .stroke-AA5{stroke:#F7F8FE;} - .d2-916026630 .stroke-AB4{stroke:#EDF0FD;} - .d2-916026630 .stroke-AB5{stroke:#F7F8FE;} - .d2-916026630 .background-color-N1{background-color:#0A0F25;} - .d2-916026630 .background-color-N2{background-color:#676C7E;} - .d2-916026630 .background-color-N3{background-color:#9499AB;} - .d2-916026630 .background-color-N4{background-color:#CFD2DD;} - .d2-916026630 .background-color-N5{background-color:#DEE1EB;} - .d2-916026630 .background-color-N6{background-color:#EEF1F8;} - .d2-916026630 .background-color-N7{background-color:#FFFFFF;} - .d2-916026630 .background-color-B1{background-color:#0D32B2;} - .d2-916026630 .background-color-B2{background-color:#0D32B2;} - .d2-916026630 .background-color-B3{background-color:#E3E9FD;} - .d2-916026630 .background-color-B4{background-color:#E3E9FD;} - .d2-916026630 .background-color-B5{background-color:#EDF0FD;} - .d2-916026630 .background-color-B6{background-color:#F7F8FE;} - .d2-916026630 .background-color-AA2{background-color:#4A6FF3;} - .d2-916026630 .background-color-AA4{background-color:#EDF0FD;} - .d2-916026630 .background-color-AA5{background-color:#F7F8FE;} - .d2-916026630 .background-color-AB4{background-color:#EDF0FD;} - .d2-916026630 .background-color-AB5{background-color:#F7F8FE;} - .d2-916026630 .color-N1{color:#0A0F25;} - .d2-916026630 .color-N2{color:#676C7E;} - .d2-916026630 .color-N3{color:#9499AB;} - .d2-916026630 .color-N4{color:#CFD2DD;} - .d2-916026630 .color-N5{color:#DEE1EB;} - .d2-916026630 .color-N6{color:#EEF1F8;} - .d2-916026630 .color-N7{color:#FFFFFF;} - .d2-916026630 .color-B1{color:#0D32B2;} - .d2-916026630 .color-B2{color:#0D32B2;} - .d2-916026630 .color-B3{color:#E3E9FD;} - .d2-916026630 .color-B4{color:#E3E9FD;} - .d2-916026630 .color-B5{color:#EDF0FD;} - .d2-916026630 .color-B6{color:#F7F8FE;} - .d2-916026630 .color-AA2{color:#4A6FF3;} - .d2-916026630 .color-AA4{color:#EDF0FD;} - .d2-916026630 .color-AA5{color:#F7F8FE;} - .d2-916026630 .color-AB4{color:#EDF0FD;} - .d2-916026630 .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}]]>acbd -======= .d2-2349687548 .fill-N1{fill:#0A0F25;} .d2-2349687548 .fill-N2{fill:#676C7E;} .d2-2349687548 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-2349687548 .color-AA4{color:#EDF0FD;} .d2-2349687548 .color-AA5{color:#F7F8FE;} .d2-2349687548 .color-AB4{color:#EDF0FD;} - .d2-2349687548 .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}]]>acbd ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-2349687548 .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}]]>acbd diff --git a/e2etests/testdata/sanity/connection_label/dagre/sketch.exp.svg b/e2etests/testdata/sanity/connection_label/dagre/sketch.exp.svg index 6d6442e55..d3cffdd21 100644 --- a/e2etests/testdata/sanity/connection_label/dagre/sketch.exp.svg +++ b/e2etests/testdata/sanity/connection_label/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -ab hello -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-1787500422 .fill-N1{fill:#0A0F25;} - .d2-1787500422 .fill-N2{fill:#676C7E;} - .d2-1787500422 .fill-N3{fill:#9499AB;} - .d2-1787500422 .fill-N4{fill:#CFD2DD;} - .d2-1787500422 .fill-N5{fill:#DEE1EB;} - .d2-1787500422 .fill-N6{fill:#EEF1F8;} - .d2-1787500422 .fill-N7{fill:#FFFFFF;} - .d2-1787500422 .fill-B1{fill:#0D32B2;} - .d2-1787500422 .fill-B2{fill:#0D32B2;} - .d2-1787500422 .fill-B3{fill:#E3E9FD;} - .d2-1787500422 .fill-B4{fill:#E3E9FD;} - .d2-1787500422 .fill-B5{fill:#EDF0FD;} - .d2-1787500422 .fill-B6{fill:#F7F8FE;} - .d2-1787500422 .fill-AA2{fill:#4A6FF3;} - .d2-1787500422 .fill-AA4{fill:#EDF0FD;} - .d2-1787500422 .fill-AA5{fill:#F7F8FE;} - .d2-1787500422 .fill-AB4{fill:#EDF0FD;} - .d2-1787500422 .fill-AB5{fill:#F7F8FE;} - .d2-1787500422 .stroke-N1{stroke:#0A0F25;} - .d2-1787500422 .stroke-N2{stroke:#676C7E;} - .d2-1787500422 .stroke-N3{stroke:#9499AB;} - .d2-1787500422 .stroke-N4{stroke:#CFD2DD;} - .d2-1787500422 .stroke-N5{stroke:#DEE1EB;} - .d2-1787500422 .stroke-N6{stroke:#EEF1F8;} - .d2-1787500422 .stroke-N7{stroke:#FFFFFF;} - .d2-1787500422 .stroke-B1{stroke:#0D32B2;} - .d2-1787500422 .stroke-B2{stroke:#0D32B2;} - .d2-1787500422 .stroke-B3{stroke:#E3E9FD;} - .d2-1787500422 .stroke-B4{stroke:#E3E9FD;} - .d2-1787500422 .stroke-B5{stroke:#EDF0FD;} - .d2-1787500422 .stroke-B6{stroke:#F7F8FE;} - .d2-1787500422 .stroke-AA2{stroke:#4A6FF3;} - .d2-1787500422 .stroke-AA4{stroke:#EDF0FD;} - .d2-1787500422 .stroke-AA5{stroke:#F7F8FE;} - .d2-1787500422 .stroke-AB4{stroke:#EDF0FD;} - .d2-1787500422 .stroke-AB5{stroke:#F7F8FE;} - .d2-1787500422 .background-color-N1{background-color:#0A0F25;} - .d2-1787500422 .background-color-N2{background-color:#676C7E;} - .d2-1787500422 .background-color-N3{background-color:#9499AB;} - .d2-1787500422 .background-color-N4{background-color:#CFD2DD;} - .d2-1787500422 .background-color-N5{background-color:#DEE1EB;} - .d2-1787500422 .background-color-N6{background-color:#EEF1F8;} - .d2-1787500422 .background-color-N7{background-color:#FFFFFF;} - .d2-1787500422 .background-color-B1{background-color:#0D32B2;} - .d2-1787500422 .background-color-B2{background-color:#0D32B2;} - .d2-1787500422 .background-color-B3{background-color:#E3E9FD;} - .d2-1787500422 .background-color-B4{background-color:#E3E9FD;} - .d2-1787500422 .background-color-B5{background-color:#EDF0FD;} - .d2-1787500422 .background-color-B6{background-color:#F7F8FE;} - .d2-1787500422 .background-color-AA2{background-color:#4A6FF3;} - .d2-1787500422 .background-color-AA4{background-color:#EDF0FD;} - .d2-1787500422 .background-color-AA5{background-color:#F7F8FE;} - .d2-1787500422 .background-color-AB4{background-color:#EDF0FD;} - .d2-1787500422 .background-color-AB5{background-color:#F7F8FE;} - .d2-1787500422 .color-N1{color:#0A0F25;} - .d2-1787500422 .color-N2{color:#676C7E;} - .d2-1787500422 .color-N3{color:#9499AB;} - .d2-1787500422 .color-N4{color:#CFD2DD;} - .d2-1787500422 .color-N5{color:#DEE1EB;} - .d2-1787500422 .color-N6{color:#EEF1F8;} - .d2-1787500422 .color-N7{color:#FFFFFF;} - .d2-1787500422 .color-B1{color:#0D32B2;} - .d2-1787500422 .color-B2{color:#0D32B2;} - .d2-1787500422 .color-B3{color:#E3E9FD;} - .d2-1787500422 .color-B4{color:#E3E9FD;} - .d2-1787500422 .color-B5{color:#EDF0FD;} - .d2-1787500422 .color-B6{color:#F7F8FE;} - .d2-1787500422 .color-AA2{color:#4A6FF3;} - .d2-1787500422 .color-AA4{color:#EDF0FD;} - .d2-1787500422 .color-AA5{color:#F7F8FE;} - .d2-1787500422 .color-AB4{color:#EDF0FD;} - .d2-1787500422 .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 hello -======= .d2-3049216668 .fill-N1{fill:#0A0F25;} .d2-3049216668 .fill-N2{fill:#676C7E;} .d2-3049216668 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-3049216668 .color-AA4{color:#EDF0FD;} .d2-3049216668 .color-AA5{color:#F7F8FE;} .d2-3049216668 .color-AB4{color:#EDF0FD;} - .d2-3049216668 .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 hello ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-3049216668 .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 hello diff --git a/e2etests/testdata/sanity/connection_label/elk/sketch.exp.svg b/e2etests/testdata/sanity/connection_label/elk/sketch.exp.svg index 4fee5c16e..82e6506c5 100644 --- a/e2etests/testdata/sanity/connection_label/elk/sketch.exp.svg +++ b/e2etests/testdata/sanity/connection_label/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -ab hello -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-3569052263 .fill-N1{fill:#0A0F25;} - .d2-3569052263 .fill-N2{fill:#676C7E;} - .d2-3569052263 .fill-N3{fill:#9499AB;} - .d2-3569052263 .fill-N4{fill:#CFD2DD;} - .d2-3569052263 .fill-N5{fill:#DEE1EB;} - .d2-3569052263 .fill-N6{fill:#EEF1F8;} - .d2-3569052263 .fill-N7{fill:#FFFFFF;} - .d2-3569052263 .fill-B1{fill:#0D32B2;} - .d2-3569052263 .fill-B2{fill:#0D32B2;} - .d2-3569052263 .fill-B3{fill:#E3E9FD;} - .d2-3569052263 .fill-B4{fill:#E3E9FD;} - .d2-3569052263 .fill-B5{fill:#EDF0FD;} - .d2-3569052263 .fill-B6{fill:#F7F8FE;} - .d2-3569052263 .fill-AA2{fill:#4A6FF3;} - .d2-3569052263 .fill-AA4{fill:#EDF0FD;} - .d2-3569052263 .fill-AA5{fill:#F7F8FE;} - .d2-3569052263 .fill-AB4{fill:#EDF0FD;} - .d2-3569052263 .fill-AB5{fill:#F7F8FE;} - .d2-3569052263 .stroke-N1{stroke:#0A0F25;} - .d2-3569052263 .stroke-N2{stroke:#676C7E;} - .d2-3569052263 .stroke-N3{stroke:#9499AB;} - .d2-3569052263 .stroke-N4{stroke:#CFD2DD;} - .d2-3569052263 .stroke-N5{stroke:#DEE1EB;} - .d2-3569052263 .stroke-N6{stroke:#EEF1F8;} - .d2-3569052263 .stroke-N7{stroke:#FFFFFF;} - .d2-3569052263 .stroke-B1{stroke:#0D32B2;} - .d2-3569052263 .stroke-B2{stroke:#0D32B2;} - .d2-3569052263 .stroke-B3{stroke:#E3E9FD;} - .d2-3569052263 .stroke-B4{stroke:#E3E9FD;} - .d2-3569052263 .stroke-B5{stroke:#EDF0FD;} - .d2-3569052263 .stroke-B6{stroke:#F7F8FE;} - .d2-3569052263 .stroke-AA2{stroke:#4A6FF3;} - .d2-3569052263 .stroke-AA4{stroke:#EDF0FD;} - .d2-3569052263 .stroke-AA5{stroke:#F7F8FE;} - .d2-3569052263 .stroke-AB4{stroke:#EDF0FD;} - .d2-3569052263 .stroke-AB5{stroke:#F7F8FE;} - .d2-3569052263 .background-color-N1{background-color:#0A0F25;} - .d2-3569052263 .background-color-N2{background-color:#676C7E;} - .d2-3569052263 .background-color-N3{background-color:#9499AB;} - .d2-3569052263 .background-color-N4{background-color:#CFD2DD;} - .d2-3569052263 .background-color-N5{background-color:#DEE1EB;} - .d2-3569052263 .background-color-N6{background-color:#EEF1F8;} - .d2-3569052263 .background-color-N7{background-color:#FFFFFF;} - .d2-3569052263 .background-color-B1{background-color:#0D32B2;} - .d2-3569052263 .background-color-B2{background-color:#0D32B2;} - .d2-3569052263 .background-color-B3{background-color:#E3E9FD;} - .d2-3569052263 .background-color-B4{background-color:#E3E9FD;} - .d2-3569052263 .background-color-B5{background-color:#EDF0FD;} - .d2-3569052263 .background-color-B6{background-color:#F7F8FE;} - .d2-3569052263 .background-color-AA2{background-color:#4A6FF3;} - .d2-3569052263 .background-color-AA4{background-color:#EDF0FD;} - .d2-3569052263 .background-color-AA5{background-color:#F7F8FE;} - .d2-3569052263 .background-color-AB4{background-color:#EDF0FD;} - .d2-3569052263 .background-color-AB5{background-color:#F7F8FE;} - .d2-3569052263 .color-N1{color:#0A0F25;} - .d2-3569052263 .color-N2{color:#676C7E;} - .d2-3569052263 .color-N3{color:#9499AB;} - .d2-3569052263 .color-N4{color:#CFD2DD;} - .d2-3569052263 .color-N5{color:#DEE1EB;} - .d2-3569052263 .color-N6{color:#EEF1F8;} - .d2-3569052263 .color-N7{color:#FFFFFF;} - .d2-3569052263 .color-B1{color:#0D32B2;} - .d2-3569052263 .color-B2{color:#0D32B2;} - .d2-3569052263 .color-B3{color:#E3E9FD;} - .d2-3569052263 .color-B4{color:#E3E9FD;} - .d2-3569052263 .color-B5{color:#EDF0FD;} - .d2-3569052263 .color-B6{color:#F7F8FE;} - .d2-3569052263 .color-AA2{color:#4A6FF3;} - .d2-3569052263 .color-AA4{color:#EDF0FD;} - .d2-3569052263 .color-AA5{color:#F7F8FE;} - .d2-3569052263 .color-AB4{color:#EDF0FD;} - .d2-3569052263 .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 hello -======= .d2-3225149769 .fill-N1{fill:#0A0F25;} .d2-3225149769 .fill-N2{fill:#676C7E;} .d2-3225149769 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-3225149769 .color-AA4{color:#EDF0FD;} .d2-3225149769 .color-AA5{color:#F7F8FE;} .d2-3225149769 .color-AB4{color:#EDF0FD;} - .d2-3225149769 .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 hello ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-3225149769 .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 hello diff --git a/e2etests/testdata/stable/3d_fill_and_stroke/dagre/sketch.exp.svg b/e2etests/testdata/stable/3d_fill_and_stroke/dagre/sketch.exp.svg index 4c40d0ae0..cf81f3521 100644 --- a/e2etests/testdata/stable/3d_fill_and_stroke/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/3d_fill_and_stroke/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-70658636 .fill-N1{fill:#0A0F25;} - .d2-70658636 .fill-N2{fill:#676C7E;} - .d2-70658636 .fill-N3{fill:#9499AB;} - .d2-70658636 .fill-N4{fill:#CFD2DD;} - .d2-70658636 .fill-N5{fill:#DEE1EB;} - .d2-70658636 .fill-N6{fill:#EEF1F8;} - .d2-70658636 .fill-N7{fill:#FFFFFF;} - .d2-70658636 .fill-B1{fill:#0D32B2;} - .d2-70658636 .fill-B2{fill:#0D32B2;} - .d2-70658636 .fill-B3{fill:#E3E9FD;} - .d2-70658636 .fill-B4{fill:#E3E9FD;} - .d2-70658636 .fill-B5{fill:#EDF0FD;} - .d2-70658636 .fill-B6{fill:#F7F8FE;} - .d2-70658636 .fill-AA2{fill:#4A6FF3;} - .d2-70658636 .fill-AA4{fill:#EDF0FD;} - .d2-70658636 .fill-AA5{fill:#F7F8FE;} - .d2-70658636 .fill-AB4{fill:#EDF0FD;} - .d2-70658636 .fill-AB5{fill:#F7F8FE;} - .d2-70658636 .stroke-N1{stroke:#0A0F25;} - .d2-70658636 .stroke-N2{stroke:#676C7E;} - .d2-70658636 .stroke-N3{stroke:#9499AB;} - .d2-70658636 .stroke-N4{stroke:#CFD2DD;} - .d2-70658636 .stroke-N5{stroke:#DEE1EB;} - .d2-70658636 .stroke-N6{stroke:#EEF1F8;} - .d2-70658636 .stroke-N7{stroke:#FFFFFF;} - .d2-70658636 .stroke-B1{stroke:#0D32B2;} - .d2-70658636 .stroke-B2{stroke:#0D32B2;} - .d2-70658636 .stroke-B3{stroke:#E3E9FD;} - .d2-70658636 .stroke-B4{stroke:#E3E9FD;} - .d2-70658636 .stroke-B5{stroke:#EDF0FD;} - .d2-70658636 .stroke-B6{stroke:#F7F8FE;} - .d2-70658636 .stroke-AA2{stroke:#4A6FF3;} - .d2-70658636 .stroke-AA4{stroke:#EDF0FD;} - .d2-70658636 .stroke-AA5{stroke:#F7F8FE;} - .d2-70658636 .stroke-AB4{stroke:#EDF0FD;} - .d2-70658636 .stroke-AB5{stroke:#F7F8FE;} - .d2-70658636 .background-color-N1{background-color:#0A0F25;} - .d2-70658636 .background-color-N2{background-color:#676C7E;} - .d2-70658636 .background-color-N3{background-color:#9499AB;} - .d2-70658636 .background-color-N4{background-color:#CFD2DD;} - .d2-70658636 .background-color-N5{background-color:#DEE1EB;} - .d2-70658636 .background-color-N6{background-color:#EEF1F8;} - .d2-70658636 .background-color-N7{background-color:#FFFFFF;} - .d2-70658636 .background-color-B1{background-color:#0D32B2;} - .d2-70658636 .background-color-B2{background-color:#0D32B2;} - .d2-70658636 .background-color-B3{background-color:#E3E9FD;} - .d2-70658636 .background-color-B4{background-color:#E3E9FD;} - .d2-70658636 .background-color-B5{background-color:#EDF0FD;} - .d2-70658636 .background-color-B6{background-color:#F7F8FE;} - .d2-70658636 .background-color-AA2{background-color:#4A6FF3;} - .d2-70658636 .background-color-AA4{background-color:#EDF0FD;} - .d2-70658636 .background-color-AA5{background-color:#F7F8FE;} - .d2-70658636 .background-color-AB4{background-color:#EDF0FD;} - .d2-70658636 .background-color-AB5{background-color:#F7F8FE;} - .d2-70658636 .color-N1{color:#0A0F25;} - .d2-70658636 .color-N2{color:#676C7E;} - .d2-70658636 .color-N3{color:#9499AB;} - .d2-70658636 .color-N4{color:#CFD2DD;} - .d2-70658636 .color-N5{color:#DEE1EB;} - .d2-70658636 .color-N6{color:#EEF1F8;} - .d2-70658636 .color-N7{color:#FFFFFF;} - .d2-70658636 .color-B1{color:#0D32B2;} - .d2-70658636 .color-B2{color:#0D32B2;} - .d2-70658636 .color-B3{color:#E3E9FD;} - .d2-70658636 .color-B4{color:#E3E9FD;} - .d2-70658636 .color-B5{color:#EDF0FD;} - .d2-70658636 .color-B6{color:#F7F8FE;} - .d2-70658636 .color-AA2{color:#4A6FF3;} - .d2-70658636 .color-AA4{color:#EDF0FD;} - .d2-70658636 .color-AA5{color:#F7F8FE;} - .d2-70658636 .color-AB4{color:#EDF0FD;} - .d2-70658636 .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}]]>rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud -======= .d2-1581150626 .fill-N1{fill:#0A0F25;} .d2-1581150626 .fill-N2{fill:#676C7E;} .d2-1581150626 .fill-N3{fill:#9499AB;} @@ -252,8 +89,7 @@ .d2-1581150626 .color-AA4{color:#EDF0FD;} .d2-1581150626 .color-AA5{color:#F7F8FE;} .d2-1581150626 .color-AB4{color:#EDF0FD;} - .d2-1581150626 .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}]]>rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-1581150626 .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}]]>rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud diff --git a/e2etests/testdata/stable/all_shapes/elk/sketch.exp.svg b/e2etests/testdata/stable/all_shapes/elk/sketch.exp.svg index 11f141965..2541f537f 100644 --- a/e2etests/testdata/stable/all_shapes/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/all_shapes/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-3736938434 .fill-N1{fill:#0A0F25;} - .d2-3736938434 .fill-N2{fill:#676C7E;} - .d2-3736938434 .fill-N3{fill:#9499AB;} - .d2-3736938434 .fill-N4{fill:#CFD2DD;} - .d2-3736938434 .fill-N5{fill:#DEE1EB;} - .d2-3736938434 .fill-N6{fill:#EEF1F8;} - .d2-3736938434 .fill-N7{fill:#FFFFFF;} - .d2-3736938434 .fill-B1{fill:#0D32B2;} - .d2-3736938434 .fill-B2{fill:#0D32B2;} - .d2-3736938434 .fill-B3{fill:#E3E9FD;} - .d2-3736938434 .fill-B4{fill:#E3E9FD;} - .d2-3736938434 .fill-B5{fill:#EDF0FD;} - .d2-3736938434 .fill-B6{fill:#F7F8FE;} - .d2-3736938434 .fill-AA2{fill:#4A6FF3;} - .d2-3736938434 .fill-AA4{fill:#EDF0FD;} - .d2-3736938434 .fill-AA5{fill:#F7F8FE;} - .d2-3736938434 .fill-AB4{fill:#EDF0FD;} - .d2-3736938434 .fill-AB5{fill:#F7F8FE;} - .d2-3736938434 .stroke-N1{stroke:#0A0F25;} - .d2-3736938434 .stroke-N2{stroke:#676C7E;} - .d2-3736938434 .stroke-N3{stroke:#9499AB;} - .d2-3736938434 .stroke-N4{stroke:#CFD2DD;} - .d2-3736938434 .stroke-N5{stroke:#DEE1EB;} - .d2-3736938434 .stroke-N6{stroke:#EEF1F8;} - .d2-3736938434 .stroke-N7{stroke:#FFFFFF;} - .d2-3736938434 .stroke-B1{stroke:#0D32B2;} - .d2-3736938434 .stroke-B2{stroke:#0D32B2;} - .d2-3736938434 .stroke-B3{stroke:#E3E9FD;} - .d2-3736938434 .stroke-B4{stroke:#E3E9FD;} - .d2-3736938434 .stroke-B5{stroke:#EDF0FD;} - .d2-3736938434 .stroke-B6{stroke:#F7F8FE;} - .d2-3736938434 .stroke-AA2{stroke:#4A6FF3;} - .d2-3736938434 .stroke-AA4{stroke:#EDF0FD;} - .d2-3736938434 .stroke-AA5{stroke:#F7F8FE;} - .d2-3736938434 .stroke-AB4{stroke:#EDF0FD;} - .d2-3736938434 .stroke-AB5{stroke:#F7F8FE;} - .d2-3736938434 .background-color-N1{background-color:#0A0F25;} - .d2-3736938434 .background-color-N2{background-color:#676C7E;} - .d2-3736938434 .background-color-N3{background-color:#9499AB;} - .d2-3736938434 .background-color-N4{background-color:#CFD2DD;} - .d2-3736938434 .background-color-N5{background-color:#DEE1EB;} - .d2-3736938434 .background-color-N6{background-color:#EEF1F8;} - .d2-3736938434 .background-color-N7{background-color:#FFFFFF;} - .d2-3736938434 .background-color-B1{background-color:#0D32B2;} - .d2-3736938434 .background-color-B2{background-color:#0D32B2;} - .d2-3736938434 .background-color-B3{background-color:#E3E9FD;} - .d2-3736938434 .background-color-B4{background-color:#E3E9FD;} - .d2-3736938434 .background-color-B5{background-color:#EDF0FD;} - .d2-3736938434 .background-color-B6{background-color:#F7F8FE;} - .d2-3736938434 .background-color-AA2{background-color:#4A6FF3;} - .d2-3736938434 .background-color-AA4{background-color:#EDF0FD;} - .d2-3736938434 .background-color-AA5{background-color:#F7F8FE;} - .d2-3736938434 .background-color-AB4{background-color:#EDF0FD;} - .d2-3736938434 .background-color-AB5{background-color:#F7F8FE;} - .d2-3736938434 .color-N1{color:#0A0F25;} - .d2-3736938434 .color-N2{color:#676C7E;} - .d2-3736938434 .color-N3{color:#9499AB;} - .d2-3736938434 .color-N4{color:#CFD2DD;} - .d2-3736938434 .color-N5{color:#DEE1EB;} - .d2-3736938434 .color-N6{color:#EEF1F8;} - .d2-3736938434 .color-N7{color:#FFFFFF;} - .d2-3736938434 .color-B1{color:#0D32B2;} - .d2-3736938434 .color-B2{color:#0D32B2;} - .d2-3736938434 .color-B3{color:#E3E9FD;} - .d2-3736938434 .color-B4{color:#E3E9FD;} - .d2-3736938434 .color-B5{color:#EDF0FD;} - .d2-3736938434 .color-B6{color:#F7F8FE;} - .d2-3736938434 .color-AA2{color:#4A6FF3;} - .d2-3736938434 .color-AA4{color:#EDF0FD;} - .d2-3736938434 .color-AA5{color:#F7F8FE;} - .d2-3736938434 .color-AB4{color:#EDF0FD;} - .d2-3736938434 .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}]]>rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud -======= .d2-359842428 .fill-N1{fill:#0A0F25;} .d2-359842428 .fill-N2{fill:#676C7E;} .d2-359842428 .fill-N3{fill:#9499AB;} @@ -252,8 +89,7 @@ .d2-359842428 .color-AA4{color:#EDF0FD;} .d2-359842428 .color-AA5{color:#F7F8FE;} .d2-359842428 .color-AB4{color:#EDF0FD;} - .d2-359842428 .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}]]>rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-359842428 .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}]]>rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud diff --git a/e2etests/testdata/stable/all_shapes_link/dagre/sketch.exp.svg b/e2etests/testdata/stable/all_shapes_link/dagre/sketch.exp.svg index 12e7102ba..00f88f8c9 100644 --- a/e2etests/testdata/stable/all_shapes_link/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/all_shapes_link/dagre/sketch.exp.svg @@ -1,60 +1,20 @@ -<<<<<<< HEAD -<<<<<<< HEAD -linkedtooltippedbothrectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloudrectangleexamplesquareexamplepageexampleparallelogramexampledocumentexamplecylinderexamplequeueexamplepackageexamplestepexamplecalloutexamplestored_dataexamplepersonexamplediamondexampleovalexamplecircleexamplehexagonexamplecloudexamplerectangleexamplesquareexamplepageexampleparallelogramexampledocumentexamplecylinderexamplequeueexamplepackageexamplestepexamplecalloutexamplestored_dataexamplepersonexamplediamondexampleovalexamplecircleexamplehexagonexamplecloudexample example -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-502624918 .fill-N1{fill:#0A0F25;} - .d2-502624918 .fill-N2{fill:#676C7E;} - .d2-502624918 .fill-N3{fill:#9499AB;} - .d2-502624918 .fill-N4{fill:#CFD2DD;} - .d2-502624918 .fill-N5{fill:#DEE1EB;} - .d2-502624918 .fill-N6{fill:#EEF1F8;} - .d2-502624918 .fill-N7{fill:#FFFFFF;} - .d2-502624918 .fill-B1{fill:#0D32B2;} - .d2-502624918 .fill-B2{fill:#0D32B2;} - .d2-502624918 .fill-B3{fill:#E3E9FD;} - .d2-502624918 .fill-B4{fill:#E3E9FD;} - .d2-502624918 .fill-B5{fill:#EDF0FD;} - .d2-502624918 .fill-B6{fill:#F7F8FE;} - .d2-502624918 .fill-AA2{fill:#4A6FF3;} - .d2-502624918 .fill-AA4{fill:#EDF0FD;} - .d2-502624918 .fill-AA5{fill:#F7F8FE;} - .d2-502624918 .fill-AB4{fill:#EDF0FD;} - .d2-502624918 .fill-AB5{fill:#F7F8FE;} - .d2-502624918 .stroke-N1{stroke:#0A0F25;} - .d2-502624918 .stroke-N2{stroke:#676C7E;} - .d2-502624918 .stroke-N3{stroke:#9499AB;} - .d2-502624918 .stroke-N4{stroke:#CFD2DD;} - .d2-502624918 .stroke-N5{stroke:#DEE1EB;} - .d2-502624918 .stroke-N6{stroke:#EEF1F8;} - .d2-502624918 .stroke-N7{stroke:#FFFFFF;} - .d2-502624918 .stroke-B1{stroke:#0D32B2;} - .d2-502624918 .stroke-B2{stroke:#0D32B2;} - .d2-502624918 .stroke-B3{stroke:#E3E9FD;} - .d2-502624918 .stroke-B4{stroke:#E3E9FD;} - .d2-502624918 .stroke-B5{stroke:#EDF0FD;} - .d2-502624918 .stroke-B6{stroke:#F7F8FE;} - .d2-502624918 .stroke-AA2{stroke:#4A6FF3;} - .d2-502624918 .stroke-AA4{stroke:#EDF0FD;} - .d2-502624918 .stroke-AA5{stroke:#F7F8FE;} - .d2-502624918 .stroke-AB4{stroke:#EDF0FD;} - .d2-502624918 .stroke-AB5{stroke:#F7F8FE;} - .d2-502624918 .background-color-N1{background-color:#0A0F25;} - .d2-502624918 .background-color-N2{background-color:#676C7E;} - .d2-502624918 .background-color-N3{background-color:#9499AB;} - .d2-502624918 .background-color-N4{background-color:#CFD2DD;} - .d2-502624918 .background-color-N5{background-color:#DEE1EB;} - .d2-502624918 .background-color-N6{background-color:#EEF1F8;} - .d2-502624918 .background-color-N7{background-color:#FFFFFF;} - .d2-502624918 .background-color-B1{background-color:#0D32B2;} - .d2-502624918 .background-color-B2{background-color:#0D32B2;} - .d2-502624918 .background-color-B3{background-color:#E3E9FD;} - .d2-502624918 .background-color-B4{background-color:#E3E9FD;} - .d2-502624918 .background-color-B5{background-color:#EDF0FD;} - .d2-502624918 .background-color-B6{background-color:#F7F8FE;} - .d2-502624918 .background-color-AA2{background-color:#4A6FF3;} - .d2-502624918 .background-color-AA4{background-color:#EDF0FD;} - .d2-502624918 .background-color-AA5{background-color:#F7F8FE;} - .d2-502624918 .background-color-AB4{background-color:#EDF0FD;} - .d2-502624918 .background-color-AB5{background-color:#F7F8FE;} - .d2-502624918 .color-N1{color:#0A0F25;} - .d2-502624918 .color-N2{color:#676C7E;} - .d2-502624918 .color-N3{color:#9499AB;} - .d2-502624918 .color-N4{color:#CFD2DD;} - .d2-502624918 .color-N5{color:#DEE1EB;} - .d2-502624918 .color-N6{color:#EEF1F8;} - .d2-502624918 .color-N7{color:#FFFFFF;} - .d2-502624918 .color-B1{color:#0D32B2;} - .d2-502624918 .color-B2{color:#0D32B2;} - .d2-502624918 .color-B3{color:#E3E9FD;} - .d2-502624918 .color-B4{color:#E3E9FD;} - .d2-502624918 .color-B5{color:#EDF0FD;} - .d2-502624918 .color-B6{color:#F7F8FE;} - .d2-502624918 .color-AA2{color:#4A6FF3;} - .d2-502624918 .color-AA4{color:#EDF0FD;} - .d2-502624918 .color-AA5{color:#F7F8FE;} - .d2-502624918 .color-AB4{color:#EDF0FD;} - .d2-502624918 .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}]]>linkedtooltippedbothrectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloudrectangleexamplesquareexamplepageexampleparallelogramexampledocumentexamplecylinderexamplequeueexamplepackageexamplestepexamplecalloutexamplestored_dataexamplepersonexamplediamondexampleovalexamplecircleexamplehexagonexamplecloudexamplerectangleexamplesquareexamplepageexampleparallelogramexampledocumentexamplecylinderexamplequeueexamplepackageexamplestepexamplecalloutexamplestored_dataexamplepersonexamplediamondexampleovalexamplecircleexamplehexagonexamplecloudexample - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -example -======= - .d2-1358474140 .fill-N1{fill:#0A0F25;} - .d2-1358474140 .fill-N2{fill:#676C7E;} - .d2-1358474140 .fill-N3{fill:#9499AB;} - .d2-1358474140 .fill-N4{fill:#CFD2DD;} - .d2-1358474140 .fill-N5{fill:#DEE1EB;} - .d2-1358474140 .fill-N6{fill:#EEF1F8;} - .d2-1358474140 .fill-N7{fill:#FFFFFF;} - .d2-1358474140 .fill-B1{fill:#0D32B2;} - .d2-1358474140 .fill-B2{fill:#0D32B2;} - .d2-1358474140 .fill-B3{fill:#E3E9FD;} - .d2-1358474140 .fill-B4{fill:#E3E9FD;} - .d2-1358474140 .fill-B5{fill:#EDF0FD;} - .d2-1358474140 .fill-B6{fill:#F7F8FE;} - .d2-1358474140 .fill-AA2{fill:#4A6FF3;} - .d2-1358474140 .fill-AA4{fill:#EDF0FD;} - .d2-1358474140 .fill-AA5{fill:#F7F8FE;} - .d2-1358474140 .fill-AB4{fill:#EDF0FD;} - .d2-1358474140 .fill-AB5{fill:#F7F8FE;} - .d2-1358474140 .stroke-N1{stroke:#0A0F25;} - .d2-1358474140 .stroke-N2{stroke:#676C7E;} - .d2-1358474140 .stroke-N3{stroke:#9499AB;} - .d2-1358474140 .stroke-N4{stroke:#CFD2DD;} - .d2-1358474140 .stroke-N5{stroke:#DEE1EB;} - .d2-1358474140 .stroke-N6{stroke:#EEF1F8;} - .d2-1358474140 .stroke-N7{stroke:#FFFFFF;} - .d2-1358474140 .stroke-B1{stroke:#0D32B2;} - .d2-1358474140 .stroke-B2{stroke:#0D32B2;} - .d2-1358474140 .stroke-B3{stroke:#E3E9FD;} - .d2-1358474140 .stroke-B4{stroke:#E3E9FD;} - .d2-1358474140 .stroke-B5{stroke:#EDF0FD;} - .d2-1358474140 .stroke-B6{stroke:#F7F8FE;} - .d2-1358474140 .stroke-AA2{stroke:#4A6FF3;} - .d2-1358474140 .stroke-AA4{stroke:#EDF0FD;} - .d2-1358474140 .stroke-AA5{stroke:#F7F8FE;} - .d2-1358474140 .stroke-AB4{stroke:#EDF0FD;} - .d2-1358474140 .stroke-AB5{stroke:#F7F8FE;} - .d2-1358474140 .background-color-N1{background-color:#0A0F25;} - .d2-1358474140 .background-color-N2{background-color:#676C7E;} - .d2-1358474140 .background-color-N3{background-color:#9499AB;} - .d2-1358474140 .background-color-N4{background-color:#CFD2DD;} - .d2-1358474140 .background-color-N5{background-color:#DEE1EB;} - .d2-1358474140 .background-color-N6{background-color:#EEF1F8;} - .d2-1358474140 .background-color-N7{background-color:#FFFFFF;} - .d2-1358474140 .background-color-B1{background-color:#0D32B2;} - .d2-1358474140 .background-color-B2{background-color:#0D32B2;} - .d2-1358474140 .background-color-B3{background-color:#E3E9FD;} - .d2-1358474140 .background-color-B4{background-color:#E3E9FD;} - .d2-1358474140 .background-color-B5{background-color:#EDF0FD;} - .d2-1358474140 .background-color-B6{background-color:#F7F8FE;} - .d2-1358474140 .background-color-AA2{background-color:#4A6FF3;} - .d2-1358474140 .background-color-AA4{background-color:#EDF0FD;} - .d2-1358474140 .background-color-AA5{background-color:#F7F8FE;} - .d2-1358474140 .background-color-AB4{background-color:#EDF0FD;} - .d2-1358474140 .background-color-AB5{background-color:#F7F8FE;} - .d2-1358474140 .color-N1{color:#0A0F25;} - .d2-1358474140 .color-N2{color:#676C7E;} - .d2-1358474140 .color-N3{color:#9499AB;} - .d2-1358474140 .color-N4{color:#CFD2DD;} - .d2-1358474140 .color-N5{color:#DEE1EB;} - .d2-1358474140 .color-N6{color:#EEF1F8;} - .d2-1358474140 .color-N7{color:#FFFFFF;} - .d2-1358474140 .color-B1{color:#0D32B2;} - .d2-1358474140 .color-B2{color:#0D32B2;} - .d2-1358474140 .color-B3{color:#E3E9FD;} - .d2-1358474140 .color-B4{color:#E3E9FD;} - .d2-1358474140 .color-B5{color:#EDF0FD;} - .d2-1358474140 .color-B6{color:#F7F8FE;} - .d2-1358474140 .color-AA2{color:#4A6FF3;} - .d2-1358474140 .color-AA4{color:#EDF0FD;} - .d2-1358474140 .color-AA5{color:#F7F8FE;} - .d2-1358474140 .color-AB4{color:#EDF0FD;} - .d2-1358474140 .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}]]>linkedtooltippedbothrectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloudrectangleexamplesquareexamplepageexampleparallelogramexampledocumentexamplecylinderexamplequeueexamplepackageexamplestepexamplecalloutexamplestored_dataexamplepersonexamplediamondexampleovalexamplecircleexamplehexagonexamplecloudexamplerectangleexamplesquareexamplepageexampleparallelogramexampledocumentexamplecylinderexamplequeueexamplepackageexamplestepexamplecalloutexamplestored_dataexamplepersonexamplediamondexampleovalexamplecircleexamplehexagonexamplecloudexample - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -example ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-3641809301 .fill-N1{fill:#0A0F25;} + .d2-3641809301 .fill-N2{fill:#676C7E;} + .d2-3641809301 .fill-N3{fill:#9499AB;} + .d2-3641809301 .fill-N4{fill:#CFD2DD;} + .d2-3641809301 .fill-N5{fill:#DEE1EB;} + .d2-3641809301 .fill-N6{fill:#EEF1F8;} + .d2-3641809301 .fill-N7{fill:#FFFFFF;} + .d2-3641809301 .fill-B1{fill:#0D32B2;} + .d2-3641809301 .fill-B2{fill:#0D32B2;} + .d2-3641809301 .fill-B3{fill:#E3E9FD;} + .d2-3641809301 .fill-B4{fill:#E3E9FD;} + .d2-3641809301 .fill-B5{fill:#EDF0FD;} + .d2-3641809301 .fill-B6{fill:#F7F8FE;} + .d2-3641809301 .fill-AA2{fill:#4A6FF3;} + .d2-3641809301 .fill-AA4{fill:#EDF0FD;} + .d2-3641809301 .fill-AA5{fill:#F7F8FE;} + .d2-3641809301 .fill-AB4{fill:#EDF0FD;} + .d2-3641809301 .fill-AB5{fill:#F7F8FE;} + .d2-3641809301 .stroke-N1{stroke:#0A0F25;} + .d2-3641809301 .stroke-N2{stroke:#676C7E;} + .d2-3641809301 .stroke-N3{stroke:#9499AB;} + .d2-3641809301 .stroke-N4{stroke:#CFD2DD;} + .d2-3641809301 .stroke-N5{stroke:#DEE1EB;} + .d2-3641809301 .stroke-N6{stroke:#EEF1F8;} + .d2-3641809301 .stroke-N7{stroke:#FFFFFF;} + .d2-3641809301 .stroke-B1{stroke:#0D32B2;} + .d2-3641809301 .stroke-B2{stroke:#0D32B2;} + .d2-3641809301 .stroke-B3{stroke:#E3E9FD;} + .d2-3641809301 .stroke-B4{stroke:#E3E9FD;} + .d2-3641809301 .stroke-B5{stroke:#EDF0FD;} + .d2-3641809301 .stroke-B6{stroke:#F7F8FE;} + .d2-3641809301 .stroke-AA2{stroke:#4A6FF3;} + .d2-3641809301 .stroke-AA4{stroke:#EDF0FD;} + .d2-3641809301 .stroke-AA5{stroke:#F7F8FE;} + .d2-3641809301 .stroke-AB4{stroke:#EDF0FD;} + .d2-3641809301 .stroke-AB5{stroke:#F7F8FE;} + .d2-3641809301 .background-color-N1{background-color:#0A0F25;} + .d2-3641809301 .background-color-N2{background-color:#676C7E;} + .d2-3641809301 .background-color-N3{background-color:#9499AB;} + .d2-3641809301 .background-color-N4{background-color:#CFD2DD;} + .d2-3641809301 .background-color-N5{background-color:#DEE1EB;} + .d2-3641809301 .background-color-N6{background-color:#EEF1F8;} + .d2-3641809301 .background-color-N7{background-color:#FFFFFF;} + .d2-3641809301 .background-color-B1{background-color:#0D32B2;} + .d2-3641809301 .background-color-B2{background-color:#0D32B2;} + .d2-3641809301 .background-color-B3{background-color:#E3E9FD;} + .d2-3641809301 .background-color-B4{background-color:#E3E9FD;} + .d2-3641809301 .background-color-B5{background-color:#EDF0FD;} + .d2-3641809301 .background-color-B6{background-color:#F7F8FE;} + .d2-3641809301 .background-color-AA2{background-color:#4A6FF3;} + .d2-3641809301 .background-color-AA4{background-color:#EDF0FD;} + .d2-3641809301 .background-color-AA5{background-color:#F7F8FE;} + .d2-3641809301 .background-color-AB4{background-color:#EDF0FD;} + .d2-3641809301 .background-color-AB5{background-color:#F7F8FE;} + .d2-3641809301 .color-N1{color:#0A0F25;} + .d2-3641809301 .color-N2{color:#676C7E;} + .d2-3641809301 .color-N3{color:#9499AB;} + .d2-3641809301 .color-N4{color:#CFD2DD;} + .d2-3641809301 .color-N5{color:#DEE1EB;} + .d2-3641809301 .color-N6{color:#EEF1F8;} + .d2-3641809301 .color-N7{color:#FFFFFF;} + .d2-3641809301 .color-B1{color:#0D32B2;} + .d2-3641809301 .color-B2{color:#0D32B2;} + .d2-3641809301 .color-B3{color:#E3E9FD;} + .d2-3641809301 .color-B4{color:#E3E9FD;} + .d2-3641809301 .color-B5{color:#EDF0FD;} + .d2-3641809301 .color-B6{color:#F7F8FE;} + .d2-3641809301 .color-AA2{color:#4A6FF3;} + .d2-3641809301 .color-AA4{color:#EDF0FD;} + .d2-3641809301 .color-AA5{color:#F7F8FE;} + .d2-3641809301 .color-AB4{color:#EDF0FD;} + .d2-3641809301 .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}]]>linkedtooltippedbothrectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloudrectangleexamplesquareexamplepageexampleparallelogramexampledocumentexamplecylinderexamplequeueexamplepackageexamplestepexamplecalloutexamplestored_dataexamplepersonexamplediamondexampleovalexamplecircleexamplehexagonexamplecloudexamplerectangleexamplesquareexamplepageexampleparallelogramexampledocumentexamplecylinderexamplequeueexamplepackageexamplestepexamplecalloutexamplestored_dataexamplepersonexamplediamondexampleovalexamplecircleexamplehexagonexamplecloudexample example @@ -1137,8 +541,7 @@ -<<<<<<< HEAD - + @@ -1194,143 +597,4 @@ -||||||| parent of 33280fed5 (fixed e2e tests) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -======= - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ->>>>>>> 33280fed5 (fixed e2e tests) \ No newline at end of file diff --git a/e2etests/testdata/stable/all_shapes_link/elk/sketch.exp.svg b/e2etests/testdata/stable/all_shapes_link/elk/sketch.exp.svg index 3252a96c9..e5ca6e654 100644 --- a/e2etests/testdata/stable/all_shapes_link/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/all_shapes_link/elk/sketch.exp.svg @@ -1,60 +1,20 @@ -<<<<<<< HEAD -<<<<<<< HEAD -linkedtooltippedbothrectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloudrectangleexamplesquareexamplepageexampleparallelogramexampledocumentexamplecylinderexamplequeueexamplepackageexamplestepexamplecalloutexamplestored_dataexamplepersonexamplediamondexampleovalexamplecircleexamplehexagonexamplecloudexamplerectangleexamplesquareexamplepageexampleparallelogramexampledocumentexamplecylinderexamplequeueexamplepackageexamplestepexamplecalloutexamplestored_dataexamplepersonexamplediamondexampleovalexamplecircleexamplehexagonexamplecloudexample example -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-1967301925 .fill-N1{fill:#0A0F25;} - .d2-1967301925 .fill-N2{fill:#676C7E;} - .d2-1967301925 .fill-N3{fill:#9499AB;} - .d2-1967301925 .fill-N4{fill:#CFD2DD;} - .d2-1967301925 .fill-N5{fill:#DEE1EB;} - .d2-1967301925 .fill-N6{fill:#EEF1F8;} - .d2-1967301925 .fill-N7{fill:#FFFFFF;} - .d2-1967301925 .fill-B1{fill:#0D32B2;} - .d2-1967301925 .fill-B2{fill:#0D32B2;} - .d2-1967301925 .fill-B3{fill:#E3E9FD;} - .d2-1967301925 .fill-B4{fill:#E3E9FD;} - .d2-1967301925 .fill-B5{fill:#EDF0FD;} - .d2-1967301925 .fill-B6{fill:#F7F8FE;} - .d2-1967301925 .fill-AA2{fill:#4A6FF3;} - .d2-1967301925 .fill-AA4{fill:#EDF0FD;} - .d2-1967301925 .fill-AA5{fill:#F7F8FE;} - .d2-1967301925 .fill-AB4{fill:#EDF0FD;} - .d2-1967301925 .fill-AB5{fill:#F7F8FE;} - .d2-1967301925 .stroke-N1{stroke:#0A0F25;} - .d2-1967301925 .stroke-N2{stroke:#676C7E;} - .d2-1967301925 .stroke-N3{stroke:#9499AB;} - .d2-1967301925 .stroke-N4{stroke:#CFD2DD;} - .d2-1967301925 .stroke-N5{stroke:#DEE1EB;} - .d2-1967301925 .stroke-N6{stroke:#EEF1F8;} - .d2-1967301925 .stroke-N7{stroke:#FFFFFF;} - .d2-1967301925 .stroke-B1{stroke:#0D32B2;} - .d2-1967301925 .stroke-B2{stroke:#0D32B2;} - .d2-1967301925 .stroke-B3{stroke:#E3E9FD;} - .d2-1967301925 .stroke-B4{stroke:#E3E9FD;} - .d2-1967301925 .stroke-B5{stroke:#EDF0FD;} - .d2-1967301925 .stroke-B6{stroke:#F7F8FE;} - .d2-1967301925 .stroke-AA2{stroke:#4A6FF3;} - .d2-1967301925 .stroke-AA4{stroke:#EDF0FD;} - .d2-1967301925 .stroke-AA5{stroke:#F7F8FE;} - .d2-1967301925 .stroke-AB4{stroke:#EDF0FD;} - .d2-1967301925 .stroke-AB5{stroke:#F7F8FE;} - .d2-1967301925 .background-color-N1{background-color:#0A0F25;} - .d2-1967301925 .background-color-N2{background-color:#676C7E;} - .d2-1967301925 .background-color-N3{background-color:#9499AB;} - .d2-1967301925 .background-color-N4{background-color:#CFD2DD;} - .d2-1967301925 .background-color-N5{background-color:#DEE1EB;} - .d2-1967301925 .background-color-N6{background-color:#EEF1F8;} - .d2-1967301925 .background-color-N7{background-color:#FFFFFF;} - .d2-1967301925 .background-color-B1{background-color:#0D32B2;} - .d2-1967301925 .background-color-B2{background-color:#0D32B2;} - .d2-1967301925 .background-color-B3{background-color:#E3E9FD;} - .d2-1967301925 .background-color-B4{background-color:#E3E9FD;} - .d2-1967301925 .background-color-B5{background-color:#EDF0FD;} - .d2-1967301925 .background-color-B6{background-color:#F7F8FE;} - .d2-1967301925 .background-color-AA2{background-color:#4A6FF3;} - .d2-1967301925 .background-color-AA4{background-color:#EDF0FD;} - .d2-1967301925 .background-color-AA5{background-color:#F7F8FE;} - .d2-1967301925 .background-color-AB4{background-color:#EDF0FD;} - .d2-1967301925 .background-color-AB5{background-color:#F7F8FE;} - .d2-1967301925 .color-N1{color:#0A0F25;} - .d2-1967301925 .color-N2{color:#676C7E;} - .d2-1967301925 .color-N3{color:#9499AB;} - .d2-1967301925 .color-N4{color:#CFD2DD;} - .d2-1967301925 .color-N5{color:#DEE1EB;} - .d2-1967301925 .color-N6{color:#EEF1F8;} - .d2-1967301925 .color-N7{color:#FFFFFF;} - .d2-1967301925 .color-B1{color:#0D32B2;} - .d2-1967301925 .color-B2{color:#0D32B2;} - .d2-1967301925 .color-B3{color:#E3E9FD;} - .d2-1967301925 .color-B4{color:#E3E9FD;} - .d2-1967301925 .color-B5{color:#EDF0FD;} - .d2-1967301925 .color-B6{color:#F7F8FE;} - .d2-1967301925 .color-AA2{color:#4A6FF3;} - .d2-1967301925 .color-AA4{color:#EDF0FD;} - .d2-1967301925 .color-AA5{color:#F7F8FE;} - .d2-1967301925 .color-AB4{color:#EDF0FD;} - .d2-1967301925 .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}]]>linkedtooltippedbothrectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloudrectangleexamplesquareexamplepageexampleparallelogramexampledocumentexamplecylinderexamplequeueexamplepackageexamplestepexamplecalloutexamplestored_dataexamplepersonexamplediamondexampleovalexamplecircleexamplehexagonexamplecloudexamplerectangleexamplesquareexamplepageexampleparallelogramexampledocumentexamplecylinderexamplequeueexamplepackageexamplestepexamplecalloutexamplestored_dataexamplepersonexamplediamondexampleovalexamplecircleexamplehexagonexamplecloudexample - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -example -======= - .d2-773868799 .fill-N1{fill:#0A0F25;} - .d2-773868799 .fill-N2{fill:#676C7E;} - .d2-773868799 .fill-N3{fill:#9499AB;} - .d2-773868799 .fill-N4{fill:#CFD2DD;} - .d2-773868799 .fill-N5{fill:#DEE1EB;} - .d2-773868799 .fill-N6{fill:#EEF1F8;} - .d2-773868799 .fill-N7{fill:#FFFFFF;} - .d2-773868799 .fill-B1{fill:#0D32B2;} - .d2-773868799 .fill-B2{fill:#0D32B2;} - .d2-773868799 .fill-B3{fill:#E3E9FD;} - .d2-773868799 .fill-B4{fill:#E3E9FD;} - .d2-773868799 .fill-B5{fill:#EDF0FD;} - .d2-773868799 .fill-B6{fill:#F7F8FE;} - .d2-773868799 .fill-AA2{fill:#4A6FF3;} - .d2-773868799 .fill-AA4{fill:#EDF0FD;} - .d2-773868799 .fill-AA5{fill:#F7F8FE;} - .d2-773868799 .fill-AB4{fill:#EDF0FD;} - .d2-773868799 .fill-AB5{fill:#F7F8FE;} - .d2-773868799 .stroke-N1{stroke:#0A0F25;} - .d2-773868799 .stroke-N2{stroke:#676C7E;} - .d2-773868799 .stroke-N3{stroke:#9499AB;} - .d2-773868799 .stroke-N4{stroke:#CFD2DD;} - .d2-773868799 .stroke-N5{stroke:#DEE1EB;} - .d2-773868799 .stroke-N6{stroke:#EEF1F8;} - .d2-773868799 .stroke-N7{stroke:#FFFFFF;} - .d2-773868799 .stroke-B1{stroke:#0D32B2;} - .d2-773868799 .stroke-B2{stroke:#0D32B2;} - .d2-773868799 .stroke-B3{stroke:#E3E9FD;} - .d2-773868799 .stroke-B4{stroke:#E3E9FD;} - .d2-773868799 .stroke-B5{stroke:#EDF0FD;} - .d2-773868799 .stroke-B6{stroke:#F7F8FE;} - .d2-773868799 .stroke-AA2{stroke:#4A6FF3;} - .d2-773868799 .stroke-AA4{stroke:#EDF0FD;} - .d2-773868799 .stroke-AA5{stroke:#F7F8FE;} - .d2-773868799 .stroke-AB4{stroke:#EDF0FD;} - .d2-773868799 .stroke-AB5{stroke:#F7F8FE;} - .d2-773868799 .background-color-N1{background-color:#0A0F25;} - .d2-773868799 .background-color-N2{background-color:#676C7E;} - .d2-773868799 .background-color-N3{background-color:#9499AB;} - .d2-773868799 .background-color-N4{background-color:#CFD2DD;} - .d2-773868799 .background-color-N5{background-color:#DEE1EB;} - .d2-773868799 .background-color-N6{background-color:#EEF1F8;} - .d2-773868799 .background-color-N7{background-color:#FFFFFF;} - .d2-773868799 .background-color-B1{background-color:#0D32B2;} - .d2-773868799 .background-color-B2{background-color:#0D32B2;} - .d2-773868799 .background-color-B3{background-color:#E3E9FD;} - .d2-773868799 .background-color-B4{background-color:#E3E9FD;} - .d2-773868799 .background-color-B5{background-color:#EDF0FD;} - .d2-773868799 .background-color-B6{background-color:#F7F8FE;} - .d2-773868799 .background-color-AA2{background-color:#4A6FF3;} - .d2-773868799 .background-color-AA4{background-color:#EDF0FD;} - .d2-773868799 .background-color-AA5{background-color:#F7F8FE;} - .d2-773868799 .background-color-AB4{background-color:#EDF0FD;} - .d2-773868799 .background-color-AB5{background-color:#F7F8FE;} - .d2-773868799 .color-N1{color:#0A0F25;} - .d2-773868799 .color-N2{color:#676C7E;} - .d2-773868799 .color-N3{color:#9499AB;} - .d2-773868799 .color-N4{color:#CFD2DD;} - .d2-773868799 .color-N5{color:#DEE1EB;} - .d2-773868799 .color-N6{color:#EEF1F8;} - .d2-773868799 .color-N7{color:#FFFFFF;} - .d2-773868799 .color-B1{color:#0D32B2;} - .d2-773868799 .color-B2{color:#0D32B2;} - .d2-773868799 .color-B3{color:#E3E9FD;} - .d2-773868799 .color-B4{color:#E3E9FD;} - .d2-773868799 .color-B5{color:#EDF0FD;} - .d2-773868799 .color-B6{color:#F7F8FE;} - .d2-773868799 .color-AA2{color:#4A6FF3;} - .d2-773868799 .color-AA4{color:#EDF0FD;} - .d2-773868799 .color-AA5{color:#F7F8FE;} - .d2-773868799 .color-AB4{color:#EDF0FD;} - .d2-773868799 .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}]]>linkedtooltippedbothrectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloudrectangleexamplesquareexamplepageexampleparallelogramexampledocumentexamplecylinderexamplequeueexamplepackageexamplestepexamplecalloutexamplestored_dataexamplepersonexamplediamondexampleovalexamplecircleexamplehexagonexamplecloudexamplerectangleexamplesquareexamplepageexampleparallelogramexampledocumentexamplecylinderexamplequeueexamplepackageexamplestepexamplecalloutexamplestored_dataexamplepersonexamplediamondexampleovalexamplecircleexamplehexagonexamplecloudexample - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -example ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-3350207851 .fill-N1{fill:#0A0F25;} + .d2-3350207851 .fill-N2{fill:#676C7E;} + .d2-3350207851 .fill-N3{fill:#9499AB;} + .d2-3350207851 .fill-N4{fill:#CFD2DD;} + .d2-3350207851 .fill-N5{fill:#DEE1EB;} + .d2-3350207851 .fill-N6{fill:#EEF1F8;} + .d2-3350207851 .fill-N7{fill:#FFFFFF;} + .d2-3350207851 .fill-B1{fill:#0D32B2;} + .d2-3350207851 .fill-B2{fill:#0D32B2;} + .d2-3350207851 .fill-B3{fill:#E3E9FD;} + .d2-3350207851 .fill-B4{fill:#E3E9FD;} + .d2-3350207851 .fill-B5{fill:#EDF0FD;} + .d2-3350207851 .fill-B6{fill:#F7F8FE;} + .d2-3350207851 .fill-AA2{fill:#4A6FF3;} + .d2-3350207851 .fill-AA4{fill:#EDF0FD;} + .d2-3350207851 .fill-AA5{fill:#F7F8FE;} + .d2-3350207851 .fill-AB4{fill:#EDF0FD;} + .d2-3350207851 .fill-AB5{fill:#F7F8FE;} + .d2-3350207851 .stroke-N1{stroke:#0A0F25;} + .d2-3350207851 .stroke-N2{stroke:#676C7E;} + .d2-3350207851 .stroke-N3{stroke:#9499AB;} + .d2-3350207851 .stroke-N4{stroke:#CFD2DD;} + .d2-3350207851 .stroke-N5{stroke:#DEE1EB;} + .d2-3350207851 .stroke-N6{stroke:#EEF1F8;} + .d2-3350207851 .stroke-N7{stroke:#FFFFFF;} + .d2-3350207851 .stroke-B1{stroke:#0D32B2;} + .d2-3350207851 .stroke-B2{stroke:#0D32B2;} + .d2-3350207851 .stroke-B3{stroke:#E3E9FD;} + .d2-3350207851 .stroke-B4{stroke:#E3E9FD;} + .d2-3350207851 .stroke-B5{stroke:#EDF0FD;} + .d2-3350207851 .stroke-B6{stroke:#F7F8FE;} + .d2-3350207851 .stroke-AA2{stroke:#4A6FF3;} + .d2-3350207851 .stroke-AA4{stroke:#EDF0FD;} + .d2-3350207851 .stroke-AA5{stroke:#F7F8FE;} + .d2-3350207851 .stroke-AB4{stroke:#EDF0FD;} + .d2-3350207851 .stroke-AB5{stroke:#F7F8FE;} + .d2-3350207851 .background-color-N1{background-color:#0A0F25;} + .d2-3350207851 .background-color-N2{background-color:#676C7E;} + .d2-3350207851 .background-color-N3{background-color:#9499AB;} + .d2-3350207851 .background-color-N4{background-color:#CFD2DD;} + .d2-3350207851 .background-color-N5{background-color:#DEE1EB;} + .d2-3350207851 .background-color-N6{background-color:#EEF1F8;} + .d2-3350207851 .background-color-N7{background-color:#FFFFFF;} + .d2-3350207851 .background-color-B1{background-color:#0D32B2;} + .d2-3350207851 .background-color-B2{background-color:#0D32B2;} + .d2-3350207851 .background-color-B3{background-color:#E3E9FD;} + .d2-3350207851 .background-color-B4{background-color:#E3E9FD;} + .d2-3350207851 .background-color-B5{background-color:#EDF0FD;} + .d2-3350207851 .background-color-B6{background-color:#F7F8FE;} + .d2-3350207851 .background-color-AA2{background-color:#4A6FF3;} + .d2-3350207851 .background-color-AA4{background-color:#EDF0FD;} + .d2-3350207851 .background-color-AA5{background-color:#F7F8FE;} + .d2-3350207851 .background-color-AB4{background-color:#EDF0FD;} + .d2-3350207851 .background-color-AB5{background-color:#F7F8FE;} + .d2-3350207851 .color-N1{color:#0A0F25;} + .d2-3350207851 .color-N2{color:#676C7E;} + .d2-3350207851 .color-N3{color:#9499AB;} + .d2-3350207851 .color-N4{color:#CFD2DD;} + .d2-3350207851 .color-N5{color:#DEE1EB;} + .d2-3350207851 .color-N6{color:#EEF1F8;} + .d2-3350207851 .color-N7{color:#FFFFFF;} + .d2-3350207851 .color-B1{color:#0D32B2;} + .d2-3350207851 .color-B2{color:#0D32B2;} + .d2-3350207851 .color-B3{color:#E3E9FD;} + .d2-3350207851 .color-B4{color:#E3E9FD;} + .d2-3350207851 .color-B5{color:#EDF0FD;} + .d2-3350207851 .color-B6{color:#F7F8FE;} + .d2-3350207851 .color-AA2{color:#4A6FF3;} + .d2-3350207851 .color-AA4{color:#EDF0FD;} + .d2-3350207851 .color-AA5{color:#F7F8FE;} + .d2-3350207851 .color-AB4{color:#EDF0FD;} + .d2-3350207851 .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}]]>linkedtooltippedbothrectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloudrectangleexamplesquareexamplepageexampleparallelogramexampledocumentexamplecylinderexamplequeueexamplepackageexamplestepexamplecalloutexamplestored_dataexamplepersonexamplediamondexampleovalexamplecircleexamplehexagonexamplecloudexamplerectangleexamplesquareexamplepageexampleparallelogramexampledocumentexamplecylinderexamplequeueexamplepackageexamplestepexamplecalloutexamplestored_dataexamplepersonexamplediamondexampleovalexamplecircleexamplehexagonexamplecloudexample example @@ -1137,8 +541,7 @@ -<<<<<<< HEAD - + @@ -1194,143 +597,4 @@ -||||||| parent of 33280fed5 (fixed e2e tests) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -======= - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ->>>>>>> 33280fed5 (fixed e2e tests) \ No newline at end of file diff --git a/e2etests/testdata/stable/all_shapes_multiple/dagre/sketch.exp.svg b/e2etests/testdata/stable/all_shapes_multiple/dagre/sketch.exp.svg index 921678610..c8f835810 100644 --- a/e2etests/testdata/stable/all_shapes_multiple/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/all_shapes_multiple/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-330319047 .fill-N1{fill:#0A0F25;} - .d2-330319047 .fill-N2{fill:#676C7E;} - .d2-330319047 .fill-N3{fill:#9499AB;} - .d2-330319047 .fill-N4{fill:#CFD2DD;} - .d2-330319047 .fill-N5{fill:#DEE1EB;} - .d2-330319047 .fill-N6{fill:#EEF1F8;} - .d2-330319047 .fill-N7{fill:#FFFFFF;} - .d2-330319047 .fill-B1{fill:#0D32B2;} - .d2-330319047 .fill-B2{fill:#0D32B2;} - .d2-330319047 .fill-B3{fill:#E3E9FD;} - .d2-330319047 .fill-B4{fill:#E3E9FD;} - .d2-330319047 .fill-B5{fill:#EDF0FD;} - .d2-330319047 .fill-B6{fill:#F7F8FE;} - .d2-330319047 .fill-AA2{fill:#4A6FF3;} - .d2-330319047 .fill-AA4{fill:#EDF0FD;} - .d2-330319047 .fill-AA5{fill:#F7F8FE;} - .d2-330319047 .fill-AB4{fill:#EDF0FD;} - .d2-330319047 .fill-AB5{fill:#F7F8FE;} - .d2-330319047 .stroke-N1{stroke:#0A0F25;} - .d2-330319047 .stroke-N2{stroke:#676C7E;} - .d2-330319047 .stroke-N3{stroke:#9499AB;} - .d2-330319047 .stroke-N4{stroke:#CFD2DD;} - .d2-330319047 .stroke-N5{stroke:#DEE1EB;} - .d2-330319047 .stroke-N6{stroke:#EEF1F8;} - .d2-330319047 .stroke-N7{stroke:#FFFFFF;} - .d2-330319047 .stroke-B1{stroke:#0D32B2;} - .d2-330319047 .stroke-B2{stroke:#0D32B2;} - .d2-330319047 .stroke-B3{stroke:#E3E9FD;} - .d2-330319047 .stroke-B4{stroke:#E3E9FD;} - .d2-330319047 .stroke-B5{stroke:#EDF0FD;} - .d2-330319047 .stroke-B6{stroke:#F7F8FE;} - .d2-330319047 .stroke-AA2{stroke:#4A6FF3;} - .d2-330319047 .stroke-AA4{stroke:#EDF0FD;} - .d2-330319047 .stroke-AA5{stroke:#F7F8FE;} - .d2-330319047 .stroke-AB4{stroke:#EDF0FD;} - .d2-330319047 .stroke-AB5{stroke:#F7F8FE;} - .d2-330319047 .background-color-N1{background-color:#0A0F25;} - .d2-330319047 .background-color-N2{background-color:#676C7E;} - .d2-330319047 .background-color-N3{background-color:#9499AB;} - .d2-330319047 .background-color-N4{background-color:#CFD2DD;} - .d2-330319047 .background-color-N5{background-color:#DEE1EB;} - .d2-330319047 .background-color-N6{background-color:#EEF1F8;} - .d2-330319047 .background-color-N7{background-color:#FFFFFF;} - .d2-330319047 .background-color-B1{background-color:#0D32B2;} - .d2-330319047 .background-color-B2{background-color:#0D32B2;} - .d2-330319047 .background-color-B3{background-color:#E3E9FD;} - .d2-330319047 .background-color-B4{background-color:#E3E9FD;} - .d2-330319047 .background-color-B5{background-color:#EDF0FD;} - .d2-330319047 .background-color-B6{background-color:#F7F8FE;} - .d2-330319047 .background-color-AA2{background-color:#4A6FF3;} - .d2-330319047 .background-color-AA4{background-color:#EDF0FD;} - .d2-330319047 .background-color-AA5{background-color:#F7F8FE;} - .d2-330319047 .background-color-AB4{background-color:#EDF0FD;} - .d2-330319047 .background-color-AB5{background-color:#F7F8FE;} - .d2-330319047 .color-N1{color:#0A0F25;} - .d2-330319047 .color-N2{color:#676C7E;} - .d2-330319047 .color-N3{color:#9499AB;} - .d2-330319047 .color-N4{color:#CFD2DD;} - .d2-330319047 .color-N5{color:#DEE1EB;} - .d2-330319047 .color-N6{color:#EEF1F8;} - .d2-330319047 .color-N7{color:#FFFFFF;} - .d2-330319047 .color-B1{color:#0D32B2;} - .d2-330319047 .color-B2{color:#0D32B2;} - .d2-330319047 .color-B3{color:#E3E9FD;} - .d2-330319047 .color-B4{color:#E3E9FD;} - .d2-330319047 .color-B5{color:#EDF0FD;} - .d2-330319047 .color-B6{color:#F7F8FE;} - .d2-330319047 .color-AA2{color:#4A6FF3;} - .d2-330319047 .color-AA4{color:#EDF0FD;} - .d2-330319047 .color-AA5{color:#F7F8FE;} - .d2-330319047 .color-AB4{color:#EDF0FD;} - .d2-330319047 .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}]]>rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud -======= .d2-955320857 .fill-N1{fill:#0A0F25;} .d2-955320857 .fill-N2{fill:#676C7E;} .d2-955320857 .fill-N3{fill:#9499AB;} @@ -252,8 +89,7 @@ .d2-955320857 .color-AA4{color:#EDF0FD;} .d2-955320857 .color-AA5{color:#F7F8FE;} .d2-955320857 .color-AB4{color:#EDF0FD;} - .d2-955320857 .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}]]>rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-955320857 .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}]]>rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud diff --git a/e2etests/testdata/stable/all_shapes_multiple/elk/sketch.exp.svg b/e2etests/testdata/stable/all_shapes_multiple/elk/sketch.exp.svg index d1bbc2fb7..d81c0fa94 100644 --- a/e2etests/testdata/stable/all_shapes_multiple/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/all_shapes_multiple/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-3214214930 .fill-N1{fill:#0A0F25;} - .d2-3214214930 .fill-N2{fill:#676C7E;} - .d2-3214214930 .fill-N3{fill:#9499AB;} - .d2-3214214930 .fill-N4{fill:#CFD2DD;} - .d2-3214214930 .fill-N5{fill:#DEE1EB;} - .d2-3214214930 .fill-N6{fill:#EEF1F8;} - .d2-3214214930 .fill-N7{fill:#FFFFFF;} - .d2-3214214930 .fill-B1{fill:#0D32B2;} - .d2-3214214930 .fill-B2{fill:#0D32B2;} - .d2-3214214930 .fill-B3{fill:#E3E9FD;} - .d2-3214214930 .fill-B4{fill:#E3E9FD;} - .d2-3214214930 .fill-B5{fill:#EDF0FD;} - .d2-3214214930 .fill-B6{fill:#F7F8FE;} - .d2-3214214930 .fill-AA2{fill:#4A6FF3;} - .d2-3214214930 .fill-AA4{fill:#EDF0FD;} - .d2-3214214930 .fill-AA5{fill:#F7F8FE;} - .d2-3214214930 .fill-AB4{fill:#EDF0FD;} - .d2-3214214930 .fill-AB5{fill:#F7F8FE;} - .d2-3214214930 .stroke-N1{stroke:#0A0F25;} - .d2-3214214930 .stroke-N2{stroke:#676C7E;} - .d2-3214214930 .stroke-N3{stroke:#9499AB;} - .d2-3214214930 .stroke-N4{stroke:#CFD2DD;} - .d2-3214214930 .stroke-N5{stroke:#DEE1EB;} - .d2-3214214930 .stroke-N6{stroke:#EEF1F8;} - .d2-3214214930 .stroke-N7{stroke:#FFFFFF;} - .d2-3214214930 .stroke-B1{stroke:#0D32B2;} - .d2-3214214930 .stroke-B2{stroke:#0D32B2;} - .d2-3214214930 .stroke-B3{stroke:#E3E9FD;} - .d2-3214214930 .stroke-B4{stroke:#E3E9FD;} - .d2-3214214930 .stroke-B5{stroke:#EDF0FD;} - .d2-3214214930 .stroke-B6{stroke:#F7F8FE;} - .d2-3214214930 .stroke-AA2{stroke:#4A6FF3;} - .d2-3214214930 .stroke-AA4{stroke:#EDF0FD;} - .d2-3214214930 .stroke-AA5{stroke:#F7F8FE;} - .d2-3214214930 .stroke-AB4{stroke:#EDF0FD;} - .d2-3214214930 .stroke-AB5{stroke:#F7F8FE;} - .d2-3214214930 .background-color-N1{background-color:#0A0F25;} - .d2-3214214930 .background-color-N2{background-color:#676C7E;} - .d2-3214214930 .background-color-N3{background-color:#9499AB;} - .d2-3214214930 .background-color-N4{background-color:#CFD2DD;} - .d2-3214214930 .background-color-N5{background-color:#DEE1EB;} - .d2-3214214930 .background-color-N6{background-color:#EEF1F8;} - .d2-3214214930 .background-color-N7{background-color:#FFFFFF;} - .d2-3214214930 .background-color-B1{background-color:#0D32B2;} - .d2-3214214930 .background-color-B2{background-color:#0D32B2;} - .d2-3214214930 .background-color-B3{background-color:#E3E9FD;} - .d2-3214214930 .background-color-B4{background-color:#E3E9FD;} - .d2-3214214930 .background-color-B5{background-color:#EDF0FD;} - .d2-3214214930 .background-color-B6{background-color:#F7F8FE;} - .d2-3214214930 .background-color-AA2{background-color:#4A6FF3;} - .d2-3214214930 .background-color-AA4{background-color:#EDF0FD;} - .d2-3214214930 .background-color-AA5{background-color:#F7F8FE;} - .d2-3214214930 .background-color-AB4{background-color:#EDF0FD;} - .d2-3214214930 .background-color-AB5{background-color:#F7F8FE;} - .d2-3214214930 .color-N1{color:#0A0F25;} - .d2-3214214930 .color-N2{color:#676C7E;} - .d2-3214214930 .color-N3{color:#9499AB;} - .d2-3214214930 .color-N4{color:#CFD2DD;} - .d2-3214214930 .color-N5{color:#DEE1EB;} - .d2-3214214930 .color-N6{color:#EEF1F8;} - .d2-3214214930 .color-N7{color:#FFFFFF;} - .d2-3214214930 .color-B1{color:#0D32B2;} - .d2-3214214930 .color-B2{color:#0D32B2;} - .d2-3214214930 .color-B3{color:#E3E9FD;} - .d2-3214214930 .color-B4{color:#E3E9FD;} - .d2-3214214930 .color-B5{color:#EDF0FD;} - .d2-3214214930 .color-B6{color:#F7F8FE;} - .d2-3214214930 .color-AA2{color:#4A6FF3;} - .d2-3214214930 .color-AA4{color:#EDF0FD;} - .d2-3214214930 .color-AA5{color:#F7F8FE;} - .d2-3214214930 .color-AB4{color:#EDF0FD;} - .d2-3214214930 .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}]]>rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud -======= .d2-2027652092 .fill-N1{fill:#0A0F25;} .d2-2027652092 .fill-N2{fill:#676C7E;} .d2-2027652092 .fill-N3{fill:#9499AB;} @@ -252,8 +89,7 @@ .d2-2027652092 .color-AA4{color:#EDF0FD;} .d2-2027652092 .color-AA5{color:#F7F8FE;} .d2-2027652092 .color-AB4{color:#EDF0FD;} - .d2-2027652092 .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}]]>rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-2027652092 .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}]]>rectanglesquarepageparallelogramdocumentcylinderqueuepackagestepcalloutstored_datapersondiamondovalcirclehexagoncloud diff --git a/e2etests/testdata/stable/all_shapes_shadow/dagre/sketch.exp.svg b/e2etests/testdata/stable/all_shapes_shadow/dagre/sketch.exp.svg index 5ad255aed..d216ae3ee 100644 --- a/e2etests/testdata/stable/all_shapes_shadow/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/all_shapes_shadow/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -your love life will behappyharmoniousboredomimmortalityFridayMondayInsomniaSleepWakeDreamListenTalk hear -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-3267239171 .fill-N1{fill:#0A0F25;} - .d2-3267239171 .fill-N2{fill:#676C7E;} - .d2-3267239171 .fill-N3{fill:#9499AB;} - .d2-3267239171 .fill-N4{fill:#CFD2DD;} - .d2-3267239171 .fill-N5{fill:#DEE1EB;} - .d2-3267239171 .fill-N6{fill:#EEF1F8;} - .d2-3267239171 .fill-N7{fill:#FFFFFF;} - .d2-3267239171 .fill-B1{fill:#0D32B2;} - .d2-3267239171 .fill-B2{fill:#0D32B2;} - .d2-3267239171 .fill-B3{fill:#E3E9FD;} - .d2-3267239171 .fill-B4{fill:#E3E9FD;} - .d2-3267239171 .fill-B5{fill:#EDF0FD;} - .d2-3267239171 .fill-B6{fill:#F7F8FE;} - .d2-3267239171 .fill-AA2{fill:#4A6FF3;} - .d2-3267239171 .fill-AA4{fill:#EDF0FD;} - .d2-3267239171 .fill-AA5{fill:#F7F8FE;} - .d2-3267239171 .fill-AB4{fill:#EDF0FD;} - .d2-3267239171 .fill-AB5{fill:#F7F8FE;} - .d2-3267239171 .stroke-N1{stroke:#0A0F25;} - .d2-3267239171 .stroke-N2{stroke:#676C7E;} - .d2-3267239171 .stroke-N3{stroke:#9499AB;} - .d2-3267239171 .stroke-N4{stroke:#CFD2DD;} - .d2-3267239171 .stroke-N5{stroke:#DEE1EB;} - .d2-3267239171 .stroke-N6{stroke:#EEF1F8;} - .d2-3267239171 .stroke-N7{stroke:#FFFFFF;} - .d2-3267239171 .stroke-B1{stroke:#0D32B2;} - .d2-3267239171 .stroke-B2{stroke:#0D32B2;} - .d2-3267239171 .stroke-B3{stroke:#E3E9FD;} - .d2-3267239171 .stroke-B4{stroke:#E3E9FD;} - .d2-3267239171 .stroke-B5{stroke:#EDF0FD;} - .d2-3267239171 .stroke-B6{stroke:#F7F8FE;} - .d2-3267239171 .stroke-AA2{stroke:#4A6FF3;} - .d2-3267239171 .stroke-AA4{stroke:#EDF0FD;} - .d2-3267239171 .stroke-AA5{stroke:#F7F8FE;} - .d2-3267239171 .stroke-AB4{stroke:#EDF0FD;} - .d2-3267239171 .stroke-AB5{stroke:#F7F8FE;} - .d2-3267239171 .background-color-N1{background-color:#0A0F25;} - .d2-3267239171 .background-color-N2{background-color:#676C7E;} - .d2-3267239171 .background-color-N3{background-color:#9499AB;} - .d2-3267239171 .background-color-N4{background-color:#CFD2DD;} - .d2-3267239171 .background-color-N5{background-color:#DEE1EB;} - .d2-3267239171 .background-color-N6{background-color:#EEF1F8;} - .d2-3267239171 .background-color-N7{background-color:#FFFFFF;} - .d2-3267239171 .background-color-B1{background-color:#0D32B2;} - .d2-3267239171 .background-color-B2{background-color:#0D32B2;} - .d2-3267239171 .background-color-B3{background-color:#E3E9FD;} - .d2-3267239171 .background-color-B4{background-color:#E3E9FD;} - .d2-3267239171 .background-color-B5{background-color:#EDF0FD;} - .d2-3267239171 .background-color-B6{background-color:#F7F8FE;} - .d2-3267239171 .background-color-AA2{background-color:#4A6FF3;} - .d2-3267239171 .background-color-AA4{background-color:#EDF0FD;} - .d2-3267239171 .background-color-AA5{background-color:#F7F8FE;} - .d2-3267239171 .background-color-AB4{background-color:#EDF0FD;} - .d2-3267239171 .background-color-AB5{background-color:#F7F8FE;} - .d2-3267239171 .color-N1{color:#0A0F25;} - .d2-3267239171 .color-N2{color:#676C7E;} - .d2-3267239171 .color-N3{color:#9499AB;} - .d2-3267239171 .color-N4{color:#CFD2DD;} - .d2-3267239171 .color-N5{color:#DEE1EB;} - .d2-3267239171 .color-N6{color:#EEF1F8;} - .d2-3267239171 .color-N7{color:#FFFFFF;} - .d2-3267239171 .color-B1{color:#0D32B2;} - .d2-3267239171 .color-B2{color:#0D32B2;} - .d2-3267239171 .color-B3{color:#E3E9FD;} - .d2-3267239171 .color-B4{color:#E3E9FD;} - .d2-3267239171 .color-B5{color:#EDF0FD;} - .d2-3267239171 .color-B6{color:#F7F8FE;} - .d2-3267239171 .color-AA2{color:#4A6FF3;} - .d2-3267239171 .color-AA4{color:#EDF0FD;} - .d2-3267239171 .color-AA5{color:#F7F8FE;} - .d2-3267239171 .color-AB4{color:#EDF0FD;} - .d2-3267239171 .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}]]>your love life will behappyharmoniousboredomimmortalityFridayMondayInsomniaSleepWakeDreamListenTalk hear -======= .d2-1623324019 .fill-N1{fill:#0A0F25;} .d2-1623324019 .fill-N2{fill:#676C7E;} .d2-1623324019 .fill-N3{fill:#9499AB;} @@ -261,8 +102,7 @@ .d2-1623324019 .color-AA4{color:#EDF0FD;} .d2-1623324019 .color-AA5{color:#F7F8FE;} .d2-1623324019 .color-AB4{color:#EDF0FD;} - .d2-1623324019 .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}]]>your love life will behappyharmoniousboredomimmortalityFridayMondayInsomniaSleepWakeDreamListenTalk hear ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-1623324019 .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}]]>your love life will behappyharmoniousboredomimmortalityFridayMondayInsomniaSleepWakeDreamListenTalk hear diff --git a/e2etests/testdata/stable/animated/elk/sketch.exp.svg b/e2etests/testdata/stable/animated/elk/sketch.exp.svg index b68a0bc08..d22c6c2d0 100644 --- a/e2etests/testdata/stable/animated/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/animated/elk/sketch.exp.svg @@ -1,16 +1,4 @@ -<<<<<<< HEAD -<<<<<<< HEAD -your love life will behappyharmoniousboredomimmortalityFridayMondayInsomniaSleepWakeDreamListenTalk hear -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-838869033 .fill-N1{fill:#0A0F25;} - .d2-838869033 .fill-N2{fill:#676C7E;} - .d2-838869033 .fill-N3{fill:#9499AB;} - .d2-838869033 .fill-N4{fill:#CFD2DD;} - .d2-838869033 .fill-N5{fill:#DEE1EB;} - .d2-838869033 .fill-N6{fill:#EEF1F8;} - .d2-838869033 .fill-N7{fill:#FFFFFF;} - .d2-838869033 .fill-B1{fill:#0D32B2;} - .d2-838869033 .fill-B2{fill:#0D32B2;} - .d2-838869033 .fill-B3{fill:#E3E9FD;} - .d2-838869033 .fill-B4{fill:#E3E9FD;} - .d2-838869033 .fill-B5{fill:#EDF0FD;} - .d2-838869033 .fill-B6{fill:#F7F8FE;} - .d2-838869033 .fill-AA2{fill:#4A6FF3;} - .d2-838869033 .fill-AA4{fill:#EDF0FD;} - .d2-838869033 .fill-AA5{fill:#F7F8FE;} - .d2-838869033 .fill-AB4{fill:#EDF0FD;} - .d2-838869033 .fill-AB5{fill:#F7F8FE;} - .d2-838869033 .stroke-N1{stroke:#0A0F25;} - .d2-838869033 .stroke-N2{stroke:#676C7E;} - .d2-838869033 .stroke-N3{stroke:#9499AB;} - .d2-838869033 .stroke-N4{stroke:#CFD2DD;} - .d2-838869033 .stroke-N5{stroke:#DEE1EB;} - .d2-838869033 .stroke-N6{stroke:#EEF1F8;} - .d2-838869033 .stroke-N7{stroke:#FFFFFF;} - .d2-838869033 .stroke-B1{stroke:#0D32B2;} - .d2-838869033 .stroke-B2{stroke:#0D32B2;} - .d2-838869033 .stroke-B3{stroke:#E3E9FD;} - .d2-838869033 .stroke-B4{stroke:#E3E9FD;} - .d2-838869033 .stroke-B5{stroke:#EDF0FD;} - .d2-838869033 .stroke-B6{stroke:#F7F8FE;} - .d2-838869033 .stroke-AA2{stroke:#4A6FF3;} - .d2-838869033 .stroke-AA4{stroke:#EDF0FD;} - .d2-838869033 .stroke-AA5{stroke:#F7F8FE;} - .d2-838869033 .stroke-AB4{stroke:#EDF0FD;} - .d2-838869033 .stroke-AB5{stroke:#F7F8FE;} - .d2-838869033 .background-color-N1{background-color:#0A0F25;} - .d2-838869033 .background-color-N2{background-color:#676C7E;} - .d2-838869033 .background-color-N3{background-color:#9499AB;} - .d2-838869033 .background-color-N4{background-color:#CFD2DD;} - .d2-838869033 .background-color-N5{background-color:#DEE1EB;} - .d2-838869033 .background-color-N6{background-color:#EEF1F8;} - .d2-838869033 .background-color-N7{background-color:#FFFFFF;} - .d2-838869033 .background-color-B1{background-color:#0D32B2;} - .d2-838869033 .background-color-B2{background-color:#0D32B2;} - .d2-838869033 .background-color-B3{background-color:#E3E9FD;} - .d2-838869033 .background-color-B4{background-color:#E3E9FD;} - .d2-838869033 .background-color-B5{background-color:#EDF0FD;} - .d2-838869033 .background-color-B6{background-color:#F7F8FE;} - .d2-838869033 .background-color-AA2{background-color:#4A6FF3;} - .d2-838869033 .background-color-AA4{background-color:#EDF0FD;} - .d2-838869033 .background-color-AA5{background-color:#F7F8FE;} - .d2-838869033 .background-color-AB4{background-color:#EDF0FD;} - .d2-838869033 .background-color-AB5{background-color:#F7F8FE;} - .d2-838869033 .color-N1{color:#0A0F25;} - .d2-838869033 .color-N2{color:#676C7E;} - .d2-838869033 .color-N3{color:#9499AB;} - .d2-838869033 .color-N4{color:#CFD2DD;} - .d2-838869033 .color-N5{color:#DEE1EB;} - .d2-838869033 .color-N6{color:#EEF1F8;} - .d2-838869033 .color-N7{color:#FFFFFF;} - .d2-838869033 .color-B1{color:#0D32B2;} - .d2-838869033 .color-B2{color:#0D32B2;} - .d2-838869033 .color-B3{color:#E3E9FD;} - .d2-838869033 .color-B4{color:#E3E9FD;} - .d2-838869033 .color-B5{color:#EDF0FD;} - .d2-838869033 .color-B6{color:#F7F8FE;} - .d2-838869033 .color-AA2{color:#4A6FF3;} - .d2-838869033 .color-AA4{color:#EDF0FD;} - .d2-838869033 .color-AA5{color:#F7F8FE;} - .d2-838869033 .color-AB4{color:#EDF0FD;} - .d2-838869033 .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}]]>your love life will behappyharmoniousboredomimmortalityFridayMondayInsomniaSleepWakeDreamListenTalk hear -======= .d2-4184520153 .fill-N1{fill:#0A0F25;} .d2-4184520153 .fill-N2{fill:#676C7E;} .d2-4184520153 .fill-N3{fill:#9499AB;} @@ -261,8 +102,7 @@ .d2-4184520153 .color-AA4{color:#EDF0FD;} .d2-4184520153 .color-AA5{color:#F7F8FE;} .d2-4184520153 .color-AB4{color:#EDF0FD;} - .d2-4184520153 .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}]]>your love life will behappyharmoniousboredomimmortalityFridayMondayInsomniaSleepWakeDreamListenTalk hear ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-4184520153 .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}]]>your love life will behappyharmoniousboredomimmortalityFridayMondayInsomniaSleepWakeDreamListenTalk hear diff --git a/e2etests/testdata/stable/arrowhead_adjustment/dagre/sketch.exp.svg b/e2etests/testdata/stable/arrowhead_adjustment/dagre/sketch.exp.svg index 4764f6ba6..f51f4d1c9 100644 --- a/e2etests/testdata/stable/arrowhead_adjustment/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/arrowhead_adjustment/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -abc * -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-840500156 .fill-N1{fill:#0A0F25;} - .d2-840500156 .fill-N2{fill:#676C7E;} - .d2-840500156 .fill-N3{fill:#9499AB;} - .d2-840500156 .fill-N4{fill:#CFD2DD;} - .d2-840500156 .fill-N5{fill:#DEE1EB;} - .d2-840500156 .fill-N6{fill:#EEF1F8;} - .d2-840500156 .fill-N7{fill:#FFFFFF;} - .d2-840500156 .fill-B1{fill:#0D32B2;} - .d2-840500156 .fill-B2{fill:#0D32B2;} - .d2-840500156 .fill-B3{fill:#E3E9FD;} - .d2-840500156 .fill-B4{fill:#E3E9FD;} - .d2-840500156 .fill-B5{fill:#EDF0FD;} - .d2-840500156 .fill-B6{fill:#F7F8FE;} - .d2-840500156 .fill-AA2{fill:#4A6FF3;} - .d2-840500156 .fill-AA4{fill:#EDF0FD;} - .d2-840500156 .fill-AA5{fill:#F7F8FE;} - .d2-840500156 .fill-AB4{fill:#EDF0FD;} - .d2-840500156 .fill-AB5{fill:#F7F8FE;} - .d2-840500156 .stroke-N1{stroke:#0A0F25;} - .d2-840500156 .stroke-N2{stroke:#676C7E;} - .d2-840500156 .stroke-N3{stroke:#9499AB;} - .d2-840500156 .stroke-N4{stroke:#CFD2DD;} - .d2-840500156 .stroke-N5{stroke:#DEE1EB;} - .d2-840500156 .stroke-N6{stroke:#EEF1F8;} - .d2-840500156 .stroke-N7{stroke:#FFFFFF;} - .d2-840500156 .stroke-B1{stroke:#0D32B2;} - .d2-840500156 .stroke-B2{stroke:#0D32B2;} - .d2-840500156 .stroke-B3{stroke:#E3E9FD;} - .d2-840500156 .stroke-B4{stroke:#E3E9FD;} - .d2-840500156 .stroke-B5{stroke:#EDF0FD;} - .d2-840500156 .stroke-B6{stroke:#F7F8FE;} - .d2-840500156 .stroke-AA2{stroke:#4A6FF3;} - .d2-840500156 .stroke-AA4{stroke:#EDF0FD;} - .d2-840500156 .stroke-AA5{stroke:#F7F8FE;} - .d2-840500156 .stroke-AB4{stroke:#EDF0FD;} - .d2-840500156 .stroke-AB5{stroke:#F7F8FE;} - .d2-840500156 .background-color-N1{background-color:#0A0F25;} - .d2-840500156 .background-color-N2{background-color:#676C7E;} - .d2-840500156 .background-color-N3{background-color:#9499AB;} - .d2-840500156 .background-color-N4{background-color:#CFD2DD;} - .d2-840500156 .background-color-N5{background-color:#DEE1EB;} - .d2-840500156 .background-color-N6{background-color:#EEF1F8;} - .d2-840500156 .background-color-N7{background-color:#FFFFFF;} - .d2-840500156 .background-color-B1{background-color:#0D32B2;} - .d2-840500156 .background-color-B2{background-color:#0D32B2;} - .d2-840500156 .background-color-B3{background-color:#E3E9FD;} - .d2-840500156 .background-color-B4{background-color:#E3E9FD;} - .d2-840500156 .background-color-B5{background-color:#EDF0FD;} - .d2-840500156 .background-color-B6{background-color:#F7F8FE;} - .d2-840500156 .background-color-AA2{background-color:#4A6FF3;} - .d2-840500156 .background-color-AA4{background-color:#EDF0FD;} - .d2-840500156 .background-color-AA5{background-color:#F7F8FE;} - .d2-840500156 .background-color-AB4{background-color:#EDF0FD;} - .d2-840500156 .background-color-AB5{background-color:#F7F8FE;} - .d2-840500156 .color-N1{color:#0A0F25;} - .d2-840500156 .color-N2{color:#676C7E;} - .d2-840500156 .color-N3{color:#9499AB;} - .d2-840500156 .color-N4{color:#CFD2DD;} - .d2-840500156 .color-N5{color:#DEE1EB;} - .d2-840500156 .color-N6{color:#EEF1F8;} - .d2-840500156 .color-N7{color:#FFFFFF;} - .d2-840500156 .color-B1{color:#0D32B2;} - .d2-840500156 .color-B2{color:#0D32B2;} - .d2-840500156 .color-B3{color:#E3E9FD;} - .d2-840500156 .color-B4{color:#E3E9FD;} - .d2-840500156 .color-B5{color:#EDF0FD;} - .d2-840500156 .color-B6{color:#F7F8FE;} - .d2-840500156 .color-AA2{color:#4A6FF3;} - .d2-840500156 .color-AA4{color:#EDF0FD;} - .d2-840500156 .color-AA5{color:#F7F8FE;} - .d2-840500156 .color-AB4{color:#EDF0FD;} - .d2-840500156 .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}]]>abc * -======= .d2-3953868334 .fill-N1{fill:#0A0F25;} .d2-3953868334 .fill-N2{fill:#676C7E;} .d2-3953868334 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-3953868334 .color-AA4{color:#EDF0FD;} .d2-3953868334 .color-AA5{color:#F7F8FE;} .d2-3953868334 .color-AB4{color:#EDF0FD;} - .d2-3953868334 .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}]]>abc * ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-3953868334 .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}]]>abc * diff --git a/e2etests/testdata/stable/arrowhead_adjustment/elk/sketch.exp.svg b/e2etests/testdata/stable/arrowhead_adjustment/elk/sketch.exp.svg index c93d212d8..8c0fda576 100644 --- a/e2etests/testdata/stable/arrowhead_adjustment/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/arrowhead_adjustment/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -abc * -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-490476208 .fill-N1{fill:#0A0F25;} - .d2-490476208 .fill-N2{fill:#676C7E;} - .d2-490476208 .fill-N3{fill:#9499AB;} - .d2-490476208 .fill-N4{fill:#CFD2DD;} - .d2-490476208 .fill-N5{fill:#DEE1EB;} - .d2-490476208 .fill-N6{fill:#EEF1F8;} - .d2-490476208 .fill-N7{fill:#FFFFFF;} - .d2-490476208 .fill-B1{fill:#0D32B2;} - .d2-490476208 .fill-B2{fill:#0D32B2;} - .d2-490476208 .fill-B3{fill:#E3E9FD;} - .d2-490476208 .fill-B4{fill:#E3E9FD;} - .d2-490476208 .fill-B5{fill:#EDF0FD;} - .d2-490476208 .fill-B6{fill:#F7F8FE;} - .d2-490476208 .fill-AA2{fill:#4A6FF3;} - .d2-490476208 .fill-AA4{fill:#EDF0FD;} - .d2-490476208 .fill-AA5{fill:#F7F8FE;} - .d2-490476208 .fill-AB4{fill:#EDF0FD;} - .d2-490476208 .fill-AB5{fill:#F7F8FE;} - .d2-490476208 .stroke-N1{stroke:#0A0F25;} - .d2-490476208 .stroke-N2{stroke:#676C7E;} - .d2-490476208 .stroke-N3{stroke:#9499AB;} - .d2-490476208 .stroke-N4{stroke:#CFD2DD;} - .d2-490476208 .stroke-N5{stroke:#DEE1EB;} - .d2-490476208 .stroke-N6{stroke:#EEF1F8;} - .d2-490476208 .stroke-N7{stroke:#FFFFFF;} - .d2-490476208 .stroke-B1{stroke:#0D32B2;} - .d2-490476208 .stroke-B2{stroke:#0D32B2;} - .d2-490476208 .stroke-B3{stroke:#E3E9FD;} - .d2-490476208 .stroke-B4{stroke:#E3E9FD;} - .d2-490476208 .stroke-B5{stroke:#EDF0FD;} - .d2-490476208 .stroke-B6{stroke:#F7F8FE;} - .d2-490476208 .stroke-AA2{stroke:#4A6FF3;} - .d2-490476208 .stroke-AA4{stroke:#EDF0FD;} - .d2-490476208 .stroke-AA5{stroke:#F7F8FE;} - .d2-490476208 .stroke-AB4{stroke:#EDF0FD;} - .d2-490476208 .stroke-AB5{stroke:#F7F8FE;} - .d2-490476208 .background-color-N1{background-color:#0A0F25;} - .d2-490476208 .background-color-N2{background-color:#676C7E;} - .d2-490476208 .background-color-N3{background-color:#9499AB;} - .d2-490476208 .background-color-N4{background-color:#CFD2DD;} - .d2-490476208 .background-color-N5{background-color:#DEE1EB;} - .d2-490476208 .background-color-N6{background-color:#EEF1F8;} - .d2-490476208 .background-color-N7{background-color:#FFFFFF;} - .d2-490476208 .background-color-B1{background-color:#0D32B2;} - .d2-490476208 .background-color-B2{background-color:#0D32B2;} - .d2-490476208 .background-color-B3{background-color:#E3E9FD;} - .d2-490476208 .background-color-B4{background-color:#E3E9FD;} - .d2-490476208 .background-color-B5{background-color:#EDF0FD;} - .d2-490476208 .background-color-B6{background-color:#F7F8FE;} - .d2-490476208 .background-color-AA2{background-color:#4A6FF3;} - .d2-490476208 .background-color-AA4{background-color:#EDF0FD;} - .d2-490476208 .background-color-AA5{background-color:#F7F8FE;} - .d2-490476208 .background-color-AB4{background-color:#EDF0FD;} - .d2-490476208 .background-color-AB5{background-color:#F7F8FE;} - .d2-490476208 .color-N1{color:#0A0F25;} - .d2-490476208 .color-N2{color:#676C7E;} - .d2-490476208 .color-N3{color:#9499AB;} - .d2-490476208 .color-N4{color:#CFD2DD;} - .d2-490476208 .color-N5{color:#DEE1EB;} - .d2-490476208 .color-N6{color:#EEF1F8;} - .d2-490476208 .color-N7{color:#FFFFFF;} - .d2-490476208 .color-B1{color:#0D32B2;} - .d2-490476208 .color-B2{color:#0D32B2;} - .d2-490476208 .color-B3{color:#E3E9FD;} - .d2-490476208 .color-B4{color:#E3E9FD;} - .d2-490476208 .color-B5{color:#EDF0FD;} - .d2-490476208 .color-B6{color:#F7F8FE;} - .d2-490476208 .color-AA2{color:#4A6FF3;} - .d2-490476208 .color-AA4{color:#EDF0FD;} - .d2-490476208 .color-AA5{color:#F7F8FE;} - .d2-490476208 .color-AB4{color:#EDF0FD;} - .d2-490476208 .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}]]>abc * -======= .d2-1297511490 .fill-N1{fill:#0A0F25;} .d2-1297511490 .fill-N2{fill:#676C7E;} .d2-1297511490 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-1297511490 .color-AA4{color:#EDF0FD;} .d2-1297511490 .color-AA5{color:#F7F8FE;} .d2-1297511490 .color-AB4{color:#EDF0FD;} - .d2-1297511490 .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}]]>abc * ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-1297511490 .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}]]>abc * diff --git a/e2etests/testdata/stable/arrowhead_labels/dagre/sketch.exp.svg b/e2etests/testdata/stable/arrowhead_labels/dagre/sketch.exp.svg index cdbf4bd97..7c3a6486c 100644 --- a/e2etests/testdata/stable/arrowhead_labels/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/arrowhead_labels/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -ab To err is human, to moo bovine1* -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-2318670067 .fill-N1{fill:#0A0F25;} - .d2-2318670067 .fill-N2{fill:#676C7E;} - .d2-2318670067 .fill-N3{fill:#9499AB;} - .d2-2318670067 .fill-N4{fill:#CFD2DD;} - .d2-2318670067 .fill-N5{fill:#DEE1EB;} - .d2-2318670067 .fill-N6{fill:#EEF1F8;} - .d2-2318670067 .fill-N7{fill:#FFFFFF;} - .d2-2318670067 .fill-B1{fill:#0D32B2;} - .d2-2318670067 .fill-B2{fill:#0D32B2;} - .d2-2318670067 .fill-B3{fill:#E3E9FD;} - .d2-2318670067 .fill-B4{fill:#E3E9FD;} - .d2-2318670067 .fill-B5{fill:#EDF0FD;} - .d2-2318670067 .fill-B6{fill:#F7F8FE;} - .d2-2318670067 .fill-AA2{fill:#4A6FF3;} - .d2-2318670067 .fill-AA4{fill:#EDF0FD;} - .d2-2318670067 .fill-AA5{fill:#F7F8FE;} - .d2-2318670067 .fill-AB4{fill:#EDF0FD;} - .d2-2318670067 .fill-AB5{fill:#F7F8FE;} - .d2-2318670067 .stroke-N1{stroke:#0A0F25;} - .d2-2318670067 .stroke-N2{stroke:#676C7E;} - .d2-2318670067 .stroke-N3{stroke:#9499AB;} - .d2-2318670067 .stroke-N4{stroke:#CFD2DD;} - .d2-2318670067 .stroke-N5{stroke:#DEE1EB;} - .d2-2318670067 .stroke-N6{stroke:#EEF1F8;} - .d2-2318670067 .stroke-N7{stroke:#FFFFFF;} - .d2-2318670067 .stroke-B1{stroke:#0D32B2;} - .d2-2318670067 .stroke-B2{stroke:#0D32B2;} - .d2-2318670067 .stroke-B3{stroke:#E3E9FD;} - .d2-2318670067 .stroke-B4{stroke:#E3E9FD;} - .d2-2318670067 .stroke-B5{stroke:#EDF0FD;} - .d2-2318670067 .stroke-B6{stroke:#F7F8FE;} - .d2-2318670067 .stroke-AA2{stroke:#4A6FF3;} - .d2-2318670067 .stroke-AA4{stroke:#EDF0FD;} - .d2-2318670067 .stroke-AA5{stroke:#F7F8FE;} - .d2-2318670067 .stroke-AB4{stroke:#EDF0FD;} - .d2-2318670067 .stroke-AB5{stroke:#F7F8FE;} - .d2-2318670067 .background-color-N1{background-color:#0A0F25;} - .d2-2318670067 .background-color-N2{background-color:#676C7E;} - .d2-2318670067 .background-color-N3{background-color:#9499AB;} - .d2-2318670067 .background-color-N4{background-color:#CFD2DD;} - .d2-2318670067 .background-color-N5{background-color:#DEE1EB;} - .d2-2318670067 .background-color-N6{background-color:#EEF1F8;} - .d2-2318670067 .background-color-N7{background-color:#FFFFFF;} - .d2-2318670067 .background-color-B1{background-color:#0D32B2;} - .d2-2318670067 .background-color-B2{background-color:#0D32B2;} - .d2-2318670067 .background-color-B3{background-color:#E3E9FD;} - .d2-2318670067 .background-color-B4{background-color:#E3E9FD;} - .d2-2318670067 .background-color-B5{background-color:#EDF0FD;} - .d2-2318670067 .background-color-B6{background-color:#F7F8FE;} - .d2-2318670067 .background-color-AA2{background-color:#4A6FF3;} - .d2-2318670067 .background-color-AA4{background-color:#EDF0FD;} - .d2-2318670067 .background-color-AA5{background-color:#F7F8FE;} - .d2-2318670067 .background-color-AB4{background-color:#EDF0FD;} - .d2-2318670067 .background-color-AB5{background-color:#F7F8FE;} - .d2-2318670067 .color-N1{color:#0A0F25;} - .d2-2318670067 .color-N2{color:#676C7E;} - .d2-2318670067 .color-N3{color:#9499AB;} - .d2-2318670067 .color-N4{color:#CFD2DD;} - .d2-2318670067 .color-N5{color:#DEE1EB;} - .d2-2318670067 .color-N6{color:#EEF1F8;} - .d2-2318670067 .color-N7{color:#FFFFFF;} - .d2-2318670067 .color-B1{color:#0D32B2;} - .d2-2318670067 .color-B2{color:#0D32B2;} - .d2-2318670067 .color-B3{color:#E3E9FD;} - .d2-2318670067 .color-B4{color:#E3E9FD;} - .d2-2318670067 .color-B5{color:#EDF0FD;} - .d2-2318670067 .color-B6{color:#F7F8FE;} - .d2-2318670067 .color-AA2{color:#4A6FF3;} - .d2-2318670067 .color-AA4{color:#EDF0FD;} - .d2-2318670067 .color-AA5{color:#F7F8FE;} - .d2-2318670067 .color-AB4{color:#EDF0FD;} - .d2-2318670067 .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 To err is human, to moo bovine1* -======= .d2-1747631069 .fill-N1{fill:#0A0F25;} .d2-1747631069 .fill-N2{fill:#676C7E;} .d2-1747631069 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-1747631069 .color-AA4{color:#EDF0FD;} .d2-1747631069 .color-AA5{color:#F7F8FE;} .d2-1747631069 .color-AB4{color:#EDF0FD;} - .d2-1747631069 .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 To err is human, to moo bovine1* ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-1747631069 .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 To err is human, to moo bovine1* diff --git a/e2etests/testdata/stable/arrowhead_labels/elk/sketch.exp.svg b/e2etests/testdata/stable/arrowhead_labels/elk/sketch.exp.svg index 4c7e998bc..d08f4b8f7 100644 --- a/e2etests/testdata/stable/arrowhead_labels/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/arrowhead_labels/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -ab To err is human, to moo bovine1* -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-249188744 .fill-N1{fill:#0A0F25;} - .d2-249188744 .fill-N2{fill:#676C7E;} - .d2-249188744 .fill-N3{fill:#9499AB;} - .d2-249188744 .fill-N4{fill:#CFD2DD;} - .d2-249188744 .fill-N5{fill:#DEE1EB;} - .d2-249188744 .fill-N6{fill:#EEF1F8;} - .d2-249188744 .fill-N7{fill:#FFFFFF;} - .d2-249188744 .fill-B1{fill:#0D32B2;} - .d2-249188744 .fill-B2{fill:#0D32B2;} - .d2-249188744 .fill-B3{fill:#E3E9FD;} - .d2-249188744 .fill-B4{fill:#E3E9FD;} - .d2-249188744 .fill-B5{fill:#EDF0FD;} - .d2-249188744 .fill-B6{fill:#F7F8FE;} - .d2-249188744 .fill-AA2{fill:#4A6FF3;} - .d2-249188744 .fill-AA4{fill:#EDF0FD;} - .d2-249188744 .fill-AA5{fill:#F7F8FE;} - .d2-249188744 .fill-AB4{fill:#EDF0FD;} - .d2-249188744 .fill-AB5{fill:#F7F8FE;} - .d2-249188744 .stroke-N1{stroke:#0A0F25;} - .d2-249188744 .stroke-N2{stroke:#676C7E;} - .d2-249188744 .stroke-N3{stroke:#9499AB;} - .d2-249188744 .stroke-N4{stroke:#CFD2DD;} - .d2-249188744 .stroke-N5{stroke:#DEE1EB;} - .d2-249188744 .stroke-N6{stroke:#EEF1F8;} - .d2-249188744 .stroke-N7{stroke:#FFFFFF;} - .d2-249188744 .stroke-B1{stroke:#0D32B2;} - .d2-249188744 .stroke-B2{stroke:#0D32B2;} - .d2-249188744 .stroke-B3{stroke:#E3E9FD;} - .d2-249188744 .stroke-B4{stroke:#E3E9FD;} - .d2-249188744 .stroke-B5{stroke:#EDF0FD;} - .d2-249188744 .stroke-B6{stroke:#F7F8FE;} - .d2-249188744 .stroke-AA2{stroke:#4A6FF3;} - .d2-249188744 .stroke-AA4{stroke:#EDF0FD;} - .d2-249188744 .stroke-AA5{stroke:#F7F8FE;} - .d2-249188744 .stroke-AB4{stroke:#EDF0FD;} - .d2-249188744 .stroke-AB5{stroke:#F7F8FE;} - .d2-249188744 .background-color-N1{background-color:#0A0F25;} - .d2-249188744 .background-color-N2{background-color:#676C7E;} - .d2-249188744 .background-color-N3{background-color:#9499AB;} - .d2-249188744 .background-color-N4{background-color:#CFD2DD;} - .d2-249188744 .background-color-N5{background-color:#DEE1EB;} - .d2-249188744 .background-color-N6{background-color:#EEF1F8;} - .d2-249188744 .background-color-N7{background-color:#FFFFFF;} - .d2-249188744 .background-color-B1{background-color:#0D32B2;} - .d2-249188744 .background-color-B2{background-color:#0D32B2;} - .d2-249188744 .background-color-B3{background-color:#E3E9FD;} - .d2-249188744 .background-color-B4{background-color:#E3E9FD;} - .d2-249188744 .background-color-B5{background-color:#EDF0FD;} - .d2-249188744 .background-color-B6{background-color:#F7F8FE;} - .d2-249188744 .background-color-AA2{background-color:#4A6FF3;} - .d2-249188744 .background-color-AA4{background-color:#EDF0FD;} - .d2-249188744 .background-color-AA5{background-color:#F7F8FE;} - .d2-249188744 .background-color-AB4{background-color:#EDF0FD;} - .d2-249188744 .background-color-AB5{background-color:#F7F8FE;} - .d2-249188744 .color-N1{color:#0A0F25;} - .d2-249188744 .color-N2{color:#676C7E;} - .d2-249188744 .color-N3{color:#9499AB;} - .d2-249188744 .color-N4{color:#CFD2DD;} - .d2-249188744 .color-N5{color:#DEE1EB;} - .d2-249188744 .color-N6{color:#EEF1F8;} - .d2-249188744 .color-N7{color:#FFFFFF;} - .d2-249188744 .color-B1{color:#0D32B2;} - .d2-249188744 .color-B2{color:#0D32B2;} - .d2-249188744 .color-B3{color:#E3E9FD;} - .d2-249188744 .color-B4{color:#E3E9FD;} - .d2-249188744 .color-B5{color:#EDF0FD;} - .d2-249188744 .color-B6{color:#F7F8FE;} - .d2-249188744 .color-AA2{color:#4A6FF3;} - .d2-249188744 .color-AA4{color:#EDF0FD;} - .d2-249188744 .color-AA5{color:#F7F8FE;} - .d2-249188744 .color-AB4{color:#EDF0FD;} - .d2-249188744 .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 To err is human, to moo bovine1* -======= .d2-2912238582 .fill-N1{fill:#0A0F25;} .d2-2912238582 .fill-N2{fill:#676C7E;} .d2-2912238582 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-2912238582 .color-AA4{color:#EDF0FD;} .d2-2912238582 .color-AA5{color:#F7F8FE;} .d2-2912238582 .color-AB4{color:#EDF0FD;} - .d2-2912238582 .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 To err is human, to moo bovine1* ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-2912238582 .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 To err is human, to moo bovine1* diff --git a/e2etests/testdata/stable/arrowhead_scaling/dagre/sketch.exp.svg b/e2etests/testdata/stable/arrowhead_scaling/dagre/sketch.exp.svg index b713ef279..5952648d2 100644 --- a/e2etests/testdata/stable/arrowhead_scaling/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/arrowhead_scaling/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -defaultlinearrowdiamondfilled diamondcirclefilled circlecf onecf one requiredcf manycf many required112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515 1 2 4 8 15124815 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-2315691330 .fill-N1{fill:#0A0F25;} - .d2-2315691330 .fill-N2{fill:#676C7E;} - .d2-2315691330 .fill-N3{fill:#9499AB;} - .d2-2315691330 .fill-N4{fill:#CFD2DD;} - .d2-2315691330 .fill-N5{fill:#DEE1EB;} - .d2-2315691330 .fill-N6{fill:#EEF1F8;} - .d2-2315691330 .fill-N7{fill:#FFFFFF;} - .d2-2315691330 .fill-B1{fill:#0D32B2;} - .d2-2315691330 .fill-B2{fill:#0D32B2;} - .d2-2315691330 .fill-B3{fill:#E3E9FD;} - .d2-2315691330 .fill-B4{fill:#E3E9FD;} - .d2-2315691330 .fill-B5{fill:#EDF0FD;} - .d2-2315691330 .fill-B6{fill:#F7F8FE;} - .d2-2315691330 .fill-AA2{fill:#4A6FF3;} - .d2-2315691330 .fill-AA4{fill:#EDF0FD;} - .d2-2315691330 .fill-AA5{fill:#F7F8FE;} - .d2-2315691330 .fill-AB4{fill:#EDF0FD;} - .d2-2315691330 .fill-AB5{fill:#F7F8FE;} - .d2-2315691330 .stroke-N1{stroke:#0A0F25;} - .d2-2315691330 .stroke-N2{stroke:#676C7E;} - .d2-2315691330 .stroke-N3{stroke:#9499AB;} - .d2-2315691330 .stroke-N4{stroke:#CFD2DD;} - .d2-2315691330 .stroke-N5{stroke:#DEE1EB;} - .d2-2315691330 .stroke-N6{stroke:#EEF1F8;} - .d2-2315691330 .stroke-N7{stroke:#FFFFFF;} - .d2-2315691330 .stroke-B1{stroke:#0D32B2;} - .d2-2315691330 .stroke-B2{stroke:#0D32B2;} - .d2-2315691330 .stroke-B3{stroke:#E3E9FD;} - .d2-2315691330 .stroke-B4{stroke:#E3E9FD;} - .d2-2315691330 .stroke-B5{stroke:#EDF0FD;} - .d2-2315691330 .stroke-B6{stroke:#F7F8FE;} - .d2-2315691330 .stroke-AA2{stroke:#4A6FF3;} - .d2-2315691330 .stroke-AA4{stroke:#EDF0FD;} - .d2-2315691330 .stroke-AA5{stroke:#F7F8FE;} - .d2-2315691330 .stroke-AB4{stroke:#EDF0FD;} - .d2-2315691330 .stroke-AB5{stroke:#F7F8FE;} - .d2-2315691330 .background-color-N1{background-color:#0A0F25;} - .d2-2315691330 .background-color-N2{background-color:#676C7E;} - .d2-2315691330 .background-color-N3{background-color:#9499AB;} - .d2-2315691330 .background-color-N4{background-color:#CFD2DD;} - .d2-2315691330 .background-color-N5{background-color:#DEE1EB;} - .d2-2315691330 .background-color-N6{background-color:#EEF1F8;} - .d2-2315691330 .background-color-N7{background-color:#FFFFFF;} - .d2-2315691330 .background-color-B1{background-color:#0D32B2;} - .d2-2315691330 .background-color-B2{background-color:#0D32B2;} - .d2-2315691330 .background-color-B3{background-color:#E3E9FD;} - .d2-2315691330 .background-color-B4{background-color:#E3E9FD;} - .d2-2315691330 .background-color-B5{background-color:#EDF0FD;} - .d2-2315691330 .background-color-B6{background-color:#F7F8FE;} - .d2-2315691330 .background-color-AA2{background-color:#4A6FF3;} - .d2-2315691330 .background-color-AA4{background-color:#EDF0FD;} - .d2-2315691330 .background-color-AA5{background-color:#F7F8FE;} - .d2-2315691330 .background-color-AB4{background-color:#EDF0FD;} - .d2-2315691330 .background-color-AB5{background-color:#F7F8FE;} - .d2-2315691330 .color-N1{color:#0A0F25;} - .d2-2315691330 .color-N2{color:#676C7E;} - .d2-2315691330 .color-N3{color:#9499AB;} - .d2-2315691330 .color-N4{color:#CFD2DD;} - .d2-2315691330 .color-N5{color:#DEE1EB;} - .d2-2315691330 .color-N6{color:#EEF1F8;} - .d2-2315691330 .color-N7{color:#FFFFFF;} - .d2-2315691330 .color-B1{color:#0D32B2;} - .d2-2315691330 .color-B2{color:#0D32B2;} - .d2-2315691330 .color-B3{color:#E3E9FD;} - .d2-2315691330 .color-B4{color:#E3E9FD;} - .d2-2315691330 .color-B5{color:#EDF0FD;} - .d2-2315691330 .color-B6{color:#F7F8FE;} - .d2-2315691330 .color-AA2{color:#4A6FF3;} - .d2-2315691330 .color-AA4{color:#EDF0FD;} - .d2-2315691330 .color-AA5{color:#F7F8FE;} - .d2-2315691330 .color-AB4{color:#EDF0FD;} - .d2-2315691330 .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}]]>defaultlinearrowdiamondfilled diamondcirclefilled circlecf onecf one requiredcf manycf many required112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515 1 2 4 8 15124815 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 -======= .d2-1634763040 .fill-N1{fill:#0A0F25;} .d2-1634763040 .fill-N2{fill:#676C7E;} .d2-1634763040 .fill-N3{fill:#9499AB;} @@ -266,8 +103,7 @@ .d2-1634763040 .color-AA4{color:#EDF0FD;} .d2-1634763040 .color-AA5{color:#F7F8FE;} .d2-1634763040 .color-AB4{color:#EDF0FD;} - .d2-1634763040 .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}]]>defaultlinearrowdiamondfilled diamondcirclefilled circlecf onecf one requiredcf manycf many required112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515 1 2 4 8 15124815 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-1634763040 .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}]]>defaultlinearrowdiamondfilled diamondcirclefilled circlecf onecf one requiredcf manycf many required112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515 1 2 4 8 15124815 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 diff --git a/e2etests/testdata/stable/arrowhead_scaling/elk/sketch.exp.svg b/e2etests/testdata/stable/arrowhead_scaling/elk/sketch.exp.svg index 693ca89ab..5f8203e37 100644 --- a/e2etests/testdata/stable/arrowhead_scaling/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/arrowhead_scaling/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -defaultlinearrowdiamondfilled diamondcirclefilled circlecf onecf one requiredcf manycf many required112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515 1 2 4 8 15124815 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-3281968207 .fill-N1{fill:#0A0F25;} - .d2-3281968207 .fill-N2{fill:#676C7E;} - .d2-3281968207 .fill-N3{fill:#9499AB;} - .d2-3281968207 .fill-N4{fill:#CFD2DD;} - .d2-3281968207 .fill-N5{fill:#DEE1EB;} - .d2-3281968207 .fill-N6{fill:#EEF1F8;} - .d2-3281968207 .fill-N7{fill:#FFFFFF;} - .d2-3281968207 .fill-B1{fill:#0D32B2;} - .d2-3281968207 .fill-B2{fill:#0D32B2;} - .d2-3281968207 .fill-B3{fill:#E3E9FD;} - .d2-3281968207 .fill-B4{fill:#E3E9FD;} - .d2-3281968207 .fill-B5{fill:#EDF0FD;} - .d2-3281968207 .fill-B6{fill:#F7F8FE;} - .d2-3281968207 .fill-AA2{fill:#4A6FF3;} - .d2-3281968207 .fill-AA4{fill:#EDF0FD;} - .d2-3281968207 .fill-AA5{fill:#F7F8FE;} - .d2-3281968207 .fill-AB4{fill:#EDF0FD;} - .d2-3281968207 .fill-AB5{fill:#F7F8FE;} - .d2-3281968207 .stroke-N1{stroke:#0A0F25;} - .d2-3281968207 .stroke-N2{stroke:#676C7E;} - .d2-3281968207 .stroke-N3{stroke:#9499AB;} - .d2-3281968207 .stroke-N4{stroke:#CFD2DD;} - .d2-3281968207 .stroke-N5{stroke:#DEE1EB;} - .d2-3281968207 .stroke-N6{stroke:#EEF1F8;} - .d2-3281968207 .stroke-N7{stroke:#FFFFFF;} - .d2-3281968207 .stroke-B1{stroke:#0D32B2;} - .d2-3281968207 .stroke-B2{stroke:#0D32B2;} - .d2-3281968207 .stroke-B3{stroke:#E3E9FD;} - .d2-3281968207 .stroke-B4{stroke:#E3E9FD;} - .d2-3281968207 .stroke-B5{stroke:#EDF0FD;} - .d2-3281968207 .stroke-B6{stroke:#F7F8FE;} - .d2-3281968207 .stroke-AA2{stroke:#4A6FF3;} - .d2-3281968207 .stroke-AA4{stroke:#EDF0FD;} - .d2-3281968207 .stroke-AA5{stroke:#F7F8FE;} - .d2-3281968207 .stroke-AB4{stroke:#EDF0FD;} - .d2-3281968207 .stroke-AB5{stroke:#F7F8FE;} - .d2-3281968207 .background-color-N1{background-color:#0A0F25;} - .d2-3281968207 .background-color-N2{background-color:#676C7E;} - .d2-3281968207 .background-color-N3{background-color:#9499AB;} - .d2-3281968207 .background-color-N4{background-color:#CFD2DD;} - .d2-3281968207 .background-color-N5{background-color:#DEE1EB;} - .d2-3281968207 .background-color-N6{background-color:#EEF1F8;} - .d2-3281968207 .background-color-N7{background-color:#FFFFFF;} - .d2-3281968207 .background-color-B1{background-color:#0D32B2;} - .d2-3281968207 .background-color-B2{background-color:#0D32B2;} - .d2-3281968207 .background-color-B3{background-color:#E3E9FD;} - .d2-3281968207 .background-color-B4{background-color:#E3E9FD;} - .d2-3281968207 .background-color-B5{background-color:#EDF0FD;} - .d2-3281968207 .background-color-B6{background-color:#F7F8FE;} - .d2-3281968207 .background-color-AA2{background-color:#4A6FF3;} - .d2-3281968207 .background-color-AA4{background-color:#EDF0FD;} - .d2-3281968207 .background-color-AA5{background-color:#F7F8FE;} - .d2-3281968207 .background-color-AB4{background-color:#EDF0FD;} - .d2-3281968207 .background-color-AB5{background-color:#F7F8FE;} - .d2-3281968207 .color-N1{color:#0A0F25;} - .d2-3281968207 .color-N2{color:#676C7E;} - .d2-3281968207 .color-N3{color:#9499AB;} - .d2-3281968207 .color-N4{color:#CFD2DD;} - .d2-3281968207 .color-N5{color:#DEE1EB;} - .d2-3281968207 .color-N6{color:#EEF1F8;} - .d2-3281968207 .color-N7{color:#FFFFFF;} - .d2-3281968207 .color-B1{color:#0D32B2;} - .d2-3281968207 .color-B2{color:#0D32B2;} - .d2-3281968207 .color-B3{color:#E3E9FD;} - .d2-3281968207 .color-B4{color:#E3E9FD;} - .d2-3281968207 .color-B5{color:#EDF0FD;} - .d2-3281968207 .color-B6{color:#F7F8FE;} - .d2-3281968207 .color-AA2{color:#4A6FF3;} - .d2-3281968207 .color-AA4{color:#EDF0FD;} - .d2-3281968207 .color-AA5{color:#F7F8FE;} - .d2-3281968207 .color-AB4{color:#EDF0FD;} - .d2-3281968207 .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}]]>defaultlinearrowdiamondfilled diamondcirclefilled circlecf onecf one requiredcf manycf many required112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515 1 2 4 8 15124815 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 -======= .d2-3046051165 .fill-N1{fill:#0A0F25;} .d2-3046051165 .fill-N2{fill:#676C7E;} .d2-3046051165 .fill-N3{fill:#9499AB;} @@ -266,8 +103,7 @@ .d2-3046051165 .color-AA4{color:#EDF0FD;} .d2-3046051165 .color-AA5{color:#F7F8FE;} .d2-3046051165 .color-AB4{color:#EDF0FD;} - .d2-3046051165 .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}]]>defaultlinearrowdiamondfilled diamondcirclefilled circlecf onecf one requiredcf manycf many required112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515 1 2 4 8 15124815 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-3046051165 .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}]]>defaultlinearrowdiamondfilled diamondcirclefilled circlecf onecf one requiredcf manycf many required112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515112244881515 1 2 4 8 15124815 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 1 2 4 8 15 diff --git a/e2etests/testdata/stable/basic-tooltips/dagre/sketch.exp.svg b/e2etests/testdata/stable/basic-tooltips/dagre/sketch.exp.svg index dca2b79d3..8b561352c 100644 --- a/e2etests/testdata/stable/basic-tooltips/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/basic-tooltips/dagre/sketch.exp.svg @@ -1,38 +1,12 @@ -<<<<<<< HEAD -<<<<<<< HEAD -xTotal abstinence is easier than perfect moderationyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! Total abstinence is easier than perfect moderation -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-2257413360 .fill-N1{fill:#0A0F25;} - .d2-2257413360 .fill-N2{fill:#676C7E;} - .d2-2257413360 .fill-N3{fill:#9499AB;} - .d2-2257413360 .fill-N4{fill:#CFD2DD;} - .d2-2257413360 .fill-N5{fill:#DEE1EB;} - .d2-2257413360 .fill-N6{fill:#EEF1F8;} - .d2-2257413360 .fill-N7{fill:#FFFFFF;} - .d2-2257413360 .fill-B1{fill:#0D32B2;} - .d2-2257413360 .fill-B2{fill:#0D32B2;} - .d2-2257413360 .fill-B3{fill:#E3E9FD;} - .d2-2257413360 .fill-B4{fill:#E3E9FD;} - .d2-2257413360 .fill-B5{fill:#EDF0FD;} - .d2-2257413360 .fill-B6{fill:#F7F8FE;} - .d2-2257413360 .fill-AA2{fill:#4A6FF3;} - .d2-2257413360 .fill-AA4{fill:#EDF0FD;} - .d2-2257413360 .fill-AA5{fill:#F7F8FE;} - .d2-2257413360 .fill-AB4{fill:#EDF0FD;} - .d2-2257413360 .fill-AB5{fill:#F7F8FE;} - .d2-2257413360 .stroke-N1{stroke:#0A0F25;} - .d2-2257413360 .stroke-N2{stroke:#676C7E;} - .d2-2257413360 .stroke-N3{stroke:#9499AB;} - .d2-2257413360 .stroke-N4{stroke:#CFD2DD;} - .d2-2257413360 .stroke-N5{stroke:#DEE1EB;} - .d2-2257413360 .stroke-N6{stroke:#EEF1F8;} - .d2-2257413360 .stroke-N7{stroke:#FFFFFF;} - .d2-2257413360 .stroke-B1{stroke:#0D32B2;} - .d2-2257413360 .stroke-B2{stroke:#0D32B2;} - .d2-2257413360 .stroke-B3{stroke:#E3E9FD;} - .d2-2257413360 .stroke-B4{stroke:#E3E9FD;} - .d2-2257413360 .stroke-B5{stroke:#EDF0FD;} - .d2-2257413360 .stroke-B6{stroke:#F7F8FE;} - .d2-2257413360 .stroke-AA2{stroke:#4A6FF3;} - .d2-2257413360 .stroke-AA4{stroke:#EDF0FD;} - .d2-2257413360 .stroke-AA5{stroke:#F7F8FE;} - .d2-2257413360 .stroke-AB4{stroke:#EDF0FD;} - .d2-2257413360 .stroke-AB5{stroke:#F7F8FE;} - .d2-2257413360 .background-color-N1{background-color:#0A0F25;} - .d2-2257413360 .background-color-N2{background-color:#676C7E;} - .d2-2257413360 .background-color-N3{background-color:#9499AB;} - .d2-2257413360 .background-color-N4{background-color:#CFD2DD;} - .d2-2257413360 .background-color-N5{background-color:#DEE1EB;} - .d2-2257413360 .background-color-N6{background-color:#EEF1F8;} - .d2-2257413360 .background-color-N7{background-color:#FFFFFF;} - .d2-2257413360 .background-color-B1{background-color:#0D32B2;} - .d2-2257413360 .background-color-B2{background-color:#0D32B2;} - .d2-2257413360 .background-color-B3{background-color:#E3E9FD;} - .d2-2257413360 .background-color-B4{background-color:#E3E9FD;} - .d2-2257413360 .background-color-B5{background-color:#EDF0FD;} - .d2-2257413360 .background-color-B6{background-color:#F7F8FE;} - .d2-2257413360 .background-color-AA2{background-color:#4A6FF3;} - .d2-2257413360 .background-color-AA4{background-color:#EDF0FD;} - .d2-2257413360 .background-color-AA5{background-color:#F7F8FE;} - .d2-2257413360 .background-color-AB4{background-color:#EDF0FD;} - .d2-2257413360 .background-color-AB5{background-color:#F7F8FE;} - .d2-2257413360 .color-N1{color:#0A0F25;} - .d2-2257413360 .color-N2{color:#676C7E;} - .d2-2257413360 .color-N3{color:#9499AB;} - .d2-2257413360 .color-N4{color:#CFD2DD;} - .d2-2257413360 .color-N5{color:#DEE1EB;} - .d2-2257413360 .color-N6{color:#EEF1F8;} - .d2-2257413360 .color-N7{color:#FFFFFF;} - .d2-2257413360 .color-B1{color:#0D32B2;} - .d2-2257413360 .color-B2{color:#0D32B2;} - .d2-2257413360 .color-B3{color:#E3E9FD;} - .d2-2257413360 .color-B4{color:#E3E9FD;} - .d2-2257413360 .color-B5{color:#EDF0FD;} - .d2-2257413360 .color-B6{color:#F7F8FE;} - .d2-2257413360 .color-AA2{color:#4A6FF3;} - .d2-2257413360 .color-AA4{color:#EDF0FD;} - .d2-2257413360 .color-AA5{color:#F7F8FE;} - .d2-2257413360 .color-AB4{color:#EDF0FD;} - .d2-2257413360 .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}]]>xTotal abstinence is easier than perfect moderationyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! Total abstinence is easier than perfect moderation -======= - .d2-640834314 .fill-N1{fill:#0A0F25;} - .d2-640834314 .fill-N2{fill:#676C7E;} - .d2-640834314 .fill-N3{fill:#9499AB;} - .d2-640834314 .fill-N4{fill:#CFD2DD;} - .d2-640834314 .fill-N5{fill:#DEE1EB;} - .d2-640834314 .fill-N6{fill:#EEF1F8;} - .d2-640834314 .fill-N7{fill:#FFFFFF;} - .d2-640834314 .fill-B1{fill:#0D32B2;} - .d2-640834314 .fill-B2{fill:#0D32B2;} - .d2-640834314 .fill-B3{fill:#E3E9FD;} - .d2-640834314 .fill-B4{fill:#E3E9FD;} - .d2-640834314 .fill-B5{fill:#EDF0FD;} - .d2-640834314 .fill-B6{fill:#F7F8FE;} - .d2-640834314 .fill-AA2{fill:#4A6FF3;} - .d2-640834314 .fill-AA4{fill:#EDF0FD;} - .d2-640834314 .fill-AA5{fill:#F7F8FE;} - .d2-640834314 .fill-AB4{fill:#EDF0FD;} - .d2-640834314 .fill-AB5{fill:#F7F8FE;} - .d2-640834314 .stroke-N1{stroke:#0A0F25;} - .d2-640834314 .stroke-N2{stroke:#676C7E;} - .d2-640834314 .stroke-N3{stroke:#9499AB;} - .d2-640834314 .stroke-N4{stroke:#CFD2DD;} - .d2-640834314 .stroke-N5{stroke:#DEE1EB;} - .d2-640834314 .stroke-N6{stroke:#EEF1F8;} - .d2-640834314 .stroke-N7{stroke:#FFFFFF;} - .d2-640834314 .stroke-B1{stroke:#0D32B2;} - .d2-640834314 .stroke-B2{stroke:#0D32B2;} - .d2-640834314 .stroke-B3{stroke:#E3E9FD;} - .d2-640834314 .stroke-B4{stroke:#E3E9FD;} - .d2-640834314 .stroke-B5{stroke:#EDF0FD;} - .d2-640834314 .stroke-B6{stroke:#F7F8FE;} - .d2-640834314 .stroke-AA2{stroke:#4A6FF3;} - .d2-640834314 .stroke-AA4{stroke:#EDF0FD;} - .d2-640834314 .stroke-AA5{stroke:#F7F8FE;} - .d2-640834314 .stroke-AB4{stroke:#EDF0FD;} - .d2-640834314 .stroke-AB5{stroke:#F7F8FE;} - .d2-640834314 .background-color-N1{background-color:#0A0F25;} - .d2-640834314 .background-color-N2{background-color:#676C7E;} - .d2-640834314 .background-color-N3{background-color:#9499AB;} - .d2-640834314 .background-color-N4{background-color:#CFD2DD;} - .d2-640834314 .background-color-N5{background-color:#DEE1EB;} - .d2-640834314 .background-color-N6{background-color:#EEF1F8;} - .d2-640834314 .background-color-N7{background-color:#FFFFFF;} - .d2-640834314 .background-color-B1{background-color:#0D32B2;} - .d2-640834314 .background-color-B2{background-color:#0D32B2;} - .d2-640834314 .background-color-B3{background-color:#E3E9FD;} - .d2-640834314 .background-color-B4{background-color:#E3E9FD;} - .d2-640834314 .background-color-B5{background-color:#EDF0FD;} - .d2-640834314 .background-color-B6{background-color:#F7F8FE;} - .d2-640834314 .background-color-AA2{background-color:#4A6FF3;} - .d2-640834314 .background-color-AA4{background-color:#EDF0FD;} - .d2-640834314 .background-color-AA5{background-color:#F7F8FE;} - .d2-640834314 .background-color-AB4{background-color:#EDF0FD;} - .d2-640834314 .background-color-AB5{background-color:#F7F8FE;} - .d2-640834314 .color-N1{color:#0A0F25;} - .d2-640834314 .color-N2{color:#676C7E;} - .d2-640834314 .color-N3{color:#9499AB;} - .d2-640834314 .color-N4{color:#CFD2DD;} - .d2-640834314 .color-N5{color:#DEE1EB;} - .d2-640834314 .color-N6{color:#EEF1F8;} - .d2-640834314 .color-N7{color:#FFFFFF;} - .d2-640834314 .color-B1{color:#0D32B2;} - .d2-640834314 .color-B2{color:#0D32B2;} - .d2-640834314 .color-B3{color:#E3E9FD;} - .d2-640834314 .color-B4{color:#E3E9FD;} - .d2-640834314 .color-B5{color:#EDF0FD;} - .d2-640834314 .color-B6{color:#F7F8FE;} - .d2-640834314 .color-AA2{color:#4A6FF3;} - .d2-640834314 .color-AA4{color:#EDF0FD;} - .d2-640834314 .color-AA5{color:#F7F8FE;} - .d2-640834314 .color-AB4{color:#EDF0FD;} - .d2-640834314 .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}]]>xTotal abstinence is easier than perfect moderationyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! Total abstinence is easier than perfect moderation ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-1071335462 .fill-N1{fill:#0A0F25;} + .d2-1071335462 .fill-N2{fill:#676C7E;} + .d2-1071335462 .fill-N3{fill:#9499AB;} + .d2-1071335462 .fill-N4{fill:#CFD2DD;} + .d2-1071335462 .fill-N5{fill:#DEE1EB;} + .d2-1071335462 .fill-N6{fill:#EEF1F8;} + .d2-1071335462 .fill-N7{fill:#FFFFFF;} + .d2-1071335462 .fill-B1{fill:#0D32B2;} + .d2-1071335462 .fill-B2{fill:#0D32B2;} + .d2-1071335462 .fill-B3{fill:#E3E9FD;} + .d2-1071335462 .fill-B4{fill:#E3E9FD;} + .d2-1071335462 .fill-B5{fill:#EDF0FD;} + .d2-1071335462 .fill-B6{fill:#F7F8FE;} + .d2-1071335462 .fill-AA2{fill:#4A6FF3;} + .d2-1071335462 .fill-AA4{fill:#EDF0FD;} + .d2-1071335462 .fill-AA5{fill:#F7F8FE;} + .d2-1071335462 .fill-AB4{fill:#EDF0FD;} + .d2-1071335462 .fill-AB5{fill:#F7F8FE;} + .d2-1071335462 .stroke-N1{stroke:#0A0F25;} + .d2-1071335462 .stroke-N2{stroke:#676C7E;} + .d2-1071335462 .stroke-N3{stroke:#9499AB;} + .d2-1071335462 .stroke-N4{stroke:#CFD2DD;} + .d2-1071335462 .stroke-N5{stroke:#DEE1EB;} + .d2-1071335462 .stroke-N6{stroke:#EEF1F8;} + .d2-1071335462 .stroke-N7{stroke:#FFFFFF;} + .d2-1071335462 .stroke-B1{stroke:#0D32B2;} + .d2-1071335462 .stroke-B2{stroke:#0D32B2;} + .d2-1071335462 .stroke-B3{stroke:#E3E9FD;} + .d2-1071335462 .stroke-B4{stroke:#E3E9FD;} + .d2-1071335462 .stroke-B5{stroke:#EDF0FD;} + .d2-1071335462 .stroke-B6{stroke:#F7F8FE;} + .d2-1071335462 .stroke-AA2{stroke:#4A6FF3;} + .d2-1071335462 .stroke-AA4{stroke:#EDF0FD;} + .d2-1071335462 .stroke-AA5{stroke:#F7F8FE;} + .d2-1071335462 .stroke-AB4{stroke:#EDF0FD;} + .d2-1071335462 .stroke-AB5{stroke:#F7F8FE;} + .d2-1071335462 .background-color-N1{background-color:#0A0F25;} + .d2-1071335462 .background-color-N2{background-color:#676C7E;} + .d2-1071335462 .background-color-N3{background-color:#9499AB;} + .d2-1071335462 .background-color-N4{background-color:#CFD2DD;} + .d2-1071335462 .background-color-N5{background-color:#DEE1EB;} + .d2-1071335462 .background-color-N6{background-color:#EEF1F8;} + .d2-1071335462 .background-color-N7{background-color:#FFFFFF;} + .d2-1071335462 .background-color-B1{background-color:#0D32B2;} + .d2-1071335462 .background-color-B2{background-color:#0D32B2;} + .d2-1071335462 .background-color-B3{background-color:#E3E9FD;} + .d2-1071335462 .background-color-B4{background-color:#E3E9FD;} + .d2-1071335462 .background-color-B5{background-color:#EDF0FD;} + .d2-1071335462 .background-color-B6{background-color:#F7F8FE;} + .d2-1071335462 .background-color-AA2{background-color:#4A6FF3;} + .d2-1071335462 .background-color-AA4{background-color:#EDF0FD;} + .d2-1071335462 .background-color-AA5{background-color:#F7F8FE;} + .d2-1071335462 .background-color-AB4{background-color:#EDF0FD;} + .d2-1071335462 .background-color-AB5{background-color:#F7F8FE;} + .d2-1071335462 .color-N1{color:#0A0F25;} + .d2-1071335462 .color-N2{color:#676C7E;} + .d2-1071335462 .color-N3{color:#9499AB;} + .d2-1071335462 .color-N4{color:#CFD2DD;} + .d2-1071335462 .color-N5{color:#DEE1EB;} + .d2-1071335462 .color-N6{color:#EEF1F8;} + .d2-1071335462 .color-N7{color:#FFFFFF;} + .d2-1071335462 .color-B1{color:#0D32B2;} + .d2-1071335462 .color-B2{color:#0D32B2;} + .d2-1071335462 .color-B3{color:#E3E9FD;} + .d2-1071335462 .color-B4{color:#E3E9FD;} + .d2-1071335462 .color-B5{color:#EDF0FD;} + .d2-1071335462 .color-B6{color:#F7F8FE;} + .d2-1071335462 .color-AA2{color:#4A6FF3;} + .d2-1071335462 .color-AA4{color:#EDF0FD;} + .d2-1071335462 .color-AA5{color:#F7F8FE;} + .d2-1071335462 .color-AB4{color:#EDF0FD;} + .d2-1071335462 .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}]]>xTotal abstinence is easier than perfect moderationyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! Total abstinence is easier than perfect moderation @@ -292,20 +118,8 @@ -<<<<<<< HEAD - + -||||||| parent of 33280fed5 (fixed e2e tests) - - - - -======= - - - - ->>>>>>> 33280fed5 (fixed e2e tests) \ No newline at end of file diff --git a/e2etests/testdata/stable/basic-tooltips/elk/sketch.exp.svg b/e2etests/testdata/stable/basic-tooltips/elk/sketch.exp.svg index e9d5abf9d..10d20fa55 100644 --- a/e2etests/testdata/stable/basic-tooltips/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/basic-tooltips/elk/sketch.exp.svg @@ -1,38 +1,12 @@ -<<<<<<< HEAD -<<<<<<< HEAD -xTotal abstinence is easier than perfect moderationyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! Total abstinence is easier than perfect moderation -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-3493271700 .fill-N1{fill:#0A0F25;} - .d2-3493271700 .fill-N2{fill:#676C7E;} - .d2-3493271700 .fill-N3{fill:#9499AB;} - .d2-3493271700 .fill-N4{fill:#CFD2DD;} - .d2-3493271700 .fill-N5{fill:#DEE1EB;} - .d2-3493271700 .fill-N6{fill:#EEF1F8;} - .d2-3493271700 .fill-N7{fill:#FFFFFF;} - .d2-3493271700 .fill-B1{fill:#0D32B2;} - .d2-3493271700 .fill-B2{fill:#0D32B2;} - .d2-3493271700 .fill-B3{fill:#E3E9FD;} - .d2-3493271700 .fill-B4{fill:#E3E9FD;} - .d2-3493271700 .fill-B5{fill:#EDF0FD;} - .d2-3493271700 .fill-B6{fill:#F7F8FE;} - .d2-3493271700 .fill-AA2{fill:#4A6FF3;} - .d2-3493271700 .fill-AA4{fill:#EDF0FD;} - .d2-3493271700 .fill-AA5{fill:#F7F8FE;} - .d2-3493271700 .fill-AB4{fill:#EDF0FD;} - .d2-3493271700 .fill-AB5{fill:#F7F8FE;} - .d2-3493271700 .stroke-N1{stroke:#0A0F25;} - .d2-3493271700 .stroke-N2{stroke:#676C7E;} - .d2-3493271700 .stroke-N3{stroke:#9499AB;} - .d2-3493271700 .stroke-N4{stroke:#CFD2DD;} - .d2-3493271700 .stroke-N5{stroke:#DEE1EB;} - .d2-3493271700 .stroke-N6{stroke:#EEF1F8;} - .d2-3493271700 .stroke-N7{stroke:#FFFFFF;} - .d2-3493271700 .stroke-B1{stroke:#0D32B2;} - .d2-3493271700 .stroke-B2{stroke:#0D32B2;} - .d2-3493271700 .stroke-B3{stroke:#E3E9FD;} - .d2-3493271700 .stroke-B4{stroke:#E3E9FD;} - .d2-3493271700 .stroke-B5{stroke:#EDF0FD;} - .d2-3493271700 .stroke-B6{stroke:#F7F8FE;} - .d2-3493271700 .stroke-AA2{stroke:#4A6FF3;} - .d2-3493271700 .stroke-AA4{stroke:#EDF0FD;} - .d2-3493271700 .stroke-AA5{stroke:#F7F8FE;} - .d2-3493271700 .stroke-AB4{stroke:#EDF0FD;} - .d2-3493271700 .stroke-AB5{stroke:#F7F8FE;} - .d2-3493271700 .background-color-N1{background-color:#0A0F25;} - .d2-3493271700 .background-color-N2{background-color:#676C7E;} - .d2-3493271700 .background-color-N3{background-color:#9499AB;} - .d2-3493271700 .background-color-N4{background-color:#CFD2DD;} - .d2-3493271700 .background-color-N5{background-color:#DEE1EB;} - .d2-3493271700 .background-color-N6{background-color:#EEF1F8;} - .d2-3493271700 .background-color-N7{background-color:#FFFFFF;} - .d2-3493271700 .background-color-B1{background-color:#0D32B2;} - .d2-3493271700 .background-color-B2{background-color:#0D32B2;} - .d2-3493271700 .background-color-B3{background-color:#E3E9FD;} - .d2-3493271700 .background-color-B4{background-color:#E3E9FD;} - .d2-3493271700 .background-color-B5{background-color:#EDF0FD;} - .d2-3493271700 .background-color-B6{background-color:#F7F8FE;} - .d2-3493271700 .background-color-AA2{background-color:#4A6FF3;} - .d2-3493271700 .background-color-AA4{background-color:#EDF0FD;} - .d2-3493271700 .background-color-AA5{background-color:#F7F8FE;} - .d2-3493271700 .background-color-AB4{background-color:#EDF0FD;} - .d2-3493271700 .background-color-AB5{background-color:#F7F8FE;} - .d2-3493271700 .color-N1{color:#0A0F25;} - .d2-3493271700 .color-N2{color:#676C7E;} - .d2-3493271700 .color-N3{color:#9499AB;} - .d2-3493271700 .color-N4{color:#CFD2DD;} - .d2-3493271700 .color-N5{color:#DEE1EB;} - .d2-3493271700 .color-N6{color:#EEF1F8;} - .d2-3493271700 .color-N7{color:#FFFFFF;} - .d2-3493271700 .color-B1{color:#0D32B2;} - .d2-3493271700 .color-B2{color:#0D32B2;} - .d2-3493271700 .color-B3{color:#E3E9FD;} - .d2-3493271700 .color-B4{color:#E3E9FD;} - .d2-3493271700 .color-B5{color:#EDF0FD;} - .d2-3493271700 .color-B6{color:#F7F8FE;} - .d2-3493271700 .color-AA2{color:#4A6FF3;} - .d2-3493271700 .color-AA4{color:#EDF0FD;} - .d2-3493271700 .color-AA5{color:#F7F8FE;} - .d2-3493271700 .color-AB4{color:#EDF0FD;} - .d2-3493271700 .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}]]>xTotal abstinence is easier than perfect moderationyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! Total abstinence is easier than perfect moderation -======= - .d2-783601786 .fill-N1{fill:#0A0F25;} - .d2-783601786 .fill-N2{fill:#676C7E;} - .d2-783601786 .fill-N3{fill:#9499AB;} - .d2-783601786 .fill-N4{fill:#CFD2DD;} - .d2-783601786 .fill-N5{fill:#DEE1EB;} - .d2-783601786 .fill-N6{fill:#EEF1F8;} - .d2-783601786 .fill-N7{fill:#FFFFFF;} - .d2-783601786 .fill-B1{fill:#0D32B2;} - .d2-783601786 .fill-B2{fill:#0D32B2;} - .d2-783601786 .fill-B3{fill:#E3E9FD;} - .d2-783601786 .fill-B4{fill:#E3E9FD;} - .d2-783601786 .fill-B5{fill:#EDF0FD;} - .d2-783601786 .fill-B6{fill:#F7F8FE;} - .d2-783601786 .fill-AA2{fill:#4A6FF3;} - .d2-783601786 .fill-AA4{fill:#EDF0FD;} - .d2-783601786 .fill-AA5{fill:#F7F8FE;} - .d2-783601786 .fill-AB4{fill:#EDF0FD;} - .d2-783601786 .fill-AB5{fill:#F7F8FE;} - .d2-783601786 .stroke-N1{stroke:#0A0F25;} - .d2-783601786 .stroke-N2{stroke:#676C7E;} - .d2-783601786 .stroke-N3{stroke:#9499AB;} - .d2-783601786 .stroke-N4{stroke:#CFD2DD;} - .d2-783601786 .stroke-N5{stroke:#DEE1EB;} - .d2-783601786 .stroke-N6{stroke:#EEF1F8;} - .d2-783601786 .stroke-N7{stroke:#FFFFFF;} - .d2-783601786 .stroke-B1{stroke:#0D32B2;} - .d2-783601786 .stroke-B2{stroke:#0D32B2;} - .d2-783601786 .stroke-B3{stroke:#E3E9FD;} - .d2-783601786 .stroke-B4{stroke:#E3E9FD;} - .d2-783601786 .stroke-B5{stroke:#EDF0FD;} - .d2-783601786 .stroke-B6{stroke:#F7F8FE;} - .d2-783601786 .stroke-AA2{stroke:#4A6FF3;} - .d2-783601786 .stroke-AA4{stroke:#EDF0FD;} - .d2-783601786 .stroke-AA5{stroke:#F7F8FE;} - .d2-783601786 .stroke-AB4{stroke:#EDF0FD;} - .d2-783601786 .stroke-AB5{stroke:#F7F8FE;} - .d2-783601786 .background-color-N1{background-color:#0A0F25;} - .d2-783601786 .background-color-N2{background-color:#676C7E;} - .d2-783601786 .background-color-N3{background-color:#9499AB;} - .d2-783601786 .background-color-N4{background-color:#CFD2DD;} - .d2-783601786 .background-color-N5{background-color:#DEE1EB;} - .d2-783601786 .background-color-N6{background-color:#EEF1F8;} - .d2-783601786 .background-color-N7{background-color:#FFFFFF;} - .d2-783601786 .background-color-B1{background-color:#0D32B2;} - .d2-783601786 .background-color-B2{background-color:#0D32B2;} - .d2-783601786 .background-color-B3{background-color:#E3E9FD;} - .d2-783601786 .background-color-B4{background-color:#E3E9FD;} - .d2-783601786 .background-color-B5{background-color:#EDF0FD;} - .d2-783601786 .background-color-B6{background-color:#F7F8FE;} - .d2-783601786 .background-color-AA2{background-color:#4A6FF3;} - .d2-783601786 .background-color-AA4{background-color:#EDF0FD;} - .d2-783601786 .background-color-AA5{background-color:#F7F8FE;} - .d2-783601786 .background-color-AB4{background-color:#EDF0FD;} - .d2-783601786 .background-color-AB5{background-color:#F7F8FE;} - .d2-783601786 .color-N1{color:#0A0F25;} - .d2-783601786 .color-N2{color:#676C7E;} - .d2-783601786 .color-N3{color:#9499AB;} - .d2-783601786 .color-N4{color:#CFD2DD;} - .d2-783601786 .color-N5{color:#DEE1EB;} - .d2-783601786 .color-N6{color:#EEF1F8;} - .d2-783601786 .color-N7{color:#FFFFFF;} - .d2-783601786 .color-B1{color:#0D32B2;} - .d2-783601786 .color-B2{color:#0D32B2;} - .d2-783601786 .color-B3{color:#E3E9FD;} - .d2-783601786 .color-B4{color:#E3E9FD;} - .d2-783601786 .color-B5{color:#EDF0FD;} - .d2-783601786 .color-B6{color:#F7F8FE;} - .d2-783601786 .color-AA2{color:#4A6FF3;} - .d2-783601786 .color-AA4{color:#EDF0FD;} - .d2-783601786 .color-AA5{color:#F7F8FE;} - .d2-783601786 .color-AB4{color:#EDF0FD;} - .d2-783601786 .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}]]>xTotal abstinence is easier than perfect moderationyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! Total abstinence is easier than perfect moderation ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-772877468 .fill-N1{fill:#0A0F25;} + .d2-772877468 .fill-N2{fill:#676C7E;} + .d2-772877468 .fill-N3{fill:#9499AB;} + .d2-772877468 .fill-N4{fill:#CFD2DD;} + .d2-772877468 .fill-N5{fill:#DEE1EB;} + .d2-772877468 .fill-N6{fill:#EEF1F8;} + .d2-772877468 .fill-N7{fill:#FFFFFF;} + .d2-772877468 .fill-B1{fill:#0D32B2;} + .d2-772877468 .fill-B2{fill:#0D32B2;} + .d2-772877468 .fill-B3{fill:#E3E9FD;} + .d2-772877468 .fill-B4{fill:#E3E9FD;} + .d2-772877468 .fill-B5{fill:#EDF0FD;} + .d2-772877468 .fill-B6{fill:#F7F8FE;} + .d2-772877468 .fill-AA2{fill:#4A6FF3;} + .d2-772877468 .fill-AA4{fill:#EDF0FD;} + .d2-772877468 .fill-AA5{fill:#F7F8FE;} + .d2-772877468 .fill-AB4{fill:#EDF0FD;} + .d2-772877468 .fill-AB5{fill:#F7F8FE;} + .d2-772877468 .stroke-N1{stroke:#0A0F25;} + .d2-772877468 .stroke-N2{stroke:#676C7E;} + .d2-772877468 .stroke-N3{stroke:#9499AB;} + .d2-772877468 .stroke-N4{stroke:#CFD2DD;} + .d2-772877468 .stroke-N5{stroke:#DEE1EB;} + .d2-772877468 .stroke-N6{stroke:#EEF1F8;} + .d2-772877468 .stroke-N7{stroke:#FFFFFF;} + .d2-772877468 .stroke-B1{stroke:#0D32B2;} + .d2-772877468 .stroke-B2{stroke:#0D32B2;} + .d2-772877468 .stroke-B3{stroke:#E3E9FD;} + .d2-772877468 .stroke-B4{stroke:#E3E9FD;} + .d2-772877468 .stroke-B5{stroke:#EDF0FD;} + .d2-772877468 .stroke-B6{stroke:#F7F8FE;} + .d2-772877468 .stroke-AA2{stroke:#4A6FF3;} + .d2-772877468 .stroke-AA4{stroke:#EDF0FD;} + .d2-772877468 .stroke-AA5{stroke:#F7F8FE;} + .d2-772877468 .stroke-AB4{stroke:#EDF0FD;} + .d2-772877468 .stroke-AB5{stroke:#F7F8FE;} + .d2-772877468 .background-color-N1{background-color:#0A0F25;} + .d2-772877468 .background-color-N2{background-color:#676C7E;} + .d2-772877468 .background-color-N3{background-color:#9499AB;} + .d2-772877468 .background-color-N4{background-color:#CFD2DD;} + .d2-772877468 .background-color-N5{background-color:#DEE1EB;} + .d2-772877468 .background-color-N6{background-color:#EEF1F8;} + .d2-772877468 .background-color-N7{background-color:#FFFFFF;} + .d2-772877468 .background-color-B1{background-color:#0D32B2;} + .d2-772877468 .background-color-B2{background-color:#0D32B2;} + .d2-772877468 .background-color-B3{background-color:#E3E9FD;} + .d2-772877468 .background-color-B4{background-color:#E3E9FD;} + .d2-772877468 .background-color-B5{background-color:#EDF0FD;} + .d2-772877468 .background-color-B6{background-color:#F7F8FE;} + .d2-772877468 .background-color-AA2{background-color:#4A6FF3;} + .d2-772877468 .background-color-AA4{background-color:#EDF0FD;} + .d2-772877468 .background-color-AA5{background-color:#F7F8FE;} + .d2-772877468 .background-color-AB4{background-color:#EDF0FD;} + .d2-772877468 .background-color-AB5{background-color:#F7F8FE;} + .d2-772877468 .color-N1{color:#0A0F25;} + .d2-772877468 .color-N2{color:#676C7E;} + .d2-772877468 .color-N3{color:#9499AB;} + .d2-772877468 .color-N4{color:#CFD2DD;} + .d2-772877468 .color-N5{color:#DEE1EB;} + .d2-772877468 .color-N6{color:#EEF1F8;} + .d2-772877468 .color-N7{color:#FFFFFF;} + .d2-772877468 .color-B1{color:#0D32B2;} + .d2-772877468 .color-B2{color:#0D32B2;} + .d2-772877468 .color-B3{color:#E3E9FD;} + .d2-772877468 .color-B4{color:#E3E9FD;} + .d2-772877468 .color-B5{color:#EDF0FD;} + .d2-772877468 .color-B6{color:#F7F8FE;} + .d2-772877468 .color-AA2{color:#4A6FF3;} + .d2-772877468 .color-AA4{color:#EDF0FD;} + .d2-772877468 .color-AA5{color:#F7F8FE;} + .d2-772877468 .color-AB4{color:#EDF0FD;} + .d2-772877468 .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}]]>xTotal abstinence is easier than perfect moderationyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! Total abstinence is easier than perfect moderation @@ -292,20 +118,8 @@ -<<<<<<< HEAD - + -||||||| parent of 33280fed5 (fixed e2e tests) - - - - -======= - - - - ->>>>>>> 33280fed5 (fixed e2e tests) \ No newline at end of file diff --git a/e2etests/testdata/stable/binary_tree/dagre/sketch.exp.svg b/e2etests/testdata/stable/binary_tree/dagre/sketch.exp.svg index 2a470b05b..214d9d8f5 100644 --- a/e2etests/testdata/stable/binary_tree/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/binary_tree/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -abcdefghijklmno -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-1843367973 .fill-N1{fill:#0A0F25;} - .d2-1843367973 .fill-N2{fill:#676C7E;} - .d2-1843367973 .fill-N3{fill:#9499AB;} - .d2-1843367973 .fill-N4{fill:#CFD2DD;} - .d2-1843367973 .fill-N5{fill:#DEE1EB;} - .d2-1843367973 .fill-N6{fill:#EEF1F8;} - .d2-1843367973 .fill-N7{fill:#FFFFFF;} - .d2-1843367973 .fill-B1{fill:#0D32B2;} - .d2-1843367973 .fill-B2{fill:#0D32B2;} - .d2-1843367973 .fill-B3{fill:#E3E9FD;} - .d2-1843367973 .fill-B4{fill:#E3E9FD;} - .d2-1843367973 .fill-B5{fill:#EDF0FD;} - .d2-1843367973 .fill-B6{fill:#F7F8FE;} - .d2-1843367973 .fill-AA2{fill:#4A6FF3;} - .d2-1843367973 .fill-AA4{fill:#EDF0FD;} - .d2-1843367973 .fill-AA5{fill:#F7F8FE;} - .d2-1843367973 .fill-AB4{fill:#EDF0FD;} - .d2-1843367973 .fill-AB5{fill:#F7F8FE;} - .d2-1843367973 .stroke-N1{stroke:#0A0F25;} - .d2-1843367973 .stroke-N2{stroke:#676C7E;} - .d2-1843367973 .stroke-N3{stroke:#9499AB;} - .d2-1843367973 .stroke-N4{stroke:#CFD2DD;} - .d2-1843367973 .stroke-N5{stroke:#DEE1EB;} - .d2-1843367973 .stroke-N6{stroke:#EEF1F8;} - .d2-1843367973 .stroke-N7{stroke:#FFFFFF;} - .d2-1843367973 .stroke-B1{stroke:#0D32B2;} - .d2-1843367973 .stroke-B2{stroke:#0D32B2;} - .d2-1843367973 .stroke-B3{stroke:#E3E9FD;} - .d2-1843367973 .stroke-B4{stroke:#E3E9FD;} - .d2-1843367973 .stroke-B5{stroke:#EDF0FD;} - .d2-1843367973 .stroke-B6{stroke:#F7F8FE;} - .d2-1843367973 .stroke-AA2{stroke:#4A6FF3;} - .d2-1843367973 .stroke-AA4{stroke:#EDF0FD;} - .d2-1843367973 .stroke-AA5{stroke:#F7F8FE;} - .d2-1843367973 .stroke-AB4{stroke:#EDF0FD;} - .d2-1843367973 .stroke-AB5{stroke:#F7F8FE;} - .d2-1843367973 .background-color-N1{background-color:#0A0F25;} - .d2-1843367973 .background-color-N2{background-color:#676C7E;} - .d2-1843367973 .background-color-N3{background-color:#9499AB;} - .d2-1843367973 .background-color-N4{background-color:#CFD2DD;} - .d2-1843367973 .background-color-N5{background-color:#DEE1EB;} - .d2-1843367973 .background-color-N6{background-color:#EEF1F8;} - .d2-1843367973 .background-color-N7{background-color:#FFFFFF;} - .d2-1843367973 .background-color-B1{background-color:#0D32B2;} - .d2-1843367973 .background-color-B2{background-color:#0D32B2;} - .d2-1843367973 .background-color-B3{background-color:#E3E9FD;} - .d2-1843367973 .background-color-B4{background-color:#E3E9FD;} - .d2-1843367973 .background-color-B5{background-color:#EDF0FD;} - .d2-1843367973 .background-color-B6{background-color:#F7F8FE;} - .d2-1843367973 .background-color-AA2{background-color:#4A6FF3;} - .d2-1843367973 .background-color-AA4{background-color:#EDF0FD;} - .d2-1843367973 .background-color-AA5{background-color:#F7F8FE;} - .d2-1843367973 .background-color-AB4{background-color:#EDF0FD;} - .d2-1843367973 .background-color-AB5{background-color:#F7F8FE;} - .d2-1843367973 .color-N1{color:#0A0F25;} - .d2-1843367973 .color-N2{color:#676C7E;} - .d2-1843367973 .color-N3{color:#9499AB;} - .d2-1843367973 .color-N4{color:#CFD2DD;} - .d2-1843367973 .color-N5{color:#DEE1EB;} - .d2-1843367973 .color-N6{color:#EEF1F8;} - .d2-1843367973 .color-N7{color:#FFFFFF;} - .d2-1843367973 .color-B1{color:#0D32B2;} - .d2-1843367973 .color-B2{color:#0D32B2;} - .d2-1843367973 .color-B3{color:#E3E9FD;} - .d2-1843367973 .color-B4{color:#E3E9FD;} - .d2-1843367973 .color-B5{color:#EDF0FD;} - .d2-1843367973 .color-B6{color:#F7F8FE;} - .d2-1843367973 .color-AA2{color:#4A6FF3;} - .d2-1843367973 .color-AA4{color:#EDF0FD;} - .d2-1843367973 .color-AA5{color:#F7F8FE;} - .d2-1843367973 .color-AB4{color:#EDF0FD;} - .d2-1843367973 .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}]]>abcdefghijklmno -======= .d2-4070461641 .fill-N1{fill:#0A0F25;} .d2-4070461641 .fill-N2{fill:#676C7E;} .d2-4070461641 .fill-N3{fill:#9499AB;} @@ -252,8 +89,7 @@ .d2-4070461641 .color-AA4{color:#EDF0FD;} .d2-4070461641 .color-AA5{color:#F7F8FE;} .d2-4070461641 .color-AB4{color:#EDF0FD;} - .d2-4070461641 .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}]]>abcdefghijklmno ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-4070461641 .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}]]>abcdefghijklmno diff --git a/e2etests/testdata/stable/binary_tree/elk/sketch.exp.svg b/e2etests/testdata/stable/binary_tree/elk/sketch.exp.svg index 832def317..991817385 100644 --- a/e2etests/testdata/stable/binary_tree/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/binary_tree/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -abcdefghijklmno -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-1983139693 .fill-N1{fill:#0A0F25;} - .d2-1983139693 .fill-N2{fill:#676C7E;} - .d2-1983139693 .fill-N3{fill:#9499AB;} - .d2-1983139693 .fill-N4{fill:#CFD2DD;} - .d2-1983139693 .fill-N5{fill:#DEE1EB;} - .d2-1983139693 .fill-N6{fill:#EEF1F8;} - .d2-1983139693 .fill-N7{fill:#FFFFFF;} - .d2-1983139693 .fill-B1{fill:#0D32B2;} - .d2-1983139693 .fill-B2{fill:#0D32B2;} - .d2-1983139693 .fill-B3{fill:#E3E9FD;} - .d2-1983139693 .fill-B4{fill:#E3E9FD;} - .d2-1983139693 .fill-B5{fill:#EDF0FD;} - .d2-1983139693 .fill-B6{fill:#F7F8FE;} - .d2-1983139693 .fill-AA2{fill:#4A6FF3;} - .d2-1983139693 .fill-AA4{fill:#EDF0FD;} - .d2-1983139693 .fill-AA5{fill:#F7F8FE;} - .d2-1983139693 .fill-AB4{fill:#EDF0FD;} - .d2-1983139693 .fill-AB5{fill:#F7F8FE;} - .d2-1983139693 .stroke-N1{stroke:#0A0F25;} - .d2-1983139693 .stroke-N2{stroke:#676C7E;} - .d2-1983139693 .stroke-N3{stroke:#9499AB;} - .d2-1983139693 .stroke-N4{stroke:#CFD2DD;} - .d2-1983139693 .stroke-N5{stroke:#DEE1EB;} - .d2-1983139693 .stroke-N6{stroke:#EEF1F8;} - .d2-1983139693 .stroke-N7{stroke:#FFFFFF;} - .d2-1983139693 .stroke-B1{stroke:#0D32B2;} - .d2-1983139693 .stroke-B2{stroke:#0D32B2;} - .d2-1983139693 .stroke-B3{stroke:#E3E9FD;} - .d2-1983139693 .stroke-B4{stroke:#E3E9FD;} - .d2-1983139693 .stroke-B5{stroke:#EDF0FD;} - .d2-1983139693 .stroke-B6{stroke:#F7F8FE;} - .d2-1983139693 .stroke-AA2{stroke:#4A6FF3;} - .d2-1983139693 .stroke-AA4{stroke:#EDF0FD;} - .d2-1983139693 .stroke-AA5{stroke:#F7F8FE;} - .d2-1983139693 .stroke-AB4{stroke:#EDF0FD;} - .d2-1983139693 .stroke-AB5{stroke:#F7F8FE;} - .d2-1983139693 .background-color-N1{background-color:#0A0F25;} - .d2-1983139693 .background-color-N2{background-color:#676C7E;} - .d2-1983139693 .background-color-N3{background-color:#9499AB;} - .d2-1983139693 .background-color-N4{background-color:#CFD2DD;} - .d2-1983139693 .background-color-N5{background-color:#DEE1EB;} - .d2-1983139693 .background-color-N6{background-color:#EEF1F8;} - .d2-1983139693 .background-color-N7{background-color:#FFFFFF;} - .d2-1983139693 .background-color-B1{background-color:#0D32B2;} - .d2-1983139693 .background-color-B2{background-color:#0D32B2;} - .d2-1983139693 .background-color-B3{background-color:#E3E9FD;} - .d2-1983139693 .background-color-B4{background-color:#E3E9FD;} - .d2-1983139693 .background-color-B5{background-color:#EDF0FD;} - .d2-1983139693 .background-color-B6{background-color:#F7F8FE;} - .d2-1983139693 .background-color-AA2{background-color:#4A6FF3;} - .d2-1983139693 .background-color-AA4{background-color:#EDF0FD;} - .d2-1983139693 .background-color-AA5{background-color:#F7F8FE;} - .d2-1983139693 .background-color-AB4{background-color:#EDF0FD;} - .d2-1983139693 .background-color-AB5{background-color:#F7F8FE;} - .d2-1983139693 .color-N1{color:#0A0F25;} - .d2-1983139693 .color-N2{color:#676C7E;} - .d2-1983139693 .color-N3{color:#9499AB;} - .d2-1983139693 .color-N4{color:#CFD2DD;} - .d2-1983139693 .color-N5{color:#DEE1EB;} - .d2-1983139693 .color-N6{color:#EEF1F8;} - .d2-1983139693 .color-N7{color:#FFFFFF;} - .d2-1983139693 .color-B1{color:#0D32B2;} - .d2-1983139693 .color-B2{color:#0D32B2;} - .d2-1983139693 .color-B3{color:#E3E9FD;} - .d2-1983139693 .color-B4{color:#E3E9FD;} - .d2-1983139693 .color-B5{color:#EDF0FD;} - .d2-1983139693 .color-B6{color:#F7F8FE;} - .d2-1983139693 .color-AA2{color:#4A6FF3;} - .d2-1983139693 .color-AA4{color:#EDF0FD;} - .d2-1983139693 .color-AA5{color:#F7F8FE;} - .d2-1983139693 .color-AB4{color:#EDF0FD;} - .d2-1983139693 .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}]]>abcdefghijklmno -======= .d2-980361313 .fill-N1{fill:#0A0F25;} .d2-980361313 .fill-N2{fill:#676C7E;} .d2-980361313 .fill-N3{fill:#9499AB;} @@ -252,8 +89,7 @@ .d2-980361313 .color-AA4{color:#EDF0FD;} .d2-980361313 .color-AA5{color:#F7F8FE;} .d2-980361313 .color-AB4{color:#EDF0FD;} - .d2-980361313 .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}]]>abcdefghijklmno ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-980361313 .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}]]>abcdefghijklmno diff --git a/e2etests/testdata/stable/centered_horizontal_connections/dagre/sketch.exp.svg b/e2etests/testdata/stable/centered_horizontal_connections/dagre/sketch.exp.svg index f85249c58..e86c2d7b3 100644 --- a/e2etests/testdata/stable/centered_horizontal_connections/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/centered_horizontal_connections/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -r1r2 eth1eth1 -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-1076035503 .fill-N1{fill:#0A0F25;} - .d2-1076035503 .fill-N2{fill:#676C7E;} - .d2-1076035503 .fill-N3{fill:#9499AB;} - .d2-1076035503 .fill-N4{fill:#CFD2DD;} - .d2-1076035503 .fill-N5{fill:#DEE1EB;} - .d2-1076035503 .fill-N6{fill:#EEF1F8;} - .d2-1076035503 .fill-N7{fill:#FFFFFF;} - .d2-1076035503 .fill-B1{fill:#0D32B2;} - .d2-1076035503 .fill-B2{fill:#0D32B2;} - .d2-1076035503 .fill-B3{fill:#E3E9FD;} - .d2-1076035503 .fill-B4{fill:#E3E9FD;} - .d2-1076035503 .fill-B5{fill:#EDF0FD;} - .d2-1076035503 .fill-B6{fill:#F7F8FE;} - .d2-1076035503 .fill-AA2{fill:#4A6FF3;} - .d2-1076035503 .fill-AA4{fill:#EDF0FD;} - .d2-1076035503 .fill-AA5{fill:#F7F8FE;} - .d2-1076035503 .fill-AB4{fill:#EDF0FD;} - .d2-1076035503 .fill-AB5{fill:#F7F8FE;} - .d2-1076035503 .stroke-N1{stroke:#0A0F25;} - .d2-1076035503 .stroke-N2{stroke:#676C7E;} - .d2-1076035503 .stroke-N3{stroke:#9499AB;} - .d2-1076035503 .stroke-N4{stroke:#CFD2DD;} - .d2-1076035503 .stroke-N5{stroke:#DEE1EB;} - .d2-1076035503 .stroke-N6{stroke:#EEF1F8;} - .d2-1076035503 .stroke-N7{stroke:#FFFFFF;} - .d2-1076035503 .stroke-B1{stroke:#0D32B2;} - .d2-1076035503 .stroke-B2{stroke:#0D32B2;} - .d2-1076035503 .stroke-B3{stroke:#E3E9FD;} - .d2-1076035503 .stroke-B4{stroke:#E3E9FD;} - .d2-1076035503 .stroke-B5{stroke:#EDF0FD;} - .d2-1076035503 .stroke-B6{stroke:#F7F8FE;} - .d2-1076035503 .stroke-AA2{stroke:#4A6FF3;} - .d2-1076035503 .stroke-AA4{stroke:#EDF0FD;} - .d2-1076035503 .stroke-AA5{stroke:#F7F8FE;} - .d2-1076035503 .stroke-AB4{stroke:#EDF0FD;} - .d2-1076035503 .stroke-AB5{stroke:#F7F8FE;} - .d2-1076035503 .background-color-N1{background-color:#0A0F25;} - .d2-1076035503 .background-color-N2{background-color:#676C7E;} - .d2-1076035503 .background-color-N3{background-color:#9499AB;} - .d2-1076035503 .background-color-N4{background-color:#CFD2DD;} - .d2-1076035503 .background-color-N5{background-color:#DEE1EB;} - .d2-1076035503 .background-color-N6{background-color:#EEF1F8;} - .d2-1076035503 .background-color-N7{background-color:#FFFFFF;} - .d2-1076035503 .background-color-B1{background-color:#0D32B2;} - .d2-1076035503 .background-color-B2{background-color:#0D32B2;} - .d2-1076035503 .background-color-B3{background-color:#E3E9FD;} - .d2-1076035503 .background-color-B4{background-color:#E3E9FD;} - .d2-1076035503 .background-color-B5{background-color:#EDF0FD;} - .d2-1076035503 .background-color-B6{background-color:#F7F8FE;} - .d2-1076035503 .background-color-AA2{background-color:#4A6FF3;} - .d2-1076035503 .background-color-AA4{background-color:#EDF0FD;} - .d2-1076035503 .background-color-AA5{background-color:#F7F8FE;} - .d2-1076035503 .background-color-AB4{background-color:#EDF0FD;} - .d2-1076035503 .background-color-AB5{background-color:#F7F8FE;} - .d2-1076035503 .color-N1{color:#0A0F25;} - .d2-1076035503 .color-N2{color:#676C7E;} - .d2-1076035503 .color-N3{color:#9499AB;} - .d2-1076035503 .color-N4{color:#CFD2DD;} - .d2-1076035503 .color-N5{color:#DEE1EB;} - .d2-1076035503 .color-N6{color:#EEF1F8;} - .d2-1076035503 .color-N7{color:#FFFFFF;} - .d2-1076035503 .color-B1{color:#0D32B2;} - .d2-1076035503 .color-B2{color:#0D32B2;} - .d2-1076035503 .color-B3{color:#E3E9FD;} - .d2-1076035503 .color-B4{color:#E3E9FD;} - .d2-1076035503 .color-B5{color:#EDF0FD;} - .d2-1076035503 .color-B6{color:#F7F8FE;} - .d2-1076035503 .color-AA2{color:#4A6FF3;} - .d2-1076035503 .color-AA4{color:#EDF0FD;} - .d2-1076035503 .color-AA5{color:#F7F8FE;} - .d2-1076035503 .color-AB4{color:#EDF0FD;} - .d2-1076035503 .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}]]>r1r2 eth1eth1 -======= .d2-2693743037 .fill-N1{fill:#0A0F25;} .d2-2693743037 .fill-N2{fill:#676C7E;} .d2-2693743037 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-2693743037 .color-AA4{color:#EDF0FD;} .d2-2693743037 .color-AA5{color:#F7F8FE;} .d2-2693743037 .color-AB4{color:#EDF0FD;} - .d2-2693743037 .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}]]>r1r2 eth1eth1 ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-2693743037 .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}]]>r1r2 eth1eth1 diff --git a/e2etests/testdata/stable/centered_horizontal_connections/elk/sketch.exp.svg b/e2etests/testdata/stable/centered_horizontal_connections/elk/sketch.exp.svg index 8e27c01a2..0de22d81a 100644 --- a/e2etests/testdata/stable/centered_horizontal_connections/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/centered_horizontal_connections/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -r1r2 eth1eth1 -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-423924276 .fill-N1{fill:#0A0F25;} - .d2-423924276 .fill-N2{fill:#676C7E;} - .d2-423924276 .fill-N3{fill:#9499AB;} - .d2-423924276 .fill-N4{fill:#CFD2DD;} - .d2-423924276 .fill-N5{fill:#DEE1EB;} - .d2-423924276 .fill-N6{fill:#EEF1F8;} - .d2-423924276 .fill-N7{fill:#FFFFFF;} - .d2-423924276 .fill-B1{fill:#0D32B2;} - .d2-423924276 .fill-B2{fill:#0D32B2;} - .d2-423924276 .fill-B3{fill:#E3E9FD;} - .d2-423924276 .fill-B4{fill:#E3E9FD;} - .d2-423924276 .fill-B5{fill:#EDF0FD;} - .d2-423924276 .fill-B6{fill:#F7F8FE;} - .d2-423924276 .fill-AA2{fill:#4A6FF3;} - .d2-423924276 .fill-AA4{fill:#EDF0FD;} - .d2-423924276 .fill-AA5{fill:#F7F8FE;} - .d2-423924276 .fill-AB4{fill:#EDF0FD;} - .d2-423924276 .fill-AB5{fill:#F7F8FE;} - .d2-423924276 .stroke-N1{stroke:#0A0F25;} - .d2-423924276 .stroke-N2{stroke:#676C7E;} - .d2-423924276 .stroke-N3{stroke:#9499AB;} - .d2-423924276 .stroke-N4{stroke:#CFD2DD;} - .d2-423924276 .stroke-N5{stroke:#DEE1EB;} - .d2-423924276 .stroke-N6{stroke:#EEF1F8;} - .d2-423924276 .stroke-N7{stroke:#FFFFFF;} - .d2-423924276 .stroke-B1{stroke:#0D32B2;} - .d2-423924276 .stroke-B2{stroke:#0D32B2;} - .d2-423924276 .stroke-B3{stroke:#E3E9FD;} - .d2-423924276 .stroke-B4{stroke:#E3E9FD;} - .d2-423924276 .stroke-B5{stroke:#EDF0FD;} - .d2-423924276 .stroke-B6{stroke:#F7F8FE;} - .d2-423924276 .stroke-AA2{stroke:#4A6FF3;} - .d2-423924276 .stroke-AA4{stroke:#EDF0FD;} - .d2-423924276 .stroke-AA5{stroke:#F7F8FE;} - .d2-423924276 .stroke-AB4{stroke:#EDF0FD;} - .d2-423924276 .stroke-AB5{stroke:#F7F8FE;} - .d2-423924276 .background-color-N1{background-color:#0A0F25;} - .d2-423924276 .background-color-N2{background-color:#676C7E;} - .d2-423924276 .background-color-N3{background-color:#9499AB;} - .d2-423924276 .background-color-N4{background-color:#CFD2DD;} - .d2-423924276 .background-color-N5{background-color:#DEE1EB;} - .d2-423924276 .background-color-N6{background-color:#EEF1F8;} - .d2-423924276 .background-color-N7{background-color:#FFFFFF;} - .d2-423924276 .background-color-B1{background-color:#0D32B2;} - .d2-423924276 .background-color-B2{background-color:#0D32B2;} - .d2-423924276 .background-color-B3{background-color:#E3E9FD;} - .d2-423924276 .background-color-B4{background-color:#E3E9FD;} - .d2-423924276 .background-color-B5{background-color:#EDF0FD;} - .d2-423924276 .background-color-B6{background-color:#F7F8FE;} - .d2-423924276 .background-color-AA2{background-color:#4A6FF3;} - .d2-423924276 .background-color-AA4{background-color:#EDF0FD;} - .d2-423924276 .background-color-AA5{background-color:#F7F8FE;} - .d2-423924276 .background-color-AB4{background-color:#EDF0FD;} - .d2-423924276 .background-color-AB5{background-color:#F7F8FE;} - .d2-423924276 .color-N1{color:#0A0F25;} - .d2-423924276 .color-N2{color:#676C7E;} - .d2-423924276 .color-N3{color:#9499AB;} - .d2-423924276 .color-N4{color:#CFD2DD;} - .d2-423924276 .color-N5{color:#DEE1EB;} - .d2-423924276 .color-N6{color:#EEF1F8;} - .d2-423924276 .color-N7{color:#FFFFFF;} - .d2-423924276 .color-B1{color:#0D32B2;} - .d2-423924276 .color-B2{color:#0D32B2;} - .d2-423924276 .color-B3{color:#E3E9FD;} - .d2-423924276 .color-B4{color:#E3E9FD;} - .d2-423924276 .color-B5{color:#EDF0FD;} - .d2-423924276 .color-B6{color:#F7F8FE;} - .d2-423924276 .color-AA2{color:#4A6FF3;} - .d2-423924276 .color-AA4{color:#EDF0FD;} - .d2-423924276 .color-AA5{color:#F7F8FE;} - .d2-423924276 .color-AB4{color:#EDF0FD;} - .d2-423924276 .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}]]>r1r2 eth1eth1 -======= .d2-2839028722 .fill-N1{fill:#0A0F25;} .d2-2839028722 .fill-N2{fill:#676C7E;} .d2-2839028722 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-2839028722 .color-AA4{color:#EDF0FD;} .d2-2839028722 .color-AA5{color:#F7F8FE;} .d2-2839028722 .color-AB4{color:#EDF0FD;} - .d2-2839028722 .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}]]>r1r2 eth1eth1 ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-2839028722 .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}]]>r1r2 eth1eth1 diff --git a/e2etests/testdata/stable/chaos2/dagre/sketch.exp.svg b/e2etests/testdata/stable/chaos2/dagre/sketch.exp.svg index af9392b7c..6ce14ee34 100644 --- a/e2etests/testdata/stable/chaos2/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/chaos2/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -abcd circle filled-circle -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-1964876090 .fill-N1{fill:#0A0F25;} - .d2-1964876090 .fill-N2{fill:#676C7E;} - .d2-1964876090 .fill-N3{fill:#9499AB;} - .d2-1964876090 .fill-N4{fill:#CFD2DD;} - .d2-1964876090 .fill-N5{fill:#DEE1EB;} - .d2-1964876090 .fill-N6{fill:#EEF1F8;} - .d2-1964876090 .fill-N7{fill:#FFFFFF;} - .d2-1964876090 .fill-B1{fill:#0D32B2;} - .d2-1964876090 .fill-B2{fill:#0D32B2;} - .d2-1964876090 .fill-B3{fill:#E3E9FD;} - .d2-1964876090 .fill-B4{fill:#E3E9FD;} - .d2-1964876090 .fill-B5{fill:#EDF0FD;} - .d2-1964876090 .fill-B6{fill:#F7F8FE;} - .d2-1964876090 .fill-AA2{fill:#4A6FF3;} - .d2-1964876090 .fill-AA4{fill:#EDF0FD;} - .d2-1964876090 .fill-AA5{fill:#F7F8FE;} - .d2-1964876090 .fill-AB4{fill:#EDF0FD;} - .d2-1964876090 .fill-AB5{fill:#F7F8FE;} - .d2-1964876090 .stroke-N1{stroke:#0A0F25;} - .d2-1964876090 .stroke-N2{stroke:#676C7E;} - .d2-1964876090 .stroke-N3{stroke:#9499AB;} - .d2-1964876090 .stroke-N4{stroke:#CFD2DD;} - .d2-1964876090 .stroke-N5{stroke:#DEE1EB;} - .d2-1964876090 .stroke-N6{stroke:#EEF1F8;} - .d2-1964876090 .stroke-N7{stroke:#FFFFFF;} - .d2-1964876090 .stroke-B1{stroke:#0D32B2;} - .d2-1964876090 .stroke-B2{stroke:#0D32B2;} - .d2-1964876090 .stroke-B3{stroke:#E3E9FD;} - .d2-1964876090 .stroke-B4{stroke:#E3E9FD;} - .d2-1964876090 .stroke-B5{stroke:#EDF0FD;} - .d2-1964876090 .stroke-B6{stroke:#F7F8FE;} - .d2-1964876090 .stroke-AA2{stroke:#4A6FF3;} - .d2-1964876090 .stroke-AA4{stroke:#EDF0FD;} - .d2-1964876090 .stroke-AA5{stroke:#F7F8FE;} - .d2-1964876090 .stroke-AB4{stroke:#EDF0FD;} - .d2-1964876090 .stroke-AB5{stroke:#F7F8FE;} - .d2-1964876090 .background-color-N1{background-color:#0A0F25;} - .d2-1964876090 .background-color-N2{background-color:#676C7E;} - .d2-1964876090 .background-color-N3{background-color:#9499AB;} - .d2-1964876090 .background-color-N4{background-color:#CFD2DD;} - .d2-1964876090 .background-color-N5{background-color:#DEE1EB;} - .d2-1964876090 .background-color-N6{background-color:#EEF1F8;} - .d2-1964876090 .background-color-N7{background-color:#FFFFFF;} - .d2-1964876090 .background-color-B1{background-color:#0D32B2;} - .d2-1964876090 .background-color-B2{background-color:#0D32B2;} - .d2-1964876090 .background-color-B3{background-color:#E3E9FD;} - .d2-1964876090 .background-color-B4{background-color:#E3E9FD;} - .d2-1964876090 .background-color-B5{background-color:#EDF0FD;} - .d2-1964876090 .background-color-B6{background-color:#F7F8FE;} - .d2-1964876090 .background-color-AA2{background-color:#4A6FF3;} - .d2-1964876090 .background-color-AA4{background-color:#EDF0FD;} - .d2-1964876090 .background-color-AA5{background-color:#F7F8FE;} - .d2-1964876090 .background-color-AB4{background-color:#EDF0FD;} - .d2-1964876090 .background-color-AB5{background-color:#F7F8FE;} - .d2-1964876090 .color-N1{color:#0A0F25;} - .d2-1964876090 .color-N2{color:#676C7E;} - .d2-1964876090 .color-N3{color:#9499AB;} - .d2-1964876090 .color-N4{color:#CFD2DD;} - .d2-1964876090 .color-N5{color:#DEE1EB;} - .d2-1964876090 .color-N6{color:#EEF1F8;} - .d2-1964876090 .color-N7{color:#FFFFFF;} - .d2-1964876090 .color-B1{color:#0D32B2;} - .d2-1964876090 .color-B2{color:#0D32B2;} - .d2-1964876090 .color-B3{color:#E3E9FD;} - .d2-1964876090 .color-B4{color:#E3E9FD;} - .d2-1964876090 .color-B5{color:#EDF0FD;} - .d2-1964876090 .color-B6{color:#F7F8FE;} - .d2-1964876090 .color-AA2{color:#4A6FF3;} - .d2-1964876090 .color-AA4{color:#EDF0FD;} - .d2-1964876090 .color-AA5{color:#F7F8FE;} - .d2-1964876090 .color-AB4{color:#EDF0FD;} - .d2-1964876090 .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 circle filled-circle -======= .d2-2944241002 .fill-N1{fill:#0A0F25;} .d2-2944241002 .fill-N2{fill:#676C7E;} .d2-2944241002 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-2944241002 .color-AA4{color:#EDF0FD;} .d2-2944241002 .color-AA5{color:#F7F8FE;} .d2-2944241002 .color-AB4{color:#EDF0FD;} - .d2-2944241002 .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 circle filled-circle ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-2944241002 .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 circle filled-circle diff --git a/e2etests/testdata/stable/circle_arrowhead/elk/sketch.exp.svg b/e2etests/testdata/stable/circle_arrowhead/elk/sketch.exp.svg index de2ff5183..f7147b44d 100644 --- a/e2etests/testdata/stable/circle_arrowhead/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/circle_arrowhead/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -abcd circle filled-circle -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-2475695899 .fill-N1{fill:#0A0F25;} - .d2-2475695899 .fill-N2{fill:#676C7E;} - .d2-2475695899 .fill-N3{fill:#9499AB;} - .d2-2475695899 .fill-N4{fill:#CFD2DD;} - .d2-2475695899 .fill-N5{fill:#DEE1EB;} - .d2-2475695899 .fill-N6{fill:#EEF1F8;} - .d2-2475695899 .fill-N7{fill:#FFFFFF;} - .d2-2475695899 .fill-B1{fill:#0D32B2;} - .d2-2475695899 .fill-B2{fill:#0D32B2;} - .d2-2475695899 .fill-B3{fill:#E3E9FD;} - .d2-2475695899 .fill-B4{fill:#E3E9FD;} - .d2-2475695899 .fill-B5{fill:#EDF0FD;} - .d2-2475695899 .fill-B6{fill:#F7F8FE;} - .d2-2475695899 .fill-AA2{fill:#4A6FF3;} - .d2-2475695899 .fill-AA4{fill:#EDF0FD;} - .d2-2475695899 .fill-AA5{fill:#F7F8FE;} - .d2-2475695899 .fill-AB4{fill:#EDF0FD;} - .d2-2475695899 .fill-AB5{fill:#F7F8FE;} - .d2-2475695899 .stroke-N1{stroke:#0A0F25;} - .d2-2475695899 .stroke-N2{stroke:#676C7E;} - .d2-2475695899 .stroke-N3{stroke:#9499AB;} - .d2-2475695899 .stroke-N4{stroke:#CFD2DD;} - .d2-2475695899 .stroke-N5{stroke:#DEE1EB;} - .d2-2475695899 .stroke-N6{stroke:#EEF1F8;} - .d2-2475695899 .stroke-N7{stroke:#FFFFFF;} - .d2-2475695899 .stroke-B1{stroke:#0D32B2;} - .d2-2475695899 .stroke-B2{stroke:#0D32B2;} - .d2-2475695899 .stroke-B3{stroke:#E3E9FD;} - .d2-2475695899 .stroke-B4{stroke:#E3E9FD;} - .d2-2475695899 .stroke-B5{stroke:#EDF0FD;} - .d2-2475695899 .stroke-B6{stroke:#F7F8FE;} - .d2-2475695899 .stroke-AA2{stroke:#4A6FF3;} - .d2-2475695899 .stroke-AA4{stroke:#EDF0FD;} - .d2-2475695899 .stroke-AA5{stroke:#F7F8FE;} - .d2-2475695899 .stroke-AB4{stroke:#EDF0FD;} - .d2-2475695899 .stroke-AB5{stroke:#F7F8FE;} - .d2-2475695899 .background-color-N1{background-color:#0A0F25;} - .d2-2475695899 .background-color-N2{background-color:#676C7E;} - .d2-2475695899 .background-color-N3{background-color:#9499AB;} - .d2-2475695899 .background-color-N4{background-color:#CFD2DD;} - .d2-2475695899 .background-color-N5{background-color:#DEE1EB;} - .d2-2475695899 .background-color-N6{background-color:#EEF1F8;} - .d2-2475695899 .background-color-N7{background-color:#FFFFFF;} - .d2-2475695899 .background-color-B1{background-color:#0D32B2;} - .d2-2475695899 .background-color-B2{background-color:#0D32B2;} - .d2-2475695899 .background-color-B3{background-color:#E3E9FD;} - .d2-2475695899 .background-color-B4{background-color:#E3E9FD;} - .d2-2475695899 .background-color-B5{background-color:#EDF0FD;} - .d2-2475695899 .background-color-B6{background-color:#F7F8FE;} - .d2-2475695899 .background-color-AA2{background-color:#4A6FF3;} - .d2-2475695899 .background-color-AA4{background-color:#EDF0FD;} - .d2-2475695899 .background-color-AA5{background-color:#F7F8FE;} - .d2-2475695899 .background-color-AB4{background-color:#EDF0FD;} - .d2-2475695899 .background-color-AB5{background-color:#F7F8FE;} - .d2-2475695899 .color-N1{color:#0A0F25;} - .d2-2475695899 .color-N2{color:#676C7E;} - .d2-2475695899 .color-N3{color:#9499AB;} - .d2-2475695899 .color-N4{color:#CFD2DD;} - .d2-2475695899 .color-N5{color:#DEE1EB;} - .d2-2475695899 .color-N6{color:#EEF1F8;} - .d2-2475695899 .color-N7{color:#FFFFFF;} - .d2-2475695899 .color-B1{color:#0D32B2;} - .d2-2475695899 .color-B2{color:#0D32B2;} - .d2-2475695899 .color-B3{color:#E3E9FD;} - .d2-2475695899 .color-B4{color:#E3E9FD;} - .d2-2475695899 .color-B5{color:#EDF0FD;} - .d2-2475695899 .color-B6{color:#F7F8FE;} - .d2-2475695899 .color-AA2{color:#4A6FF3;} - .d2-2475695899 .color-AA4{color:#EDF0FD;} - .d2-2475695899 .color-AA5{color:#F7F8FE;} - .d2-2475695899 .color-AB4{color:#EDF0FD;} - .d2-2475695899 .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 circle filled-circle -======= .d2-3911433299 .fill-N1{fill:#0A0F25;} .d2-3911433299 .fill-N2{fill:#676C7E;} .d2-3911433299 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-3911433299 .color-AA4{color:#EDF0FD;} .d2-3911433299 .color-AA5{color:#F7F8FE;} .d2-3911433299 .color-AB4{color:#EDF0FD;} - .d2-3911433299 .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 circle filled-circle ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-3911433299 .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 circle filled-circle diff --git a/e2etests/testdata/stable/circular_dependency/dagre/sketch.exp.svg b/e2etests/testdata/stable/circular_dependency/dagre/sketch.exp.svg index 6a46312ef..9c122da22 100644 --- a/e2etests/testdata/stable/circular_dependency/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/circular_dependency/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -abc -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-3859270131 .fill-N1{fill:#0A0F25;} - .d2-3859270131 .fill-N2{fill:#676C7E;} - .d2-3859270131 .fill-N3{fill:#9499AB;} - .d2-3859270131 .fill-N4{fill:#CFD2DD;} - .d2-3859270131 .fill-N5{fill:#DEE1EB;} - .d2-3859270131 .fill-N6{fill:#EEF1F8;} - .d2-3859270131 .fill-N7{fill:#FFFFFF;} - .d2-3859270131 .fill-B1{fill:#0D32B2;} - .d2-3859270131 .fill-B2{fill:#0D32B2;} - .d2-3859270131 .fill-B3{fill:#E3E9FD;} - .d2-3859270131 .fill-B4{fill:#E3E9FD;} - .d2-3859270131 .fill-B5{fill:#EDF0FD;} - .d2-3859270131 .fill-B6{fill:#F7F8FE;} - .d2-3859270131 .fill-AA2{fill:#4A6FF3;} - .d2-3859270131 .fill-AA4{fill:#EDF0FD;} - .d2-3859270131 .fill-AA5{fill:#F7F8FE;} - .d2-3859270131 .fill-AB4{fill:#EDF0FD;} - .d2-3859270131 .fill-AB5{fill:#F7F8FE;} - .d2-3859270131 .stroke-N1{stroke:#0A0F25;} - .d2-3859270131 .stroke-N2{stroke:#676C7E;} - .d2-3859270131 .stroke-N3{stroke:#9499AB;} - .d2-3859270131 .stroke-N4{stroke:#CFD2DD;} - .d2-3859270131 .stroke-N5{stroke:#DEE1EB;} - .d2-3859270131 .stroke-N6{stroke:#EEF1F8;} - .d2-3859270131 .stroke-N7{stroke:#FFFFFF;} - .d2-3859270131 .stroke-B1{stroke:#0D32B2;} - .d2-3859270131 .stroke-B2{stroke:#0D32B2;} - .d2-3859270131 .stroke-B3{stroke:#E3E9FD;} - .d2-3859270131 .stroke-B4{stroke:#E3E9FD;} - .d2-3859270131 .stroke-B5{stroke:#EDF0FD;} - .d2-3859270131 .stroke-B6{stroke:#F7F8FE;} - .d2-3859270131 .stroke-AA2{stroke:#4A6FF3;} - .d2-3859270131 .stroke-AA4{stroke:#EDF0FD;} - .d2-3859270131 .stroke-AA5{stroke:#F7F8FE;} - .d2-3859270131 .stroke-AB4{stroke:#EDF0FD;} - .d2-3859270131 .stroke-AB5{stroke:#F7F8FE;} - .d2-3859270131 .background-color-N1{background-color:#0A0F25;} - .d2-3859270131 .background-color-N2{background-color:#676C7E;} - .d2-3859270131 .background-color-N3{background-color:#9499AB;} - .d2-3859270131 .background-color-N4{background-color:#CFD2DD;} - .d2-3859270131 .background-color-N5{background-color:#DEE1EB;} - .d2-3859270131 .background-color-N6{background-color:#EEF1F8;} - .d2-3859270131 .background-color-N7{background-color:#FFFFFF;} - .d2-3859270131 .background-color-B1{background-color:#0D32B2;} - .d2-3859270131 .background-color-B2{background-color:#0D32B2;} - .d2-3859270131 .background-color-B3{background-color:#E3E9FD;} - .d2-3859270131 .background-color-B4{background-color:#E3E9FD;} - .d2-3859270131 .background-color-B5{background-color:#EDF0FD;} - .d2-3859270131 .background-color-B6{background-color:#F7F8FE;} - .d2-3859270131 .background-color-AA2{background-color:#4A6FF3;} - .d2-3859270131 .background-color-AA4{background-color:#EDF0FD;} - .d2-3859270131 .background-color-AA5{background-color:#F7F8FE;} - .d2-3859270131 .background-color-AB4{background-color:#EDF0FD;} - .d2-3859270131 .background-color-AB5{background-color:#F7F8FE;} - .d2-3859270131 .color-N1{color:#0A0F25;} - .d2-3859270131 .color-N2{color:#676C7E;} - .d2-3859270131 .color-N3{color:#9499AB;} - .d2-3859270131 .color-N4{color:#CFD2DD;} - .d2-3859270131 .color-N5{color:#DEE1EB;} - .d2-3859270131 .color-N6{color:#EEF1F8;} - .d2-3859270131 .color-N7{color:#FFFFFF;} - .d2-3859270131 .color-B1{color:#0D32B2;} - .d2-3859270131 .color-B2{color:#0D32B2;} - .d2-3859270131 .color-B3{color:#E3E9FD;} - .d2-3859270131 .color-B4{color:#E3E9FD;} - .d2-3859270131 .color-B5{color:#EDF0FD;} - .d2-3859270131 .color-B6{color:#F7F8FE;} - .d2-3859270131 .color-AA2{color:#4A6FF3;} - .d2-3859270131 .color-AA4{color:#EDF0FD;} - .d2-3859270131 .color-AA5{color:#F7F8FE;} - .d2-3859270131 .color-AB4{color:#EDF0FD;} - .d2-3859270131 .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}]]>abc -======= .d2-1404699995 .fill-N1{fill:#0A0F25;} .d2-1404699995 .fill-N2{fill:#676C7E;} .d2-1404699995 .fill-N3{fill:#9499AB;} @@ -252,8 +89,7 @@ .d2-1404699995 .color-AA4{color:#EDF0FD;} .d2-1404699995 .color-AA5{color:#F7F8FE;} .d2-1404699995 .color-AB4{color:#EDF0FD;} - .d2-1404699995 .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}]]>abc ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-1404699995 .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}]]>abc diff --git a/e2etests/testdata/stable/circular_dependency/elk/sketch.exp.svg b/e2etests/testdata/stable/circular_dependency/elk/sketch.exp.svg index c206068e2..03e2e47eb 100644 --- a/e2etests/testdata/stable/circular_dependency/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/circular_dependency/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -abc -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-3022025952 .fill-N1{fill:#0A0F25;} - .d2-3022025952 .fill-N2{fill:#676C7E;} - .d2-3022025952 .fill-N3{fill:#9499AB;} - .d2-3022025952 .fill-N4{fill:#CFD2DD;} - .d2-3022025952 .fill-N5{fill:#DEE1EB;} - .d2-3022025952 .fill-N6{fill:#EEF1F8;} - .d2-3022025952 .fill-N7{fill:#FFFFFF;} - .d2-3022025952 .fill-B1{fill:#0D32B2;} - .d2-3022025952 .fill-B2{fill:#0D32B2;} - .d2-3022025952 .fill-B3{fill:#E3E9FD;} - .d2-3022025952 .fill-B4{fill:#E3E9FD;} - .d2-3022025952 .fill-B5{fill:#EDF0FD;} - .d2-3022025952 .fill-B6{fill:#F7F8FE;} - .d2-3022025952 .fill-AA2{fill:#4A6FF3;} - .d2-3022025952 .fill-AA4{fill:#EDF0FD;} - .d2-3022025952 .fill-AA5{fill:#F7F8FE;} - .d2-3022025952 .fill-AB4{fill:#EDF0FD;} - .d2-3022025952 .fill-AB5{fill:#F7F8FE;} - .d2-3022025952 .stroke-N1{stroke:#0A0F25;} - .d2-3022025952 .stroke-N2{stroke:#676C7E;} - .d2-3022025952 .stroke-N3{stroke:#9499AB;} - .d2-3022025952 .stroke-N4{stroke:#CFD2DD;} - .d2-3022025952 .stroke-N5{stroke:#DEE1EB;} - .d2-3022025952 .stroke-N6{stroke:#EEF1F8;} - .d2-3022025952 .stroke-N7{stroke:#FFFFFF;} - .d2-3022025952 .stroke-B1{stroke:#0D32B2;} - .d2-3022025952 .stroke-B2{stroke:#0D32B2;} - .d2-3022025952 .stroke-B3{stroke:#E3E9FD;} - .d2-3022025952 .stroke-B4{stroke:#E3E9FD;} - .d2-3022025952 .stroke-B5{stroke:#EDF0FD;} - .d2-3022025952 .stroke-B6{stroke:#F7F8FE;} - .d2-3022025952 .stroke-AA2{stroke:#4A6FF3;} - .d2-3022025952 .stroke-AA4{stroke:#EDF0FD;} - .d2-3022025952 .stroke-AA5{stroke:#F7F8FE;} - .d2-3022025952 .stroke-AB4{stroke:#EDF0FD;} - .d2-3022025952 .stroke-AB5{stroke:#F7F8FE;} - .d2-3022025952 .background-color-N1{background-color:#0A0F25;} - .d2-3022025952 .background-color-N2{background-color:#676C7E;} - .d2-3022025952 .background-color-N3{background-color:#9499AB;} - .d2-3022025952 .background-color-N4{background-color:#CFD2DD;} - .d2-3022025952 .background-color-N5{background-color:#DEE1EB;} - .d2-3022025952 .background-color-N6{background-color:#EEF1F8;} - .d2-3022025952 .background-color-N7{background-color:#FFFFFF;} - .d2-3022025952 .background-color-B1{background-color:#0D32B2;} - .d2-3022025952 .background-color-B2{background-color:#0D32B2;} - .d2-3022025952 .background-color-B3{background-color:#E3E9FD;} - .d2-3022025952 .background-color-B4{background-color:#E3E9FD;} - .d2-3022025952 .background-color-B5{background-color:#EDF0FD;} - .d2-3022025952 .background-color-B6{background-color:#F7F8FE;} - .d2-3022025952 .background-color-AA2{background-color:#4A6FF3;} - .d2-3022025952 .background-color-AA4{background-color:#EDF0FD;} - .d2-3022025952 .background-color-AA5{background-color:#F7F8FE;} - .d2-3022025952 .background-color-AB4{background-color:#EDF0FD;} - .d2-3022025952 .background-color-AB5{background-color:#F7F8FE;} - .d2-3022025952 .color-N1{color:#0A0F25;} - .d2-3022025952 .color-N2{color:#676C7E;} - .d2-3022025952 .color-N3{color:#9499AB;} - .d2-3022025952 .color-N4{color:#CFD2DD;} - .d2-3022025952 .color-N5{color:#DEE1EB;} - .d2-3022025952 .color-N6{color:#EEF1F8;} - .d2-3022025952 .color-N7{color:#FFFFFF;} - .d2-3022025952 .color-B1{color:#0D32B2;} - .d2-3022025952 .color-B2{color:#0D32B2;} - .d2-3022025952 .color-B3{color:#E3E9FD;} - .d2-3022025952 .color-B4{color:#E3E9FD;} - .d2-3022025952 .color-B5{color:#EDF0FD;} - .d2-3022025952 .color-B6{color:#F7F8FE;} - .d2-3022025952 .color-AA2{color:#4A6FF3;} - .d2-3022025952 .color-AA4{color:#EDF0FD;} - .d2-3022025952 .color-AA5{color:#F7F8FE;} - .d2-3022025952 .color-AB4{color:#EDF0FD;} - .d2-3022025952 .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}]]>abc -======= .d2-1081912832 .fill-N1{fill:#0A0F25;} .d2-1081912832 .fill-N2{fill:#676C7E;} .d2-1081912832 .fill-N3{fill:#9499AB;} @@ -252,8 +89,7 @@ .d2-1081912832 .color-AA4{color:#EDF0FD;} .d2-1081912832 .color-AA5{color:#F7F8FE;} .d2-1081912832 .color-AB4{color:#EDF0FD;} - .d2-1081912832 .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}]]>abc ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-1081912832 .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}]]>abc diff --git a/e2etests/testdata/stable/classes/dagre/sketch.exp.svg b/e2etests/testdata/stable/classes/dagre/sketch.exp.svg index 4147415c3..e69779040 100644 --- a/e2etests/testdata/stable/classes/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/classes/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -*** thenthen -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-107579682 .fill-N1{fill:#0A0F25;} - .d2-107579682 .fill-N2{fill:#676C7E;} - .d2-107579682 .fill-N3{fill:#9499AB;} - .d2-107579682 .fill-N4{fill:#CFD2DD;} - .d2-107579682 .fill-N5{fill:#DEE1EB;} - .d2-107579682 .fill-N6{fill:#EEF1F8;} - .d2-107579682 .fill-N7{fill:#FFFFFF;} - .d2-107579682 .fill-B1{fill:#0D32B2;} - .d2-107579682 .fill-B2{fill:#0D32B2;} - .d2-107579682 .fill-B3{fill:#E3E9FD;} - .d2-107579682 .fill-B4{fill:#E3E9FD;} - .d2-107579682 .fill-B5{fill:#EDF0FD;} - .d2-107579682 .fill-B6{fill:#F7F8FE;} - .d2-107579682 .fill-AA2{fill:#4A6FF3;} - .d2-107579682 .fill-AA4{fill:#EDF0FD;} - .d2-107579682 .fill-AA5{fill:#F7F8FE;} - .d2-107579682 .fill-AB4{fill:#EDF0FD;} - .d2-107579682 .fill-AB5{fill:#F7F8FE;} - .d2-107579682 .stroke-N1{stroke:#0A0F25;} - .d2-107579682 .stroke-N2{stroke:#676C7E;} - .d2-107579682 .stroke-N3{stroke:#9499AB;} - .d2-107579682 .stroke-N4{stroke:#CFD2DD;} - .d2-107579682 .stroke-N5{stroke:#DEE1EB;} - .d2-107579682 .stroke-N6{stroke:#EEF1F8;} - .d2-107579682 .stroke-N7{stroke:#FFFFFF;} - .d2-107579682 .stroke-B1{stroke:#0D32B2;} - .d2-107579682 .stroke-B2{stroke:#0D32B2;} - .d2-107579682 .stroke-B3{stroke:#E3E9FD;} - .d2-107579682 .stroke-B4{stroke:#E3E9FD;} - .d2-107579682 .stroke-B5{stroke:#EDF0FD;} - .d2-107579682 .stroke-B6{stroke:#F7F8FE;} - .d2-107579682 .stroke-AA2{stroke:#4A6FF3;} - .d2-107579682 .stroke-AA4{stroke:#EDF0FD;} - .d2-107579682 .stroke-AA5{stroke:#F7F8FE;} - .d2-107579682 .stroke-AB4{stroke:#EDF0FD;} - .d2-107579682 .stroke-AB5{stroke:#F7F8FE;} - .d2-107579682 .background-color-N1{background-color:#0A0F25;} - .d2-107579682 .background-color-N2{background-color:#676C7E;} - .d2-107579682 .background-color-N3{background-color:#9499AB;} - .d2-107579682 .background-color-N4{background-color:#CFD2DD;} - .d2-107579682 .background-color-N5{background-color:#DEE1EB;} - .d2-107579682 .background-color-N6{background-color:#EEF1F8;} - .d2-107579682 .background-color-N7{background-color:#FFFFFF;} - .d2-107579682 .background-color-B1{background-color:#0D32B2;} - .d2-107579682 .background-color-B2{background-color:#0D32B2;} - .d2-107579682 .background-color-B3{background-color:#E3E9FD;} - .d2-107579682 .background-color-B4{background-color:#E3E9FD;} - .d2-107579682 .background-color-B5{background-color:#EDF0FD;} - .d2-107579682 .background-color-B6{background-color:#F7F8FE;} - .d2-107579682 .background-color-AA2{background-color:#4A6FF3;} - .d2-107579682 .background-color-AA4{background-color:#EDF0FD;} - .d2-107579682 .background-color-AA5{background-color:#F7F8FE;} - .d2-107579682 .background-color-AB4{background-color:#EDF0FD;} - .d2-107579682 .background-color-AB5{background-color:#F7F8FE;} - .d2-107579682 .color-N1{color:#0A0F25;} - .d2-107579682 .color-N2{color:#676C7E;} - .d2-107579682 .color-N3{color:#9499AB;} - .d2-107579682 .color-N4{color:#CFD2DD;} - .d2-107579682 .color-N5{color:#DEE1EB;} - .d2-107579682 .color-N6{color:#EEF1F8;} - .d2-107579682 .color-N7{color:#FFFFFF;} - .d2-107579682 .color-B1{color:#0D32B2;} - .d2-107579682 .color-B2{color:#0D32B2;} - .d2-107579682 .color-B3{color:#E3E9FD;} - .d2-107579682 .color-B4{color:#E3E9FD;} - .d2-107579682 .color-B5{color:#EDF0FD;} - .d2-107579682 .color-B6{color:#F7F8FE;} - .d2-107579682 .color-AA2{color:#4A6FF3;} - .d2-107579682 .color-AA4{color:#EDF0FD;} - .d2-107579682 .color-AA5{color:#F7F8FE;} - .d2-107579682 .color-AB4{color:#EDF0FD;} - .d2-107579682 .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}]]>*** thenthen -======= .d2-2750620662 .fill-N1{fill:#0A0F25;} .d2-2750620662 .fill-N2{fill:#676C7E;} .d2-2750620662 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-2750620662 .color-AA4{color:#EDF0FD;} .d2-2750620662 .color-AA5{color:#F7F8FE;} .d2-2750620662 .color-AB4{color:#EDF0FD;} - .d2-2750620662 .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}]]>*** thenthen ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-2750620662 .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}]]>*** thenthen diff --git a/e2etests/testdata/stable/classes/elk/sketch.exp.svg b/e2etests/testdata/stable/classes/elk/sketch.exp.svg index f1e34b9b8..adb1afff7 100644 --- a/e2etests/testdata/stable/classes/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/classes/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -*** thenthen -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-3768899376 .fill-N1{fill:#0A0F25;} - .d2-3768899376 .fill-N2{fill:#676C7E;} - .d2-3768899376 .fill-N3{fill:#9499AB;} - .d2-3768899376 .fill-N4{fill:#CFD2DD;} - .d2-3768899376 .fill-N5{fill:#DEE1EB;} - .d2-3768899376 .fill-N6{fill:#EEF1F8;} - .d2-3768899376 .fill-N7{fill:#FFFFFF;} - .d2-3768899376 .fill-B1{fill:#0D32B2;} - .d2-3768899376 .fill-B2{fill:#0D32B2;} - .d2-3768899376 .fill-B3{fill:#E3E9FD;} - .d2-3768899376 .fill-B4{fill:#E3E9FD;} - .d2-3768899376 .fill-B5{fill:#EDF0FD;} - .d2-3768899376 .fill-B6{fill:#F7F8FE;} - .d2-3768899376 .fill-AA2{fill:#4A6FF3;} - .d2-3768899376 .fill-AA4{fill:#EDF0FD;} - .d2-3768899376 .fill-AA5{fill:#F7F8FE;} - .d2-3768899376 .fill-AB4{fill:#EDF0FD;} - .d2-3768899376 .fill-AB5{fill:#F7F8FE;} - .d2-3768899376 .stroke-N1{stroke:#0A0F25;} - .d2-3768899376 .stroke-N2{stroke:#676C7E;} - .d2-3768899376 .stroke-N3{stroke:#9499AB;} - .d2-3768899376 .stroke-N4{stroke:#CFD2DD;} - .d2-3768899376 .stroke-N5{stroke:#DEE1EB;} - .d2-3768899376 .stroke-N6{stroke:#EEF1F8;} - .d2-3768899376 .stroke-N7{stroke:#FFFFFF;} - .d2-3768899376 .stroke-B1{stroke:#0D32B2;} - .d2-3768899376 .stroke-B2{stroke:#0D32B2;} - .d2-3768899376 .stroke-B3{stroke:#E3E9FD;} - .d2-3768899376 .stroke-B4{stroke:#E3E9FD;} - .d2-3768899376 .stroke-B5{stroke:#EDF0FD;} - .d2-3768899376 .stroke-B6{stroke:#F7F8FE;} - .d2-3768899376 .stroke-AA2{stroke:#4A6FF3;} - .d2-3768899376 .stroke-AA4{stroke:#EDF0FD;} - .d2-3768899376 .stroke-AA5{stroke:#F7F8FE;} - .d2-3768899376 .stroke-AB4{stroke:#EDF0FD;} - .d2-3768899376 .stroke-AB5{stroke:#F7F8FE;} - .d2-3768899376 .background-color-N1{background-color:#0A0F25;} - .d2-3768899376 .background-color-N2{background-color:#676C7E;} - .d2-3768899376 .background-color-N3{background-color:#9499AB;} - .d2-3768899376 .background-color-N4{background-color:#CFD2DD;} - .d2-3768899376 .background-color-N5{background-color:#DEE1EB;} - .d2-3768899376 .background-color-N6{background-color:#EEF1F8;} - .d2-3768899376 .background-color-N7{background-color:#FFFFFF;} - .d2-3768899376 .background-color-B1{background-color:#0D32B2;} - .d2-3768899376 .background-color-B2{background-color:#0D32B2;} - .d2-3768899376 .background-color-B3{background-color:#E3E9FD;} - .d2-3768899376 .background-color-B4{background-color:#E3E9FD;} - .d2-3768899376 .background-color-B5{background-color:#EDF0FD;} - .d2-3768899376 .background-color-B6{background-color:#F7F8FE;} - .d2-3768899376 .background-color-AA2{background-color:#4A6FF3;} - .d2-3768899376 .background-color-AA4{background-color:#EDF0FD;} - .d2-3768899376 .background-color-AA5{background-color:#F7F8FE;} - .d2-3768899376 .background-color-AB4{background-color:#EDF0FD;} - .d2-3768899376 .background-color-AB5{background-color:#F7F8FE;} - .d2-3768899376 .color-N1{color:#0A0F25;} - .d2-3768899376 .color-N2{color:#676C7E;} - .d2-3768899376 .color-N3{color:#9499AB;} - .d2-3768899376 .color-N4{color:#CFD2DD;} - .d2-3768899376 .color-N5{color:#DEE1EB;} - .d2-3768899376 .color-N6{color:#EEF1F8;} - .d2-3768899376 .color-N7{color:#FFFFFF;} - .d2-3768899376 .color-B1{color:#0D32B2;} - .d2-3768899376 .color-B2{color:#0D32B2;} - .d2-3768899376 .color-B3{color:#E3E9FD;} - .d2-3768899376 .color-B4{color:#E3E9FD;} - .d2-3768899376 .color-B5{color:#EDF0FD;} - .d2-3768899376 .color-B6{color:#F7F8FE;} - .d2-3768899376 .color-AA2{color:#4A6FF3;} - .d2-3768899376 .color-AA4{color:#EDF0FD;} - .d2-3768899376 .color-AA5{color:#F7F8FE;} - .d2-3768899376 .color-AB4{color:#EDF0FD;} - .d2-3768899376 .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}]]>*** thenthen -======= .d2-2024900768 .fill-N1{fill:#0A0F25;} .d2-2024900768 .fill-N2{fill:#676C7E;} .d2-2024900768 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-2024900768 .color-AA4{color:#EDF0FD;} .d2-2024900768 .color-AA5{color:#F7F8FE;} .d2-2024900768 .color-AB4{color:#EDF0FD;} - .d2-2024900768 .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}]]>*** thenthen ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-2024900768 .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}]]>*** thenthen diff --git a/e2etests/testdata/stable/code_snippet/dagre/sketch.exp.svg b/e2etests/testdata/stable/code_snippet/dagre/sketch.exp.svg index 9a4b58e5b..d9370ce17 100644 --- a/e2etests/testdata/stable/code_snippet/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/code_snippet/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -// RegisterHash registers a function that returns a new instance of the given -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-3528049809 .fill-N1{fill:#0A0F25;} - .d2-3528049809 .fill-N2{fill:#676C7E;} - .d2-3528049809 .fill-N3{fill:#9499AB;} - .d2-3528049809 .fill-N4{fill:#CFD2DD;} - .d2-3528049809 .fill-N5{fill:#DEE1EB;} - .d2-3528049809 .fill-N6{fill:#EEF1F8;} - .d2-3528049809 .fill-N7{fill:#FFFFFF;} - .d2-3528049809 .fill-B1{fill:#0D32B2;} - .d2-3528049809 .fill-B2{fill:#0D32B2;} - .d2-3528049809 .fill-B3{fill:#E3E9FD;} - .d2-3528049809 .fill-B4{fill:#E3E9FD;} - .d2-3528049809 .fill-B5{fill:#EDF0FD;} - .d2-3528049809 .fill-B6{fill:#F7F8FE;} - .d2-3528049809 .fill-AA2{fill:#4A6FF3;} - .d2-3528049809 .fill-AA4{fill:#EDF0FD;} - .d2-3528049809 .fill-AA5{fill:#F7F8FE;} - .d2-3528049809 .fill-AB4{fill:#EDF0FD;} - .d2-3528049809 .fill-AB5{fill:#F7F8FE;} - .d2-3528049809 .stroke-N1{stroke:#0A0F25;} - .d2-3528049809 .stroke-N2{stroke:#676C7E;} - .d2-3528049809 .stroke-N3{stroke:#9499AB;} - .d2-3528049809 .stroke-N4{stroke:#CFD2DD;} - .d2-3528049809 .stroke-N5{stroke:#DEE1EB;} - .d2-3528049809 .stroke-N6{stroke:#EEF1F8;} - .d2-3528049809 .stroke-N7{stroke:#FFFFFF;} - .d2-3528049809 .stroke-B1{stroke:#0D32B2;} - .d2-3528049809 .stroke-B2{stroke:#0D32B2;} - .d2-3528049809 .stroke-B3{stroke:#E3E9FD;} - .d2-3528049809 .stroke-B4{stroke:#E3E9FD;} - .d2-3528049809 .stroke-B5{stroke:#EDF0FD;} - .d2-3528049809 .stroke-B6{stroke:#F7F8FE;} - .d2-3528049809 .stroke-AA2{stroke:#4A6FF3;} - .d2-3528049809 .stroke-AA4{stroke:#EDF0FD;} - .d2-3528049809 .stroke-AA5{stroke:#F7F8FE;} - .d2-3528049809 .stroke-AB4{stroke:#EDF0FD;} - .d2-3528049809 .stroke-AB5{stroke:#F7F8FE;} - .d2-3528049809 .background-color-N1{background-color:#0A0F25;} - .d2-3528049809 .background-color-N2{background-color:#676C7E;} - .d2-3528049809 .background-color-N3{background-color:#9499AB;} - .d2-3528049809 .background-color-N4{background-color:#CFD2DD;} - .d2-3528049809 .background-color-N5{background-color:#DEE1EB;} - .d2-3528049809 .background-color-N6{background-color:#EEF1F8;} - .d2-3528049809 .background-color-N7{background-color:#FFFFFF;} - .d2-3528049809 .background-color-B1{background-color:#0D32B2;} - .d2-3528049809 .background-color-B2{background-color:#0D32B2;} - .d2-3528049809 .background-color-B3{background-color:#E3E9FD;} - .d2-3528049809 .background-color-B4{background-color:#E3E9FD;} - .d2-3528049809 .background-color-B5{background-color:#EDF0FD;} - .d2-3528049809 .background-color-B6{background-color:#F7F8FE;} - .d2-3528049809 .background-color-AA2{background-color:#4A6FF3;} - .d2-3528049809 .background-color-AA4{background-color:#EDF0FD;} - .d2-3528049809 .background-color-AA5{background-color:#F7F8FE;} - .d2-3528049809 .background-color-AB4{background-color:#EDF0FD;} - .d2-3528049809 .background-color-AB5{background-color:#F7F8FE;} - .d2-3528049809 .color-N1{color:#0A0F25;} - .d2-3528049809 .color-N2{color:#676C7E;} - .d2-3528049809 .color-N3{color:#9499AB;} - .d2-3528049809 .color-N4{color:#CFD2DD;} - .d2-3528049809 .color-N5{color:#DEE1EB;} - .d2-3528049809 .color-N6{color:#EEF1F8;} - .d2-3528049809 .color-N7{color:#FFFFFF;} - .d2-3528049809 .color-B1{color:#0D32B2;} - .d2-3528049809 .color-B2{color:#0D32B2;} - .d2-3528049809 .color-B3{color:#E3E9FD;} - .d2-3528049809 .color-B4{color:#E3E9FD;} - .d2-3528049809 .color-B5{color:#EDF0FD;} - .d2-3528049809 .color-B6{color:#F7F8FE;} - .d2-3528049809 .color-AA2{color:#4A6FF3;} - .d2-3528049809 .color-AA4{color:#EDF0FD;} - .d2-3528049809 .color-AA5{color:#F7F8FE;} - .d2-3528049809 .color-AB4{color:#EDF0FD;} - .d2-3528049809 .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}]]>// RegisterHash registers a function that returns a new instance of the given -======= .d2-4018680361 .fill-N1{fill:#0A0F25;} .d2-4018680361 .fill-N2{fill:#676C7E;} .d2-4018680361 .fill-N3{fill:#9499AB;} @@ -273,8 +110,7 @@ .d2-4018680361 .color-AA4{color:#EDF0FD;} .d2-4018680361 .color-AA5{color:#F7F8FE;} .d2-4018680361 .color-AB4{color:#EDF0FD;} - .d2-4018680361 .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}]]>// RegisterHash registers a function that returns a new instance of the given ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-4018680361 .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}]]>// RegisterHash registers a function that returns a new instance of the given // hash function. This is intended to be called from the init function in // packages that implement hash functions. func RegisterHash(h Hash, f func() hash.Hash) { @@ -282,7 +118,6 @@         panic("crypto: RegisterHash of unknown hash function")     }     hashes[h] = f -<<<<<<< HEAD }// RegisterHash registers a function that returns a new instance of the given // hash function. This is intended to be called from the init function in // packages that implement hash functions. @@ -291,28 +126,7 @@         panic("crypto: RegisterHash of unknown hash function")     }     hashes[h] = f -}xy -||||||| parent of 33280fed5 (fixed e2e tests) -}// RegisterHash registers a function that returns a new instance of the given -// hash function. This is intended to be called from the init function in -// packages that implement hash functions. -func RegisterHash(h Hash, f func() hash.Hash) { -    if h >= maxHash { -        panic("crypto: RegisterHash of unknown hash function") -    } -    hashes[h] = f -}xy -======= -}// RegisterHash registers a function that returns a new instance of the given -// hash function. This is intended to be called from the init function in -// packages that implement hash functions. -func RegisterHash(h Hash, f func() hash.Hash) { -    if h >= maxHash { -        panic("crypto: RegisterHash of unknown hash function") -    } -    hashes[h] = f -}xy ->>>>>>> 33280fed5 (fixed e2e tests) +}xy diff --git a/e2etests/testdata/stable/code_snippet/elk/sketch.exp.svg b/e2etests/testdata/stable/code_snippet/elk/sketch.exp.svg index 7f7155da8..412b09e14 100644 --- a/e2etests/testdata/stable/code_snippet/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/code_snippet/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -// RegisterHash registers a function that returns a new instance of the given -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-3358777174 .fill-N1{fill:#0A0F25;} - .d2-3358777174 .fill-N2{fill:#676C7E;} - .d2-3358777174 .fill-N3{fill:#9499AB;} - .d2-3358777174 .fill-N4{fill:#CFD2DD;} - .d2-3358777174 .fill-N5{fill:#DEE1EB;} - .d2-3358777174 .fill-N6{fill:#EEF1F8;} - .d2-3358777174 .fill-N7{fill:#FFFFFF;} - .d2-3358777174 .fill-B1{fill:#0D32B2;} - .d2-3358777174 .fill-B2{fill:#0D32B2;} - .d2-3358777174 .fill-B3{fill:#E3E9FD;} - .d2-3358777174 .fill-B4{fill:#E3E9FD;} - .d2-3358777174 .fill-B5{fill:#EDF0FD;} - .d2-3358777174 .fill-B6{fill:#F7F8FE;} - .d2-3358777174 .fill-AA2{fill:#4A6FF3;} - .d2-3358777174 .fill-AA4{fill:#EDF0FD;} - .d2-3358777174 .fill-AA5{fill:#F7F8FE;} - .d2-3358777174 .fill-AB4{fill:#EDF0FD;} - .d2-3358777174 .fill-AB5{fill:#F7F8FE;} - .d2-3358777174 .stroke-N1{stroke:#0A0F25;} - .d2-3358777174 .stroke-N2{stroke:#676C7E;} - .d2-3358777174 .stroke-N3{stroke:#9499AB;} - .d2-3358777174 .stroke-N4{stroke:#CFD2DD;} - .d2-3358777174 .stroke-N5{stroke:#DEE1EB;} - .d2-3358777174 .stroke-N6{stroke:#EEF1F8;} - .d2-3358777174 .stroke-N7{stroke:#FFFFFF;} - .d2-3358777174 .stroke-B1{stroke:#0D32B2;} - .d2-3358777174 .stroke-B2{stroke:#0D32B2;} - .d2-3358777174 .stroke-B3{stroke:#E3E9FD;} - .d2-3358777174 .stroke-B4{stroke:#E3E9FD;} - .d2-3358777174 .stroke-B5{stroke:#EDF0FD;} - .d2-3358777174 .stroke-B6{stroke:#F7F8FE;} - .d2-3358777174 .stroke-AA2{stroke:#4A6FF3;} - .d2-3358777174 .stroke-AA4{stroke:#EDF0FD;} - .d2-3358777174 .stroke-AA5{stroke:#F7F8FE;} - .d2-3358777174 .stroke-AB4{stroke:#EDF0FD;} - .d2-3358777174 .stroke-AB5{stroke:#F7F8FE;} - .d2-3358777174 .background-color-N1{background-color:#0A0F25;} - .d2-3358777174 .background-color-N2{background-color:#676C7E;} - .d2-3358777174 .background-color-N3{background-color:#9499AB;} - .d2-3358777174 .background-color-N4{background-color:#CFD2DD;} - .d2-3358777174 .background-color-N5{background-color:#DEE1EB;} - .d2-3358777174 .background-color-N6{background-color:#EEF1F8;} - .d2-3358777174 .background-color-N7{background-color:#FFFFFF;} - .d2-3358777174 .background-color-B1{background-color:#0D32B2;} - .d2-3358777174 .background-color-B2{background-color:#0D32B2;} - .d2-3358777174 .background-color-B3{background-color:#E3E9FD;} - .d2-3358777174 .background-color-B4{background-color:#E3E9FD;} - .d2-3358777174 .background-color-B5{background-color:#EDF0FD;} - .d2-3358777174 .background-color-B6{background-color:#F7F8FE;} - .d2-3358777174 .background-color-AA2{background-color:#4A6FF3;} - .d2-3358777174 .background-color-AA4{background-color:#EDF0FD;} - .d2-3358777174 .background-color-AA5{background-color:#F7F8FE;} - .d2-3358777174 .background-color-AB4{background-color:#EDF0FD;} - .d2-3358777174 .background-color-AB5{background-color:#F7F8FE;} - .d2-3358777174 .color-N1{color:#0A0F25;} - .d2-3358777174 .color-N2{color:#676C7E;} - .d2-3358777174 .color-N3{color:#9499AB;} - .d2-3358777174 .color-N4{color:#CFD2DD;} - .d2-3358777174 .color-N5{color:#DEE1EB;} - .d2-3358777174 .color-N6{color:#EEF1F8;} - .d2-3358777174 .color-N7{color:#FFFFFF;} - .d2-3358777174 .color-B1{color:#0D32B2;} - .d2-3358777174 .color-B2{color:#0D32B2;} - .d2-3358777174 .color-B3{color:#E3E9FD;} - .d2-3358777174 .color-B4{color:#E3E9FD;} - .d2-3358777174 .color-B5{color:#EDF0FD;} - .d2-3358777174 .color-B6{color:#F7F8FE;} - .d2-3358777174 .color-AA2{color:#4A6FF3;} - .d2-3358777174 .color-AA4{color:#EDF0FD;} - .d2-3358777174 .color-AA5{color:#F7F8FE;} - .d2-3358777174 .color-AB4{color:#EDF0FD;} - .d2-3358777174 .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}]]>// RegisterHash registers a function that returns a new instance of the given -======= .d2-637161018 .fill-N1{fill:#0A0F25;} .d2-637161018 .fill-N2{fill:#676C7E;} .d2-637161018 .fill-N3{fill:#9499AB;} @@ -273,8 +110,7 @@ .d2-637161018 .color-AA4{color:#EDF0FD;} .d2-637161018 .color-AA5{color:#F7F8FE;} .d2-637161018 .color-AB4{color:#EDF0FD;} - .d2-637161018 .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}]]>// RegisterHash registers a function that returns a new instance of the given ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-637161018 .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}]]>// RegisterHash registers a function that returns a new instance of the given // hash function. This is intended to be called from the init function in // packages that implement hash functions. func RegisterHash(h Hash, f func() hash.Hash) { @@ -282,7 +118,6 @@         panic("crypto: RegisterHash of unknown hash function")     }     hashes[h] = f -<<<<<<< HEAD }// RegisterHash registers a function that returns a new instance of the given // hash function. This is intended to be called from the init function in // packages that implement hash functions. @@ -291,28 +126,7 @@         panic("crypto: RegisterHash of unknown hash function")     }     hashes[h] = f -}xy -||||||| parent of 33280fed5 (fixed e2e tests) -}// RegisterHash registers a function that returns a new instance of the given -// hash function. This is intended to be called from the init function in -// packages that implement hash functions. -func RegisterHash(h Hash, f func() hash.Hash) { -    if h >= maxHash { -        panic("crypto: RegisterHash of unknown hash function") -    } -    hashes[h] = f -}xy -======= -}// RegisterHash registers a function that returns a new instance of the given -// hash function. This is intended to be called from the init function in -// packages that implement hash functions. -func RegisterHash(h Hash, f func() hash.Hash) { -    if h >= maxHash { -        panic("crypto: RegisterHash of unknown hash function") -    } -    hashes[h] = f -}xy ->>>>>>> 33280fed5 (fixed e2e tests) +}xy diff --git a/e2etests/testdata/stable/complex-layers/dagre/sketch.exp.svg b/e2etests/testdata/stable/complex-layers/dagre/sketch.exp.svg index 5fd770976..16d177021 100644 --- a/e2etests/testdata/stable/complex-layers/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/complex-layers/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD windowroofgarage -||||||| parent of 33280fed5 (fixed e2e tests) -}]]>windowroofgarage -======= -}]]>windowroofgarage ->>>>>>> 33280fed5 (fixed e2e tests) +}]]>windowroofgarage -<<<<<<< HEAD -blindsglass -||||||| parent of 33280fed5 (fixed e2e tests) -blindsglass -======= -blindsglass ->>>>>>> 33280fed5 (fixed e2e tests) +blindsglass -<<<<<<< HEAD -shinglesstarlinkutility hookup -||||||| parent of 33280fed5 (fixed e2e tests) -shinglesstarlinkutility hookup -======= -shinglesstarlinkutility hookup ->>>>>>> 33280fed5 (fixed e2e tests) +shinglesstarlinkutility hookup -<<<<<<< HEAD -toolsvehicles -||||||| parent of 33280fed5 (fixed e2e tests) -toolsvehicles -======= -toolsvehicles ->>>>>>> 33280fed5 (fixed e2e tests) +toolsvehicles -<<<<<<< HEAD -find contractorscraigslistfacebook -||||||| parent of 33280fed5 (fixed e2e tests) -find contractorscraigslistfacebook -======= -find contractorscraigslistfacebook ->>>>>>> 33280fed5 (fixed e2e tests) +find contractorscraigslistfacebook -<<<<<<< HEAD -find contractorssolicit quotescraigslistfacebook -||||||| parent of 33280fed5 (fixed e2e tests) -find contractorssolicit quotescraigslistfacebook -======= -find contractorssolicit quotescraigslistfacebook ->>>>>>> 33280fed5 (fixed e2e tests) +find contractorssolicit quotescraigslistfacebook -<<<<<<< HEAD -find contractorssolicit quotesobtain quotesnegotiatecraigslistfacebook -||||||| parent of 33280fed5 (fixed e2e tests) -find contractorssolicit quotesobtain quotesnegotiatecraigslistfacebook -======= -find contractorssolicit quotesobtain quotesnegotiatecraigslistfacebook ->>>>>>> 33280fed5 (fixed e2e tests) +find contractorssolicit quotesobtain quotesnegotiatecraigslistfacebook @@ -278,13 +220,7 @@ -<<<<<<< HEAD -find contractorssolicit quotesobtain quotesnegotiatebook the best bidcraigslistfacebook -||||||| parent of 33280fed5 (fixed e2e tests) -find contractorssolicit quotesobtain quotesnegotiatebook the best bidcraigslistfacebook -======= -find contractorssolicit quotesobtain quotesnegotiatebook the best bidcraigslistfacebook ->>>>>>> 33280fed5 (fixed e2e tests) +find contractorssolicit quotesobtain quotesnegotiatebook the best bidcraigslistfacebook @@ -293,13 +229,7 @@ -<<<<<<< HEAD -windowroofgaragewaterrainthunder -||||||| parent of 33280fed5 (fixed e2e tests) -windowroofgaragewaterrainthunder -======= -windowroofgaragewaterrainthunder ->>>>>>> 33280fed5 (fixed e2e tests) +windowroofgaragewaterrainthunder diff --git a/e2etests/testdata/stable/complex-layers/elk/sketch.exp.svg b/e2etests/testdata/stable/complex-layers/elk/sketch.exp.svg index a18d07fcc..560828cfe 100644 --- a/e2etests/testdata/stable/complex-layers/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/complex-layers/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD windowroofgarage -||||||| parent of 33280fed5 (fixed e2e tests) -}]]>windowroofgarage -======= -}]]>windowroofgarage ->>>>>>> 33280fed5 (fixed e2e tests) +}]]>windowroofgarage -<<<<<<< HEAD -blindsglass -||||||| parent of 33280fed5 (fixed e2e tests) -blindsglass -======= -blindsglass ->>>>>>> 33280fed5 (fixed e2e tests) +blindsglass -<<<<<<< HEAD -shinglesstarlinkutility hookup -||||||| parent of 33280fed5 (fixed e2e tests) -shinglesstarlinkutility hookup -======= -shinglesstarlinkutility hookup ->>>>>>> 33280fed5 (fixed e2e tests) +shinglesstarlinkutility hookup -<<<<<<< HEAD -toolsvehicles -||||||| parent of 33280fed5 (fixed e2e tests) -toolsvehicles -======= -toolsvehicles ->>>>>>> 33280fed5 (fixed e2e tests) +toolsvehicles -<<<<<<< HEAD -find contractorscraigslistfacebook -||||||| parent of 33280fed5 (fixed e2e tests) -find contractorscraigslistfacebook -======= -find contractorscraigslistfacebook ->>>>>>> 33280fed5 (fixed e2e tests) +find contractorscraigslistfacebook -<<<<<<< HEAD -find contractorssolicit quotescraigslistfacebook -||||||| parent of 33280fed5 (fixed e2e tests) -find contractorssolicit quotescraigslistfacebook -======= -find contractorssolicit quotescraigslistfacebook ->>>>>>> 33280fed5 (fixed e2e tests) +find contractorssolicit quotescraigslistfacebook -<<<<<<< HEAD -find contractorssolicit quotesobtain quotesnegotiatecraigslistfacebook -||||||| parent of 33280fed5 (fixed e2e tests) -find contractorssolicit quotesobtain quotesnegotiatecraigslistfacebook -======= -find contractorssolicit quotesobtain quotesnegotiatecraigslistfacebook ->>>>>>> 33280fed5 (fixed e2e tests) +find contractorssolicit quotesobtain quotesnegotiatecraigslistfacebook @@ -278,13 +220,7 @@ -<<<<<<< HEAD -find contractorssolicit quotesobtain quotesnegotiatebook the best bidcraigslistfacebook -||||||| parent of 33280fed5 (fixed e2e tests) -find contractorssolicit quotesobtain quotesnegotiatebook the best bidcraigslistfacebook -======= -find contractorssolicit quotesobtain quotesnegotiatebook the best bidcraigslistfacebook ->>>>>>> 33280fed5 (fixed e2e tests) +find contractorssolicit quotesobtain quotesnegotiatebook the best bidcraigslistfacebook @@ -293,13 +229,7 @@ -<<<<<<< HEAD -windowroofgaragewaterrainthunder -||||||| parent of 33280fed5 (fixed e2e tests) -windowroofgaragewaterrainthunder -======= -windowroofgaragewaterrainthunder ->>>>>>> 33280fed5 (fixed e2e tests) +windowroofgaragewaterrainthunder diff --git a/e2etests/testdata/stable/connected_container/dagre/sketch.exp.svg b/e2etests/testdata/stable/connected_container/dagre/sketch.exp.svg index a8e7fd5f8..7260d3a07 100644 --- a/e2etests/testdata/stable/connected_container/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/connected_container/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -acfbdhg -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-140937193 .fill-N1{fill:#0A0F25;} - .d2-140937193 .fill-N2{fill:#676C7E;} - .d2-140937193 .fill-N3{fill:#9499AB;} - .d2-140937193 .fill-N4{fill:#CFD2DD;} - .d2-140937193 .fill-N5{fill:#DEE1EB;} - .d2-140937193 .fill-N6{fill:#EEF1F8;} - .d2-140937193 .fill-N7{fill:#FFFFFF;} - .d2-140937193 .fill-B1{fill:#0D32B2;} - .d2-140937193 .fill-B2{fill:#0D32B2;} - .d2-140937193 .fill-B3{fill:#E3E9FD;} - .d2-140937193 .fill-B4{fill:#E3E9FD;} - .d2-140937193 .fill-B5{fill:#EDF0FD;} - .d2-140937193 .fill-B6{fill:#F7F8FE;} - .d2-140937193 .fill-AA2{fill:#4A6FF3;} - .d2-140937193 .fill-AA4{fill:#EDF0FD;} - .d2-140937193 .fill-AA5{fill:#F7F8FE;} - .d2-140937193 .fill-AB4{fill:#EDF0FD;} - .d2-140937193 .fill-AB5{fill:#F7F8FE;} - .d2-140937193 .stroke-N1{stroke:#0A0F25;} - .d2-140937193 .stroke-N2{stroke:#676C7E;} - .d2-140937193 .stroke-N3{stroke:#9499AB;} - .d2-140937193 .stroke-N4{stroke:#CFD2DD;} - .d2-140937193 .stroke-N5{stroke:#DEE1EB;} - .d2-140937193 .stroke-N6{stroke:#EEF1F8;} - .d2-140937193 .stroke-N7{stroke:#FFFFFF;} - .d2-140937193 .stroke-B1{stroke:#0D32B2;} - .d2-140937193 .stroke-B2{stroke:#0D32B2;} - .d2-140937193 .stroke-B3{stroke:#E3E9FD;} - .d2-140937193 .stroke-B4{stroke:#E3E9FD;} - .d2-140937193 .stroke-B5{stroke:#EDF0FD;} - .d2-140937193 .stroke-B6{stroke:#F7F8FE;} - .d2-140937193 .stroke-AA2{stroke:#4A6FF3;} - .d2-140937193 .stroke-AA4{stroke:#EDF0FD;} - .d2-140937193 .stroke-AA5{stroke:#F7F8FE;} - .d2-140937193 .stroke-AB4{stroke:#EDF0FD;} - .d2-140937193 .stroke-AB5{stroke:#F7F8FE;} - .d2-140937193 .background-color-N1{background-color:#0A0F25;} - .d2-140937193 .background-color-N2{background-color:#676C7E;} - .d2-140937193 .background-color-N3{background-color:#9499AB;} - .d2-140937193 .background-color-N4{background-color:#CFD2DD;} - .d2-140937193 .background-color-N5{background-color:#DEE1EB;} - .d2-140937193 .background-color-N6{background-color:#EEF1F8;} - .d2-140937193 .background-color-N7{background-color:#FFFFFF;} - .d2-140937193 .background-color-B1{background-color:#0D32B2;} - .d2-140937193 .background-color-B2{background-color:#0D32B2;} - .d2-140937193 .background-color-B3{background-color:#E3E9FD;} - .d2-140937193 .background-color-B4{background-color:#E3E9FD;} - .d2-140937193 .background-color-B5{background-color:#EDF0FD;} - .d2-140937193 .background-color-B6{background-color:#F7F8FE;} - .d2-140937193 .background-color-AA2{background-color:#4A6FF3;} - .d2-140937193 .background-color-AA4{background-color:#EDF0FD;} - .d2-140937193 .background-color-AA5{background-color:#F7F8FE;} - .d2-140937193 .background-color-AB4{background-color:#EDF0FD;} - .d2-140937193 .background-color-AB5{background-color:#F7F8FE;} - .d2-140937193 .color-N1{color:#0A0F25;} - .d2-140937193 .color-N2{color:#676C7E;} - .d2-140937193 .color-N3{color:#9499AB;} - .d2-140937193 .color-N4{color:#CFD2DD;} - .d2-140937193 .color-N5{color:#DEE1EB;} - .d2-140937193 .color-N6{color:#EEF1F8;} - .d2-140937193 .color-N7{color:#FFFFFF;} - .d2-140937193 .color-B1{color:#0D32B2;} - .d2-140937193 .color-B2{color:#0D32B2;} - .d2-140937193 .color-B3{color:#E3E9FD;} - .d2-140937193 .color-B4{color:#E3E9FD;} - .d2-140937193 .color-B5{color:#EDF0FD;} - .d2-140937193 .color-B6{color:#F7F8FE;} - .d2-140937193 .color-AA2{color:#4A6FF3;} - .d2-140937193 .color-AA4{color:#EDF0FD;} - .d2-140937193 .color-AA5{color:#F7F8FE;} - .d2-140937193 .color-AB4{color:#EDF0FD;} - .d2-140937193 .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}]]>acfbdhg -======= .d2-1439024777 .fill-N1{fill:#0A0F25;} .d2-1439024777 .fill-N2{fill:#676C7E;} .d2-1439024777 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-1439024777 .color-AA4{color:#EDF0FD;} .d2-1439024777 .color-AA5{color:#F7F8FE;} .d2-1439024777 .color-AB4{color:#EDF0FD;} - .d2-1439024777 .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}]]>acfbdhg ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-1439024777 .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}]]>acfbdhg diff --git a/e2etests/testdata/stable/connected_container/elk/sketch.exp.svg b/e2etests/testdata/stable/connected_container/elk/sketch.exp.svg index 8b276d7f7..ffb3ba2e1 100644 --- a/e2etests/testdata/stable/connected_container/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/connected_container/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -acfbdhg -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-1664589405 .fill-N1{fill:#0A0F25;} - .d2-1664589405 .fill-N2{fill:#676C7E;} - .d2-1664589405 .fill-N3{fill:#9499AB;} - .d2-1664589405 .fill-N4{fill:#CFD2DD;} - .d2-1664589405 .fill-N5{fill:#DEE1EB;} - .d2-1664589405 .fill-N6{fill:#EEF1F8;} - .d2-1664589405 .fill-N7{fill:#FFFFFF;} - .d2-1664589405 .fill-B1{fill:#0D32B2;} - .d2-1664589405 .fill-B2{fill:#0D32B2;} - .d2-1664589405 .fill-B3{fill:#E3E9FD;} - .d2-1664589405 .fill-B4{fill:#E3E9FD;} - .d2-1664589405 .fill-B5{fill:#EDF0FD;} - .d2-1664589405 .fill-B6{fill:#F7F8FE;} - .d2-1664589405 .fill-AA2{fill:#4A6FF3;} - .d2-1664589405 .fill-AA4{fill:#EDF0FD;} - .d2-1664589405 .fill-AA5{fill:#F7F8FE;} - .d2-1664589405 .fill-AB4{fill:#EDF0FD;} - .d2-1664589405 .fill-AB5{fill:#F7F8FE;} - .d2-1664589405 .stroke-N1{stroke:#0A0F25;} - .d2-1664589405 .stroke-N2{stroke:#676C7E;} - .d2-1664589405 .stroke-N3{stroke:#9499AB;} - .d2-1664589405 .stroke-N4{stroke:#CFD2DD;} - .d2-1664589405 .stroke-N5{stroke:#DEE1EB;} - .d2-1664589405 .stroke-N6{stroke:#EEF1F8;} - .d2-1664589405 .stroke-N7{stroke:#FFFFFF;} - .d2-1664589405 .stroke-B1{stroke:#0D32B2;} - .d2-1664589405 .stroke-B2{stroke:#0D32B2;} - .d2-1664589405 .stroke-B3{stroke:#E3E9FD;} - .d2-1664589405 .stroke-B4{stroke:#E3E9FD;} - .d2-1664589405 .stroke-B5{stroke:#EDF0FD;} - .d2-1664589405 .stroke-B6{stroke:#F7F8FE;} - .d2-1664589405 .stroke-AA2{stroke:#4A6FF3;} - .d2-1664589405 .stroke-AA4{stroke:#EDF0FD;} - .d2-1664589405 .stroke-AA5{stroke:#F7F8FE;} - .d2-1664589405 .stroke-AB4{stroke:#EDF0FD;} - .d2-1664589405 .stroke-AB5{stroke:#F7F8FE;} - .d2-1664589405 .background-color-N1{background-color:#0A0F25;} - .d2-1664589405 .background-color-N2{background-color:#676C7E;} - .d2-1664589405 .background-color-N3{background-color:#9499AB;} - .d2-1664589405 .background-color-N4{background-color:#CFD2DD;} - .d2-1664589405 .background-color-N5{background-color:#DEE1EB;} - .d2-1664589405 .background-color-N6{background-color:#EEF1F8;} - .d2-1664589405 .background-color-N7{background-color:#FFFFFF;} - .d2-1664589405 .background-color-B1{background-color:#0D32B2;} - .d2-1664589405 .background-color-B2{background-color:#0D32B2;} - .d2-1664589405 .background-color-B3{background-color:#E3E9FD;} - .d2-1664589405 .background-color-B4{background-color:#E3E9FD;} - .d2-1664589405 .background-color-B5{background-color:#EDF0FD;} - .d2-1664589405 .background-color-B6{background-color:#F7F8FE;} - .d2-1664589405 .background-color-AA2{background-color:#4A6FF3;} - .d2-1664589405 .background-color-AA4{background-color:#EDF0FD;} - .d2-1664589405 .background-color-AA5{background-color:#F7F8FE;} - .d2-1664589405 .background-color-AB4{background-color:#EDF0FD;} - .d2-1664589405 .background-color-AB5{background-color:#F7F8FE;} - .d2-1664589405 .color-N1{color:#0A0F25;} - .d2-1664589405 .color-N2{color:#676C7E;} - .d2-1664589405 .color-N3{color:#9499AB;} - .d2-1664589405 .color-N4{color:#CFD2DD;} - .d2-1664589405 .color-N5{color:#DEE1EB;} - .d2-1664589405 .color-N6{color:#EEF1F8;} - .d2-1664589405 .color-N7{color:#FFFFFF;} - .d2-1664589405 .color-B1{color:#0D32B2;} - .d2-1664589405 .color-B2{color:#0D32B2;} - .d2-1664589405 .color-B3{color:#E3E9FD;} - .d2-1664589405 .color-B4{color:#E3E9FD;} - .d2-1664589405 .color-B5{color:#EDF0FD;} - .d2-1664589405 .color-B6{color:#F7F8FE;} - .d2-1664589405 .color-AA2{color:#4A6FF3;} - .d2-1664589405 .color-AA4{color:#EDF0FD;} - .d2-1664589405 .color-AA5{color:#F7F8FE;} - .d2-1664589405 .color-AB4{color:#EDF0FD;} - .d2-1664589405 .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}]]>acfbdhg -======= .d2-1130993745 .fill-N1{fill:#0A0F25;} .d2-1130993745 .fill-N2{fill:#676C7E;} .d2-1130993745 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-1130993745 .color-AA4{color:#EDF0FD;} .d2-1130993745 .color-AA5{color:#F7F8FE;} .d2-1130993745 .color-AB4{color:#EDF0FD;} - .d2-1130993745 .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}]]>acfbdhg ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-1130993745 .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}]]>acfbdhg diff --git a/e2etests/testdata/stable/constant_near_stress/dagre/sketch.exp.svg b/e2etests/testdata/stable/constant_near_stress/dagre/sketch.exp.svg index 476f8761c..022df6e15 100644 --- a/e2etests/testdata/stable/constant_near_stress/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/constant_near_stress/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -agdfbhec -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-2124593193 .fill-N1{fill:#0A0F25;} - .d2-2124593193 .fill-N2{fill:#676C7E;} - .d2-2124593193 .fill-N3{fill:#9499AB;} - .d2-2124593193 .fill-N4{fill:#CFD2DD;} - .d2-2124593193 .fill-N5{fill:#DEE1EB;} - .d2-2124593193 .fill-N6{fill:#EEF1F8;} - .d2-2124593193 .fill-N7{fill:#FFFFFF;} - .d2-2124593193 .fill-B1{fill:#0D32B2;} - .d2-2124593193 .fill-B2{fill:#0D32B2;} - .d2-2124593193 .fill-B3{fill:#E3E9FD;} - .d2-2124593193 .fill-B4{fill:#E3E9FD;} - .d2-2124593193 .fill-B5{fill:#EDF0FD;} - .d2-2124593193 .fill-B6{fill:#F7F8FE;} - .d2-2124593193 .fill-AA2{fill:#4A6FF3;} - .d2-2124593193 .fill-AA4{fill:#EDF0FD;} - .d2-2124593193 .fill-AA5{fill:#F7F8FE;} - .d2-2124593193 .fill-AB4{fill:#EDF0FD;} - .d2-2124593193 .fill-AB5{fill:#F7F8FE;} - .d2-2124593193 .stroke-N1{stroke:#0A0F25;} - .d2-2124593193 .stroke-N2{stroke:#676C7E;} - .d2-2124593193 .stroke-N3{stroke:#9499AB;} - .d2-2124593193 .stroke-N4{stroke:#CFD2DD;} - .d2-2124593193 .stroke-N5{stroke:#DEE1EB;} - .d2-2124593193 .stroke-N6{stroke:#EEF1F8;} - .d2-2124593193 .stroke-N7{stroke:#FFFFFF;} - .d2-2124593193 .stroke-B1{stroke:#0D32B2;} - .d2-2124593193 .stroke-B2{stroke:#0D32B2;} - .d2-2124593193 .stroke-B3{stroke:#E3E9FD;} - .d2-2124593193 .stroke-B4{stroke:#E3E9FD;} - .d2-2124593193 .stroke-B5{stroke:#EDF0FD;} - .d2-2124593193 .stroke-B6{stroke:#F7F8FE;} - .d2-2124593193 .stroke-AA2{stroke:#4A6FF3;} - .d2-2124593193 .stroke-AA4{stroke:#EDF0FD;} - .d2-2124593193 .stroke-AA5{stroke:#F7F8FE;} - .d2-2124593193 .stroke-AB4{stroke:#EDF0FD;} - .d2-2124593193 .stroke-AB5{stroke:#F7F8FE;} - .d2-2124593193 .background-color-N1{background-color:#0A0F25;} - .d2-2124593193 .background-color-N2{background-color:#676C7E;} - .d2-2124593193 .background-color-N3{background-color:#9499AB;} - .d2-2124593193 .background-color-N4{background-color:#CFD2DD;} - .d2-2124593193 .background-color-N5{background-color:#DEE1EB;} - .d2-2124593193 .background-color-N6{background-color:#EEF1F8;} - .d2-2124593193 .background-color-N7{background-color:#FFFFFF;} - .d2-2124593193 .background-color-B1{background-color:#0D32B2;} - .d2-2124593193 .background-color-B2{background-color:#0D32B2;} - .d2-2124593193 .background-color-B3{background-color:#E3E9FD;} - .d2-2124593193 .background-color-B4{background-color:#E3E9FD;} - .d2-2124593193 .background-color-B5{background-color:#EDF0FD;} - .d2-2124593193 .background-color-B6{background-color:#F7F8FE;} - .d2-2124593193 .background-color-AA2{background-color:#4A6FF3;} - .d2-2124593193 .background-color-AA4{background-color:#EDF0FD;} - .d2-2124593193 .background-color-AA5{background-color:#F7F8FE;} - .d2-2124593193 .background-color-AB4{background-color:#EDF0FD;} - .d2-2124593193 .background-color-AB5{background-color:#F7F8FE;} - .d2-2124593193 .color-N1{color:#0A0F25;} - .d2-2124593193 .color-N2{color:#676C7E;} - .d2-2124593193 .color-N3{color:#9499AB;} - .d2-2124593193 .color-N4{color:#CFD2DD;} - .d2-2124593193 .color-N5{color:#DEE1EB;} - .d2-2124593193 .color-N6{color:#EEF1F8;} - .d2-2124593193 .color-N7{color:#FFFFFF;} - .d2-2124593193 .color-B1{color:#0D32B2;} - .d2-2124593193 .color-B2{color:#0D32B2;} - .d2-2124593193 .color-B3{color:#E3E9FD;} - .d2-2124593193 .color-B4{color:#E3E9FD;} - .d2-2124593193 .color-B5{color:#EDF0FD;} - .d2-2124593193 .color-B6{color:#F7F8FE;} - .d2-2124593193 .color-AA2{color:#4A6FF3;} - .d2-2124593193 .color-AA4{color:#EDF0FD;} - .d2-2124593193 .color-AA5{color:#F7F8FE;} - .d2-2124593193 .color-AB4{color:#EDF0FD;} - .d2-2124593193 .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}]]>agdfbhec -======= .d2-3483235013 .fill-N1{fill:#0A0F25;} .d2-3483235013 .fill-N2{fill:#676C7E;} .d2-3483235013 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-3483235013 .color-AA4{color:#EDF0FD;} .d2-3483235013 .color-AA5{color:#F7F8FE;} .d2-3483235013 .color-AB4{color:#EDF0FD;} - .d2-3483235013 .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}]]>agdfbhec ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-3483235013 .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}]]>agdfbhec diff --git a/e2etests/testdata/stable/container_edges/elk/sketch.exp.svg b/e2etests/testdata/stable/container_edges/elk/sketch.exp.svg index 2349b9627..b3e67f22f 100644 --- a/e2etests/testdata/stable/container_edges/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/container_edges/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -agdfbhec -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-62429622 .fill-N1{fill:#0A0F25;} - .d2-62429622 .fill-N2{fill:#676C7E;} - .d2-62429622 .fill-N3{fill:#9499AB;} - .d2-62429622 .fill-N4{fill:#CFD2DD;} - .d2-62429622 .fill-N5{fill:#DEE1EB;} - .d2-62429622 .fill-N6{fill:#EEF1F8;} - .d2-62429622 .fill-N7{fill:#FFFFFF;} - .d2-62429622 .fill-B1{fill:#0D32B2;} - .d2-62429622 .fill-B2{fill:#0D32B2;} - .d2-62429622 .fill-B3{fill:#E3E9FD;} - .d2-62429622 .fill-B4{fill:#E3E9FD;} - .d2-62429622 .fill-B5{fill:#EDF0FD;} - .d2-62429622 .fill-B6{fill:#F7F8FE;} - .d2-62429622 .fill-AA2{fill:#4A6FF3;} - .d2-62429622 .fill-AA4{fill:#EDF0FD;} - .d2-62429622 .fill-AA5{fill:#F7F8FE;} - .d2-62429622 .fill-AB4{fill:#EDF0FD;} - .d2-62429622 .fill-AB5{fill:#F7F8FE;} - .d2-62429622 .stroke-N1{stroke:#0A0F25;} - .d2-62429622 .stroke-N2{stroke:#676C7E;} - .d2-62429622 .stroke-N3{stroke:#9499AB;} - .d2-62429622 .stroke-N4{stroke:#CFD2DD;} - .d2-62429622 .stroke-N5{stroke:#DEE1EB;} - .d2-62429622 .stroke-N6{stroke:#EEF1F8;} - .d2-62429622 .stroke-N7{stroke:#FFFFFF;} - .d2-62429622 .stroke-B1{stroke:#0D32B2;} - .d2-62429622 .stroke-B2{stroke:#0D32B2;} - .d2-62429622 .stroke-B3{stroke:#E3E9FD;} - .d2-62429622 .stroke-B4{stroke:#E3E9FD;} - .d2-62429622 .stroke-B5{stroke:#EDF0FD;} - .d2-62429622 .stroke-B6{stroke:#F7F8FE;} - .d2-62429622 .stroke-AA2{stroke:#4A6FF3;} - .d2-62429622 .stroke-AA4{stroke:#EDF0FD;} - .d2-62429622 .stroke-AA5{stroke:#F7F8FE;} - .d2-62429622 .stroke-AB4{stroke:#EDF0FD;} - .d2-62429622 .stroke-AB5{stroke:#F7F8FE;} - .d2-62429622 .background-color-N1{background-color:#0A0F25;} - .d2-62429622 .background-color-N2{background-color:#676C7E;} - .d2-62429622 .background-color-N3{background-color:#9499AB;} - .d2-62429622 .background-color-N4{background-color:#CFD2DD;} - .d2-62429622 .background-color-N5{background-color:#DEE1EB;} - .d2-62429622 .background-color-N6{background-color:#EEF1F8;} - .d2-62429622 .background-color-N7{background-color:#FFFFFF;} - .d2-62429622 .background-color-B1{background-color:#0D32B2;} - .d2-62429622 .background-color-B2{background-color:#0D32B2;} - .d2-62429622 .background-color-B3{background-color:#E3E9FD;} - .d2-62429622 .background-color-B4{background-color:#E3E9FD;} - .d2-62429622 .background-color-B5{background-color:#EDF0FD;} - .d2-62429622 .background-color-B6{background-color:#F7F8FE;} - .d2-62429622 .background-color-AA2{background-color:#4A6FF3;} - .d2-62429622 .background-color-AA4{background-color:#EDF0FD;} - .d2-62429622 .background-color-AA5{background-color:#F7F8FE;} - .d2-62429622 .background-color-AB4{background-color:#EDF0FD;} - .d2-62429622 .background-color-AB5{background-color:#F7F8FE;} - .d2-62429622 .color-N1{color:#0A0F25;} - .d2-62429622 .color-N2{color:#676C7E;} - .d2-62429622 .color-N3{color:#9499AB;} - .d2-62429622 .color-N4{color:#CFD2DD;} - .d2-62429622 .color-N5{color:#DEE1EB;} - .d2-62429622 .color-N6{color:#EEF1F8;} - .d2-62429622 .color-N7{color:#FFFFFF;} - .d2-62429622 .color-B1{color:#0D32B2;} - .d2-62429622 .color-B2{color:#0D32B2;} - .d2-62429622 .color-B3{color:#E3E9FD;} - .d2-62429622 .color-B4{color:#E3E9FD;} - .d2-62429622 .color-B5{color:#EDF0FD;} - .d2-62429622 .color-B6{color:#F7F8FE;} - .d2-62429622 .color-AA2{color:#4A6FF3;} - .d2-62429622 .color-AA4{color:#EDF0FD;} - .d2-62429622 .color-AA5{color:#F7F8FE;} - .d2-62429622 .color-AB4{color:#EDF0FD;} - .d2-62429622 .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}]]>agdfbhec -======= .d2-2761197570 .fill-N1{fill:#0A0F25;} .d2-2761197570 .fill-N2{fill:#676C7E;} .d2-2761197570 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-2761197570 .color-AA4{color:#EDF0FD;} .d2-2761197570 .color-AA5{color:#F7F8FE;} .d2-2761197570 .color-AB4{color:#EDF0FD;} - .d2-2761197570 .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}]]>agdfbhec ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-2761197570 .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}]]>agdfbhec diff --git a/e2etests/testdata/stable/crow_foot_arrowhead/dagre/sketch.exp.svg b/e2etests/testdata/stable/crow_foot_arrowhead/dagre/sketch.exp.svg index 3ca25d1f1..e917d1547 100644 --- a/e2etests/testdata/stable/crow_foot_arrowhead/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/crow_foot_arrowhead/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -a1b1a2b2a3b3c1d1c2d2c3d3e1f1e2f2e3f3g1h1g2h2g3h3cdf -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-2476952213 .fill-N1{fill:#0A0F25;} - .d2-2476952213 .fill-N2{fill:#676C7E;} - .d2-2476952213 .fill-N3{fill:#9499AB;} - .d2-2476952213 .fill-N4{fill:#CFD2DD;} - .d2-2476952213 .fill-N5{fill:#DEE1EB;} - .d2-2476952213 .fill-N6{fill:#EEF1F8;} - .d2-2476952213 .fill-N7{fill:#FFFFFF;} - .d2-2476952213 .fill-B1{fill:#0D32B2;} - .d2-2476952213 .fill-B2{fill:#0D32B2;} - .d2-2476952213 .fill-B3{fill:#E3E9FD;} - .d2-2476952213 .fill-B4{fill:#E3E9FD;} - .d2-2476952213 .fill-B5{fill:#EDF0FD;} - .d2-2476952213 .fill-B6{fill:#F7F8FE;} - .d2-2476952213 .fill-AA2{fill:#4A6FF3;} - .d2-2476952213 .fill-AA4{fill:#EDF0FD;} - .d2-2476952213 .fill-AA5{fill:#F7F8FE;} - .d2-2476952213 .fill-AB4{fill:#EDF0FD;} - .d2-2476952213 .fill-AB5{fill:#F7F8FE;} - .d2-2476952213 .stroke-N1{stroke:#0A0F25;} - .d2-2476952213 .stroke-N2{stroke:#676C7E;} - .d2-2476952213 .stroke-N3{stroke:#9499AB;} - .d2-2476952213 .stroke-N4{stroke:#CFD2DD;} - .d2-2476952213 .stroke-N5{stroke:#DEE1EB;} - .d2-2476952213 .stroke-N6{stroke:#EEF1F8;} - .d2-2476952213 .stroke-N7{stroke:#FFFFFF;} - .d2-2476952213 .stroke-B1{stroke:#0D32B2;} - .d2-2476952213 .stroke-B2{stroke:#0D32B2;} - .d2-2476952213 .stroke-B3{stroke:#E3E9FD;} - .d2-2476952213 .stroke-B4{stroke:#E3E9FD;} - .d2-2476952213 .stroke-B5{stroke:#EDF0FD;} - .d2-2476952213 .stroke-B6{stroke:#F7F8FE;} - .d2-2476952213 .stroke-AA2{stroke:#4A6FF3;} - .d2-2476952213 .stroke-AA4{stroke:#EDF0FD;} - .d2-2476952213 .stroke-AA5{stroke:#F7F8FE;} - .d2-2476952213 .stroke-AB4{stroke:#EDF0FD;} - .d2-2476952213 .stroke-AB5{stroke:#F7F8FE;} - .d2-2476952213 .background-color-N1{background-color:#0A0F25;} - .d2-2476952213 .background-color-N2{background-color:#676C7E;} - .d2-2476952213 .background-color-N3{background-color:#9499AB;} - .d2-2476952213 .background-color-N4{background-color:#CFD2DD;} - .d2-2476952213 .background-color-N5{background-color:#DEE1EB;} - .d2-2476952213 .background-color-N6{background-color:#EEF1F8;} - .d2-2476952213 .background-color-N7{background-color:#FFFFFF;} - .d2-2476952213 .background-color-B1{background-color:#0D32B2;} - .d2-2476952213 .background-color-B2{background-color:#0D32B2;} - .d2-2476952213 .background-color-B3{background-color:#E3E9FD;} - .d2-2476952213 .background-color-B4{background-color:#E3E9FD;} - .d2-2476952213 .background-color-B5{background-color:#EDF0FD;} - .d2-2476952213 .background-color-B6{background-color:#F7F8FE;} - .d2-2476952213 .background-color-AA2{background-color:#4A6FF3;} - .d2-2476952213 .background-color-AA4{background-color:#EDF0FD;} - .d2-2476952213 .background-color-AA5{background-color:#F7F8FE;} - .d2-2476952213 .background-color-AB4{background-color:#EDF0FD;} - .d2-2476952213 .background-color-AB5{background-color:#F7F8FE;} - .d2-2476952213 .color-N1{color:#0A0F25;} - .d2-2476952213 .color-N2{color:#676C7E;} - .d2-2476952213 .color-N3{color:#9499AB;} - .d2-2476952213 .color-N4{color:#CFD2DD;} - .d2-2476952213 .color-N5{color:#DEE1EB;} - .d2-2476952213 .color-N6{color:#EEF1F8;} - .d2-2476952213 .color-N7{color:#FFFFFF;} - .d2-2476952213 .color-B1{color:#0D32B2;} - .d2-2476952213 .color-B2{color:#0D32B2;} - .d2-2476952213 .color-B3{color:#E3E9FD;} - .d2-2476952213 .color-B4{color:#E3E9FD;} - .d2-2476952213 .color-B5{color:#EDF0FD;} - .d2-2476952213 .color-B6{color:#F7F8FE;} - .d2-2476952213 .color-AA2{color:#4A6FF3;} - .d2-2476952213 .color-AA4{color:#EDF0FD;} - .d2-2476952213 .color-AA5{color:#F7F8FE;} - .d2-2476952213 .color-AB4{color:#EDF0FD;} - .d2-2476952213 .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}]]>a1b1a2b2a3b3c1d1c2d2c3d3e1f1e2f2e3f3g1h1g2h2g3h3cdf -======= .d2-2257826249 .fill-N1{fill:#0A0F25;} .d2-2257826249 .fill-N2{fill:#676C7E;} .d2-2257826249 .fill-N3{fill:#9499AB;} @@ -252,8 +89,7 @@ .d2-2257826249 .color-AA4{color:#EDF0FD;} .d2-2257826249 .color-AA5{color:#F7F8FE;} .d2-2257826249 .color-AB4{color:#EDF0FD;} - .d2-2257826249 .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}]]>a1b1a2b2a3b3c1d1c2d2c3d3e1f1e2f2e3f3g1h1g2h2g3h3cdf ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-2257826249 .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}]]>a1b1a2b2a3b3c1d1c2d2c3d3e1f1e2f2e3f3g1h1g2h2g3h3cdf diff --git a/e2etests/testdata/stable/crow_foot_arrowhead/elk/sketch.exp.svg b/e2etests/testdata/stable/crow_foot_arrowhead/elk/sketch.exp.svg index da948139a..6e7ca3089 100644 --- a/e2etests/testdata/stable/crow_foot_arrowhead/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/crow_foot_arrowhead/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -a1b1a2b2a3b3c1d1c2d2c3d3e1f1e2f2e3f3g1h1g2h2g3h3cdf -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-2427018465 .fill-N1{fill:#0A0F25;} - .d2-2427018465 .fill-N2{fill:#676C7E;} - .d2-2427018465 .fill-N3{fill:#9499AB;} - .d2-2427018465 .fill-N4{fill:#CFD2DD;} - .d2-2427018465 .fill-N5{fill:#DEE1EB;} - .d2-2427018465 .fill-N6{fill:#EEF1F8;} - .d2-2427018465 .fill-N7{fill:#FFFFFF;} - .d2-2427018465 .fill-B1{fill:#0D32B2;} - .d2-2427018465 .fill-B2{fill:#0D32B2;} - .d2-2427018465 .fill-B3{fill:#E3E9FD;} - .d2-2427018465 .fill-B4{fill:#E3E9FD;} - .d2-2427018465 .fill-B5{fill:#EDF0FD;} - .d2-2427018465 .fill-B6{fill:#F7F8FE;} - .d2-2427018465 .fill-AA2{fill:#4A6FF3;} - .d2-2427018465 .fill-AA4{fill:#EDF0FD;} - .d2-2427018465 .fill-AA5{fill:#F7F8FE;} - .d2-2427018465 .fill-AB4{fill:#EDF0FD;} - .d2-2427018465 .fill-AB5{fill:#F7F8FE;} - .d2-2427018465 .stroke-N1{stroke:#0A0F25;} - .d2-2427018465 .stroke-N2{stroke:#676C7E;} - .d2-2427018465 .stroke-N3{stroke:#9499AB;} - .d2-2427018465 .stroke-N4{stroke:#CFD2DD;} - .d2-2427018465 .stroke-N5{stroke:#DEE1EB;} - .d2-2427018465 .stroke-N6{stroke:#EEF1F8;} - .d2-2427018465 .stroke-N7{stroke:#FFFFFF;} - .d2-2427018465 .stroke-B1{stroke:#0D32B2;} - .d2-2427018465 .stroke-B2{stroke:#0D32B2;} - .d2-2427018465 .stroke-B3{stroke:#E3E9FD;} - .d2-2427018465 .stroke-B4{stroke:#E3E9FD;} - .d2-2427018465 .stroke-B5{stroke:#EDF0FD;} - .d2-2427018465 .stroke-B6{stroke:#F7F8FE;} - .d2-2427018465 .stroke-AA2{stroke:#4A6FF3;} - .d2-2427018465 .stroke-AA4{stroke:#EDF0FD;} - .d2-2427018465 .stroke-AA5{stroke:#F7F8FE;} - .d2-2427018465 .stroke-AB4{stroke:#EDF0FD;} - .d2-2427018465 .stroke-AB5{stroke:#F7F8FE;} - .d2-2427018465 .background-color-N1{background-color:#0A0F25;} - .d2-2427018465 .background-color-N2{background-color:#676C7E;} - .d2-2427018465 .background-color-N3{background-color:#9499AB;} - .d2-2427018465 .background-color-N4{background-color:#CFD2DD;} - .d2-2427018465 .background-color-N5{background-color:#DEE1EB;} - .d2-2427018465 .background-color-N6{background-color:#EEF1F8;} - .d2-2427018465 .background-color-N7{background-color:#FFFFFF;} - .d2-2427018465 .background-color-B1{background-color:#0D32B2;} - .d2-2427018465 .background-color-B2{background-color:#0D32B2;} - .d2-2427018465 .background-color-B3{background-color:#E3E9FD;} - .d2-2427018465 .background-color-B4{background-color:#E3E9FD;} - .d2-2427018465 .background-color-B5{background-color:#EDF0FD;} - .d2-2427018465 .background-color-B6{background-color:#F7F8FE;} - .d2-2427018465 .background-color-AA2{background-color:#4A6FF3;} - .d2-2427018465 .background-color-AA4{background-color:#EDF0FD;} - .d2-2427018465 .background-color-AA5{background-color:#F7F8FE;} - .d2-2427018465 .background-color-AB4{background-color:#EDF0FD;} - .d2-2427018465 .background-color-AB5{background-color:#F7F8FE;} - .d2-2427018465 .color-N1{color:#0A0F25;} - .d2-2427018465 .color-N2{color:#676C7E;} - .d2-2427018465 .color-N3{color:#9499AB;} - .d2-2427018465 .color-N4{color:#CFD2DD;} - .d2-2427018465 .color-N5{color:#DEE1EB;} - .d2-2427018465 .color-N6{color:#EEF1F8;} - .d2-2427018465 .color-N7{color:#FFFFFF;} - .d2-2427018465 .color-B1{color:#0D32B2;} - .d2-2427018465 .color-B2{color:#0D32B2;} - .d2-2427018465 .color-B3{color:#E3E9FD;} - .d2-2427018465 .color-B4{color:#E3E9FD;} - .d2-2427018465 .color-B5{color:#EDF0FD;} - .d2-2427018465 .color-B6{color:#F7F8FE;} - .d2-2427018465 .color-AA2{color:#4A6FF3;} - .d2-2427018465 .color-AA4{color:#EDF0FD;} - .d2-2427018465 .color-AA5{color:#F7F8FE;} - .d2-2427018465 .color-AB4{color:#EDF0FD;} - .d2-2427018465 .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}]]>a1b1a2b2a3b3c1d1c2d2c3d3e1f1e2f2e3f3g1h1g2h2g3h3cdf -======= .d2-2487059389 .fill-N1{fill:#0A0F25;} .d2-2487059389 .fill-N2{fill:#676C7E;} .d2-2487059389 .fill-N3{fill:#9499AB;} @@ -252,8 +89,7 @@ .d2-2487059389 .color-AA4{color:#EDF0FD;} .d2-2487059389 .color-AA5{color:#F7F8FE;} .d2-2487059389 .color-AB4{color:#EDF0FD;} - .d2-2487059389 .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}]]>a1b1a2b2a3b3c1d1c2d2c3d3e1f1e2f2e3f3g1h1g2h2g3h3cdf ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-2487059389 .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}]]>a1b1a2b2a3b3c1d1c2d2c3d3e1f1e2f2e3f3g1h1g2h2g3h3cdf diff --git a/e2etests/testdata/stable/cycle-order/dagre/sketch.exp.svg b/e2etests/testdata/stable/cycle-order/dagre/sketch.exp.svg index d2da30e6c..7f844ff1f 100644 --- a/e2etests/testdata/stable/cycle-order/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/cycle-order/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -PlanCodeBuildTestCheckReleaseDeployOperateMonitorClickUpGitDockerPlaywrightTruffleHogGithub ActionAWS CopilotAWS ECSGrafana -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-1034147298 .fill-N1{fill:#0A0F25;} - .d2-1034147298 .fill-N2{fill:#676C7E;} - .d2-1034147298 .fill-N3{fill:#9499AB;} - .d2-1034147298 .fill-N4{fill:#CFD2DD;} - .d2-1034147298 .fill-N5{fill:#DEE1EB;} - .d2-1034147298 .fill-N6{fill:#EEF1F8;} - .d2-1034147298 .fill-N7{fill:#FFFFFF;} - .d2-1034147298 .fill-B1{fill:#0D32B2;} - .d2-1034147298 .fill-B2{fill:#0D32B2;} - .d2-1034147298 .fill-B3{fill:#E3E9FD;} - .d2-1034147298 .fill-B4{fill:#E3E9FD;} - .d2-1034147298 .fill-B5{fill:#EDF0FD;} - .d2-1034147298 .fill-B6{fill:#F7F8FE;} - .d2-1034147298 .fill-AA2{fill:#4A6FF3;} - .d2-1034147298 .fill-AA4{fill:#EDF0FD;} - .d2-1034147298 .fill-AA5{fill:#F7F8FE;} - .d2-1034147298 .fill-AB4{fill:#EDF0FD;} - .d2-1034147298 .fill-AB5{fill:#F7F8FE;} - .d2-1034147298 .stroke-N1{stroke:#0A0F25;} - .d2-1034147298 .stroke-N2{stroke:#676C7E;} - .d2-1034147298 .stroke-N3{stroke:#9499AB;} - .d2-1034147298 .stroke-N4{stroke:#CFD2DD;} - .d2-1034147298 .stroke-N5{stroke:#DEE1EB;} - .d2-1034147298 .stroke-N6{stroke:#EEF1F8;} - .d2-1034147298 .stroke-N7{stroke:#FFFFFF;} - .d2-1034147298 .stroke-B1{stroke:#0D32B2;} - .d2-1034147298 .stroke-B2{stroke:#0D32B2;} - .d2-1034147298 .stroke-B3{stroke:#E3E9FD;} - .d2-1034147298 .stroke-B4{stroke:#E3E9FD;} - .d2-1034147298 .stroke-B5{stroke:#EDF0FD;} - .d2-1034147298 .stroke-B6{stroke:#F7F8FE;} - .d2-1034147298 .stroke-AA2{stroke:#4A6FF3;} - .d2-1034147298 .stroke-AA4{stroke:#EDF0FD;} - .d2-1034147298 .stroke-AA5{stroke:#F7F8FE;} - .d2-1034147298 .stroke-AB4{stroke:#EDF0FD;} - .d2-1034147298 .stroke-AB5{stroke:#F7F8FE;} - .d2-1034147298 .background-color-N1{background-color:#0A0F25;} - .d2-1034147298 .background-color-N2{background-color:#676C7E;} - .d2-1034147298 .background-color-N3{background-color:#9499AB;} - .d2-1034147298 .background-color-N4{background-color:#CFD2DD;} - .d2-1034147298 .background-color-N5{background-color:#DEE1EB;} - .d2-1034147298 .background-color-N6{background-color:#EEF1F8;} - .d2-1034147298 .background-color-N7{background-color:#FFFFFF;} - .d2-1034147298 .background-color-B1{background-color:#0D32B2;} - .d2-1034147298 .background-color-B2{background-color:#0D32B2;} - .d2-1034147298 .background-color-B3{background-color:#E3E9FD;} - .d2-1034147298 .background-color-B4{background-color:#E3E9FD;} - .d2-1034147298 .background-color-B5{background-color:#EDF0FD;} - .d2-1034147298 .background-color-B6{background-color:#F7F8FE;} - .d2-1034147298 .background-color-AA2{background-color:#4A6FF3;} - .d2-1034147298 .background-color-AA4{background-color:#EDF0FD;} - .d2-1034147298 .background-color-AA5{background-color:#F7F8FE;} - .d2-1034147298 .background-color-AB4{background-color:#EDF0FD;} - .d2-1034147298 .background-color-AB5{background-color:#F7F8FE;} - .d2-1034147298 .color-N1{color:#0A0F25;} - .d2-1034147298 .color-N2{color:#676C7E;} - .d2-1034147298 .color-N3{color:#9499AB;} - .d2-1034147298 .color-N4{color:#CFD2DD;} - .d2-1034147298 .color-N5{color:#DEE1EB;} - .d2-1034147298 .color-N6{color:#EEF1F8;} - .d2-1034147298 .color-N7{color:#FFFFFF;} - .d2-1034147298 .color-B1{color:#0D32B2;} - .d2-1034147298 .color-B2{color:#0D32B2;} - .d2-1034147298 .color-B3{color:#E3E9FD;} - .d2-1034147298 .color-B4{color:#E3E9FD;} - .d2-1034147298 .color-B5{color:#EDF0FD;} - .d2-1034147298 .color-B6{color:#F7F8FE;} - .d2-1034147298 .color-AA2{color:#4A6FF3;} - .d2-1034147298 .color-AA4{color:#EDF0FD;} - .d2-1034147298 .color-AA5{color:#F7F8FE;} - .d2-1034147298 .color-AB4{color:#EDF0FD;} - .d2-1034147298 .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}]]>PlanCodeBuildTestCheckReleaseDeployOperateMonitorClickUpGitDockerPlaywrightTruffleHogGithub ActionAWS CopilotAWS ECSGrafana -======= .d2-1686362016 .fill-N1{fill:#0A0F25;} .d2-1686362016 .fill-N2{fill:#676C7E;} .d2-1686362016 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-1686362016 .color-AA4{color:#EDF0FD;} .d2-1686362016 .color-AA5{color:#F7F8FE;} .d2-1686362016 .color-AB4{color:#EDF0FD;} - .d2-1686362016 .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}]]>PlanCodeBuildTestCheckReleaseDeployOperateMonitorClickUpGitDockerPlaywrightTruffleHogGithub ActionAWS CopilotAWS ECSGrafana ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-1686362016 .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}]]>PlanCodeBuildTestCheckReleaseDeployOperateMonitorClickUpGitDockerPlaywrightTruffleHogGithub ActionAWS CopilotAWS ECSGrafana diff --git a/e2etests/testdata/stable/cycle-order/elk/sketch.exp.svg b/e2etests/testdata/stable/cycle-order/elk/sketch.exp.svg index 40765360b..811bc1f5e 100644 --- a/e2etests/testdata/stable/cycle-order/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/cycle-order/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -PlanCodeBuildTestCheckReleaseDeployOperateMonitorClickUpGitDockerPlaywrightTruffleHogGithub ActionAWS CopilotAWS ECSGrafana -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-3587231517 .fill-N1{fill:#0A0F25;} - .d2-3587231517 .fill-N2{fill:#676C7E;} - .d2-3587231517 .fill-N3{fill:#9499AB;} - .d2-3587231517 .fill-N4{fill:#CFD2DD;} - .d2-3587231517 .fill-N5{fill:#DEE1EB;} - .d2-3587231517 .fill-N6{fill:#EEF1F8;} - .d2-3587231517 .fill-N7{fill:#FFFFFF;} - .d2-3587231517 .fill-B1{fill:#0D32B2;} - .d2-3587231517 .fill-B2{fill:#0D32B2;} - .d2-3587231517 .fill-B3{fill:#E3E9FD;} - .d2-3587231517 .fill-B4{fill:#E3E9FD;} - .d2-3587231517 .fill-B5{fill:#EDF0FD;} - .d2-3587231517 .fill-B6{fill:#F7F8FE;} - .d2-3587231517 .fill-AA2{fill:#4A6FF3;} - .d2-3587231517 .fill-AA4{fill:#EDF0FD;} - .d2-3587231517 .fill-AA5{fill:#F7F8FE;} - .d2-3587231517 .fill-AB4{fill:#EDF0FD;} - .d2-3587231517 .fill-AB5{fill:#F7F8FE;} - .d2-3587231517 .stroke-N1{stroke:#0A0F25;} - .d2-3587231517 .stroke-N2{stroke:#676C7E;} - .d2-3587231517 .stroke-N3{stroke:#9499AB;} - .d2-3587231517 .stroke-N4{stroke:#CFD2DD;} - .d2-3587231517 .stroke-N5{stroke:#DEE1EB;} - .d2-3587231517 .stroke-N6{stroke:#EEF1F8;} - .d2-3587231517 .stroke-N7{stroke:#FFFFFF;} - .d2-3587231517 .stroke-B1{stroke:#0D32B2;} - .d2-3587231517 .stroke-B2{stroke:#0D32B2;} - .d2-3587231517 .stroke-B3{stroke:#E3E9FD;} - .d2-3587231517 .stroke-B4{stroke:#E3E9FD;} - .d2-3587231517 .stroke-B5{stroke:#EDF0FD;} - .d2-3587231517 .stroke-B6{stroke:#F7F8FE;} - .d2-3587231517 .stroke-AA2{stroke:#4A6FF3;} - .d2-3587231517 .stroke-AA4{stroke:#EDF0FD;} - .d2-3587231517 .stroke-AA5{stroke:#F7F8FE;} - .d2-3587231517 .stroke-AB4{stroke:#EDF0FD;} - .d2-3587231517 .stroke-AB5{stroke:#F7F8FE;} - .d2-3587231517 .background-color-N1{background-color:#0A0F25;} - .d2-3587231517 .background-color-N2{background-color:#676C7E;} - .d2-3587231517 .background-color-N3{background-color:#9499AB;} - .d2-3587231517 .background-color-N4{background-color:#CFD2DD;} - .d2-3587231517 .background-color-N5{background-color:#DEE1EB;} - .d2-3587231517 .background-color-N6{background-color:#EEF1F8;} - .d2-3587231517 .background-color-N7{background-color:#FFFFFF;} - .d2-3587231517 .background-color-B1{background-color:#0D32B2;} - .d2-3587231517 .background-color-B2{background-color:#0D32B2;} - .d2-3587231517 .background-color-B3{background-color:#E3E9FD;} - .d2-3587231517 .background-color-B4{background-color:#E3E9FD;} - .d2-3587231517 .background-color-B5{background-color:#EDF0FD;} - .d2-3587231517 .background-color-B6{background-color:#F7F8FE;} - .d2-3587231517 .background-color-AA2{background-color:#4A6FF3;} - .d2-3587231517 .background-color-AA4{background-color:#EDF0FD;} - .d2-3587231517 .background-color-AA5{background-color:#F7F8FE;} - .d2-3587231517 .background-color-AB4{background-color:#EDF0FD;} - .d2-3587231517 .background-color-AB5{background-color:#F7F8FE;} - .d2-3587231517 .color-N1{color:#0A0F25;} - .d2-3587231517 .color-N2{color:#676C7E;} - .d2-3587231517 .color-N3{color:#9499AB;} - .d2-3587231517 .color-N4{color:#CFD2DD;} - .d2-3587231517 .color-N5{color:#DEE1EB;} - .d2-3587231517 .color-N6{color:#EEF1F8;} - .d2-3587231517 .color-N7{color:#FFFFFF;} - .d2-3587231517 .color-B1{color:#0D32B2;} - .d2-3587231517 .color-B2{color:#0D32B2;} - .d2-3587231517 .color-B3{color:#E3E9FD;} - .d2-3587231517 .color-B4{color:#E3E9FD;} - .d2-3587231517 .color-B5{color:#EDF0FD;} - .d2-3587231517 .color-B6{color:#F7F8FE;} - .d2-3587231517 .color-AA2{color:#4A6FF3;} - .d2-3587231517 .color-AA4{color:#EDF0FD;} - .d2-3587231517 .color-AA5{color:#F7F8FE;} - .d2-3587231517 .color-AB4{color:#EDF0FD;} - .d2-3587231517 .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}]]>PlanCodeBuildTestCheckReleaseDeployOperateMonitorClickUpGitDockerPlaywrightTruffleHogGithub ActionAWS CopilotAWS ECSGrafana -======= .d2-1906685131 .fill-N1{fill:#0A0F25;} .d2-1906685131 .fill-N2{fill:#676C7E;} .d2-1906685131 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-1906685131 .color-AA4{color:#EDF0FD;} .d2-1906685131 .color-AA5{color:#F7F8FE;} .d2-1906685131 .color-AB4{color:#EDF0FD;} - .d2-1906685131 .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}]]>PlanCodeBuildTestCheckReleaseDeployOperateMonitorClickUpGitDockerPlaywrightTruffleHogGithub ActionAWS CopilotAWS ECSGrafana ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-1906685131 .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}]]>PlanCodeBuildTestCheckReleaseDeployOperateMonitorClickUpGitDockerPlaywrightTruffleHogGithub ActionAWS CopilotAWS ECSGrafana diff --git a/e2etests/testdata/stable/dagre-container/dagre/sketch.exp.svg b/e2etests/testdata/stable/dagre-container/dagre/sketch.exp.svg index 7e9baefc5..e54c97303 100644 --- a/e2etests/testdata/stable/dagre-container/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/dagre-container/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -ababcabc -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-4204566465 .fill-N1{fill:#0A0F25;} - .d2-4204566465 .fill-N2{fill:#676C7E;} - .d2-4204566465 .fill-N3{fill:#9499AB;} - .d2-4204566465 .fill-N4{fill:#CFD2DD;} - .d2-4204566465 .fill-N5{fill:#DEE1EB;} - .d2-4204566465 .fill-N6{fill:#EEF1F8;} - .d2-4204566465 .fill-N7{fill:#FFFFFF;} - .d2-4204566465 .fill-B1{fill:#0D32B2;} - .d2-4204566465 .fill-B2{fill:#0D32B2;} - .d2-4204566465 .fill-B3{fill:#E3E9FD;} - .d2-4204566465 .fill-B4{fill:#E3E9FD;} - .d2-4204566465 .fill-B5{fill:#EDF0FD;} - .d2-4204566465 .fill-B6{fill:#F7F8FE;} - .d2-4204566465 .fill-AA2{fill:#4A6FF3;} - .d2-4204566465 .fill-AA4{fill:#EDF0FD;} - .d2-4204566465 .fill-AA5{fill:#F7F8FE;} - .d2-4204566465 .fill-AB4{fill:#EDF0FD;} - .d2-4204566465 .fill-AB5{fill:#F7F8FE;} - .d2-4204566465 .stroke-N1{stroke:#0A0F25;} - .d2-4204566465 .stroke-N2{stroke:#676C7E;} - .d2-4204566465 .stroke-N3{stroke:#9499AB;} - .d2-4204566465 .stroke-N4{stroke:#CFD2DD;} - .d2-4204566465 .stroke-N5{stroke:#DEE1EB;} - .d2-4204566465 .stroke-N6{stroke:#EEF1F8;} - .d2-4204566465 .stroke-N7{stroke:#FFFFFF;} - .d2-4204566465 .stroke-B1{stroke:#0D32B2;} - .d2-4204566465 .stroke-B2{stroke:#0D32B2;} - .d2-4204566465 .stroke-B3{stroke:#E3E9FD;} - .d2-4204566465 .stroke-B4{stroke:#E3E9FD;} - .d2-4204566465 .stroke-B5{stroke:#EDF0FD;} - .d2-4204566465 .stroke-B6{stroke:#F7F8FE;} - .d2-4204566465 .stroke-AA2{stroke:#4A6FF3;} - .d2-4204566465 .stroke-AA4{stroke:#EDF0FD;} - .d2-4204566465 .stroke-AA5{stroke:#F7F8FE;} - .d2-4204566465 .stroke-AB4{stroke:#EDF0FD;} - .d2-4204566465 .stroke-AB5{stroke:#F7F8FE;} - .d2-4204566465 .background-color-N1{background-color:#0A0F25;} - .d2-4204566465 .background-color-N2{background-color:#676C7E;} - .d2-4204566465 .background-color-N3{background-color:#9499AB;} - .d2-4204566465 .background-color-N4{background-color:#CFD2DD;} - .d2-4204566465 .background-color-N5{background-color:#DEE1EB;} - .d2-4204566465 .background-color-N6{background-color:#EEF1F8;} - .d2-4204566465 .background-color-N7{background-color:#FFFFFF;} - .d2-4204566465 .background-color-B1{background-color:#0D32B2;} - .d2-4204566465 .background-color-B2{background-color:#0D32B2;} - .d2-4204566465 .background-color-B3{background-color:#E3E9FD;} - .d2-4204566465 .background-color-B4{background-color:#E3E9FD;} - .d2-4204566465 .background-color-B5{background-color:#EDF0FD;} - .d2-4204566465 .background-color-B6{background-color:#F7F8FE;} - .d2-4204566465 .background-color-AA2{background-color:#4A6FF3;} - .d2-4204566465 .background-color-AA4{background-color:#EDF0FD;} - .d2-4204566465 .background-color-AA5{background-color:#F7F8FE;} - .d2-4204566465 .background-color-AB4{background-color:#EDF0FD;} - .d2-4204566465 .background-color-AB5{background-color:#F7F8FE;} - .d2-4204566465 .color-N1{color:#0A0F25;} - .d2-4204566465 .color-N2{color:#676C7E;} - .d2-4204566465 .color-N3{color:#9499AB;} - .d2-4204566465 .color-N4{color:#CFD2DD;} - .d2-4204566465 .color-N5{color:#DEE1EB;} - .d2-4204566465 .color-N6{color:#EEF1F8;} - .d2-4204566465 .color-N7{color:#FFFFFF;} - .d2-4204566465 .color-B1{color:#0D32B2;} - .d2-4204566465 .color-B2{color:#0D32B2;} - .d2-4204566465 .color-B3{color:#E3E9FD;} - .d2-4204566465 .color-B4{color:#E3E9FD;} - .d2-4204566465 .color-B5{color:#EDF0FD;} - .d2-4204566465 .color-B6{color:#F7F8FE;} - .d2-4204566465 .color-AA2{color:#4A6FF3;} - .d2-4204566465 .color-AA4{color:#EDF0FD;} - .d2-4204566465 .color-AA5{color:#F7F8FE;} - .d2-4204566465 .color-AB4{color:#EDF0FD;} - .d2-4204566465 .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}]]>ababcabc -======= .d2-1140613891 .fill-N1{fill:#0A0F25;} .d2-1140613891 .fill-N2{fill:#676C7E;} .d2-1140613891 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-1140613891 .color-AA4{color:#EDF0FD;} .d2-1140613891 .color-AA5{color:#F7F8FE;} .d2-1140613891 .color-AB4{color:#EDF0FD;} - .d2-1140613891 .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}]]>ababcabc ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-1140613891 .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}]]>ababcabc diff --git a/e2etests/testdata/stable/dagre-container/elk/sketch.exp.svg b/e2etests/testdata/stable/dagre-container/elk/sketch.exp.svg index 71a891704..da29a9f26 100644 --- a/e2etests/testdata/stable/dagre-container/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/dagre-container/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -ababcabc -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-1725799876 .fill-N1{fill:#0A0F25;} - .d2-1725799876 .fill-N2{fill:#676C7E;} - .d2-1725799876 .fill-N3{fill:#9499AB;} - .d2-1725799876 .fill-N4{fill:#CFD2DD;} - .d2-1725799876 .fill-N5{fill:#DEE1EB;} - .d2-1725799876 .fill-N6{fill:#EEF1F8;} - .d2-1725799876 .fill-N7{fill:#FFFFFF;} - .d2-1725799876 .fill-B1{fill:#0D32B2;} - .d2-1725799876 .fill-B2{fill:#0D32B2;} - .d2-1725799876 .fill-B3{fill:#E3E9FD;} - .d2-1725799876 .fill-B4{fill:#E3E9FD;} - .d2-1725799876 .fill-B5{fill:#EDF0FD;} - .d2-1725799876 .fill-B6{fill:#F7F8FE;} - .d2-1725799876 .fill-AA2{fill:#4A6FF3;} - .d2-1725799876 .fill-AA4{fill:#EDF0FD;} - .d2-1725799876 .fill-AA5{fill:#F7F8FE;} - .d2-1725799876 .fill-AB4{fill:#EDF0FD;} - .d2-1725799876 .fill-AB5{fill:#F7F8FE;} - .d2-1725799876 .stroke-N1{stroke:#0A0F25;} - .d2-1725799876 .stroke-N2{stroke:#676C7E;} - .d2-1725799876 .stroke-N3{stroke:#9499AB;} - .d2-1725799876 .stroke-N4{stroke:#CFD2DD;} - .d2-1725799876 .stroke-N5{stroke:#DEE1EB;} - .d2-1725799876 .stroke-N6{stroke:#EEF1F8;} - .d2-1725799876 .stroke-N7{stroke:#FFFFFF;} - .d2-1725799876 .stroke-B1{stroke:#0D32B2;} - .d2-1725799876 .stroke-B2{stroke:#0D32B2;} - .d2-1725799876 .stroke-B3{stroke:#E3E9FD;} - .d2-1725799876 .stroke-B4{stroke:#E3E9FD;} - .d2-1725799876 .stroke-B5{stroke:#EDF0FD;} - .d2-1725799876 .stroke-B6{stroke:#F7F8FE;} - .d2-1725799876 .stroke-AA2{stroke:#4A6FF3;} - .d2-1725799876 .stroke-AA4{stroke:#EDF0FD;} - .d2-1725799876 .stroke-AA5{stroke:#F7F8FE;} - .d2-1725799876 .stroke-AB4{stroke:#EDF0FD;} - .d2-1725799876 .stroke-AB5{stroke:#F7F8FE;} - .d2-1725799876 .background-color-N1{background-color:#0A0F25;} - .d2-1725799876 .background-color-N2{background-color:#676C7E;} - .d2-1725799876 .background-color-N3{background-color:#9499AB;} - .d2-1725799876 .background-color-N4{background-color:#CFD2DD;} - .d2-1725799876 .background-color-N5{background-color:#DEE1EB;} - .d2-1725799876 .background-color-N6{background-color:#EEF1F8;} - .d2-1725799876 .background-color-N7{background-color:#FFFFFF;} - .d2-1725799876 .background-color-B1{background-color:#0D32B2;} - .d2-1725799876 .background-color-B2{background-color:#0D32B2;} - .d2-1725799876 .background-color-B3{background-color:#E3E9FD;} - .d2-1725799876 .background-color-B4{background-color:#E3E9FD;} - .d2-1725799876 .background-color-B5{background-color:#EDF0FD;} - .d2-1725799876 .background-color-B6{background-color:#F7F8FE;} - .d2-1725799876 .background-color-AA2{background-color:#4A6FF3;} - .d2-1725799876 .background-color-AA4{background-color:#EDF0FD;} - .d2-1725799876 .background-color-AA5{background-color:#F7F8FE;} - .d2-1725799876 .background-color-AB4{background-color:#EDF0FD;} - .d2-1725799876 .background-color-AB5{background-color:#F7F8FE;} - .d2-1725799876 .color-N1{color:#0A0F25;} - .d2-1725799876 .color-N2{color:#676C7E;} - .d2-1725799876 .color-N3{color:#9499AB;} - .d2-1725799876 .color-N4{color:#CFD2DD;} - .d2-1725799876 .color-N5{color:#DEE1EB;} - .d2-1725799876 .color-N6{color:#EEF1F8;} - .d2-1725799876 .color-N7{color:#FFFFFF;} - .d2-1725799876 .color-B1{color:#0D32B2;} - .d2-1725799876 .color-B2{color:#0D32B2;} - .d2-1725799876 .color-B3{color:#E3E9FD;} - .d2-1725799876 .color-B4{color:#E3E9FD;} - .d2-1725799876 .color-B5{color:#EDF0FD;} - .d2-1725799876 .color-B6{color:#F7F8FE;} - .d2-1725799876 .color-AA2{color:#4A6FF3;} - .d2-1725799876 .color-AA4{color:#EDF0FD;} - .d2-1725799876 .color-AA5{color:#F7F8FE;} - .d2-1725799876 .color-AB4{color:#EDF0FD;} - .d2-1725799876 .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}]]>ababcabc -======= .d2-2673984254 .fill-N1{fill:#0A0F25;} .d2-2673984254 .fill-N2{fill:#676C7E;} .d2-2673984254 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-2673984254 .color-AA4{color:#EDF0FD;} .d2-2673984254 .color-AA5{color:#F7F8FE;} .d2-2673984254 .color-AB4{color:#EDF0FD;} - .d2-2673984254 .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}]]>ababcabc ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-2673984254 .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}]]>ababcabc diff --git a/e2etests/testdata/stable/dagre_spacing/dagre/sketch.exp.svg b/e2etests/testdata/stable/dagre_spacing/dagre/sketch.exp.svg index 738c79347..3c8b26269 100644 --- a/e2etests/testdata/stable/dagre_spacing/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/dagre_spacing/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -askuhykfnsomsssscccccccccccccccccccczrgtiiigsjjcfi 1234 -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-493210531 .fill-N1{fill:#0A0F25;} - .d2-493210531 .fill-N2{fill:#676C7E;} - .d2-493210531 .fill-N3{fill:#9499AB;} - .d2-493210531 .fill-N4{fill:#CFD2DD;} - .d2-493210531 .fill-N5{fill:#DEE1EB;} - .d2-493210531 .fill-N6{fill:#EEF1F8;} - .d2-493210531 .fill-N7{fill:#FFFFFF;} - .d2-493210531 .fill-B1{fill:#0D32B2;} - .d2-493210531 .fill-B2{fill:#0D32B2;} - .d2-493210531 .fill-B3{fill:#E3E9FD;} - .d2-493210531 .fill-B4{fill:#E3E9FD;} - .d2-493210531 .fill-B5{fill:#EDF0FD;} - .d2-493210531 .fill-B6{fill:#F7F8FE;} - .d2-493210531 .fill-AA2{fill:#4A6FF3;} - .d2-493210531 .fill-AA4{fill:#EDF0FD;} - .d2-493210531 .fill-AA5{fill:#F7F8FE;} - .d2-493210531 .fill-AB4{fill:#EDF0FD;} - .d2-493210531 .fill-AB5{fill:#F7F8FE;} - .d2-493210531 .stroke-N1{stroke:#0A0F25;} - .d2-493210531 .stroke-N2{stroke:#676C7E;} - .d2-493210531 .stroke-N3{stroke:#9499AB;} - .d2-493210531 .stroke-N4{stroke:#CFD2DD;} - .d2-493210531 .stroke-N5{stroke:#DEE1EB;} - .d2-493210531 .stroke-N6{stroke:#EEF1F8;} - .d2-493210531 .stroke-N7{stroke:#FFFFFF;} - .d2-493210531 .stroke-B1{stroke:#0D32B2;} - .d2-493210531 .stroke-B2{stroke:#0D32B2;} - .d2-493210531 .stroke-B3{stroke:#E3E9FD;} - .d2-493210531 .stroke-B4{stroke:#E3E9FD;} - .d2-493210531 .stroke-B5{stroke:#EDF0FD;} - .d2-493210531 .stroke-B6{stroke:#F7F8FE;} - .d2-493210531 .stroke-AA2{stroke:#4A6FF3;} - .d2-493210531 .stroke-AA4{stroke:#EDF0FD;} - .d2-493210531 .stroke-AA5{stroke:#F7F8FE;} - .d2-493210531 .stroke-AB4{stroke:#EDF0FD;} - .d2-493210531 .stroke-AB5{stroke:#F7F8FE;} - .d2-493210531 .background-color-N1{background-color:#0A0F25;} - .d2-493210531 .background-color-N2{background-color:#676C7E;} - .d2-493210531 .background-color-N3{background-color:#9499AB;} - .d2-493210531 .background-color-N4{background-color:#CFD2DD;} - .d2-493210531 .background-color-N5{background-color:#DEE1EB;} - .d2-493210531 .background-color-N6{background-color:#EEF1F8;} - .d2-493210531 .background-color-N7{background-color:#FFFFFF;} - .d2-493210531 .background-color-B1{background-color:#0D32B2;} - .d2-493210531 .background-color-B2{background-color:#0D32B2;} - .d2-493210531 .background-color-B3{background-color:#E3E9FD;} - .d2-493210531 .background-color-B4{background-color:#E3E9FD;} - .d2-493210531 .background-color-B5{background-color:#EDF0FD;} - .d2-493210531 .background-color-B6{background-color:#F7F8FE;} - .d2-493210531 .background-color-AA2{background-color:#4A6FF3;} - .d2-493210531 .background-color-AA4{background-color:#EDF0FD;} - .d2-493210531 .background-color-AA5{background-color:#F7F8FE;} - .d2-493210531 .background-color-AB4{background-color:#EDF0FD;} - .d2-493210531 .background-color-AB5{background-color:#F7F8FE;} - .d2-493210531 .color-N1{color:#0A0F25;} - .d2-493210531 .color-N2{color:#676C7E;} - .d2-493210531 .color-N3{color:#9499AB;} - .d2-493210531 .color-N4{color:#CFD2DD;} - .d2-493210531 .color-N5{color:#DEE1EB;} - .d2-493210531 .color-N6{color:#EEF1F8;} - .d2-493210531 .color-N7{color:#FFFFFF;} - .d2-493210531 .color-B1{color:#0D32B2;} - .d2-493210531 .color-B2{color:#0D32B2;} - .d2-493210531 .color-B3{color:#E3E9FD;} - .d2-493210531 .color-B4{color:#E3E9FD;} - .d2-493210531 .color-B5{color:#EDF0FD;} - .d2-493210531 .color-B6{color:#F7F8FE;} - .d2-493210531 .color-AA2{color:#4A6FF3;} - .d2-493210531 .color-AA4{color:#EDF0FD;} - .d2-493210531 .color-AA5{color:#F7F8FE;} - .d2-493210531 .color-AB4{color:#EDF0FD;} - .d2-493210531 .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}]]>askuhykfnsomsssscccccccccccccccccccczrgtiiigsjjcfi 1234 -======= .d2-167658915 .fill-N1{fill:#0A0F25;} .d2-167658915 .fill-N2{fill:#676C7E;} .d2-167658915 .fill-N3{fill:#9499AB;} @@ -266,8 +103,7 @@ .d2-167658915 .color-AA4{color:#EDF0FD;} .d2-167658915 .color-AA5{color:#F7F8FE;} .d2-167658915 .color-AB4{color:#EDF0FD;} - .d2-167658915 .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}]]>askuhykfnsomsssscccccccccccccccccccczrgtiiigsjjcfi 1234 ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-167658915 .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}]]>askuhykfnsomsssscccccccccccccccccccczrgtiiigsjjcfi 1234 diff --git a/e2etests/testdata/stable/dagre_spacing/elk/sketch.exp.svg b/e2etests/testdata/stable/dagre_spacing/elk/sketch.exp.svg index 9c8c3b760..93178bb66 100644 --- a/e2etests/testdata/stable/dagre_spacing/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/dagre_spacing/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -askuhykfnsomsssscccccccccccccccccccczrgtiiigsjjcfi 1234 -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-2155987667 .fill-N1{fill:#0A0F25;} - .d2-2155987667 .fill-N2{fill:#676C7E;} - .d2-2155987667 .fill-N3{fill:#9499AB;} - .d2-2155987667 .fill-N4{fill:#CFD2DD;} - .d2-2155987667 .fill-N5{fill:#DEE1EB;} - .d2-2155987667 .fill-N6{fill:#EEF1F8;} - .d2-2155987667 .fill-N7{fill:#FFFFFF;} - .d2-2155987667 .fill-B1{fill:#0D32B2;} - .d2-2155987667 .fill-B2{fill:#0D32B2;} - .d2-2155987667 .fill-B3{fill:#E3E9FD;} - .d2-2155987667 .fill-B4{fill:#E3E9FD;} - .d2-2155987667 .fill-B5{fill:#EDF0FD;} - .d2-2155987667 .fill-B6{fill:#F7F8FE;} - .d2-2155987667 .fill-AA2{fill:#4A6FF3;} - .d2-2155987667 .fill-AA4{fill:#EDF0FD;} - .d2-2155987667 .fill-AA5{fill:#F7F8FE;} - .d2-2155987667 .fill-AB4{fill:#EDF0FD;} - .d2-2155987667 .fill-AB5{fill:#F7F8FE;} - .d2-2155987667 .stroke-N1{stroke:#0A0F25;} - .d2-2155987667 .stroke-N2{stroke:#676C7E;} - .d2-2155987667 .stroke-N3{stroke:#9499AB;} - .d2-2155987667 .stroke-N4{stroke:#CFD2DD;} - .d2-2155987667 .stroke-N5{stroke:#DEE1EB;} - .d2-2155987667 .stroke-N6{stroke:#EEF1F8;} - .d2-2155987667 .stroke-N7{stroke:#FFFFFF;} - .d2-2155987667 .stroke-B1{stroke:#0D32B2;} - .d2-2155987667 .stroke-B2{stroke:#0D32B2;} - .d2-2155987667 .stroke-B3{stroke:#E3E9FD;} - .d2-2155987667 .stroke-B4{stroke:#E3E9FD;} - .d2-2155987667 .stroke-B5{stroke:#EDF0FD;} - .d2-2155987667 .stroke-B6{stroke:#F7F8FE;} - .d2-2155987667 .stroke-AA2{stroke:#4A6FF3;} - .d2-2155987667 .stroke-AA4{stroke:#EDF0FD;} - .d2-2155987667 .stroke-AA5{stroke:#F7F8FE;} - .d2-2155987667 .stroke-AB4{stroke:#EDF0FD;} - .d2-2155987667 .stroke-AB5{stroke:#F7F8FE;} - .d2-2155987667 .background-color-N1{background-color:#0A0F25;} - .d2-2155987667 .background-color-N2{background-color:#676C7E;} - .d2-2155987667 .background-color-N3{background-color:#9499AB;} - .d2-2155987667 .background-color-N4{background-color:#CFD2DD;} - .d2-2155987667 .background-color-N5{background-color:#DEE1EB;} - .d2-2155987667 .background-color-N6{background-color:#EEF1F8;} - .d2-2155987667 .background-color-N7{background-color:#FFFFFF;} - .d2-2155987667 .background-color-B1{background-color:#0D32B2;} - .d2-2155987667 .background-color-B2{background-color:#0D32B2;} - .d2-2155987667 .background-color-B3{background-color:#E3E9FD;} - .d2-2155987667 .background-color-B4{background-color:#E3E9FD;} - .d2-2155987667 .background-color-B5{background-color:#EDF0FD;} - .d2-2155987667 .background-color-B6{background-color:#F7F8FE;} - .d2-2155987667 .background-color-AA2{background-color:#4A6FF3;} - .d2-2155987667 .background-color-AA4{background-color:#EDF0FD;} - .d2-2155987667 .background-color-AA5{background-color:#F7F8FE;} - .d2-2155987667 .background-color-AB4{background-color:#EDF0FD;} - .d2-2155987667 .background-color-AB5{background-color:#F7F8FE;} - .d2-2155987667 .color-N1{color:#0A0F25;} - .d2-2155987667 .color-N2{color:#676C7E;} - .d2-2155987667 .color-N3{color:#9499AB;} - .d2-2155987667 .color-N4{color:#CFD2DD;} - .d2-2155987667 .color-N5{color:#DEE1EB;} - .d2-2155987667 .color-N6{color:#EEF1F8;} - .d2-2155987667 .color-N7{color:#FFFFFF;} - .d2-2155987667 .color-B1{color:#0D32B2;} - .d2-2155987667 .color-B2{color:#0D32B2;} - .d2-2155987667 .color-B3{color:#E3E9FD;} - .d2-2155987667 .color-B4{color:#E3E9FD;} - .d2-2155987667 .color-B5{color:#EDF0FD;} - .d2-2155987667 .color-B6{color:#F7F8FE;} - .d2-2155987667 .color-AA2{color:#4A6FF3;} - .d2-2155987667 .color-AA4{color:#EDF0FD;} - .d2-2155987667 .color-AA5{color:#F7F8FE;} - .d2-2155987667 .color-AB4{color:#EDF0FD;} - .d2-2155987667 .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}]]>askuhykfnsomsssscccccccccccccccccccczrgtiiigsjjcfi 1234 -======= .d2-124072347 .fill-N1{fill:#0A0F25;} .d2-124072347 .fill-N2{fill:#676C7E;} .d2-124072347 .fill-N3{fill:#9499AB;} @@ -266,8 +103,7 @@ .d2-124072347 .color-AA4{color:#EDF0FD;} .d2-124072347 .color-AA5{color:#F7F8FE;} .d2-124072347 .color-AB4{color:#EDF0FD;} - .d2-124072347 .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}]]>askuhykfnsomsssscccccccccccccccccccczrgtiiigsjjcfi 1234 ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-124072347 .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}]]>askuhykfnsomsssscccccccccccccccccccczrgtiiigsjjcfi 1234 diff --git a/e2etests/testdata/stable/dagre_spacing_right/dagre/sketch.exp.svg b/e2etests/testdata/stable/dagre_spacing_right/dagre/sketch.exp.svg index 30bd1a7d9..0ac6f67e3 100644 --- a/e2etests/testdata/stable/dagre_spacing_right/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/dagre_spacing_right/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -askuhykfnsomsssscccccccccccccccccccczrgtiiigsjjcfi 1234 -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-476290811 .fill-N1{fill:#0A0F25;} - .d2-476290811 .fill-N2{fill:#676C7E;} - .d2-476290811 .fill-N3{fill:#9499AB;} - .d2-476290811 .fill-N4{fill:#CFD2DD;} - .d2-476290811 .fill-N5{fill:#DEE1EB;} - .d2-476290811 .fill-N6{fill:#EEF1F8;} - .d2-476290811 .fill-N7{fill:#FFFFFF;} - .d2-476290811 .fill-B1{fill:#0D32B2;} - .d2-476290811 .fill-B2{fill:#0D32B2;} - .d2-476290811 .fill-B3{fill:#E3E9FD;} - .d2-476290811 .fill-B4{fill:#E3E9FD;} - .d2-476290811 .fill-B5{fill:#EDF0FD;} - .d2-476290811 .fill-B6{fill:#F7F8FE;} - .d2-476290811 .fill-AA2{fill:#4A6FF3;} - .d2-476290811 .fill-AA4{fill:#EDF0FD;} - .d2-476290811 .fill-AA5{fill:#F7F8FE;} - .d2-476290811 .fill-AB4{fill:#EDF0FD;} - .d2-476290811 .fill-AB5{fill:#F7F8FE;} - .d2-476290811 .stroke-N1{stroke:#0A0F25;} - .d2-476290811 .stroke-N2{stroke:#676C7E;} - .d2-476290811 .stroke-N3{stroke:#9499AB;} - .d2-476290811 .stroke-N4{stroke:#CFD2DD;} - .d2-476290811 .stroke-N5{stroke:#DEE1EB;} - .d2-476290811 .stroke-N6{stroke:#EEF1F8;} - .d2-476290811 .stroke-N7{stroke:#FFFFFF;} - .d2-476290811 .stroke-B1{stroke:#0D32B2;} - .d2-476290811 .stroke-B2{stroke:#0D32B2;} - .d2-476290811 .stroke-B3{stroke:#E3E9FD;} - .d2-476290811 .stroke-B4{stroke:#E3E9FD;} - .d2-476290811 .stroke-B5{stroke:#EDF0FD;} - .d2-476290811 .stroke-B6{stroke:#F7F8FE;} - .d2-476290811 .stroke-AA2{stroke:#4A6FF3;} - .d2-476290811 .stroke-AA4{stroke:#EDF0FD;} - .d2-476290811 .stroke-AA5{stroke:#F7F8FE;} - .d2-476290811 .stroke-AB4{stroke:#EDF0FD;} - .d2-476290811 .stroke-AB5{stroke:#F7F8FE;} - .d2-476290811 .background-color-N1{background-color:#0A0F25;} - .d2-476290811 .background-color-N2{background-color:#676C7E;} - .d2-476290811 .background-color-N3{background-color:#9499AB;} - .d2-476290811 .background-color-N4{background-color:#CFD2DD;} - .d2-476290811 .background-color-N5{background-color:#DEE1EB;} - .d2-476290811 .background-color-N6{background-color:#EEF1F8;} - .d2-476290811 .background-color-N7{background-color:#FFFFFF;} - .d2-476290811 .background-color-B1{background-color:#0D32B2;} - .d2-476290811 .background-color-B2{background-color:#0D32B2;} - .d2-476290811 .background-color-B3{background-color:#E3E9FD;} - .d2-476290811 .background-color-B4{background-color:#E3E9FD;} - .d2-476290811 .background-color-B5{background-color:#EDF0FD;} - .d2-476290811 .background-color-B6{background-color:#F7F8FE;} - .d2-476290811 .background-color-AA2{background-color:#4A6FF3;} - .d2-476290811 .background-color-AA4{background-color:#EDF0FD;} - .d2-476290811 .background-color-AA5{background-color:#F7F8FE;} - .d2-476290811 .background-color-AB4{background-color:#EDF0FD;} - .d2-476290811 .background-color-AB5{background-color:#F7F8FE;} - .d2-476290811 .color-N1{color:#0A0F25;} - .d2-476290811 .color-N2{color:#676C7E;} - .d2-476290811 .color-N3{color:#9499AB;} - .d2-476290811 .color-N4{color:#CFD2DD;} - .d2-476290811 .color-N5{color:#DEE1EB;} - .d2-476290811 .color-N6{color:#EEF1F8;} - .d2-476290811 .color-N7{color:#FFFFFF;} - .d2-476290811 .color-B1{color:#0D32B2;} - .d2-476290811 .color-B2{color:#0D32B2;} - .d2-476290811 .color-B3{color:#E3E9FD;} - .d2-476290811 .color-B4{color:#E3E9FD;} - .d2-476290811 .color-B5{color:#EDF0FD;} - .d2-476290811 .color-B6{color:#F7F8FE;} - .d2-476290811 .color-AA2{color:#4A6FF3;} - .d2-476290811 .color-AA4{color:#EDF0FD;} - .d2-476290811 .color-AA5{color:#F7F8FE;} - .d2-476290811 .color-AB4{color:#EDF0FD;} - .d2-476290811 .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}]]>askuhykfnsomsssscccccccccccccccccccczrgtiiigsjjcfi 1234 -======= .d2-3518654467 .fill-N1{fill:#0A0F25;} .d2-3518654467 .fill-N2{fill:#676C7E;} .d2-3518654467 .fill-N3{fill:#9499AB;} @@ -266,8 +103,7 @@ .d2-3518654467 .color-AA4{color:#EDF0FD;} .d2-3518654467 .color-AA5{color:#F7F8FE;} .d2-3518654467 .color-AB4{color:#EDF0FD;} - .d2-3518654467 .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}]]>askuhykfnsomsssscccccccccccccccccccczrgtiiigsjjcfi 1234 ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-3518654467 .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}]]>askuhykfnsomsssscccccccccccccccccccczrgtiiigsjjcfi 1234 diff --git a/e2etests/testdata/stable/dagre_spacing_right/elk/sketch.exp.svg b/e2etests/testdata/stable/dagre_spacing_right/elk/sketch.exp.svg index 1a2546ba4..d164e5640 100644 --- a/e2etests/testdata/stable/dagre_spacing_right/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/dagre_spacing_right/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -askuhykfnsomsssscccccccccccccccccccczrgtiiigsjjcfi 1234 -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-1511896059 .fill-N1{fill:#0A0F25;} - .d2-1511896059 .fill-N2{fill:#676C7E;} - .d2-1511896059 .fill-N3{fill:#9499AB;} - .d2-1511896059 .fill-N4{fill:#CFD2DD;} - .d2-1511896059 .fill-N5{fill:#DEE1EB;} - .d2-1511896059 .fill-N6{fill:#EEF1F8;} - .d2-1511896059 .fill-N7{fill:#FFFFFF;} - .d2-1511896059 .fill-B1{fill:#0D32B2;} - .d2-1511896059 .fill-B2{fill:#0D32B2;} - .d2-1511896059 .fill-B3{fill:#E3E9FD;} - .d2-1511896059 .fill-B4{fill:#E3E9FD;} - .d2-1511896059 .fill-B5{fill:#EDF0FD;} - .d2-1511896059 .fill-B6{fill:#F7F8FE;} - .d2-1511896059 .fill-AA2{fill:#4A6FF3;} - .d2-1511896059 .fill-AA4{fill:#EDF0FD;} - .d2-1511896059 .fill-AA5{fill:#F7F8FE;} - .d2-1511896059 .fill-AB4{fill:#EDF0FD;} - .d2-1511896059 .fill-AB5{fill:#F7F8FE;} - .d2-1511896059 .stroke-N1{stroke:#0A0F25;} - .d2-1511896059 .stroke-N2{stroke:#676C7E;} - .d2-1511896059 .stroke-N3{stroke:#9499AB;} - .d2-1511896059 .stroke-N4{stroke:#CFD2DD;} - .d2-1511896059 .stroke-N5{stroke:#DEE1EB;} - .d2-1511896059 .stroke-N6{stroke:#EEF1F8;} - .d2-1511896059 .stroke-N7{stroke:#FFFFFF;} - .d2-1511896059 .stroke-B1{stroke:#0D32B2;} - .d2-1511896059 .stroke-B2{stroke:#0D32B2;} - .d2-1511896059 .stroke-B3{stroke:#E3E9FD;} - .d2-1511896059 .stroke-B4{stroke:#E3E9FD;} - .d2-1511896059 .stroke-B5{stroke:#EDF0FD;} - .d2-1511896059 .stroke-B6{stroke:#F7F8FE;} - .d2-1511896059 .stroke-AA2{stroke:#4A6FF3;} - .d2-1511896059 .stroke-AA4{stroke:#EDF0FD;} - .d2-1511896059 .stroke-AA5{stroke:#F7F8FE;} - .d2-1511896059 .stroke-AB4{stroke:#EDF0FD;} - .d2-1511896059 .stroke-AB5{stroke:#F7F8FE;} - .d2-1511896059 .background-color-N1{background-color:#0A0F25;} - .d2-1511896059 .background-color-N2{background-color:#676C7E;} - .d2-1511896059 .background-color-N3{background-color:#9499AB;} - .d2-1511896059 .background-color-N4{background-color:#CFD2DD;} - .d2-1511896059 .background-color-N5{background-color:#DEE1EB;} - .d2-1511896059 .background-color-N6{background-color:#EEF1F8;} - .d2-1511896059 .background-color-N7{background-color:#FFFFFF;} - .d2-1511896059 .background-color-B1{background-color:#0D32B2;} - .d2-1511896059 .background-color-B2{background-color:#0D32B2;} - .d2-1511896059 .background-color-B3{background-color:#E3E9FD;} - .d2-1511896059 .background-color-B4{background-color:#E3E9FD;} - .d2-1511896059 .background-color-B5{background-color:#EDF0FD;} - .d2-1511896059 .background-color-B6{background-color:#F7F8FE;} - .d2-1511896059 .background-color-AA2{background-color:#4A6FF3;} - .d2-1511896059 .background-color-AA4{background-color:#EDF0FD;} - .d2-1511896059 .background-color-AA5{background-color:#F7F8FE;} - .d2-1511896059 .background-color-AB4{background-color:#EDF0FD;} - .d2-1511896059 .background-color-AB5{background-color:#F7F8FE;} - .d2-1511896059 .color-N1{color:#0A0F25;} - .d2-1511896059 .color-N2{color:#676C7E;} - .d2-1511896059 .color-N3{color:#9499AB;} - .d2-1511896059 .color-N4{color:#CFD2DD;} - .d2-1511896059 .color-N5{color:#DEE1EB;} - .d2-1511896059 .color-N6{color:#EEF1F8;} - .d2-1511896059 .color-N7{color:#FFFFFF;} - .d2-1511896059 .color-B1{color:#0D32B2;} - .d2-1511896059 .color-B2{color:#0D32B2;} - .d2-1511896059 .color-B3{color:#E3E9FD;} - .d2-1511896059 .color-B4{color:#E3E9FD;} - .d2-1511896059 .color-B5{color:#EDF0FD;} - .d2-1511896059 .color-B6{color:#F7F8FE;} - .d2-1511896059 .color-AA2{color:#4A6FF3;} - .d2-1511896059 .color-AA4{color:#EDF0FD;} - .d2-1511896059 .color-AA5{color:#F7F8FE;} - .d2-1511896059 .color-AB4{color:#EDF0FD;} - .d2-1511896059 .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}]]>askuhykfnsomsssscccccccccccccccccccczrgtiiigsjjcfi 1234 -======= .d2-359663691 .fill-N1{fill:#0A0F25;} .d2-359663691 .fill-N2{fill:#676C7E;} .d2-359663691 .fill-N3{fill:#9499AB;} @@ -266,8 +103,7 @@ .d2-359663691 .color-AA4{color:#EDF0FD;} .d2-359663691 .color-AA5{color:#F7F8FE;} .d2-359663691 .color-AB4{color:#EDF0FD;} - .d2-359663691 .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}]]>askuhykfnsomsssscccccccccccccccccccczrgtiiigsjjcfi 1234 ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-359663691 .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}]]>askuhykfnsomsssscccccccccccccccccccczrgtiiigsjjcfi 1234 diff --git a/e2etests/testdata/stable/dense/dagre/sketch.exp.svg b/e2etests/testdata/stable/dense/dagre/sketch.exp.svg index 0a10a29f3..05e0e435a 100644 --- a/e2etests/testdata/stable/dense/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/dense/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -abcdefghijklmnopq -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-4142769503 .fill-N1{fill:#0A0F25;} - .d2-4142769503 .fill-N2{fill:#676C7E;} - .d2-4142769503 .fill-N3{fill:#9499AB;} - .d2-4142769503 .fill-N4{fill:#CFD2DD;} - .d2-4142769503 .fill-N5{fill:#DEE1EB;} - .d2-4142769503 .fill-N6{fill:#EEF1F8;} - .d2-4142769503 .fill-N7{fill:#FFFFFF;} - .d2-4142769503 .fill-B1{fill:#0D32B2;} - .d2-4142769503 .fill-B2{fill:#0D32B2;} - .d2-4142769503 .fill-B3{fill:#E3E9FD;} - .d2-4142769503 .fill-B4{fill:#E3E9FD;} - .d2-4142769503 .fill-B5{fill:#EDF0FD;} - .d2-4142769503 .fill-B6{fill:#F7F8FE;} - .d2-4142769503 .fill-AA2{fill:#4A6FF3;} - .d2-4142769503 .fill-AA4{fill:#EDF0FD;} - .d2-4142769503 .fill-AA5{fill:#F7F8FE;} - .d2-4142769503 .fill-AB4{fill:#EDF0FD;} - .d2-4142769503 .fill-AB5{fill:#F7F8FE;} - .d2-4142769503 .stroke-N1{stroke:#0A0F25;} - .d2-4142769503 .stroke-N2{stroke:#676C7E;} - .d2-4142769503 .stroke-N3{stroke:#9499AB;} - .d2-4142769503 .stroke-N4{stroke:#CFD2DD;} - .d2-4142769503 .stroke-N5{stroke:#DEE1EB;} - .d2-4142769503 .stroke-N6{stroke:#EEF1F8;} - .d2-4142769503 .stroke-N7{stroke:#FFFFFF;} - .d2-4142769503 .stroke-B1{stroke:#0D32B2;} - .d2-4142769503 .stroke-B2{stroke:#0D32B2;} - .d2-4142769503 .stroke-B3{stroke:#E3E9FD;} - .d2-4142769503 .stroke-B4{stroke:#E3E9FD;} - .d2-4142769503 .stroke-B5{stroke:#EDF0FD;} - .d2-4142769503 .stroke-B6{stroke:#F7F8FE;} - .d2-4142769503 .stroke-AA2{stroke:#4A6FF3;} - .d2-4142769503 .stroke-AA4{stroke:#EDF0FD;} - .d2-4142769503 .stroke-AA5{stroke:#F7F8FE;} - .d2-4142769503 .stroke-AB4{stroke:#EDF0FD;} - .d2-4142769503 .stroke-AB5{stroke:#F7F8FE;} - .d2-4142769503 .background-color-N1{background-color:#0A0F25;} - .d2-4142769503 .background-color-N2{background-color:#676C7E;} - .d2-4142769503 .background-color-N3{background-color:#9499AB;} - .d2-4142769503 .background-color-N4{background-color:#CFD2DD;} - .d2-4142769503 .background-color-N5{background-color:#DEE1EB;} - .d2-4142769503 .background-color-N6{background-color:#EEF1F8;} - .d2-4142769503 .background-color-N7{background-color:#FFFFFF;} - .d2-4142769503 .background-color-B1{background-color:#0D32B2;} - .d2-4142769503 .background-color-B2{background-color:#0D32B2;} - .d2-4142769503 .background-color-B3{background-color:#E3E9FD;} - .d2-4142769503 .background-color-B4{background-color:#E3E9FD;} - .d2-4142769503 .background-color-B5{background-color:#EDF0FD;} - .d2-4142769503 .background-color-B6{background-color:#F7F8FE;} - .d2-4142769503 .background-color-AA2{background-color:#4A6FF3;} - .d2-4142769503 .background-color-AA4{background-color:#EDF0FD;} - .d2-4142769503 .background-color-AA5{background-color:#F7F8FE;} - .d2-4142769503 .background-color-AB4{background-color:#EDF0FD;} - .d2-4142769503 .background-color-AB5{background-color:#F7F8FE;} - .d2-4142769503 .color-N1{color:#0A0F25;} - .d2-4142769503 .color-N2{color:#676C7E;} - .d2-4142769503 .color-N3{color:#9499AB;} - .d2-4142769503 .color-N4{color:#CFD2DD;} - .d2-4142769503 .color-N5{color:#DEE1EB;} - .d2-4142769503 .color-N6{color:#EEF1F8;} - .d2-4142769503 .color-N7{color:#FFFFFF;} - .d2-4142769503 .color-B1{color:#0D32B2;} - .d2-4142769503 .color-B2{color:#0D32B2;} - .d2-4142769503 .color-B3{color:#E3E9FD;} - .d2-4142769503 .color-B4{color:#E3E9FD;} - .d2-4142769503 .color-B5{color:#EDF0FD;} - .d2-4142769503 .color-B6{color:#F7F8FE;} - .d2-4142769503 .color-AA2{color:#4A6FF3;} - .d2-4142769503 .color-AA4{color:#EDF0FD;} - .d2-4142769503 .color-AA5{color:#F7F8FE;} - .d2-4142769503 .color-AB4{color:#EDF0FD;} - .d2-4142769503 .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}]]>abcdefghijklmnopq -======= .d2-157913151 .fill-N1{fill:#0A0F25;} .d2-157913151 .fill-N2{fill:#676C7E;} .d2-157913151 .fill-N3{fill:#9499AB;} @@ -252,8 +89,7 @@ .d2-157913151 .color-AA4{color:#EDF0FD;} .d2-157913151 .color-AA5{color:#F7F8FE;} .d2-157913151 .color-AB4{color:#EDF0FD;} - .d2-157913151 .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}]]>abcdefghijklmnopq ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-157913151 .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}]]>abcdefghijklmnopq diff --git a/e2etests/testdata/stable/dense/elk/sketch.exp.svg b/e2etests/testdata/stable/dense/elk/sketch.exp.svg index 5d08263e2..1e0ec9448 100644 --- a/e2etests/testdata/stable/dense/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/dense/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -abcdefghijklmnopq -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-3932570534 .fill-N1{fill:#0A0F25;} - .d2-3932570534 .fill-N2{fill:#676C7E;} - .d2-3932570534 .fill-N3{fill:#9499AB;} - .d2-3932570534 .fill-N4{fill:#CFD2DD;} - .d2-3932570534 .fill-N5{fill:#DEE1EB;} - .d2-3932570534 .fill-N6{fill:#EEF1F8;} - .d2-3932570534 .fill-N7{fill:#FFFFFF;} - .d2-3932570534 .fill-B1{fill:#0D32B2;} - .d2-3932570534 .fill-B2{fill:#0D32B2;} - .d2-3932570534 .fill-B3{fill:#E3E9FD;} - .d2-3932570534 .fill-B4{fill:#E3E9FD;} - .d2-3932570534 .fill-B5{fill:#EDF0FD;} - .d2-3932570534 .fill-B6{fill:#F7F8FE;} - .d2-3932570534 .fill-AA2{fill:#4A6FF3;} - .d2-3932570534 .fill-AA4{fill:#EDF0FD;} - .d2-3932570534 .fill-AA5{fill:#F7F8FE;} - .d2-3932570534 .fill-AB4{fill:#EDF0FD;} - .d2-3932570534 .fill-AB5{fill:#F7F8FE;} - .d2-3932570534 .stroke-N1{stroke:#0A0F25;} - .d2-3932570534 .stroke-N2{stroke:#676C7E;} - .d2-3932570534 .stroke-N3{stroke:#9499AB;} - .d2-3932570534 .stroke-N4{stroke:#CFD2DD;} - .d2-3932570534 .stroke-N5{stroke:#DEE1EB;} - .d2-3932570534 .stroke-N6{stroke:#EEF1F8;} - .d2-3932570534 .stroke-N7{stroke:#FFFFFF;} - .d2-3932570534 .stroke-B1{stroke:#0D32B2;} - .d2-3932570534 .stroke-B2{stroke:#0D32B2;} - .d2-3932570534 .stroke-B3{stroke:#E3E9FD;} - .d2-3932570534 .stroke-B4{stroke:#E3E9FD;} - .d2-3932570534 .stroke-B5{stroke:#EDF0FD;} - .d2-3932570534 .stroke-B6{stroke:#F7F8FE;} - .d2-3932570534 .stroke-AA2{stroke:#4A6FF3;} - .d2-3932570534 .stroke-AA4{stroke:#EDF0FD;} - .d2-3932570534 .stroke-AA5{stroke:#F7F8FE;} - .d2-3932570534 .stroke-AB4{stroke:#EDF0FD;} - .d2-3932570534 .stroke-AB5{stroke:#F7F8FE;} - .d2-3932570534 .background-color-N1{background-color:#0A0F25;} - .d2-3932570534 .background-color-N2{background-color:#676C7E;} - .d2-3932570534 .background-color-N3{background-color:#9499AB;} - .d2-3932570534 .background-color-N4{background-color:#CFD2DD;} - .d2-3932570534 .background-color-N5{background-color:#DEE1EB;} - .d2-3932570534 .background-color-N6{background-color:#EEF1F8;} - .d2-3932570534 .background-color-N7{background-color:#FFFFFF;} - .d2-3932570534 .background-color-B1{background-color:#0D32B2;} - .d2-3932570534 .background-color-B2{background-color:#0D32B2;} - .d2-3932570534 .background-color-B3{background-color:#E3E9FD;} - .d2-3932570534 .background-color-B4{background-color:#E3E9FD;} - .d2-3932570534 .background-color-B5{background-color:#EDF0FD;} - .d2-3932570534 .background-color-B6{background-color:#F7F8FE;} - .d2-3932570534 .background-color-AA2{background-color:#4A6FF3;} - .d2-3932570534 .background-color-AA4{background-color:#EDF0FD;} - .d2-3932570534 .background-color-AA5{background-color:#F7F8FE;} - .d2-3932570534 .background-color-AB4{background-color:#EDF0FD;} - .d2-3932570534 .background-color-AB5{background-color:#F7F8FE;} - .d2-3932570534 .color-N1{color:#0A0F25;} - .d2-3932570534 .color-N2{color:#676C7E;} - .d2-3932570534 .color-N3{color:#9499AB;} - .d2-3932570534 .color-N4{color:#CFD2DD;} - .d2-3932570534 .color-N5{color:#DEE1EB;} - .d2-3932570534 .color-N6{color:#EEF1F8;} - .d2-3932570534 .color-N7{color:#FFFFFF;} - .d2-3932570534 .color-B1{color:#0D32B2;} - .d2-3932570534 .color-B2{color:#0D32B2;} - .d2-3932570534 .color-B3{color:#E3E9FD;} - .d2-3932570534 .color-B4{color:#E3E9FD;} - .d2-3932570534 .color-B5{color:#EDF0FD;} - .d2-3932570534 .color-B6{color:#F7F8FE;} - .d2-3932570534 .color-AA2{color:#4A6FF3;} - .d2-3932570534 .color-AA4{color:#EDF0FD;} - .d2-3932570534 .color-AA5{color:#F7F8FE;} - .d2-3932570534 .color-AB4{color:#EDF0FD;} - .d2-3932570534 .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}]]>abcdefghijklmnopq -======= .d2-3081161686 .fill-N1{fill:#0A0F25;} .d2-3081161686 .fill-N2{fill:#676C7E;} .d2-3081161686 .fill-N3{fill:#9499AB;} @@ -252,8 +89,7 @@ .d2-3081161686 .color-AA4{color:#EDF0FD;} .d2-3081161686 .color-AA5{color:#F7F8FE;} .d2-3081161686 .color-AB4{color:#EDF0FD;} - .d2-3081161686 .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}]]>abcdefghijklmnopq ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-3081161686 .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}]]>abcdefghijklmnopq diff --git a/e2etests/testdata/stable/different_subgraphs/dagre/sketch.exp.svg b/e2etests/testdata/stable/different_subgraphs/dagre/sketch.exp.svg index ff967d347..cae2d0830 100644 --- a/e2etests/testdata/stable/different_subgraphs/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/different_subgraphs/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -atreeandnodessomemoremanythenhereyouhavehierarchyfinallyanotherofnestingtreesatreeinsidehierarchyroot -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-696853950 .fill-N1{fill:#0A0F25;} - .d2-696853950 .fill-N2{fill:#676C7E;} - .d2-696853950 .fill-N3{fill:#9499AB;} - .d2-696853950 .fill-N4{fill:#CFD2DD;} - .d2-696853950 .fill-N5{fill:#DEE1EB;} - .d2-696853950 .fill-N6{fill:#EEF1F8;} - .d2-696853950 .fill-N7{fill:#FFFFFF;} - .d2-696853950 .fill-B1{fill:#0D32B2;} - .d2-696853950 .fill-B2{fill:#0D32B2;} - .d2-696853950 .fill-B3{fill:#E3E9FD;} - .d2-696853950 .fill-B4{fill:#E3E9FD;} - .d2-696853950 .fill-B5{fill:#EDF0FD;} - .d2-696853950 .fill-B6{fill:#F7F8FE;} - .d2-696853950 .fill-AA2{fill:#4A6FF3;} - .d2-696853950 .fill-AA4{fill:#EDF0FD;} - .d2-696853950 .fill-AA5{fill:#F7F8FE;} - .d2-696853950 .fill-AB4{fill:#EDF0FD;} - .d2-696853950 .fill-AB5{fill:#F7F8FE;} - .d2-696853950 .stroke-N1{stroke:#0A0F25;} - .d2-696853950 .stroke-N2{stroke:#676C7E;} - .d2-696853950 .stroke-N3{stroke:#9499AB;} - .d2-696853950 .stroke-N4{stroke:#CFD2DD;} - .d2-696853950 .stroke-N5{stroke:#DEE1EB;} - .d2-696853950 .stroke-N6{stroke:#EEF1F8;} - .d2-696853950 .stroke-N7{stroke:#FFFFFF;} - .d2-696853950 .stroke-B1{stroke:#0D32B2;} - .d2-696853950 .stroke-B2{stroke:#0D32B2;} - .d2-696853950 .stroke-B3{stroke:#E3E9FD;} - .d2-696853950 .stroke-B4{stroke:#E3E9FD;} - .d2-696853950 .stroke-B5{stroke:#EDF0FD;} - .d2-696853950 .stroke-B6{stroke:#F7F8FE;} - .d2-696853950 .stroke-AA2{stroke:#4A6FF3;} - .d2-696853950 .stroke-AA4{stroke:#EDF0FD;} - .d2-696853950 .stroke-AA5{stroke:#F7F8FE;} - .d2-696853950 .stroke-AB4{stroke:#EDF0FD;} - .d2-696853950 .stroke-AB5{stroke:#F7F8FE;} - .d2-696853950 .background-color-N1{background-color:#0A0F25;} - .d2-696853950 .background-color-N2{background-color:#676C7E;} - .d2-696853950 .background-color-N3{background-color:#9499AB;} - .d2-696853950 .background-color-N4{background-color:#CFD2DD;} - .d2-696853950 .background-color-N5{background-color:#DEE1EB;} - .d2-696853950 .background-color-N6{background-color:#EEF1F8;} - .d2-696853950 .background-color-N7{background-color:#FFFFFF;} - .d2-696853950 .background-color-B1{background-color:#0D32B2;} - .d2-696853950 .background-color-B2{background-color:#0D32B2;} - .d2-696853950 .background-color-B3{background-color:#E3E9FD;} - .d2-696853950 .background-color-B4{background-color:#E3E9FD;} - .d2-696853950 .background-color-B5{background-color:#EDF0FD;} - .d2-696853950 .background-color-B6{background-color:#F7F8FE;} - .d2-696853950 .background-color-AA2{background-color:#4A6FF3;} - .d2-696853950 .background-color-AA4{background-color:#EDF0FD;} - .d2-696853950 .background-color-AA5{background-color:#F7F8FE;} - .d2-696853950 .background-color-AB4{background-color:#EDF0FD;} - .d2-696853950 .background-color-AB5{background-color:#F7F8FE;} - .d2-696853950 .color-N1{color:#0A0F25;} - .d2-696853950 .color-N2{color:#676C7E;} - .d2-696853950 .color-N3{color:#9499AB;} - .d2-696853950 .color-N4{color:#CFD2DD;} - .d2-696853950 .color-N5{color:#DEE1EB;} - .d2-696853950 .color-N6{color:#EEF1F8;} - .d2-696853950 .color-N7{color:#FFFFFF;} - .d2-696853950 .color-B1{color:#0D32B2;} - .d2-696853950 .color-B2{color:#0D32B2;} - .d2-696853950 .color-B3{color:#E3E9FD;} - .d2-696853950 .color-B4{color:#E3E9FD;} - .d2-696853950 .color-B5{color:#EDF0FD;} - .d2-696853950 .color-B6{color:#F7F8FE;} - .d2-696853950 .color-AA2{color:#4A6FF3;} - .d2-696853950 .color-AA4{color:#EDF0FD;} - .d2-696853950 .color-AA5{color:#F7F8FE;} - .d2-696853950 .color-AB4{color:#EDF0FD;} - .d2-696853950 .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}]]>atreeandnodessomemoremanythenhereyouhavehierarchyfinallyanotherofnestingtreesatreeinsidehierarchyroot -======= .d2-42533050 .fill-N1{fill:#0A0F25;} .d2-42533050 .fill-N2{fill:#676C7E;} .d2-42533050 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-42533050 .color-AA4{color:#EDF0FD;} .d2-42533050 .color-AA5{color:#F7F8FE;} .d2-42533050 .color-AB4{color:#EDF0FD;} - .d2-42533050 .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}]]>atreeandnodessomemoremanythenhereyouhavehierarchyfinallyanotherofnestingtreesatreeinsidehierarchyroot ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-42533050 .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}]]>atreeandnodessomemoremanythenhereyouhavehierarchyfinallyanotherofnestingtreesatreeinsidehierarchyroot diff --git a/e2etests/testdata/stable/different_subgraphs/elk/sketch.exp.svg b/e2etests/testdata/stable/different_subgraphs/elk/sketch.exp.svg index ac72e380a..fce15a2b7 100644 --- a/e2etests/testdata/stable/different_subgraphs/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/different_subgraphs/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -atreeandnodessomemoremanythenhereyouhavehierarchyfinallyanotherofnestingtreesatreeinsidehierarchyroot -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-1096842315 .fill-N1{fill:#0A0F25;} - .d2-1096842315 .fill-N2{fill:#676C7E;} - .d2-1096842315 .fill-N3{fill:#9499AB;} - .d2-1096842315 .fill-N4{fill:#CFD2DD;} - .d2-1096842315 .fill-N5{fill:#DEE1EB;} - .d2-1096842315 .fill-N6{fill:#EEF1F8;} - .d2-1096842315 .fill-N7{fill:#FFFFFF;} - .d2-1096842315 .fill-B1{fill:#0D32B2;} - .d2-1096842315 .fill-B2{fill:#0D32B2;} - .d2-1096842315 .fill-B3{fill:#E3E9FD;} - .d2-1096842315 .fill-B4{fill:#E3E9FD;} - .d2-1096842315 .fill-B5{fill:#EDF0FD;} - .d2-1096842315 .fill-B6{fill:#F7F8FE;} - .d2-1096842315 .fill-AA2{fill:#4A6FF3;} - .d2-1096842315 .fill-AA4{fill:#EDF0FD;} - .d2-1096842315 .fill-AA5{fill:#F7F8FE;} - .d2-1096842315 .fill-AB4{fill:#EDF0FD;} - .d2-1096842315 .fill-AB5{fill:#F7F8FE;} - .d2-1096842315 .stroke-N1{stroke:#0A0F25;} - .d2-1096842315 .stroke-N2{stroke:#676C7E;} - .d2-1096842315 .stroke-N3{stroke:#9499AB;} - .d2-1096842315 .stroke-N4{stroke:#CFD2DD;} - .d2-1096842315 .stroke-N5{stroke:#DEE1EB;} - .d2-1096842315 .stroke-N6{stroke:#EEF1F8;} - .d2-1096842315 .stroke-N7{stroke:#FFFFFF;} - .d2-1096842315 .stroke-B1{stroke:#0D32B2;} - .d2-1096842315 .stroke-B2{stroke:#0D32B2;} - .d2-1096842315 .stroke-B3{stroke:#E3E9FD;} - .d2-1096842315 .stroke-B4{stroke:#E3E9FD;} - .d2-1096842315 .stroke-B5{stroke:#EDF0FD;} - .d2-1096842315 .stroke-B6{stroke:#F7F8FE;} - .d2-1096842315 .stroke-AA2{stroke:#4A6FF3;} - .d2-1096842315 .stroke-AA4{stroke:#EDF0FD;} - .d2-1096842315 .stroke-AA5{stroke:#F7F8FE;} - .d2-1096842315 .stroke-AB4{stroke:#EDF0FD;} - .d2-1096842315 .stroke-AB5{stroke:#F7F8FE;} - .d2-1096842315 .background-color-N1{background-color:#0A0F25;} - .d2-1096842315 .background-color-N2{background-color:#676C7E;} - .d2-1096842315 .background-color-N3{background-color:#9499AB;} - .d2-1096842315 .background-color-N4{background-color:#CFD2DD;} - .d2-1096842315 .background-color-N5{background-color:#DEE1EB;} - .d2-1096842315 .background-color-N6{background-color:#EEF1F8;} - .d2-1096842315 .background-color-N7{background-color:#FFFFFF;} - .d2-1096842315 .background-color-B1{background-color:#0D32B2;} - .d2-1096842315 .background-color-B2{background-color:#0D32B2;} - .d2-1096842315 .background-color-B3{background-color:#E3E9FD;} - .d2-1096842315 .background-color-B4{background-color:#E3E9FD;} - .d2-1096842315 .background-color-B5{background-color:#EDF0FD;} - .d2-1096842315 .background-color-B6{background-color:#F7F8FE;} - .d2-1096842315 .background-color-AA2{background-color:#4A6FF3;} - .d2-1096842315 .background-color-AA4{background-color:#EDF0FD;} - .d2-1096842315 .background-color-AA5{background-color:#F7F8FE;} - .d2-1096842315 .background-color-AB4{background-color:#EDF0FD;} - .d2-1096842315 .background-color-AB5{background-color:#F7F8FE;} - .d2-1096842315 .color-N1{color:#0A0F25;} - .d2-1096842315 .color-N2{color:#676C7E;} - .d2-1096842315 .color-N3{color:#9499AB;} - .d2-1096842315 .color-N4{color:#CFD2DD;} - .d2-1096842315 .color-N5{color:#DEE1EB;} - .d2-1096842315 .color-N6{color:#EEF1F8;} - .d2-1096842315 .color-N7{color:#FFFFFF;} - .d2-1096842315 .color-B1{color:#0D32B2;} - .d2-1096842315 .color-B2{color:#0D32B2;} - .d2-1096842315 .color-B3{color:#E3E9FD;} - .d2-1096842315 .color-B4{color:#E3E9FD;} - .d2-1096842315 .color-B5{color:#EDF0FD;} - .d2-1096842315 .color-B6{color:#F7F8FE;} - .d2-1096842315 .color-AA2{color:#4A6FF3;} - .d2-1096842315 .color-AA4{color:#EDF0FD;} - .d2-1096842315 .color-AA5{color:#F7F8FE;} - .d2-1096842315 .color-AB4{color:#EDF0FD;} - .d2-1096842315 .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}]]>atreeandnodessomemoremanythenhereyouhavehierarchyfinallyanotherofnestingtreesatreeinsidehierarchyroot -======= .d2-2796703163 .fill-N1{fill:#0A0F25;} .d2-2796703163 .fill-N2{fill:#676C7E;} .d2-2796703163 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-2796703163 .color-AA4{color:#EDF0FD;} .d2-2796703163 .color-AA5{color:#F7F8FE;} .d2-2796703163 .color-AB4{color:#EDF0FD;} - .d2-2796703163 .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}]]>atreeandnodessomemoremanythenhereyouhavehierarchyfinallyanotherofnestingtreesatreeinsidehierarchyroot ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-2796703163 .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}]]>atreeandnodessomemoremanythenhereyouhavehierarchyfinallyanotherofnestingtreesatreeinsidehierarchyroot diff --git a/e2etests/testdata/stable/direction/dagre/sketch.exp.svg b/e2etests/testdata/stable/direction/dagre/sketch.exp.svg index 0c3fddac9..103e1c60c 100644 --- a/e2etests/testdata/stable/direction/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/direction/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -abcde12345abcde -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-1191740353 .fill-N1{fill:#0A0F25;} - .d2-1191740353 .fill-N2{fill:#676C7E;} - .d2-1191740353 .fill-N3{fill:#9499AB;} - .d2-1191740353 .fill-N4{fill:#CFD2DD;} - .d2-1191740353 .fill-N5{fill:#DEE1EB;} - .d2-1191740353 .fill-N6{fill:#EEF1F8;} - .d2-1191740353 .fill-N7{fill:#FFFFFF;} - .d2-1191740353 .fill-B1{fill:#0D32B2;} - .d2-1191740353 .fill-B2{fill:#0D32B2;} - .d2-1191740353 .fill-B3{fill:#E3E9FD;} - .d2-1191740353 .fill-B4{fill:#E3E9FD;} - .d2-1191740353 .fill-B5{fill:#EDF0FD;} - .d2-1191740353 .fill-B6{fill:#F7F8FE;} - .d2-1191740353 .fill-AA2{fill:#4A6FF3;} - .d2-1191740353 .fill-AA4{fill:#EDF0FD;} - .d2-1191740353 .fill-AA5{fill:#F7F8FE;} - .d2-1191740353 .fill-AB4{fill:#EDF0FD;} - .d2-1191740353 .fill-AB5{fill:#F7F8FE;} - .d2-1191740353 .stroke-N1{stroke:#0A0F25;} - .d2-1191740353 .stroke-N2{stroke:#676C7E;} - .d2-1191740353 .stroke-N3{stroke:#9499AB;} - .d2-1191740353 .stroke-N4{stroke:#CFD2DD;} - .d2-1191740353 .stroke-N5{stroke:#DEE1EB;} - .d2-1191740353 .stroke-N6{stroke:#EEF1F8;} - .d2-1191740353 .stroke-N7{stroke:#FFFFFF;} - .d2-1191740353 .stroke-B1{stroke:#0D32B2;} - .d2-1191740353 .stroke-B2{stroke:#0D32B2;} - .d2-1191740353 .stroke-B3{stroke:#E3E9FD;} - .d2-1191740353 .stroke-B4{stroke:#E3E9FD;} - .d2-1191740353 .stroke-B5{stroke:#EDF0FD;} - .d2-1191740353 .stroke-B6{stroke:#F7F8FE;} - .d2-1191740353 .stroke-AA2{stroke:#4A6FF3;} - .d2-1191740353 .stroke-AA4{stroke:#EDF0FD;} - .d2-1191740353 .stroke-AA5{stroke:#F7F8FE;} - .d2-1191740353 .stroke-AB4{stroke:#EDF0FD;} - .d2-1191740353 .stroke-AB5{stroke:#F7F8FE;} - .d2-1191740353 .background-color-N1{background-color:#0A0F25;} - .d2-1191740353 .background-color-N2{background-color:#676C7E;} - .d2-1191740353 .background-color-N3{background-color:#9499AB;} - .d2-1191740353 .background-color-N4{background-color:#CFD2DD;} - .d2-1191740353 .background-color-N5{background-color:#DEE1EB;} - .d2-1191740353 .background-color-N6{background-color:#EEF1F8;} - .d2-1191740353 .background-color-N7{background-color:#FFFFFF;} - .d2-1191740353 .background-color-B1{background-color:#0D32B2;} - .d2-1191740353 .background-color-B2{background-color:#0D32B2;} - .d2-1191740353 .background-color-B3{background-color:#E3E9FD;} - .d2-1191740353 .background-color-B4{background-color:#E3E9FD;} - .d2-1191740353 .background-color-B5{background-color:#EDF0FD;} - .d2-1191740353 .background-color-B6{background-color:#F7F8FE;} - .d2-1191740353 .background-color-AA2{background-color:#4A6FF3;} - .d2-1191740353 .background-color-AA4{background-color:#EDF0FD;} - .d2-1191740353 .background-color-AA5{background-color:#F7F8FE;} - .d2-1191740353 .background-color-AB4{background-color:#EDF0FD;} - .d2-1191740353 .background-color-AB5{background-color:#F7F8FE;} - .d2-1191740353 .color-N1{color:#0A0F25;} - .d2-1191740353 .color-N2{color:#676C7E;} - .d2-1191740353 .color-N3{color:#9499AB;} - .d2-1191740353 .color-N4{color:#CFD2DD;} - .d2-1191740353 .color-N5{color:#DEE1EB;} - .d2-1191740353 .color-N6{color:#EEF1F8;} - .d2-1191740353 .color-N7{color:#FFFFFF;} - .d2-1191740353 .color-B1{color:#0D32B2;} - .d2-1191740353 .color-B2{color:#0D32B2;} - .d2-1191740353 .color-B3{color:#E3E9FD;} - .d2-1191740353 .color-B4{color:#E3E9FD;} - .d2-1191740353 .color-B5{color:#EDF0FD;} - .d2-1191740353 .color-B6{color:#F7F8FE;} - .d2-1191740353 .color-AA2{color:#4A6FF3;} - .d2-1191740353 .color-AA4{color:#EDF0FD;} - .d2-1191740353 .color-AA5{color:#F7F8FE;} - .d2-1191740353 .color-AB4{color:#EDF0FD;} - .d2-1191740353 .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}]]>abcde12345abcde -======= .d2-1704811701 .fill-N1{fill:#0A0F25;} .d2-1704811701 .fill-N2{fill:#676C7E;} .d2-1704811701 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-1704811701 .color-AA4{color:#EDF0FD;} .d2-1704811701 .color-AA5{color:#F7F8FE;} .d2-1704811701 .color-AB4{color:#EDF0FD;} - .d2-1704811701 .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}]]>abcde12345abcde ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-1704811701 .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}]]>abcde12345abcde diff --git a/e2etests/testdata/stable/direction/elk/sketch.exp.svg b/e2etests/testdata/stable/direction/elk/sketch.exp.svg index b0797d30d..ff5bfa28f 100644 --- a/e2etests/testdata/stable/direction/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/direction/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -abcde12345abcde -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-514344385 .fill-N1{fill:#0A0F25;} - .d2-514344385 .fill-N2{fill:#676C7E;} - .d2-514344385 .fill-N3{fill:#9499AB;} - .d2-514344385 .fill-N4{fill:#CFD2DD;} - .d2-514344385 .fill-N5{fill:#DEE1EB;} - .d2-514344385 .fill-N6{fill:#EEF1F8;} - .d2-514344385 .fill-N7{fill:#FFFFFF;} - .d2-514344385 .fill-B1{fill:#0D32B2;} - .d2-514344385 .fill-B2{fill:#0D32B2;} - .d2-514344385 .fill-B3{fill:#E3E9FD;} - .d2-514344385 .fill-B4{fill:#E3E9FD;} - .d2-514344385 .fill-B5{fill:#EDF0FD;} - .d2-514344385 .fill-B6{fill:#F7F8FE;} - .d2-514344385 .fill-AA2{fill:#4A6FF3;} - .d2-514344385 .fill-AA4{fill:#EDF0FD;} - .d2-514344385 .fill-AA5{fill:#F7F8FE;} - .d2-514344385 .fill-AB4{fill:#EDF0FD;} - .d2-514344385 .fill-AB5{fill:#F7F8FE;} - .d2-514344385 .stroke-N1{stroke:#0A0F25;} - .d2-514344385 .stroke-N2{stroke:#676C7E;} - .d2-514344385 .stroke-N3{stroke:#9499AB;} - .d2-514344385 .stroke-N4{stroke:#CFD2DD;} - .d2-514344385 .stroke-N5{stroke:#DEE1EB;} - .d2-514344385 .stroke-N6{stroke:#EEF1F8;} - .d2-514344385 .stroke-N7{stroke:#FFFFFF;} - .d2-514344385 .stroke-B1{stroke:#0D32B2;} - .d2-514344385 .stroke-B2{stroke:#0D32B2;} - .d2-514344385 .stroke-B3{stroke:#E3E9FD;} - .d2-514344385 .stroke-B4{stroke:#E3E9FD;} - .d2-514344385 .stroke-B5{stroke:#EDF0FD;} - .d2-514344385 .stroke-B6{stroke:#F7F8FE;} - .d2-514344385 .stroke-AA2{stroke:#4A6FF3;} - .d2-514344385 .stroke-AA4{stroke:#EDF0FD;} - .d2-514344385 .stroke-AA5{stroke:#F7F8FE;} - .d2-514344385 .stroke-AB4{stroke:#EDF0FD;} - .d2-514344385 .stroke-AB5{stroke:#F7F8FE;} - .d2-514344385 .background-color-N1{background-color:#0A0F25;} - .d2-514344385 .background-color-N2{background-color:#676C7E;} - .d2-514344385 .background-color-N3{background-color:#9499AB;} - .d2-514344385 .background-color-N4{background-color:#CFD2DD;} - .d2-514344385 .background-color-N5{background-color:#DEE1EB;} - .d2-514344385 .background-color-N6{background-color:#EEF1F8;} - .d2-514344385 .background-color-N7{background-color:#FFFFFF;} - .d2-514344385 .background-color-B1{background-color:#0D32B2;} - .d2-514344385 .background-color-B2{background-color:#0D32B2;} - .d2-514344385 .background-color-B3{background-color:#E3E9FD;} - .d2-514344385 .background-color-B4{background-color:#E3E9FD;} - .d2-514344385 .background-color-B5{background-color:#EDF0FD;} - .d2-514344385 .background-color-B6{background-color:#F7F8FE;} - .d2-514344385 .background-color-AA2{background-color:#4A6FF3;} - .d2-514344385 .background-color-AA4{background-color:#EDF0FD;} - .d2-514344385 .background-color-AA5{background-color:#F7F8FE;} - .d2-514344385 .background-color-AB4{background-color:#EDF0FD;} - .d2-514344385 .background-color-AB5{background-color:#F7F8FE;} - .d2-514344385 .color-N1{color:#0A0F25;} - .d2-514344385 .color-N2{color:#676C7E;} - .d2-514344385 .color-N3{color:#9499AB;} - .d2-514344385 .color-N4{color:#CFD2DD;} - .d2-514344385 .color-N5{color:#DEE1EB;} - .d2-514344385 .color-N6{color:#EEF1F8;} - .d2-514344385 .color-N7{color:#FFFFFF;} - .d2-514344385 .color-B1{color:#0D32B2;} - .d2-514344385 .color-B2{color:#0D32B2;} - .d2-514344385 .color-B3{color:#E3E9FD;} - .d2-514344385 .color-B4{color:#E3E9FD;} - .d2-514344385 .color-B5{color:#EDF0FD;} - .d2-514344385 .color-B6{color:#F7F8FE;} - .d2-514344385 .color-AA2{color:#4A6FF3;} - .d2-514344385 .color-AA4{color:#EDF0FD;} - .d2-514344385 .color-AA5{color:#F7F8FE;} - .d2-514344385 .color-AB4{color:#EDF0FD;} - .d2-514344385 .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}]]>abcde12345abcde -======= .d2-55429049 .fill-N1{fill:#0A0F25;} .d2-55429049 .fill-N2{fill:#676C7E;} .d2-55429049 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-55429049 .color-AA4{color:#EDF0FD;} .d2-55429049 .color-AA5{color:#F7F8FE;} .d2-55429049 .color-AB4{color:#EDF0FD;} - .d2-55429049 .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}]]>abcde12345abcde ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-55429049 .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}]]>abcde12345abcde diff --git a/e2etests/testdata/stable/edge-label-overflow/dagre/sketch.exp.svg b/e2etests/testdata/stable/edge-label-overflow/dagre/sketch.exp.svg index 418636dd6..1da0c9ced 100644 --- a/e2etests/testdata/stable/edge-label-overflow/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/edge-label-overflow/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -studentcommittee chaircommittee Apply for appeal Deny. Need more informationAccept appeal -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-4227359708 .fill-N1{fill:#0A0F25;} - .d2-4227359708 .fill-N2{fill:#676C7E;} - .d2-4227359708 .fill-N3{fill:#9499AB;} - .d2-4227359708 .fill-N4{fill:#CFD2DD;} - .d2-4227359708 .fill-N5{fill:#DEE1EB;} - .d2-4227359708 .fill-N6{fill:#EEF1F8;} - .d2-4227359708 .fill-N7{fill:#FFFFFF;} - .d2-4227359708 .fill-B1{fill:#0D32B2;} - .d2-4227359708 .fill-B2{fill:#0D32B2;} - .d2-4227359708 .fill-B3{fill:#E3E9FD;} - .d2-4227359708 .fill-B4{fill:#E3E9FD;} - .d2-4227359708 .fill-B5{fill:#EDF0FD;} - .d2-4227359708 .fill-B6{fill:#F7F8FE;} - .d2-4227359708 .fill-AA2{fill:#4A6FF3;} - .d2-4227359708 .fill-AA4{fill:#EDF0FD;} - .d2-4227359708 .fill-AA5{fill:#F7F8FE;} - .d2-4227359708 .fill-AB4{fill:#EDF0FD;} - .d2-4227359708 .fill-AB5{fill:#F7F8FE;} - .d2-4227359708 .stroke-N1{stroke:#0A0F25;} - .d2-4227359708 .stroke-N2{stroke:#676C7E;} - .d2-4227359708 .stroke-N3{stroke:#9499AB;} - .d2-4227359708 .stroke-N4{stroke:#CFD2DD;} - .d2-4227359708 .stroke-N5{stroke:#DEE1EB;} - .d2-4227359708 .stroke-N6{stroke:#EEF1F8;} - .d2-4227359708 .stroke-N7{stroke:#FFFFFF;} - .d2-4227359708 .stroke-B1{stroke:#0D32B2;} - .d2-4227359708 .stroke-B2{stroke:#0D32B2;} - .d2-4227359708 .stroke-B3{stroke:#E3E9FD;} - .d2-4227359708 .stroke-B4{stroke:#E3E9FD;} - .d2-4227359708 .stroke-B5{stroke:#EDF0FD;} - .d2-4227359708 .stroke-B6{stroke:#F7F8FE;} - .d2-4227359708 .stroke-AA2{stroke:#4A6FF3;} - .d2-4227359708 .stroke-AA4{stroke:#EDF0FD;} - .d2-4227359708 .stroke-AA5{stroke:#F7F8FE;} - .d2-4227359708 .stroke-AB4{stroke:#EDF0FD;} - .d2-4227359708 .stroke-AB5{stroke:#F7F8FE;} - .d2-4227359708 .background-color-N1{background-color:#0A0F25;} - .d2-4227359708 .background-color-N2{background-color:#676C7E;} - .d2-4227359708 .background-color-N3{background-color:#9499AB;} - .d2-4227359708 .background-color-N4{background-color:#CFD2DD;} - .d2-4227359708 .background-color-N5{background-color:#DEE1EB;} - .d2-4227359708 .background-color-N6{background-color:#EEF1F8;} - .d2-4227359708 .background-color-N7{background-color:#FFFFFF;} - .d2-4227359708 .background-color-B1{background-color:#0D32B2;} - .d2-4227359708 .background-color-B2{background-color:#0D32B2;} - .d2-4227359708 .background-color-B3{background-color:#E3E9FD;} - .d2-4227359708 .background-color-B4{background-color:#E3E9FD;} - .d2-4227359708 .background-color-B5{background-color:#EDF0FD;} - .d2-4227359708 .background-color-B6{background-color:#F7F8FE;} - .d2-4227359708 .background-color-AA2{background-color:#4A6FF3;} - .d2-4227359708 .background-color-AA4{background-color:#EDF0FD;} - .d2-4227359708 .background-color-AA5{background-color:#F7F8FE;} - .d2-4227359708 .background-color-AB4{background-color:#EDF0FD;} - .d2-4227359708 .background-color-AB5{background-color:#F7F8FE;} - .d2-4227359708 .color-N1{color:#0A0F25;} - .d2-4227359708 .color-N2{color:#676C7E;} - .d2-4227359708 .color-N3{color:#9499AB;} - .d2-4227359708 .color-N4{color:#CFD2DD;} - .d2-4227359708 .color-N5{color:#DEE1EB;} - .d2-4227359708 .color-N6{color:#EEF1F8;} - .d2-4227359708 .color-N7{color:#FFFFFF;} - .d2-4227359708 .color-B1{color:#0D32B2;} - .d2-4227359708 .color-B2{color:#0D32B2;} - .d2-4227359708 .color-B3{color:#E3E9FD;} - .d2-4227359708 .color-B4{color:#E3E9FD;} - .d2-4227359708 .color-B5{color:#EDF0FD;} - .d2-4227359708 .color-B6{color:#F7F8FE;} - .d2-4227359708 .color-AA2{color:#4A6FF3;} - .d2-4227359708 .color-AA4{color:#EDF0FD;} - .d2-4227359708 .color-AA5{color:#F7F8FE;} - .d2-4227359708 .color-AB4{color:#EDF0FD;} - .d2-4227359708 .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}]]>studentcommittee chaircommittee Apply for appeal Deny. Need more informationAccept appeal -======= .d2-828254482 .fill-N1{fill:#0A0F25;} .d2-828254482 .fill-N2{fill:#676C7E;} .d2-828254482 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-828254482 .color-AA4{color:#EDF0FD;} .d2-828254482 .color-AA5{color:#F7F8FE;} .d2-828254482 .color-AB4{color:#EDF0FD;} - .d2-828254482 .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}]]>studentcommittee chaircommittee Apply for appeal Deny. Need more informationAccept appeal ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-828254482 .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}]]>studentcommittee chaircommittee Apply for appeal Deny. Need more informationAccept appeal diff --git a/e2etests/testdata/stable/edge-label-overflow/elk/sketch.exp.svg b/e2etests/testdata/stable/edge-label-overflow/elk/sketch.exp.svg index 47a46cb66..a3b44e101 100644 --- a/e2etests/testdata/stable/edge-label-overflow/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/edge-label-overflow/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -studentcommittee chaircommittee Apply for appeal Deny. Need more informationAccept appeal -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-1480834410 .fill-N1{fill:#0A0F25;} - .d2-1480834410 .fill-N2{fill:#676C7E;} - .d2-1480834410 .fill-N3{fill:#9499AB;} - .d2-1480834410 .fill-N4{fill:#CFD2DD;} - .d2-1480834410 .fill-N5{fill:#DEE1EB;} - .d2-1480834410 .fill-N6{fill:#EEF1F8;} - .d2-1480834410 .fill-N7{fill:#FFFFFF;} - .d2-1480834410 .fill-B1{fill:#0D32B2;} - .d2-1480834410 .fill-B2{fill:#0D32B2;} - .d2-1480834410 .fill-B3{fill:#E3E9FD;} - .d2-1480834410 .fill-B4{fill:#E3E9FD;} - .d2-1480834410 .fill-B5{fill:#EDF0FD;} - .d2-1480834410 .fill-B6{fill:#F7F8FE;} - .d2-1480834410 .fill-AA2{fill:#4A6FF3;} - .d2-1480834410 .fill-AA4{fill:#EDF0FD;} - .d2-1480834410 .fill-AA5{fill:#F7F8FE;} - .d2-1480834410 .fill-AB4{fill:#EDF0FD;} - .d2-1480834410 .fill-AB5{fill:#F7F8FE;} - .d2-1480834410 .stroke-N1{stroke:#0A0F25;} - .d2-1480834410 .stroke-N2{stroke:#676C7E;} - .d2-1480834410 .stroke-N3{stroke:#9499AB;} - .d2-1480834410 .stroke-N4{stroke:#CFD2DD;} - .d2-1480834410 .stroke-N5{stroke:#DEE1EB;} - .d2-1480834410 .stroke-N6{stroke:#EEF1F8;} - .d2-1480834410 .stroke-N7{stroke:#FFFFFF;} - .d2-1480834410 .stroke-B1{stroke:#0D32B2;} - .d2-1480834410 .stroke-B2{stroke:#0D32B2;} - .d2-1480834410 .stroke-B3{stroke:#E3E9FD;} - .d2-1480834410 .stroke-B4{stroke:#E3E9FD;} - .d2-1480834410 .stroke-B5{stroke:#EDF0FD;} - .d2-1480834410 .stroke-B6{stroke:#F7F8FE;} - .d2-1480834410 .stroke-AA2{stroke:#4A6FF3;} - .d2-1480834410 .stroke-AA4{stroke:#EDF0FD;} - .d2-1480834410 .stroke-AA5{stroke:#F7F8FE;} - .d2-1480834410 .stroke-AB4{stroke:#EDF0FD;} - .d2-1480834410 .stroke-AB5{stroke:#F7F8FE;} - .d2-1480834410 .background-color-N1{background-color:#0A0F25;} - .d2-1480834410 .background-color-N2{background-color:#676C7E;} - .d2-1480834410 .background-color-N3{background-color:#9499AB;} - .d2-1480834410 .background-color-N4{background-color:#CFD2DD;} - .d2-1480834410 .background-color-N5{background-color:#DEE1EB;} - .d2-1480834410 .background-color-N6{background-color:#EEF1F8;} - .d2-1480834410 .background-color-N7{background-color:#FFFFFF;} - .d2-1480834410 .background-color-B1{background-color:#0D32B2;} - .d2-1480834410 .background-color-B2{background-color:#0D32B2;} - .d2-1480834410 .background-color-B3{background-color:#E3E9FD;} - .d2-1480834410 .background-color-B4{background-color:#E3E9FD;} - .d2-1480834410 .background-color-B5{background-color:#EDF0FD;} - .d2-1480834410 .background-color-B6{background-color:#F7F8FE;} - .d2-1480834410 .background-color-AA2{background-color:#4A6FF3;} - .d2-1480834410 .background-color-AA4{background-color:#EDF0FD;} - .d2-1480834410 .background-color-AA5{background-color:#F7F8FE;} - .d2-1480834410 .background-color-AB4{background-color:#EDF0FD;} - .d2-1480834410 .background-color-AB5{background-color:#F7F8FE;} - .d2-1480834410 .color-N1{color:#0A0F25;} - .d2-1480834410 .color-N2{color:#676C7E;} - .d2-1480834410 .color-N3{color:#9499AB;} - .d2-1480834410 .color-N4{color:#CFD2DD;} - .d2-1480834410 .color-N5{color:#DEE1EB;} - .d2-1480834410 .color-N6{color:#EEF1F8;} - .d2-1480834410 .color-N7{color:#FFFFFF;} - .d2-1480834410 .color-B1{color:#0D32B2;} - .d2-1480834410 .color-B2{color:#0D32B2;} - .d2-1480834410 .color-B3{color:#E3E9FD;} - .d2-1480834410 .color-B4{color:#E3E9FD;} - .d2-1480834410 .color-B5{color:#EDF0FD;} - .d2-1480834410 .color-B6{color:#F7F8FE;} - .d2-1480834410 .color-AA2{color:#4A6FF3;} - .d2-1480834410 .color-AA4{color:#EDF0FD;} - .d2-1480834410 .color-AA5{color:#F7F8FE;} - .d2-1480834410 .color-AB4{color:#EDF0FD;} - .d2-1480834410 .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}]]>studentcommittee chaircommittee Apply for appeal Deny. Need more informationAccept appeal -======= .d2-1299507912 .fill-N1{fill:#0A0F25;} .d2-1299507912 .fill-N2{fill:#676C7E;} .d2-1299507912 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-1299507912 .color-AA4{color:#EDF0FD;} .d2-1299507912 .color-AA5{color:#F7F8FE;} .d2-1299507912 .color-AB4{color:#EDF0FD;} - .d2-1299507912 .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}]]>studentcommittee chaircommittee Apply for appeal Deny. Need more informationAccept appeal ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-1299507912 .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}]]>studentcommittee chaircommittee Apply for appeal Deny. Need more informationAccept appeal diff --git a/e2etests/testdata/stable/elk_border_radius/dagre/sketch.exp.svg b/e2etests/testdata/stable/elk_border_radius/dagre/sketch.exp.svg index 302343d92..281a055d2 100644 --- a/e2etests/testdata/stable/elk_border_radius/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/elk_border_radius/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -abcefg -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-2026819057 .fill-N1{fill:#0A0F25;} - .d2-2026819057 .fill-N2{fill:#676C7E;} - .d2-2026819057 .fill-N3{fill:#9499AB;} - .d2-2026819057 .fill-N4{fill:#CFD2DD;} - .d2-2026819057 .fill-N5{fill:#DEE1EB;} - .d2-2026819057 .fill-N6{fill:#EEF1F8;} - .d2-2026819057 .fill-N7{fill:#FFFFFF;} - .d2-2026819057 .fill-B1{fill:#0D32B2;} - .d2-2026819057 .fill-B2{fill:#0D32B2;} - .d2-2026819057 .fill-B3{fill:#E3E9FD;} - .d2-2026819057 .fill-B4{fill:#E3E9FD;} - .d2-2026819057 .fill-B5{fill:#EDF0FD;} - .d2-2026819057 .fill-B6{fill:#F7F8FE;} - .d2-2026819057 .fill-AA2{fill:#4A6FF3;} - .d2-2026819057 .fill-AA4{fill:#EDF0FD;} - .d2-2026819057 .fill-AA5{fill:#F7F8FE;} - .d2-2026819057 .fill-AB4{fill:#EDF0FD;} - .d2-2026819057 .fill-AB5{fill:#F7F8FE;} - .d2-2026819057 .stroke-N1{stroke:#0A0F25;} - .d2-2026819057 .stroke-N2{stroke:#676C7E;} - .d2-2026819057 .stroke-N3{stroke:#9499AB;} - .d2-2026819057 .stroke-N4{stroke:#CFD2DD;} - .d2-2026819057 .stroke-N5{stroke:#DEE1EB;} - .d2-2026819057 .stroke-N6{stroke:#EEF1F8;} - .d2-2026819057 .stroke-N7{stroke:#FFFFFF;} - .d2-2026819057 .stroke-B1{stroke:#0D32B2;} - .d2-2026819057 .stroke-B2{stroke:#0D32B2;} - .d2-2026819057 .stroke-B3{stroke:#E3E9FD;} - .d2-2026819057 .stroke-B4{stroke:#E3E9FD;} - .d2-2026819057 .stroke-B5{stroke:#EDF0FD;} - .d2-2026819057 .stroke-B6{stroke:#F7F8FE;} - .d2-2026819057 .stroke-AA2{stroke:#4A6FF3;} - .d2-2026819057 .stroke-AA4{stroke:#EDF0FD;} - .d2-2026819057 .stroke-AA5{stroke:#F7F8FE;} - .d2-2026819057 .stroke-AB4{stroke:#EDF0FD;} - .d2-2026819057 .stroke-AB5{stroke:#F7F8FE;} - .d2-2026819057 .background-color-N1{background-color:#0A0F25;} - .d2-2026819057 .background-color-N2{background-color:#676C7E;} - .d2-2026819057 .background-color-N3{background-color:#9499AB;} - .d2-2026819057 .background-color-N4{background-color:#CFD2DD;} - .d2-2026819057 .background-color-N5{background-color:#DEE1EB;} - .d2-2026819057 .background-color-N6{background-color:#EEF1F8;} - .d2-2026819057 .background-color-N7{background-color:#FFFFFF;} - .d2-2026819057 .background-color-B1{background-color:#0D32B2;} - .d2-2026819057 .background-color-B2{background-color:#0D32B2;} - .d2-2026819057 .background-color-B3{background-color:#E3E9FD;} - .d2-2026819057 .background-color-B4{background-color:#E3E9FD;} - .d2-2026819057 .background-color-B5{background-color:#EDF0FD;} - .d2-2026819057 .background-color-B6{background-color:#F7F8FE;} - .d2-2026819057 .background-color-AA2{background-color:#4A6FF3;} - .d2-2026819057 .background-color-AA4{background-color:#EDF0FD;} - .d2-2026819057 .background-color-AA5{background-color:#F7F8FE;} - .d2-2026819057 .background-color-AB4{background-color:#EDF0FD;} - .d2-2026819057 .background-color-AB5{background-color:#F7F8FE;} - .d2-2026819057 .color-N1{color:#0A0F25;} - .d2-2026819057 .color-N2{color:#676C7E;} - .d2-2026819057 .color-N3{color:#9499AB;} - .d2-2026819057 .color-N4{color:#CFD2DD;} - .d2-2026819057 .color-N5{color:#DEE1EB;} - .d2-2026819057 .color-N6{color:#EEF1F8;} - .d2-2026819057 .color-N7{color:#FFFFFF;} - .d2-2026819057 .color-B1{color:#0D32B2;} - .d2-2026819057 .color-B2{color:#0D32B2;} - .d2-2026819057 .color-B3{color:#E3E9FD;} - .d2-2026819057 .color-B4{color:#E3E9FD;} - .d2-2026819057 .color-B5{color:#EDF0FD;} - .d2-2026819057 .color-B6{color:#F7F8FE;} - .d2-2026819057 .color-AA2{color:#4A6FF3;} - .d2-2026819057 .color-AA4{color:#EDF0FD;} - .d2-2026819057 .color-AA5{color:#F7F8FE;} - .d2-2026819057 .color-AB4{color:#EDF0FD;} - .d2-2026819057 .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}]]>abcefg -======= .d2-876572791 .fill-N1{fill:#0A0F25;} .d2-876572791 .fill-N2{fill:#676C7E;} .d2-876572791 .fill-N3{fill:#9499AB;} @@ -252,8 +89,7 @@ .d2-876572791 .color-AA4{color:#EDF0FD;} .d2-876572791 .color-AA5{color:#F7F8FE;} .d2-876572791 .color-AB4{color:#EDF0FD;} - .d2-876572791 .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}]]>abcefg ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-876572791 .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}]]>abcefg diff --git a/e2etests/testdata/stable/elk_border_radius/elk/sketch.exp.svg b/e2etests/testdata/stable/elk_border_radius/elk/sketch.exp.svg index 49e50b4fc..5422986a4 100644 --- a/e2etests/testdata/stable/elk_border_radius/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/elk_border_radius/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -abcefg -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-1553621327 .fill-N1{fill:#0A0F25;} - .d2-1553621327 .fill-N2{fill:#676C7E;} - .d2-1553621327 .fill-N3{fill:#9499AB;} - .d2-1553621327 .fill-N4{fill:#CFD2DD;} - .d2-1553621327 .fill-N5{fill:#DEE1EB;} - .d2-1553621327 .fill-N6{fill:#EEF1F8;} - .d2-1553621327 .fill-N7{fill:#FFFFFF;} - .d2-1553621327 .fill-B1{fill:#0D32B2;} - .d2-1553621327 .fill-B2{fill:#0D32B2;} - .d2-1553621327 .fill-B3{fill:#E3E9FD;} - .d2-1553621327 .fill-B4{fill:#E3E9FD;} - .d2-1553621327 .fill-B5{fill:#EDF0FD;} - .d2-1553621327 .fill-B6{fill:#F7F8FE;} - .d2-1553621327 .fill-AA2{fill:#4A6FF3;} - .d2-1553621327 .fill-AA4{fill:#EDF0FD;} - .d2-1553621327 .fill-AA5{fill:#F7F8FE;} - .d2-1553621327 .fill-AB4{fill:#EDF0FD;} - .d2-1553621327 .fill-AB5{fill:#F7F8FE;} - .d2-1553621327 .stroke-N1{stroke:#0A0F25;} - .d2-1553621327 .stroke-N2{stroke:#676C7E;} - .d2-1553621327 .stroke-N3{stroke:#9499AB;} - .d2-1553621327 .stroke-N4{stroke:#CFD2DD;} - .d2-1553621327 .stroke-N5{stroke:#DEE1EB;} - .d2-1553621327 .stroke-N6{stroke:#EEF1F8;} - .d2-1553621327 .stroke-N7{stroke:#FFFFFF;} - .d2-1553621327 .stroke-B1{stroke:#0D32B2;} - .d2-1553621327 .stroke-B2{stroke:#0D32B2;} - .d2-1553621327 .stroke-B3{stroke:#E3E9FD;} - .d2-1553621327 .stroke-B4{stroke:#E3E9FD;} - .d2-1553621327 .stroke-B5{stroke:#EDF0FD;} - .d2-1553621327 .stroke-B6{stroke:#F7F8FE;} - .d2-1553621327 .stroke-AA2{stroke:#4A6FF3;} - .d2-1553621327 .stroke-AA4{stroke:#EDF0FD;} - .d2-1553621327 .stroke-AA5{stroke:#F7F8FE;} - .d2-1553621327 .stroke-AB4{stroke:#EDF0FD;} - .d2-1553621327 .stroke-AB5{stroke:#F7F8FE;} - .d2-1553621327 .background-color-N1{background-color:#0A0F25;} - .d2-1553621327 .background-color-N2{background-color:#676C7E;} - .d2-1553621327 .background-color-N3{background-color:#9499AB;} - .d2-1553621327 .background-color-N4{background-color:#CFD2DD;} - .d2-1553621327 .background-color-N5{background-color:#DEE1EB;} - .d2-1553621327 .background-color-N6{background-color:#EEF1F8;} - .d2-1553621327 .background-color-N7{background-color:#FFFFFF;} - .d2-1553621327 .background-color-B1{background-color:#0D32B2;} - .d2-1553621327 .background-color-B2{background-color:#0D32B2;} - .d2-1553621327 .background-color-B3{background-color:#E3E9FD;} - .d2-1553621327 .background-color-B4{background-color:#E3E9FD;} - .d2-1553621327 .background-color-B5{background-color:#EDF0FD;} - .d2-1553621327 .background-color-B6{background-color:#F7F8FE;} - .d2-1553621327 .background-color-AA2{background-color:#4A6FF3;} - .d2-1553621327 .background-color-AA4{background-color:#EDF0FD;} - .d2-1553621327 .background-color-AA5{background-color:#F7F8FE;} - .d2-1553621327 .background-color-AB4{background-color:#EDF0FD;} - .d2-1553621327 .background-color-AB5{background-color:#F7F8FE;} - .d2-1553621327 .color-N1{color:#0A0F25;} - .d2-1553621327 .color-N2{color:#676C7E;} - .d2-1553621327 .color-N3{color:#9499AB;} - .d2-1553621327 .color-N4{color:#CFD2DD;} - .d2-1553621327 .color-N5{color:#DEE1EB;} - .d2-1553621327 .color-N6{color:#EEF1F8;} - .d2-1553621327 .color-N7{color:#FFFFFF;} - .d2-1553621327 .color-B1{color:#0D32B2;} - .d2-1553621327 .color-B2{color:#0D32B2;} - .d2-1553621327 .color-B3{color:#E3E9FD;} - .d2-1553621327 .color-B4{color:#E3E9FD;} - .d2-1553621327 .color-B5{color:#EDF0FD;} - .d2-1553621327 .color-B6{color:#F7F8FE;} - .d2-1553621327 .color-AA2{color:#4A6FF3;} - .d2-1553621327 .color-AA4{color:#EDF0FD;} - .d2-1553621327 .color-AA5{color:#F7F8FE;} - .d2-1553621327 .color-AB4{color:#EDF0FD;} - .d2-1553621327 .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}]]>abcefg -======= .d2-319236909 .fill-N1{fill:#0A0F25;} .d2-319236909 .fill-N2{fill:#676C7E;} .d2-319236909 .fill-N3{fill:#9499AB;} @@ -252,8 +89,7 @@ .d2-319236909 .color-AA4{color:#EDF0FD;} .d2-319236909 .color-AA5{color:#F7F8FE;} .d2-319236909 .color-AB4{color:#EDF0FD;} - .d2-319236909 .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}]]>abcefg ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-319236909 .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}]]>abcefg diff --git a/e2etests/testdata/stable/elk_shim/dagre/sketch.exp.svg b/e2etests/testdata/stable/elk_shim/dagre/sketch.exp.svg index 3547d2e2e..0984805f6 100644 --- a/e2etests/testdata/stable/elk_shim/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/elk_shim/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -networkuserapi serverlogscell towerONLINE PORTALLLLdata processorsatellitestransmitteruistorage sendsendsendphone logsmake call accessdisplaypersist -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-3062169964 .fill-N1{fill:#0A0F25;} - .d2-3062169964 .fill-N2{fill:#676C7E;} - .d2-3062169964 .fill-N3{fill:#9499AB;} - .d2-3062169964 .fill-N4{fill:#CFD2DD;} - .d2-3062169964 .fill-N5{fill:#DEE1EB;} - .d2-3062169964 .fill-N6{fill:#EEF1F8;} - .d2-3062169964 .fill-N7{fill:#FFFFFF;} - .d2-3062169964 .fill-B1{fill:#0D32B2;} - .d2-3062169964 .fill-B2{fill:#0D32B2;} - .d2-3062169964 .fill-B3{fill:#E3E9FD;} - .d2-3062169964 .fill-B4{fill:#E3E9FD;} - .d2-3062169964 .fill-B5{fill:#EDF0FD;} - .d2-3062169964 .fill-B6{fill:#F7F8FE;} - .d2-3062169964 .fill-AA2{fill:#4A6FF3;} - .d2-3062169964 .fill-AA4{fill:#EDF0FD;} - .d2-3062169964 .fill-AA5{fill:#F7F8FE;} - .d2-3062169964 .fill-AB4{fill:#EDF0FD;} - .d2-3062169964 .fill-AB5{fill:#F7F8FE;} - .d2-3062169964 .stroke-N1{stroke:#0A0F25;} - .d2-3062169964 .stroke-N2{stroke:#676C7E;} - .d2-3062169964 .stroke-N3{stroke:#9499AB;} - .d2-3062169964 .stroke-N4{stroke:#CFD2DD;} - .d2-3062169964 .stroke-N5{stroke:#DEE1EB;} - .d2-3062169964 .stroke-N6{stroke:#EEF1F8;} - .d2-3062169964 .stroke-N7{stroke:#FFFFFF;} - .d2-3062169964 .stroke-B1{stroke:#0D32B2;} - .d2-3062169964 .stroke-B2{stroke:#0D32B2;} - .d2-3062169964 .stroke-B3{stroke:#E3E9FD;} - .d2-3062169964 .stroke-B4{stroke:#E3E9FD;} - .d2-3062169964 .stroke-B5{stroke:#EDF0FD;} - .d2-3062169964 .stroke-B6{stroke:#F7F8FE;} - .d2-3062169964 .stroke-AA2{stroke:#4A6FF3;} - .d2-3062169964 .stroke-AA4{stroke:#EDF0FD;} - .d2-3062169964 .stroke-AA5{stroke:#F7F8FE;} - .d2-3062169964 .stroke-AB4{stroke:#EDF0FD;} - .d2-3062169964 .stroke-AB5{stroke:#F7F8FE;} - .d2-3062169964 .background-color-N1{background-color:#0A0F25;} - .d2-3062169964 .background-color-N2{background-color:#676C7E;} - .d2-3062169964 .background-color-N3{background-color:#9499AB;} - .d2-3062169964 .background-color-N4{background-color:#CFD2DD;} - .d2-3062169964 .background-color-N5{background-color:#DEE1EB;} - .d2-3062169964 .background-color-N6{background-color:#EEF1F8;} - .d2-3062169964 .background-color-N7{background-color:#FFFFFF;} - .d2-3062169964 .background-color-B1{background-color:#0D32B2;} - .d2-3062169964 .background-color-B2{background-color:#0D32B2;} - .d2-3062169964 .background-color-B3{background-color:#E3E9FD;} - .d2-3062169964 .background-color-B4{background-color:#E3E9FD;} - .d2-3062169964 .background-color-B5{background-color:#EDF0FD;} - .d2-3062169964 .background-color-B6{background-color:#F7F8FE;} - .d2-3062169964 .background-color-AA2{background-color:#4A6FF3;} - .d2-3062169964 .background-color-AA4{background-color:#EDF0FD;} - .d2-3062169964 .background-color-AA5{background-color:#F7F8FE;} - .d2-3062169964 .background-color-AB4{background-color:#EDF0FD;} - .d2-3062169964 .background-color-AB5{background-color:#F7F8FE;} - .d2-3062169964 .color-N1{color:#0A0F25;} - .d2-3062169964 .color-N2{color:#676C7E;} - .d2-3062169964 .color-N3{color:#9499AB;} - .d2-3062169964 .color-N4{color:#CFD2DD;} - .d2-3062169964 .color-N5{color:#DEE1EB;} - .d2-3062169964 .color-N6{color:#EEF1F8;} - .d2-3062169964 .color-N7{color:#FFFFFF;} - .d2-3062169964 .color-B1{color:#0D32B2;} - .d2-3062169964 .color-B2{color:#0D32B2;} - .d2-3062169964 .color-B3{color:#E3E9FD;} - .d2-3062169964 .color-B4{color:#E3E9FD;} - .d2-3062169964 .color-B5{color:#EDF0FD;} - .d2-3062169964 .color-B6{color:#F7F8FE;} - .d2-3062169964 .color-AA2{color:#4A6FF3;} - .d2-3062169964 .color-AA4{color:#EDF0FD;} - .d2-3062169964 .color-AA5{color:#F7F8FE;} - .d2-3062169964 .color-AB4{color:#EDF0FD;} - .d2-3062169964 .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}]]>networkuserapi serverlogscell towerONLINE PORTALLLLdata processorsatellitestransmitteruistorage sendsendsendphone logsmake call accessdisplaypersist -======= .d2-3936198194 .fill-N1{fill:#0A0F25;} .d2-3936198194 .fill-N2{fill:#676C7E;} .d2-3936198194 .fill-N3{fill:#9499AB;} @@ -266,8 +103,7 @@ .d2-3936198194 .color-AA4{color:#EDF0FD;} .d2-3936198194 .color-AA5{color:#F7F8FE;} .d2-3936198194 .color-AB4{color:#EDF0FD;} - .d2-3936198194 .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}]]>networkuserapi serverlogscell towerONLINE PORTALLLLdata processorsatellitestransmitteruistorage sendsendsendphone logsmake call accessdisplaypersist ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-3936198194 .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}]]>networkuserapi serverlogscell towerONLINE PORTALLLLdata processorsatellitestransmitteruistorage sendsendsendphone logsmake call accessdisplaypersist diff --git a/e2etests/testdata/stable/elk_shim/elk/sketch.exp.svg b/e2etests/testdata/stable/elk_shim/elk/sketch.exp.svg index 3777b7e9a..e475fdfed 100644 --- a/e2etests/testdata/stable/elk_shim/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/elk_shim/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -networkuserapi serverlogscell towerONLINE PORTALLLLdata processorsatellitestransmitteruistorage sendsendsendphone logsmake call accessdisplaypersist -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-3043315268 .fill-N1{fill:#0A0F25;} - .d2-3043315268 .fill-N2{fill:#676C7E;} - .d2-3043315268 .fill-N3{fill:#9499AB;} - .d2-3043315268 .fill-N4{fill:#CFD2DD;} - .d2-3043315268 .fill-N5{fill:#DEE1EB;} - .d2-3043315268 .fill-N6{fill:#EEF1F8;} - .d2-3043315268 .fill-N7{fill:#FFFFFF;} - .d2-3043315268 .fill-B1{fill:#0D32B2;} - .d2-3043315268 .fill-B2{fill:#0D32B2;} - .d2-3043315268 .fill-B3{fill:#E3E9FD;} - .d2-3043315268 .fill-B4{fill:#E3E9FD;} - .d2-3043315268 .fill-B5{fill:#EDF0FD;} - .d2-3043315268 .fill-B6{fill:#F7F8FE;} - .d2-3043315268 .fill-AA2{fill:#4A6FF3;} - .d2-3043315268 .fill-AA4{fill:#EDF0FD;} - .d2-3043315268 .fill-AA5{fill:#F7F8FE;} - .d2-3043315268 .fill-AB4{fill:#EDF0FD;} - .d2-3043315268 .fill-AB5{fill:#F7F8FE;} - .d2-3043315268 .stroke-N1{stroke:#0A0F25;} - .d2-3043315268 .stroke-N2{stroke:#676C7E;} - .d2-3043315268 .stroke-N3{stroke:#9499AB;} - .d2-3043315268 .stroke-N4{stroke:#CFD2DD;} - .d2-3043315268 .stroke-N5{stroke:#DEE1EB;} - .d2-3043315268 .stroke-N6{stroke:#EEF1F8;} - .d2-3043315268 .stroke-N7{stroke:#FFFFFF;} - .d2-3043315268 .stroke-B1{stroke:#0D32B2;} - .d2-3043315268 .stroke-B2{stroke:#0D32B2;} - .d2-3043315268 .stroke-B3{stroke:#E3E9FD;} - .d2-3043315268 .stroke-B4{stroke:#E3E9FD;} - .d2-3043315268 .stroke-B5{stroke:#EDF0FD;} - .d2-3043315268 .stroke-B6{stroke:#F7F8FE;} - .d2-3043315268 .stroke-AA2{stroke:#4A6FF3;} - .d2-3043315268 .stroke-AA4{stroke:#EDF0FD;} - .d2-3043315268 .stroke-AA5{stroke:#F7F8FE;} - .d2-3043315268 .stroke-AB4{stroke:#EDF0FD;} - .d2-3043315268 .stroke-AB5{stroke:#F7F8FE;} - .d2-3043315268 .background-color-N1{background-color:#0A0F25;} - .d2-3043315268 .background-color-N2{background-color:#676C7E;} - .d2-3043315268 .background-color-N3{background-color:#9499AB;} - .d2-3043315268 .background-color-N4{background-color:#CFD2DD;} - .d2-3043315268 .background-color-N5{background-color:#DEE1EB;} - .d2-3043315268 .background-color-N6{background-color:#EEF1F8;} - .d2-3043315268 .background-color-N7{background-color:#FFFFFF;} - .d2-3043315268 .background-color-B1{background-color:#0D32B2;} - .d2-3043315268 .background-color-B2{background-color:#0D32B2;} - .d2-3043315268 .background-color-B3{background-color:#E3E9FD;} - .d2-3043315268 .background-color-B4{background-color:#E3E9FD;} - .d2-3043315268 .background-color-B5{background-color:#EDF0FD;} - .d2-3043315268 .background-color-B6{background-color:#F7F8FE;} - .d2-3043315268 .background-color-AA2{background-color:#4A6FF3;} - .d2-3043315268 .background-color-AA4{background-color:#EDF0FD;} - .d2-3043315268 .background-color-AA5{background-color:#F7F8FE;} - .d2-3043315268 .background-color-AB4{background-color:#EDF0FD;} - .d2-3043315268 .background-color-AB5{background-color:#F7F8FE;} - .d2-3043315268 .color-N1{color:#0A0F25;} - .d2-3043315268 .color-N2{color:#676C7E;} - .d2-3043315268 .color-N3{color:#9499AB;} - .d2-3043315268 .color-N4{color:#CFD2DD;} - .d2-3043315268 .color-N5{color:#DEE1EB;} - .d2-3043315268 .color-N6{color:#EEF1F8;} - .d2-3043315268 .color-N7{color:#FFFFFF;} - .d2-3043315268 .color-B1{color:#0D32B2;} - .d2-3043315268 .color-B2{color:#0D32B2;} - .d2-3043315268 .color-B3{color:#E3E9FD;} - .d2-3043315268 .color-B4{color:#E3E9FD;} - .d2-3043315268 .color-B5{color:#EDF0FD;} - .d2-3043315268 .color-B6{color:#F7F8FE;} - .d2-3043315268 .color-AA2{color:#4A6FF3;} - .d2-3043315268 .color-AA4{color:#EDF0FD;} - .d2-3043315268 .color-AA5{color:#F7F8FE;} - .d2-3043315268 .color-AB4{color:#EDF0FD;} - .d2-3043315268 .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}]]>networkuserapi serverlogscell towerONLINE PORTALLLLdata processorsatellitestransmitteruistorage sendsendsendphone logsmake call accessdisplaypersist -======= .d2-3809872294 .fill-N1{fill:#0A0F25;} .d2-3809872294 .fill-N2{fill:#676C7E;} .d2-3809872294 .fill-N3{fill:#9499AB;} @@ -266,8 +103,7 @@ .d2-3809872294 .color-AA4{color:#EDF0FD;} .d2-3809872294 .color-AA5{color:#F7F8FE;} .d2-3809872294 .color-AB4{color:#EDF0FD;} - .d2-3809872294 .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}]]>networkuserapi serverlogscell towerONLINE PORTALLLLdata processorsatellitestransmitteruistorage sendsendsendphone logsmake call accessdisplaypersist ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-3809872294 .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}]]>networkuserapi serverlogscell towerONLINE PORTALLLLdata processorsatellitestransmitteruistorage sendsendsendphone logsmake call accessdisplaypersist diff --git a/e2etests/testdata/stable/ent2d2_basic/dagre/sketch.exp.svg b/e2etests/testdata/stable/ent2d2_basic/dagre/sketch.exp.svg index 7c8e94a07..4631b0a21 100644 --- a/e2etests/testdata/stable/ent2d2_basic/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/ent2d2_basic/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spouse children/parent/ancestorpets/ownercard/ownerposts/authormetadata/userinfo/user -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-3290175475 .fill-N1{fill:#0A0F25;} - .d2-3290175475 .fill-N2{fill:#676C7E;} - .d2-3290175475 .fill-N3{fill:#9499AB;} - .d2-3290175475 .fill-N4{fill:#CFD2DD;} - .d2-3290175475 .fill-N5{fill:#DEE1EB;} - .d2-3290175475 .fill-N6{fill:#EEF1F8;} - .d2-3290175475 .fill-N7{fill:#FFFFFF;} - .d2-3290175475 .fill-B1{fill:#0D32B2;} - .d2-3290175475 .fill-B2{fill:#0D32B2;} - .d2-3290175475 .fill-B3{fill:#E3E9FD;} - .d2-3290175475 .fill-B4{fill:#E3E9FD;} - .d2-3290175475 .fill-B5{fill:#EDF0FD;} - .d2-3290175475 .fill-B6{fill:#F7F8FE;} - .d2-3290175475 .fill-AA2{fill:#4A6FF3;} - .d2-3290175475 .fill-AA4{fill:#EDF0FD;} - .d2-3290175475 .fill-AA5{fill:#F7F8FE;} - .d2-3290175475 .fill-AB4{fill:#EDF0FD;} - .d2-3290175475 .fill-AB5{fill:#F7F8FE;} - .d2-3290175475 .stroke-N1{stroke:#0A0F25;} - .d2-3290175475 .stroke-N2{stroke:#676C7E;} - .d2-3290175475 .stroke-N3{stroke:#9499AB;} - .d2-3290175475 .stroke-N4{stroke:#CFD2DD;} - .d2-3290175475 .stroke-N5{stroke:#DEE1EB;} - .d2-3290175475 .stroke-N6{stroke:#EEF1F8;} - .d2-3290175475 .stroke-N7{stroke:#FFFFFF;} - .d2-3290175475 .stroke-B1{stroke:#0D32B2;} - .d2-3290175475 .stroke-B2{stroke:#0D32B2;} - .d2-3290175475 .stroke-B3{stroke:#E3E9FD;} - .d2-3290175475 .stroke-B4{stroke:#E3E9FD;} - .d2-3290175475 .stroke-B5{stroke:#EDF0FD;} - .d2-3290175475 .stroke-B6{stroke:#F7F8FE;} - .d2-3290175475 .stroke-AA2{stroke:#4A6FF3;} - .d2-3290175475 .stroke-AA4{stroke:#EDF0FD;} - .d2-3290175475 .stroke-AA5{stroke:#F7F8FE;} - .d2-3290175475 .stroke-AB4{stroke:#EDF0FD;} - .d2-3290175475 .stroke-AB5{stroke:#F7F8FE;} - .d2-3290175475 .background-color-N1{background-color:#0A0F25;} - .d2-3290175475 .background-color-N2{background-color:#676C7E;} - .d2-3290175475 .background-color-N3{background-color:#9499AB;} - .d2-3290175475 .background-color-N4{background-color:#CFD2DD;} - .d2-3290175475 .background-color-N5{background-color:#DEE1EB;} - .d2-3290175475 .background-color-N6{background-color:#EEF1F8;} - .d2-3290175475 .background-color-N7{background-color:#FFFFFF;} - .d2-3290175475 .background-color-B1{background-color:#0D32B2;} - .d2-3290175475 .background-color-B2{background-color:#0D32B2;} - .d2-3290175475 .background-color-B3{background-color:#E3E9FD;} - .d2-3290175475 .background-color-B4{background-color:#E3E9FD;} - .d2-3290175475 .background-color-B5{background-color:#EDF0FD;} - .d2-3290175475 .background-color-B6{background-color:#F7F8FE;} - .d2-3290175475 .background-color-AA2{background-color:#4A6FF3;} - .d2-3290175475 .background-color-AA4{background-color:#EDF0FD;} - .d2-3290175475 .background-color-AA5{background-color:#F7F8FE;} - .d2-3290175475 .background-color-AB4{background-color:#EDF0FD;} - .d2-3290175475 .background-color-AB5{background-color:#F7F8FE;} - .d2-3290175475 .color-N1{color:#0A0F25;} - .d2-3290175475 .color-N2{color:#676C7E;} - .d2-3290175475 .color-N3{color:#9499AB;} - .d2-3290175475 .color-N4{color:#CFD2DD;} - .d2-3290175475 .color-N5{color:#DEE1EB;} - .d2-3290175475 .color-N6{color:#EEF1F8;} - .d2-3290175475 .color-N7{color:#FFFFFF;} - .d2-3290175475 .color-B1{color:#0D32B2;} - .d2-3290175475 .color-B2{color:#0D32B2;} - .d2-3290175475 .color-B3{color:#E3E9FD;} - .d2-3290175475 .color-B4{color:#E3E9FD;} - .d2-3290175475 .color-B5{color:#EDF0FD;} - .d2-3290175475 .color-B6{color:#F7F8FE;} - .d2-3290175475 .color-AA2{color:#4A6FF3;} - .d2-3290175475 .color-AA4{color:#EDF0FD;} - .d2-3290175475 .color-AA5{color:#F7F8FE;} - .d2-3290175475 .color-AB4{color:#EDF0FD;} - .d2-3290175475 .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}]]>UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spouse children/parent/ancestorpets/ownercard/ownerposts/authormetadata/userinfo/user -======= .d2-3683838457 .fill-N1{fill:#0A0F25;} .d2-3683838457 .fill-N2{fill:#676C7E;} .d2-3683838457 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-3683838457 .color-AA4{color:#EDF0FD;} .d2-3683838457 .color-AA5{color:#F7F8FE;} .d2-3683838457 .color-AB4{color:#EDF0FD;} - .d2-3683838457 .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}]]>UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spouse children/parent/ancestorpets/ownercard/ownerposts/authormetadata/userinfo/user ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-3683838457 .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}]]>UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spouse children/parent/ancestorpets/ownercard/ownerposts/authormetadata/userinfo/user diff --git a/e2etests/testdata/stable/ent2d2_basic/elk/sketch.exp.svg b/e2etests/testdata/stable/ent2d2_basic/elk/sketch.exp.svg index ea0ba6aeb..1b0257b31 100644 --- a/e2etests/testdata/stable/ent2d2_basic/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/ent2d2_basic/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spouse children/parent/ancestorpets/ownercard/ownerposts/authormetadata/userinfo/user -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-362248761 .fill-N1{fill:#0A0F25;} - .d2-362248761 .fill-N2{fill:#676C7E;} - .d2-362248761 .fill-N3{fill:#9499AB;} - .d2-362248761 .fill-N4{fill:#CFD2DD;} - .d2-362248761 .fill-N5{fill:#DEE1EB;} - .d2-362248761 .fill-N6{fill:#EEF1F8;} - .d2-362248761 .fill-N7{fill:#FFFFFF;} - .d2-362248761 .fill-B1{fill:#0D32B2;} - .d2-362248761 .fill-B2{fill:#0D32B2;} - .d2-362248761 .fill-B3{fill:#E3E9FD;} - .d2-362248761 .fill-B4{fill:#E3E9FD;} - .d2-362248761 .fill-B5{fill:#EDF0FD;} - .d2-362248761 .fill-B6{fill:#F7F8FE;} - .d2-362248761 .fill-AA2{fill:#4A6FF3;} - .d2-362248761 .fill-AA4{fill:#EDF0FD;} - .d2-362248761 .fill-AA5{fill:#F7F8FE;} - .d2-362248761 .fill-AB4{fill:#EDF0FD;} - .d2-362248761 .fill-AB5{fill:#F7F8FE;} - .d2-362248761 .stroke-N1{stroke:#0A0F25;} - .d2-362248761 .stroke-N2{stroke:#676C7E;} - .d2-362248761 .stroke-N3{stroke:#9499AB;} - .d2-362248761 .stroke-N4{stroke:#CFD2DD;} - .d2-362248761 .stroke-N5{stroke:#DEE1EB;} - .d2-362248761 .stroke-N6{stroke:#EEF1F8;} - .d2-362248761 .stroke-N7{stroke:#FFFFFF;} - .d2-362248761 .stroke-B1{stroke:#0D32B2;} - .d2-362248761 .stroke-B2{stroke:#0D32B2;} - .d2-362248761 .stroke-B3{stroke:#E3E9FD;} - .d2-362248761 .stroke-B4{stroke:#E3E9FD;} - .d2-362248761 .stroke-B5{stroke:#EDF0FD;} - .d2-362248761 .stroke-B6{stroke:#F7F8FE;} - .d2-362248761 .stroke-AA2{stroke:#4A6FF3;} - .d2-362248761 .stroke-AA4{stroke:#EDF0FD;} - .d2-362248761 .stroke-AA5{stroke:#F7F8FE;} - .d2-362248761 .stroke-AB4{stroke:#EDF0FD;} - .d2-362248761 .stroke-AB5{stroke:#F7F8FE;} - .d2-362248761 .background-color-N1{background-color:#0A0F25;} - .d2-362248761 .background-color-N2{background-color:#676C7E;} - .d2-362248761 .background-color-N3{background-color:#9499AB;} - .d2-362248761 .background-color-N4{background-color:#CFD2DD;} - .d2-362248761 .background-color-N5{background-color:#DEE1EB;} - .d2-362248761 .background-color-N6{background-color:#EEF1F8;} - .d2-362248761 .background-color-N7{background-color:#FFFFFF;} - .d2-362248761 .background-color-B1{background-color:#0D32B2;} - .d2-362248761 .background-color-B2{background-color:#0D32B2;} - .d2-362248761 .background-color-B3{background-color:#E3E9FD;} - .d2-362248761 .background-color-B4{background-color:#E3E9FD;} - .d2-362248761 .background-color-B5{background-color:#EDF0FD;} - .d2-362248761 .background-color-B6{background-color:#F7F8FE;} - .d2-362248761 .background-color-AA2{background-color:#4A6FF3;} - .d2-362248761 .background-color-AA4{background-color:#EDF0FD;} - .d2-362248761 .background-color-AA5{background-color:#F7F8FE;} - .d2-362248761 .background-color-AB4{background-color:#EDF0FD;} - .d2-362248761 .background-color-AB5{background-color:#F7F8FE;} - .d2-362248761 .color-N1{color:#0A0F25;} - .d2-362248761 .color-N2{color:#676C7E;} - .d2-362248761 .color-N3{color:#9499AB;} - .d2-362248761 .color-N4{color:#CFD2DD;} - .d2-362248761 .color-N5{color:#DEE1EB;} - .d2-362248761 .color-N6{color:#EEF1F8;} - .d2-362248761 .color-N7{color:#FFFFFF;} - .d2-362248761 .color-B1{color:#0D32B2;} - .d2-362248761 .color-B2{color:#0D32B2;} - .d2-362248761 .color-B3{color:#E3E9FD;} - .d2-362248761 .color-B4{color:#E3E9FD;} - .d2-362248761 .color-B5{color:#EDF0FD;} - .d2-362248761 .color-B6{color:#F7F8FE;} - .d2-362248761 .color-AA2{color:#4A6FF3;} - .d2-362248761 .color-AA4{color:#EDF0FD;} - .d2-362248761 .color-AA5{color:#F7F8FE;} - .d2-362248761 .color-AB4{color:#EDF0FD;} - .d2-362248761 .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}]]>UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spouse children/parent/ancestorpets/ownercard/ownerposts/authormetadata/userinfo/user -======= .d2-1236166627 .fill-N1{fill:#0A0F25;} .d2-1236166627 .fill-N2{fill:#676C7E;} .d2-1236166627 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-1236166627 .color-AA4{color:#EDF0FD;} .d2-1236166627 .color-AA5{color:#F7F8FE;} .d2-1236166627 .color-AB4{color:#EDF0FD;} - .d2-1236166627 .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}]]>UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spouse children/parent/ancestorpets/ownercard/ownerposts/authormetadata/userinfo/user ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-1236166627 .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}]]>UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spouse children/parent/ancestorpets/ownercard/ownerposts/authormetadata/userinfo/user diff --git a/e2etests/testdata/stable/ent2d2_right/dagre/sketch.exp.svg b/e2etests/testdata/stable/ent2d2_right/dagre/sketch.exp.svg index 60e31797c..c521d0131 100644 --- a/e2etests/testdata/stable/ent2d2_right/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/ent2d2_right/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spousespouse childrenparentyowhoaheypets/ownercard/ownerposts/authormetadata/userinfo/user -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-1514920926 .fill-N1{fill:#0A0F25;} - .d2-1514920926 .fill-N2{fill:#676C7E;} - .d2-1514920926 .fill-N3{fill:#9499AB;} - .d2-1514920926 .fill-N4{fill:#CFD2DD;} - .d2-1514920926 .fill-N5{fill:#DEE1EB;} - .d2-1514920926 .fill-N6{fill:#EEF1F8;} - .d2-1514920926 .fill-N7{fill:#FFFFFF;} - .d2-1514920926 .fill-B1{fill:#0D32B2;} - .d2-1514920926 .fill-B2{fill:#0D32B2;} - .d2-1514920926 .fill-B3{fill:#E3E9FD;} - .d2-1514920926 .fill-B4{fill:#E3E9FD;} - .d2-1514920926 .fill-B5{fill:#EDF0FD;} - .d2-1514920926 .fill-B6{fill:#F7F8FE;} - .d2-1514920926 .fill-AA2{fill:#4A6FF3;} - .d2-1514920926 .fill-AA4{fill:#EDF0FD;} - .d2-1514920926 .fill-AA5{fill:#F7F8FE;} - .d2-1514920926 .fill-AB4{fill:#EDF0FD;} - .d2-1514920926 .fill-AB5{fill:#F7F8FE;} - .d2-1514920926 .stroke-N1{stroke:#0A0F25;} - .d2-1514920926 .stroke-N2{stroke:#676C7E;} - .d2-1514920926 .stroke-N3{stroke:#9499AB;} - .d2-1514920926 .stroke-N4{stroke:#CFD2DD;} - .d2-1514920926 .stroke-N5{stroke:#DEE1EB;} - .d2-1514920926 .stroke-N6{stroke:#EEF1F8;} - .d2-1514920926 .stroke-N7{stroke:#FFFFFF;} - .d2-1514920926 .stroke-B1{stroke:#0D32B2;} - .d2-1514920926 .stroke-B2{stroke:#0D32B2;} - .d2-1514920926 .stroke-B3{stroke:#E3E9FD;} - .d2-1514920926 .stroke-B4{stroke:#E3E9FD;} - .d2-1514920926 .stroke-B5{stroke:#EDF0FD;} - .d2-1514920926 .stroke-B6{stroke:#F7F8FE;} - .d2-1514920926 .stroke-AA2{stroke:#4A6FF3;} - .d2-1514920926 .stroke-AA4{stroke:#EDF0FD;} - .d2-1514920926 .stroke-AA5{stroke:#F7F8FE;} - .d2-1514920926 .stroke-AB4{stroke:#EDF0FD;} - .d2-1514920926 .stroke-AB5{stroke:#F7F8FE;} - .d2-1514920926 .background-color-N1{background-color:#0A0F25;} - .d2-1514920926 .background-color-N2{background-color:#676C7E;} - .d2-1514920926 .background-color-N3{background-color:#9499AB;} - .d2-1514920926 .background-color-N4{background-color:#CFD2DD;} - .d2-1514920926 .background-color-N5{background-color:#DEE1EB;} - .d2-1514920926 .background-color-N6{background-color:#EEF1F8;} - .d2-1514920926 .background-color-N7{background-color:#FFFFFF;} - .d2-1514920926 .background-color-B1{background-color:#0D32B2;} - .d2-1514920926 .background-color-B2{background-color:#0D32B2;} - .d2-1514920926 .background-color-B3{background-color:#E3E9FD;} - .d2-1514920926 .background-color-B4{background-color:#E3E9FD;} - .d2-1514920926 .background-color-B5{background-color:#EDF0FD;} - .d2-1514920926 .background-color-B6{background-color:#F7F8FE;} - .d2-1514920926 .background-color-AA2{background-color:#4A6FF3;} - .d2-1514920926 .background-color-AA4{background-color:#EDF0FD;} - .d2-1514920926 .background-color-AA5{background-color:#F7F8FE;} - .d2-1514920926 .background-color-AB4{background-color:#EDF0FD;} - .d2-1514920926 .background-color-AB5{background-color:#F7F8FE;} - .d2-1514920926 .color-N1{color:#0A0F25;} - .d2-1514920926 .color-N2{color:#676C7E;} - .d2-1514920926 .color-N3{color:#9499AB;} - .d2-1514920926 .color-N4{color:#CFD2DD;} - .d2-1514920926 .color-N5{color:#DEE1EB;} - .d2-1514920926 .color-N6{color:#EEF1F8;} - .d2-1514920926 .color-N7{color:#FFFFFF;} - .d2-1514920926 .color-B1{color:#0D32B2;} - .d2-1514920926 .color-B2{color:#0D32B2;} - .d2-1514920926 .color-B3{color:#E3E9FD;} - .d2-1514920926 .color-B4{color:#E3E9FD;} - .d2-1514920926 .color-B5{color:#EDF0FD;} - .d2-1514920926 .color-B6{color:#F7F8FE;} - .d2-1514920926 .color-AA2{color:#4A6FF3;} - .d2-1514920926 .color-AA4{color:#EDF0FD;} - .d2-1514920926 .color-AA5{color:#F7F8FE;} - .d2-1514920926 .color-AB4{color:#EDF0FD;} - .d2-1514920926 .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}]]>UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spousespouse childrenparentyowhoaheypets/ownercard/ownerposts/authormetadata/userinfo/user -======= .d2-4135108908 .fill-N1{fill:#0A0F25;} .d2-4135108908 .fill-N2{fill:#676C7E;} .d2-4135108908 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-4135108908 .color-AA4{color:#EDF0FD;} .d2-4135108908 .color-AA5{color:#F7F8FE;} .d2-4135108908 .color-AB4{color:#EDF0FD;} - .d2-4135108908 .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}]]>UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spousespouse childrenparentyowhoaheypets/ownercard/ownerposts/authormetadata/userinfo/user ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-4135108908 .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}]]>UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spousespouse childrenparentyowhoaheypets/ownercard/ownerposts/authormetadata/userinfo/user diff --git a/e2etests/testdata/stable/ent2d2_right/elk/sketch.exp.svg b/e2etests/testdata/stable/ent2d2_right/elk/sketch.exp.svg index 0c18d3e19..b4b05a6be 100644 --- a/e2etests/testdata/stable/ent2d2_right/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/ent2d2_right/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spousespouse childrenparentyowhoaheypets/ownercard/ownerposts/authormetadata/userinfo/user -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-1743102802 .fill-N1{fill:#0A0F25;} - .d2-1743102802 .fill-N2{fill:#676C7E;} - .d2-1743102802 .fill-N3{fill:#9499AB;} - .d2-1743102802 .fill-N4{fill:#CFD2DD;} - .d2-1743102802 .fill-N5{fill:#DEE1EB;} - .d2-1743102802 .fill-N6{fill:#EEF1F8;} - .d2-1743102802 .fill-N7{fill:#FFFFFF;} - .d2-1743102802 .fill-B1{fill:#0D32B2;} - .d2-1743102802 .fill-B2{fill:#0D32B2;} - .d2-1743102802 .fill-B3{fill:#E3E9FD;} - .d2-1743102802 .fill-B4{fill:#E3E9FD;} - .d2-1743102802 .fill-B5{fill:#EDF0FD;} - .d2-1743102802 .fill-B6{fill:#F7F8FE;} - .d2-1743102802 .fill-AA2{fill:#4A6FF3;} - .d2-1743102802 .fill-AA4{fill:#EDF0FD;} - .d2-1743102802 .fill-AA5{fill:#F7F8FE;} - .d2-1743102802 .fill-AB4{fill:#EDF0FD;} - .d2-1743102802 .fill-AB5{fill:#F7F8FE;} - .d2-1743102802 .stroke-N1{stroke:#0A0F25;} - .d2-1743102802 .stroke-N2{stroke:#676C7E;} - .d2-1743102802 .stroke-N3{stroke:#9499AB;} - .d2-1743102802 .stroke-N4{stroke:#CFD2DD;} - .d2-1743102802 .stroke-N5{stroke:#DEE1EB;} - .d2-1743102802 .stroke-N6{stroke:#EEF1F8;} - .d2-1743102802 .stroke-N7{stroke:#FFFFFF;} - .d2-1743102802 .stroke-B1{stroke:#0D32B2;} - .d2-1743102802 .stroke-B2{stroke:#0D32B2;} - .d2-1743102802 .stroke-B3{stroke:#E3E9FD;} - .d2-1743102802 .stroke-B4{stroke:#E3E9FD;} - .d2-1743102802 .stroke-B5{stroke:#EDF0FD;} - .d2-1743102802 .stroke-B6{stroke:#F7F8FE;} - .d2-1743102802 .stroke-AA2{stroke:#4A6FF3;} - .d2-1743102802 .stroke-AA4{stroke:#EDF0FD;} - .d2-1743102802 .stroke-AA5{stroke:#F7F8FE;} - .d2-1743102802 .stroke-AB4{stroke:#EDF0FD;} - .d2-1743102802 .stroke-AB5{stroke:#F7F8FE;} - .d2-1743102802 .background-color-N1{background-color:#0A0F25;} - .d2-1743102802 .background-color-N2{background-color:#676C7E;} - .d2-1743102802 .background-color-N3{background-color:#9499AB;} - .d2-1743102802 .background-color-N4{background-color:#CFD2DD;} - .d2-1743102802 .background-color-N5{background-color:#DEE1EB;} - .d2-1743102802 .background-color-N6{background-color:#EEF1F8;} - .d2-1743102802 .background-color-N7{background-color:#FFFFFF;} - .d2-1743102802 .background-color-B1{background-color:#0D32B2;} - .d2-1743102802 .background-color-B2{background-color:#0D32B2;} - .d2-1743102802 .background-color-B3{background-color:#E3E9FD;} - .d2-1743102802 .background-color-B4{background-color:#E3E9FD;} - .d2-1743102802 .background-color-B5{background-color:#EDF0FD;} - .d2-1743102802 .background-color-B6{background-color:#F7F8FE;} - .d2-1743102802 .background-color-AA2{background-color:#4A6FF3;} - .d2-1743102802 .background-color-AA4{background-color:#EDF0FD;} - .d2-1743102802 .background-color-AA5{background-color:#F7F8FE;} - .d2-1743102802 .background-color-AB4{background-color:#EDF0FD;} - .d2-1743102802 .background-color-AB5{background-color:#F7F8FE;} - .d2-1743102802 .color-N1{color:#0A0F25;} - .d2-1743102802 .color-N2{color:#676C7E;} - .d2-1743102802 .color-N3{color:#9499AB;} - .d2-1743102802 .color-N4{color:#CFD2DD;} - .d2-1743102802 .color-N5{color:#DEE1EB;} - .d2-1743102802 .color-N6{color:#EEF1F8;} - .d2-1743102802 .color-N7{color:#FFFFFF;} - .d2-1743102802 .color-B1{color:#0D32B2;} - .d2-1743102802 .color-B2{color:#0D32B2;} - .d2-1743102802 .color-B3{color:#E3E9FD;} - .d2-1743102802 .color-B4{color:#E3E9FD;} - .d2-1743102802 .color-B5{color:#EDF0FD;} - .d2-1743102802 .color-B6{color:#F7F8FE;} - .d2-1743102802 .color-AA2{color:#4A6FF3;} - .d2-1743102802 .color-AA4{color:#EDF0FD;} - .d2-1743102802 .color-AA5{color:#F7F8FE;} - .d2-1743102802 .color-AB4{color:#EDF0FD;} - .d2-1743102802 .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}]]>UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spousespouse childrenparentyowhoaheypets/ownercard/ownerposts/authormetadata/userinfo/user -======= .d2-2028736040 .fill-N1{fill:#0A0F25;} .d2-2028736040 .fill-N2{fill:#676C7E;} .d2-2028736040 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-2028736040 .color-AA4{color:#EDF0FD;} .d2-2028736040 .color-AA5{color:#F7F8FE;} .d2-2028736040 .color-AB4{color:#EDF0FD;} - .d2-2028736040 .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}]]>UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spousespouse childrenparentyowhoaheypets/ownercard/ownerposts/authormetadata/userinfo/user ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-2028736040 .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}]]>UseridintPKparent_idintFKspouse_idintFKPetidintPKowner_idintFKCardidintPKowner_idintFKPostidintPKtextstringauthor_idintFKMetadataidintPKageintInfoidintPKcontentjson.RawMessage spousespouse childrenparentyowhoaheypets/ownercard/ownerposts/authormetadata/userinfo/user diff --git a/e2etests/testdata/stable/font_colors/dagre/sketch.exp.svg b/e2etests/testdata/stable/font_colors/dagre/sketch.exp.svg index c32b56c1b..238801e5a 100644 --- a/e2etests/testdata/stable/font_colors/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/font_colors/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -size XSsize Ssize Msize Lsize XLsize XXLsize XXXLcustom 8custom 12custom 18custom 21custom 64 custom 10custom 15custom 48 -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-3174230406 .fill-N1{fill:#0A0F25;} - .d2-3174230406 .fill-N2{fill:#676C7E;} - .d2-3174230406 .fill-N3{fill:#9499AB;} - .d2-3174230406 .fill-N4{fill:#CFD2DD;} - .d2-3174230406 .fill-N5{fill:#DEE1EB;} - .d2-3174230406 .fill-N6{fill:#EEF1F8;} - .d2-3174230406 .fill-N7{fill:#FFFFFF;} - .d2-3174230406 .fill-B1{fill:#0D32B2;} - .d2-3174230406 .fill-B2{fill:#0D32B2;} - .d2-3174230406 .fill-B3{fill:#E3E9FD;} - .d2-3174230406 .fill-B4{fill:#E3E9FD;} - .d2-3174230406 .fill-B5{fill:#EDF0FD;} - .d2-3174230406 .fill-B6{fill:#F7F8FE;} - .d2-3174230406 .fill-AA2{fill:#4A6FF3;} - .d2-3174230406 .fill-AA4{fill:#EDF0FD;} - .d2-3174230406 .fill-AA5{fill:#F7F8FE;} - .d2-3174230406 .fill-AB4{fill:#EDF0FD;} - .d2-3174230406 .fill-AB5{fill:#F7F8FE;} - .d2-3174230406 .stroke-N1{stroke:#0A0F25;} - .d2-3174230406 .stroke-N2{stroke:#676C7E;} - .d2-3174230406 .stroke-N3{stroke:#9499AB;} - .d2-3174230406 .stroke-N4{stroke:#CFD2DD;} - .d2-3174230406 .stroke-N5{stroke:#DEE1EB;} - .d2-3174230406 .stroke-N6{stroke:#EEF1F8;} - .d2-3174230406 .stroke-N7{stroke:#FFFFFF;} - .d2-3174230406 .stroke-B1{stroke:#0D32B2;} - .d2-3174230406 .stroke-B2{stroke:#0D32B2;} - .d2-3174230406 .stroke-B3{stroke:#E3E9FD;} - .d2-3174230406 .stroke-B4{stroke:#E3E9FD;} - .d2-3174230406 .stroke-B5{stroke:#EDF0FD;} - .d2-3174230406 .stroke-B6{stroke:#F7F8FE;} - .d2-3174230406 .stroke-AA2{stroke:#4A6FF3;} - .d2-3174230406 .stroke-AA4{stroke:#EDF0FD;} - .d2-3174230406 .stroke-AA5{stroke:#F7F8FE;} - .d2-3174230406 .stroke-AB4{stroke:#EDF0FD;} - .d2-3174230406 .stroke-AB5{stroke:#F7F8FE;} - .d2-3174230406 .background-color-N1{background-color:#0A0F25;} - .d2-3174230406 .background-color-N2{background-color:#676C7E;} - .d2-3174230406 .background-color-N3{background-color:#9499AB;} - .d2-3174230406 .background-color-N4{background-color:#CFD2DD;} - .d2-3174230406 .background-color-N5{background-color:#DEE1EB;} - .d2-3174230406 .background-color-N6{background-color:#EEF1F8;} - .d2-3174230406 .background-color-N7{background-color:#FFFFFF;} - .d2-3174230406 .background-color-B1{background-color:#0D32B2;} - .d2-3174230406 .background-color-B2{background-color:#0D32B2;} - .d2-3174230406 .background-color-B3{background-color:#E3E9FD;} - .d2-3174230406 .background-color-B4{background-color:#E3E9FD;} - .d2-3174230406 .background-color-B5{background-color:#EDF0FD;} - .d2-3174230406 .background-color-B6{background-color:#F7F8FE;} - .d2-3174230406 .background-color-AA2{background-color:#4A6FF3;} - .d2-3174230406 .background-color-AA4{background-color:#EDF0FD;} - .d2-3174230406 .background-color-AA5{background-color:#F7F8FE;} - .d2-3174230406 .background-color-AB4{background-color:#EDF0FD;} - .d2-3174230406 .background-color-AB5{background-color:#F7F8FE;} - .d2-3174230406 .color-N1{color:#0A0F25;} - .d2-3174230406 .color-N2{color:#676C7E;} - .d2-3174230406 .color-N3{color:#9499AB;} - .d2-3174230406 .color-N4{color:#CFD2DD;} - .d2-3174230406 .color-N5{color:#DEE1EB;} - .d2-3174230406 .color-N6{color:#EEF1F8;} - .d2-3174230406 .color-N7{color:#FFFFFF;} - .d2-3174230406 .color-B1{color:#0D32B2;} - .d2-3174230406 .color-B2{color:#0D32B2;} - .d2-3174230406 .color-B3{color:#E3E9FD;} - .d2-3174230406 .color-B4{color:#E3E9FD;} - .d2-3174230406 .color-B5{color:#EDF0FD;} - .d2-3174230406 .color-B6{color:#F7F8FE;} - .d2-3174230406 .color-AA2{color:#4A6FF3;} - .d2-3174230406 .color-AA4{color:#EDF0FD;} - .d2-3174230406 .color-AA5{color:#F7F8FE;} - .d2-3174230406 .color-AB4{color:#EDF0FD;} - .d2-3174230406 .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 .fill-N1{fill:#0A0F25;} .d2-2181559084 .fill-N2{fill:#676C7E;} .d2-2181559084 .fill-N3{fill:#9499AB;} @@ -259,14 +96,7 @@ .d2-2181559084 .color-AA4{color:#EDF0FD;} .d2-2181559084 .color-AA5{color:#F7F8FE;} .d2-2181559084 .color-AB4{color:#EDF0FD;} -<<<<<<< HEAD - .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 ->>>>>>> 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) + .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 diff --git a/e2etests/testdata/stable/font_sizes/elk/sketch.exp.svg b/e2etests/testdata/stable/font_sizes/elk/sketch.exp.svg index 46f3e7fe7..65a85bca1 100644 --- a/e2etests/testdata/stable/font_sizes/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/font_sizes/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -size XSsize Ssize Msize Lsize XLsize XXLsize XXXLcustom 8custom 12custom 18custom 21custom 64 custom 10custom 15custom 48 -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-1981788603 .fill-N1{fill:#0A0F25;} - .d2-1981788603 .fill-N2{fill:#676C7E;} - .d2-1981788603 .fill-N3{fill:#9499AB;} - .d2-1981788603 .fill-N4{fill:#CFD2DD;} - .d2-1981788603 .fill-N5{fill:#DEE1EB;} - .d2-1981788603 .fill-N6{fill:#EEF1F8;} - .d2-1981788603 .fill-N7{fill:#FFFFFF;} - .d2-1981788603 .fill-B1{fill:#0D32B2;} - .d2-1981788603 .fill-B2{fill:#0D32B2;} - .d2-1981788603 .fill-B3{fill:#E3E9FD;} - .d2-1981788603 .fill-B4{fill:#E3E9FD;} - .d2-1981788603 .fill-B5{fill:#EDF0FD;} - .d2-1981788603 .fill-B6{fill:#F7F8FE;} - .d2-1981788603 .fill-AA2{fill:#4A6FF3;} - .d2-1981788603 .fill-AA4{fill:#EDF0FD;} - .d2-1981788603 .fill-AA5{fill:#F7F8FE;} - .d2-1981788603 .fill-AB4{fill:#EDF0FD;} - .d2-1981788603 .fill-AB5{fill:#F7F8FE;} - .d2-1981788603 .stroke-N1{stroke:#0A0F25;} - .d2-1981788603 .stroke-N2{stroke:#676C7E;} - .d2-1981788603 .stroke-N3{stroke:#9499AB;} - .d2-1981788603 .stroke-N4{stroke:#CFD2DD;} - .d2-1981788603 .stroke-N5{stroke:#DEE1EB;} - .d2-1981788603 .stroke-N6{stroke:#EEF1F8;} - .d2-1981788603 .stroke-N7{stroke:#FFFFFF;} - .d2-1981788603 .stroke-B1{stroke:#0D32B2;} - .d2-1981788603 .stroke-B2{stroke:#0D32B2;} - .d2-1981788603 .stroke-B3{stroke:#E3E9FD;} - .d2-1981788603 .stroke-B4{stroke:#E3E9FD;} - .d2-1981788603 .stroke-B5{stroke:#EDF0FD;} - .d2-1981788603 .stroke-B6{stroke:#F7F8FE;} - .d2-1981788603 .stroke-AA2{stroke:#4A6FF3;} - .d2-1981788603 .stroke-AA4{stroke:#EDF0FD;} - .d2-1981788603 .stroke-AA5{stroke:#F7F8FE;} - .d2-1981788603 .stroke-AB4{stroke:#EDF0FD;} - .d2-1981788603 .stroke-AB5{stroke:#F7F8FE;} - .d2-1981788603 .background-color-N1{background-color:#0A0F25;} - .d2-1981788603 .background-color-N2{background-color:#676C7E;} - .d2-1981788603 .background-color-N3{background-color:#9499AB;} - .d2-1981788603 .background-color-N4{background-color:#CFD2DD;} - .d2-1981788603 .background-color-N5{background-color:#DEE1EB;} - .d2-1981788603 .background-color-N6{background-color:#EEF1F8;} - .d2-1981788603 .background-color-N7{background-color:#FFFFFF;} - .d2-1981788603 .background-color-B1{background-color:#0D32B2;} - .d2-1981788603 .background-color-B2{background-color:#0D32B2;} - .d2-1981788603 .background-color-B3{background-color:#E3E9FD;} - .d2-1981788603 .background-color-B4{background-color:#E3E9FD;} - .d2-1981788603 .background-color-B5{background-color:#EDF0FD;} - .d2-1981788603 .background-color-B6{background-color:#F7F8FE;} - .d2-1981788603 .background-color-AA2{background-color:#4A6FF3;} - .d2-1981788603 .background-color-AA4{background-color:#EDF0FD;} - .d2-1981788603 .background-color-AA5{background-color:#F7F8FE;} - .d2-1981788603 .background-color-AB4{background-color:#EDF0FD;} - .d2-1981788603 .background-color-AB5{background-color:#F7F8FE;} - .d2-1981788603 .color-N1{color:#0A0F25;} - .d2-1981788603 .color-N2{color:#676C7E;} - .d2-1981788603 .color-N3{color:#9499AB;} - .d2-1981788603 .color-N4{color:#CFD2DD;} - .d2-1981788603 .color-N5{color:#DEE1EB;} - .d2-1981788603 .color-N6{color:#EEF1F8;} - .d2-1981788603 .color-N7{color:#FFFFFF;} - .d2-1981788603 .color-B1{color:#0D32B2;} - .d2-1981788603 .color-B2{color:#0D32B2;} - .d2-1981788603 .color-B3{color:#E3E9FD;} - .d2-1981788603 .color-B4{color:#E3E9FD;} - .d2-1981788603 .color-B5{color:#EDF0FD;} - .d2-1981788603 .color-B6{color:#F7F8FE;} - .d2-1981788603 .color-AA2{color:#4A6FF3;} - .d2-1981788603 .color-AA4{color:#EDF0FD;} - .d2-1981788603 .color-AA5{color:#F7F8FE;} - .d2-1981788603 .color-AB4{color:#EDF0FD;} - .d2-1981788603 .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 .fill-N1{fill:#0A0F25;} .d2-486037045 .fill-N2{fill:#676C7E;} .d2-486037045 .fill-N3{fill:#9499AB;} @@ -259,14 +96,7 @@ .d2-486037045 .color-AA4{color:#EDF0FD;} .d2-486037045 .color-AA5{color:#F7F8FE;} .d2-486037045 .color-AB4{color:#EDF0FD;} -<<<<<<< HEAD - .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 ->>>>>>> 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) + .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 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 fae24fb33..e7b587e8a 100644 --- a/e2etests/testdata/stable/giant_markdown_test/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/giant_markdown_test/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -gridcell 1cell 2cell 3abcefdg -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-658062648 .fill-N1{fill:#0A0F25;} - .d2-658062648 .fill-N2{fill:#676C7E;} - .d2-658062648 .fill-N3{fill:#9499AB;} - .d2-658062648 .fill-N4{fill:#CFD2DD;} - .d2-658062648 .fill-N5{fill:#DEE1EB;} - .d2-658062648 .fill-N6{fill:#EEF1F8;} - .d2-658062648 .fill-N7{fill:#FFFFFF;} - .d2-658062648 .fill-B1{fill:#0D32B2;} - .d2-658062648 .fill-B2{fill:#0D32B2;} - .d2-658062648 .fill-B3{fill:#E3E9FD;} - .d2-658062648 .fill-B4{fill:#E3E9FD;} - .d2-658062648 .fill-B5{fill:#EDF0FD;} - .d2-658062648 .fill-B6{fill:#F7F8FE;} - .d2-658062648 .fill-AA2{fill:#4A6FF3;} - .d2-658062648 .fill-AA4{fill:#EDF0FD;} - .d2-658062648 .fill-AA5{fill:#F7F8FE;} - .d2-658062648 .fill-AB4{fill:#EDF0FD;} - .d2-658062648 .fill-AB5{fill:#F7F8FE;} - .d2-658062648 .stroke-N1{stroke:#0A0F25;} - .d2-658062648 .stroke-N2{stroke:#676C7E;} - .d2-658062648 .stroke-N3{stroke:#9499AB;} - .d2-658062648 .stroke-N4{stroke:#CFD2DD;} - .d2-658062648 .stroke-N5{stroke:#DEE1EB;} - .d2-658062648 .stroke-N6{stroke:#EEF1F8;} - .d2-658062648 .stroke-N7{stroke:#FFFFFF;} - .d2-658062648 .stroke-B1{stroke:#0D32B2;} - .d2-658062648 .stroke-B2{stroke:#0D32B2;} - .d2-658062648 .stroke-B3{stroke:#E3E9FD;} - .d2-658062648 .stroke-B4{stroke:#E3E9FD;} - .d2-658062648 .stroke-B5{stroke:#EDF0FD;} - .d2-658062648 .stroke-B6{stroke:#F7F8FE;} - .d2-658062648 .stroke-AA2{stroke:#4A6FF3;} - .d2-658062648 .stroke-AA4{stroke:#EDF0FD;} - .d2-658062648 .stroke-AA5{stroke:#F7F8FE;} - .d2-658062648 .stroke-AB4{stroke:#EDF0FD;} - .d2-658062648 .stroke-AB5{stroke:#F7F8FE;} - .d2-658062648 .background-color-N1{background-color:#0A0F25;} - .d2-658062648 .background-color-N2{background-color:#676C7E;} - .d2-658062648 .background-color-N3{background-color:#9499AB;} - .d2-658062648 .background-color-N4{background-color:#CFD2DD;} - .d2-658062648 .background-color-N5{background-color:#DEE1EB;} - .d2-658062648 .background-color-N6{background-color:#EEF1F8;} - .d2-658062648 .background-color-N7{background-color:#FFFFFF;} - .d2-658062648 .background-color-B1{background-color:#0D32B2;} - .d2-658062648 .background-color-B2{background-color:#0D32B2;} - .d2-658062648 .background-color-B3{background-color:#E3E9FD;} - .d2-658062648 .background-color-B4{background-color:#E3E9FD;} - .d2-658062648 .background-color-B5{background-color:#EDF0FD;} - .d2-658062648 .background-color-B6{background-color:#F7F8FE;} - .d2-658062648 .background-color-AA2{background-color:#4A6FF3;} - .d2-658062648 .background-color-AA4{background-color:#EDF0FD;} - .d2-658062648 .background-color-AA5{background-color:#F7F8FE;} - .d2-658062648 .background-color-AB4{background-color:#EDF0FD;} - .d2-658062648 .background-color-AB5{background-color:#F7F8FE;} - .d2-658062648 .color-N1{color:#0A0F25;} - .d2-658062648 .color-N2{color:#676C7E;} - .d2-658062648 .color-N3{color:#9499AB;} - .d2-658062648 .color-N4{color:#CFD2DD;} - .d2-658062648 .color-N5{color:#DEE1EB;} - .d2-658062648 .color-N6{color:#EEF1F8;} - .d2-658062648 .color-N7{color:#FFFFFF;} - .d2-658062648 .color-B1{color:#0D32B2;} - .d2-658062648 .color-B2{color:#0D32B2;} - .d2-658062648 .color-B3{color:#E3E9FD;} - .d2-658062648 .color-B4{color:#E3E9FD;} - .d2-658062648 .color-B5{color:#EDF0FD;} - .d2-658062648 .color-B6{color:#F7F8FE;} - .d2-658062648 .color-AA2{color:#4A6FF3;} - .d2-658062648 .color-AA4{color:#EDF0FD;} - .d2-658062648 .color-AA5{color:#F7F8FE;} - .d2-658062648 .color-AB4{color:#EDF0FD;} - .d2-658062648 .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}]]>gridcell 1cell 2cell 3abcefdg -======= .d2-3064456510 .fill-N1{fill:#0A0F25;} .d2-3064456510 .fill-N2{fill:#676C7E;} .d2-3064456510 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-3064456510 .color-AA4{color:#EDF0FD;} .d2-3064456510 .color-AA5{color:#F7F8FE;} .d2-3064456510 .color-AB4{color:#EDF0FD;} - .d2-3064456510 .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}]]>gridcell 1cell 2cell 3abcefdg ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-3064456510 .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}]]>gridcell 1cell 2cell 3abcefdg diff --git a/e2etests/testdata/stable/grid_edge_across_cell/elk/sketch.exp.svg b/e2etests/testdata/stable/grid_edge_across_cell/elk/sketch.exp.svg index 18959eeaa..e6ac57fe3 100644 --- a/e2etests/testdata/stable/grid_edge_across_cell/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_edge_across_cell/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -gridcell 1cell 2cell 3abcefdg -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-2418558348 .fill-N1{fill:#0A0F25;} - .d2-2418558348 .fill-N2{fill:#676C7E;} - .d2-2418558348 .fill-N3{fill:#9499AB;} - .d2-2418558348 .fill-N4{fill:#CFD2DD;} - .d2-2418558348 .fill-N5{fill:#DEE1EB;} - .d2-2418558348 .fill-N6{fill:#EEF1F8;} - .d2-2418558348 .fill-N7{fill:#FFFFFF;} - .d2-2418558348 .fill-B1{fill:#0D32B2;} - .d2-2418558348 .fill-B2{fill:#0D32B2;} - .d2-2418558348 .fill-B3{fill:#E3E9FD;} - .d2-2418558348 .fill-B4{fill:#E3E9FD;} - .d2-2418558348 .fill-B5{fill:#EDF0FD;} - .d2-2418558348 .fill-B6{fill:#F7F8FE;} - .d2-2418558348 .fill-AA2{fill:#4A6FF3;} - .d2-2418558348 .fill-AA4{fill:#EDF0FD;} - .d2-2418558348 .fill-AA5{fill:#F7F8FE;} - .d2-2418558348 .fill-AB4{fill:#EDF0FD;} - .d2-2418558348 .fill-AB5{fill:#F7F8FE;} - .d2-2418558348 .stroke-N1{stroke:#0A0F25;} - .d2-2418558348 .stroke-N2{stroke:#676C7E;} - .d2-2418558348 .stroke-N3{stroke:#9499AB;} - .d2-2418558348 .stroke-N4{stroke:#CFD2DD;} - .d2-2418558348 .stroke-N5{stroke:#DEE1EB;} - .d2-2418558348 .stroke-N6{stroke:#EEF1F8;} - .d2-2418558348 .stroke-N7{stroke:#FFFFFF;} - .d2-2418558348 .stroke-B1{stroke:#0D32B2;} - .d2-2418558348 .stroke-B2{stroke:#0D32B2;} - .d2-2418558348 .stroke-B3{stroke:#E3E9FD;} - .d2-2418558348 .stroke-B4{stroke:#E3E9FD;} - .d2-2418558348 .stroke-B5{stroke:#EDF0FD;} - .d2-2418558348 .stroke-B6{stroke:#F7F8FE;} - .d2-2418558348 .stroke-AA2{stroke:#4A6FF3;} - .d2-2418558348 .stroke-AA4{stroke:#EDF0FD;} - .d2-2418558348 .stroke-AA5{stroke:#F7F8FE;} - .d2-2418558348 .stroke-AB4{stroke:#EDF0FD;} - .d2-2418558348 .stroke-AB5{stroke:#F7F8FE;} - .d2-2418558348 .background-color-N1{background-color:#0A0F25;} - .d2-2418558348 .background-color-N2{background-color:#676C7E;} - .d2-2418558348 .background-color-N3{background-color:#9499AB;} - .d2-2418558348 .background-color-N4{background-color:#CFD2DD;} - .d2-2418558348 .background-color-N5{background-color:#DEE1EB;} - .d2-2418558348 .background-color-N6{background-color:#EEF1F8;} - .d2-2418558348 .background-color-N7{background-color:#FFFFFF;} - .d2-2418558348 .background-color-B1{background-color:#0D32B2;} - .d2-2418558348 .background-color-B2{background-color:#0D32B2;} - .d2-2418558348 .background-color-B3{background-color:#E3E9FD;} - .d2-2418558348 .background-color-B4{background-color:#E3E9FD;} - .d2-2418558348 .background-color-B5{background-color:#EDF0FD;} - .d2-2418558348 .background-color-B6{background-color:#F7F8FE;} - .d2-2418558348 .background-color-AA2{background-color:#4A6FF3;} - .d2-2418558348 .background-color-AA4{background-color:#EDF0FD;} - .d2-2418558348 .background-color-AA5{background-color:#F7F8FE;} - .d2-2418558348 .background-color-AB4{background-color:#EDF0FD;} - .d2-2418558348 .background-color-AB5{background-color:#F7F8FE;} - .d2-2418558348 .color-N1{color:#0A0F25;} - .d2-2418558348 .color-N2{color:#676C7E;} - .d2-2418558348 .color-N3{color:#9499AB;} - .d2-2418558348 .color-N4{color:#CFD2DD;} - .d2-2418558348 .color-N5{color:#DEE1EB;} - .d2-2418558348 .color-N6{color:#EEF1F8;} - .d2-2418558348 .color-N7{color:#FFFFFF;} - .d2-2418558348 .color-B1{color:#0D32B2;} - .d2-2418558348 .color-B2{color:#0D32B2;} - .d2-2418558348 .color-B3{color:#E3E9FD;} - .d2-2418558348 .color-B4{color:#E3E9FD;} - .d2-2418558348 .color-B5{color:#EDF0FD;} - .d2-2418558348 .color-B6{color:#F7F8FE;} - .d2-2418558348 .color-AA2{color:#4A6FF3;} - .d2-2418558348 .color-AA4{color:#EDF0FD;} - .d2-2418558348 .color-AA5{color:#F7F8FE;} - .d2-2418558348 .color-AB4{color:#EDF0FD;} - .d2-2418558348 .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}]]>gridcell 1cell 2cell 3abcefdg -======= .d2-2681609462 .fill-N1{fill:#0A0F25;} .d2-2681609462 .fill-N2{fill:#676C7E;} .d2-2681609462 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-2681609462 .color-AA4{color:#EDF0FD;} .d2-2681609462 .color-AA5{color:#F7F8FE;} .d2-2681609462 .color-AB4{color:#EDF0FD;} - .d2-2681609462 .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}]]>gridcell 1cell 2cell 3abcefdg ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-2681609462 .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}]]>gridcell 1cell 2cell 3abcefdg diff --git a/e2etests/testdata/stable/grid_label_positions/dagre/sketch.exp.svg b/e2etests/testdata/stable/grid_label_positions/dagre/sketch.exp.svg index e78491035..6bc473245 100644 --- a/e2etests/testdata/stable/grid_label_positions/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_label_positions/dagre/sketch.exp.svg @@ -1,52 +1,16 @@ -<<<<<<< HEAD -<<<<<<< HEAD -OutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopTopLeftTopCenterTopRightOutsideRightTopOutsideLeftCenterCenterLeftCenterCenterCenterRightOutsideRightCenterOutsideLeftBottomBottomLeftBottomCenterBottomRightOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghij -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-3312924885 .fill-N1{fill:#0A0F25;} - .d2-3312924885 .fill-N2{fill:#676C7E;} - .d2-3312924885 .fill-N3{fill:#9499AB;} - .d2-3312924885 .fill-N4{fill:#CFD2DD;} - .d2-3312924885 .fill-N5{fill:#DEE1EB;} - .d2-3312924885 .fill-N6{fill:#EEF1F8;} - .d2-3312924885 .fill-N7{fill:#FFFFFF;} - .d2-3312924885 .fill-B1{fill:#0D32B2;} - .d2-3312924885 .fill-B2{fill:#0D32B2;} - .d2-3312924885 .fill-B3{fill:#E3E9FD;} - .d2-3312924885 .fill-B4{fill:#E3E9FD;} - .d2-3312924885 .fill-B5{fill:#EDF0FD;} - .d2-3312924885 .fill-B6{fill:#F7F8FE;} - .d2-3312924885 .fill-AA2{fill:#4A6FF3;} - .d2-3312924885 .fill-AA4{fill:#EDF0FD;} - .d2-3312924885 .fill-AA5{fill:#F7F8FE;} - .d2-3312924885 .fill-AB4{fill:#EDF0FD;} - .d2-3312924885 .fill-AB5{fill:#F7F8FE;} - .d2-3312924885 .stroke-N1{stroke:#0A0F25;} - .d2-3312924885 .stroke-N2{stroke:#676C7E;} - .d2-3312924885 .stroke-N3{stroke:#9499AB;} - .d2-3312924885 .stroke-N4{stroke:#CFD2DD;} - .d2-3312924885 .stroke-N5{stroke:#DEE1EB;} - .d2-3312924885 .stroke-N6{stroke:#EEF1F8;} - .d2-3312924885 .stroke-N7{stroke:#FFFFFF;} - .d2-3312924885 .stroke-B1{stroke:#0D32B2;} - .d2-3312924885 .stroke-B2{stroke:#0D32B2;} - .d2-3312924885 .stroke-B3{stroke:#E3E9FD;} - .d2-3312924885 .stroke-B4{stroke:#E3E9FD;} - .d2-3312924885 .stroke-B5{stroke:#EDF0FD;} - .d2-3312924885 .stroke-B6{stroke:#F7F8FE;} - .d2-3312924885 .stroke-AA2{stroke:#4A6FF3;} - .d2-3312924885 .stroke-AA4{stroke:#EDF0FD;} - .d2-3312924885 .stroke-AA5{stroke:#F7F8FE;} - .d2-3312924885 .stroke-AB4{stroke:#EDF0FD;} - .d2-3312924885 .stroke-AB5{stroke:#F7F8FE;} - .d2-3312924885 .background-color-N1{background-color:#0A0F25;} - .d2-3312924885 .background-color-N2{background-color:#676C7E;} - .d2-3312924885 .background-color-N3{background-color:#9499AB;} - .d2-3312924885 .background-color-N4{background-color:#CFD2DD;} - .d2-3312924885 .background-color-N5{background-color:#DEE1EB;} - .d2-3312924885 .background-color-N6{background-color:#EEF1F8;} - .d2-3312924885 .background-color-N7{background-color:#FFFFFF;} - .d2-3312924885 .background-color-B1{background-color:#0D32B2;} - .d2-3312924885 .background-color-B2{background-color:#0D32B2;} - .d2-3312924885 .background-color-B3{background-color:#E3E9FD;} - .d2-3312924885 .background-color-B4{background-color:#E3E9FD;} - .d2-3312924885 .background-color-B5{background-color:#EDF0FD;} - .d2-3312924885 .background-color-B6{background-color:#F7F8FE;} - .d2-3312924885 .background-color-AA2{background-color:#4A6FF3;} - .d2-3312924885 .background-color-AA4{background-color:#EDF0FD;} - .d2-3312924885 .background-color-AA5{background-color:#F7F8FE;} - .d2-3312924885 .background-color-AB4{background-color:#EDF0FD;} - .d2-3312924885 .background-color-AB5{background-color:#F7F8FE;} - .d2-3312924885 .color-N1{color:#0A0F25;} - .d2-3312924885 .color-N2{color:#676C7E;} - .d2-3312924885 .color-N3{color:#9499AB;} - .d2-3312924885 .color-N4{color:#CFD2DD;} - .d2-3312924885 .color-N5{color:#DEE1EB;} - .d2-3312924885 .color-N6{color:#EEF1F8;} - .d2-3312924885 .color-N7{color:#FFFFFF;} - .d2-3312924885 .color-B1{color:#0D32B2;} - .d2-3312924885 .color-B2{color:#0D32B2;} - .d2-3312924885 .color-B3{color:#E3E9FD;} - .d2-3312924885 .color-B4{color:#E3E9FD;} - .d2-3312924885 .color-B5{color:#EDF0FD;} - .d2-3312924885 .color-B6{color:#F7F8FE;} - .d2-3312924885 .color-AA2{color:#4A6FF3;} - .d2-3312924885 .color-AA4{color:#EDF0FD;} - .d2-3312924885 .color-AA5{color:#F7F8FE;} - .d2-3312924885 .color-AB4{color:#EDF0FD;} - .d2-3312924885 .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}]]>OutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopTopLeftTopCenterTopRightOutsideRightTopOutsideLeftCenterCenterLeftCenterCenterCenterRightOutsideRightCenterOutsideLeftBottomBottomLeftBottomCenterBottomRightOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightaaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbbbcccccccccccccccccccccdddddddddddddddddddddeeeeeeeeeeeeeeeeeeeeefffffffffffffffffffffggggggggggggggggggggghhhhhhhhhhhhhhhhhhhhhiiiiiiiiiiiiiiiiiiiiijjjjjjjjjjjjjjjjjjjjj -======= - .d2-21467065 .fill-N1{fill:#0A0F25;} - .d2-21467065 .fill-N2{fill:#676C7E;} - .d2-21467065 .fill-N3{fill:#9499AB;} - .d2-21467065 .fill-N4{fill:#CFD2DD;} - .d2-21467065 .fill-N5{fill:#DEE1EB;} - .d2-21467065 .fill-N6{fill:#EEF1F8;} - .d2-21467065 .fill-N7{fill:#FFFFFF;} - .d2-21467065 .fill-B1{fill:#0D32B2;} - .d2-21467065 .fill-B2{fill:#0D32B2;} - .d2-21467065 .fill-B3{fill:#E3E9FD;} - .d2-21467065 .fill-B4{fill:#E3E9FD;} - .d2-21467065 .fill-B5{fill:#EDF0FD;} - .d2-21467065 .fill-B6{fill:#F7F8FE;} - .d2-21467065 .fill-AA2{fill:#4A6FF3;} - .d2-21467065 .fill-AA4{fill:#EDF0FD;} - .d2-21467065 .fill-AA5{fill:#F7F8FE;} - .d2-21467065 .fill-AB4{fill:#EDF0FD;} - .d2-21467065 .fill-AB5{fill:#F7F8FE;} - .d2-21467065 .stroke-N1{stroke:#0A0F25;} - .d2-21467065 .stroke-N2{stroke:#676C7E;} - .d2-21467065 .stroke-N3{stroke:#9499AB;} - .d2-21467065 .stroke-N4{stroke:#CFD2DD;} - .d2-21467065 .stroke-N5{stroke:#DEE1EB;} - .d2-21467065 .stroke-N6{stroke:#EEF1F8;} - .d2-21467065 .stroke-N7{stroke:#FFFFFF;} - .d2-21467065 .stroke-B1{stroke:#0D32B2;} - .d2-21467065 .stroke-B2{stroke:#0D32B2;} - .d2-21467065 .stroke-B3{stroke:#E3E9FD;} - .d2-21467065 .stroke-B4{stroke:#E3E9FD;} - .d2-21467065 .stroke-B5{stroke:#EDF0FD;} - .d2-21467065 .stroke-B6{stroke:#F7F8FE;} - .d2-21467065 .stroke-AA2{stroke:#4A6FF3;} - .d2-21467065 .stroke-AA4{stroke:#EDF0FD;} - .d2-21467065 .stroke-AA5{stroke:#F7F8FE;} - .d2-21467065 .stroke-AB4{stroke:#EDF0FD;} - .d2-21467065 .stroke-AB5{stroke:#F7F8FE;} - .d2-21467065 .background-color-N1{background-color:#0A0F25;} - .d2-21467065 .background-color-N2{background-color:#676C7E;} - .d2-21467065 .background-color-N3{background-color:#9499AB;} - .d2-21467065 .background-color-N4{background-color:#CFD2DD;} - .d2-21467065 .background-color-N5{background-color:#DEE1EB;} - .d2-21467065 .background-color-N6{background-color:#EEF1F8;} - .d2-21467065 .background-color-N7{background-color:#FFFFFF;} - .d2-21467065 .background-color-B1{background-color:#0D32B2;} - .d2-21467065 .background-color-B2{background-color:#0D32B2;} - .d2-21467065 .background-color-B3{background-color:#E3E9FD;} - .d2-21467065 .background-color-B4{background-color:#E3E9FD;} - .d2-21467065 .background-color-B5{background-color:#EDF0FD;} - .d2-21467065 .background-color-B6{background-color:#F7F8FE;} - .d2-21467065 .background-color-AA2{background-color:#4A6FF3;} - .d2-21467065 .background-color-AA4{background-color:#EDF0FD;} - .d2-21467065 .background-color-AA5{background-color:#F7F8FE;} - .d2-21467065 .background-color-AB4{background-color:#EDF0FD;} - .d2-21467065 .background-color-AB5{background-color:#F7F8FE;} - .d2-21467065 .color-N1{color:#0A0F25;} - .d2-21467065 .color-N2{color:#676C7E;} - .d2-21467065 .color-N3{color:#9499AB;} - .d2-21467065 .color-N4{color:#CFD2DD;} - .d2-21467065 .color-N5{color:#DEE1EB;} - .d2-21467065 .color-N6{color:#EEF1F8;} - .d2-21467065 .color-N7{color:#FFFFFF;} - .d2-21467065 .color-B1{color:#0D32B2;} - .d2-21467065 .color-B2{color:#0D32B2;} - .d2-21467065 .color-B3{color:#E3E9FD;} - .d2-21467065 .color-B4{color:#E3E9FD;} - .d2-21467065 .color-B5{color:#EDF0FD;} - .d2-21467065 .color-B6{color:#F7F8FE;} - .d2-21467065 .color-AA2{color:#4A6FF3;} - .d2-21467065 .color-AA4{color:#EDF0FD;} - .d2-21467065 .color-AA5{color:#F7F8FE;} - .d2-21467065 .color-AB4{color:#EDF0FD;} - .d2-21467065 .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}]]>OutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopTopLeftTopCenterTopRightOutsideRightTopOutsideLeftCenterCenterLeftCenterCenterCenterRightOutsideRightCenterOutsideLeftBottomBottomLeftBottomCenterBottomRightOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightaaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbbbcccccccccccccccccccccdddddddddddddddddddddeeeeeeeeeeeeeeeeeeeeefffffffffffffffffffffggggggggggggggggggggghhhhhhhhhhhhhhhhhhhhhiiiiiiiiiiiiiiiiiiiiijjjjjjjjjjjjjjjjjjjjj ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-3006468073 .fill-N1{fill:#0A0F25;} + .d2-3006468073 .fill-N2{fill:#676C7E;} + .d2-3006468073 .fill-N3{fill:#9499AB;} + .d2-3006468073 .fill-N4{fill:#CFD2DD;} + .d2-3006468073 .fill-N5{fill:#DEE1EB;} + .d2-3006468073 .fill-N6{fill:#EEF1F8;} + .d2-3006468073 .fill-N7{fill:#FFFFFF;} + .d2-3006468073 .fill-B1{fill:#0D32B2;} + .d2-3006468073 .fill-B2{fill:#0D32B2;} + .d2-3006468073 .fill-B3{fill:#E3E9FD;} + .d2-3006468073 .fill-B4{fill:#E3E9FD;} + .d2-3006468073 .fill-B5{fill:#EDF0FD;} + .d2-3006468073 .fill-B6{fill:#F7F8FE;} + .d2-3006468073 .fill-AA2{fill:#4A6FF3;} + .d2-3006468073 .fill-AA4{fill:#EDF0FD;} + .d2-3006468073 .fill-AA5{fill:#F7F8FE;} + .d2-3006468073 .fill-AB4{fill:#EDF0FD;} + .d2-3006468073 .fill-AB5{fill:#F7F8FE;} + .d2-3006468073 .stroke-N1{stroke:#0A0F25;} + .d2-3006468073 .stroke-N2{stroke:#676C7E;} + .d2-3006468073 .stroke-N3{stroke:#9499AB;} + .d2-3006468073 .stroke-N4{stroke:#CFD2DD;} + .d2-3006468073 .stroke-N5{stroke:#DEE1EB;} + .d2-3006468073 .stroke-N6{stroke:#EEF1F8;} + .d2-3006468073 .stroke-N7{stroke:#FFFFFF;} + .d2-3006468073 .stroke-B1{stroke:#0D32B2;} + .d2-3006468073 .stroke-B2{stroke:#0D32B2;} + .d2-3006468073 .stroke-B3{stroke:#E3E9FD;} + .d2-3006468073 .stroke-B4{stroke:#E3E9FD;} + .d2-3006468073 .stroke-B5{stroke:#EDF0FD;} + .d2-3006468073 .stroke-B6{stroke:#F7F8FE;} + .d2-3006468073 .stroke-AA2{stroke:#4A6FF3;} + .d2-3006468073 .stroke-AA4{stroke:#EDF0FD;} + .d2-3006468073 .stroke-AA5{stroke:#F7F8FE;} + .d2-3006468073 .stroke-AB4{stroke:#EDF0FD;} + .d2-3006468073 .stroke-AB5{stroke:#F7F8FE;} + .d2-3006468073 .background-color-N1{background-color:#0A0F25;} + .d2-3006468073 .background-color-N2{background-color:#676C7E;} + .d2-3006468073 .background-color-N3{background-color:#9499AB;} + .d2-3006468073 .background-color-N4{background-color:#CFD2DD;} + .d2-3006468073 .background-color-N5{background-color:#DEE1EB;} + .d2-3006468073 .background-color-N6{background-color:#EEF1F8;} + .d2-3006468073 .background-color-N7{background-color:#FFFFFF;} + .d2-3006468073 .background-color-B1{background-color:#0D32B2;} + .d2-3006468073 .background-color-B2{background-color:#0D32B2;} + .d2-3006468073 .background-color-B3{background-color:#E3E9FD;} + .d2-3006468073 .background-color-B4{background-color:#E3E9FD;} + .d2-3006468073 .background-color-B5{background-color:#EDF0FD;} + .d2-3006468073 .background-color-B6{background-color:#F7F8FE;} + .d2-3006468073 .background-color-AA2{background-color:#4A6FF3;} + .d2-3006468073 .background-color-AA4{background-color:#EDF0FD;} + .d2-3006468073 .background-color-AA5{background-color:#F7F8FE;} + .d2-3006468073 .background-color-AB4{background-color:#EDF0FD;} + .d2-3006468073 .background-color-AB5{background-color:#F7F8FE;} + .d2-3006468073 .color-N1{color:#0A0F25;} + .d2-3006468073 .color-N2{color:#676C7E;} + .d2-3006468073 .color-N3{color:#9499AB;} + .d2-3006468073 .color-N4{color:#CFD2DD;} + .d2-3006468073 .color-N5{color:#DEE1EB;} + .d2-3006468073 .color-N6{color:#EEF1F8;} + .d2-3006468073 .color-N7{color:#FFFFFF;} + .d2-3006468073 .color-B1{color:#0D32B2;} + .d2-3006468073 .color-B2{color:#0D32B2;} + .d2-3006468073 .color-B3{color:#E3E9FD;} + .d2-3006468073 .color-B4{color:#E3E9FD;} + .d2-3006468073 .color-B5{color:#EDF0FD;} + .d2-3006468073 .color-B6{color:#F7F8FE;} + .d2-3006468073 .color-AA2{color:#4A6FF3;} + .d2-3006468073 .color-AA4{color:#EDF0FD;} + .d2-3006468073 .color-AA5{color:#F7F8FE;} + .d2-3006468073 .color-AB4{color:#EDF0FD;} + .d2-3006468073 .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}]]>OutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopTopLeftTopCenterTopRightOutsideRightTopOutsideLeftCenterCenterLeftCenterCenterCenterRightOutsideRightCenterOutsideLeftBottomBottomLeftBottomCenterBottomRightOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghij diff --git a/e2etests/testdata/stable/grid_label_positions/elk/sketch.exp.svg b/e2etests/testdata/stable/grid_label_positions/elk/sketch.exp.svg index a6b5b01e4..b35b00319 100644 --- a/e2etests/testdata/stable/grid_label_positions/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_label_positions/elk/sketch.exp.svg @@ -1,52 +1,16 @@ -<<<<<<< HEAD -<<<<<<< HEAD -OutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopTopLeftTopCenterTopRightOutsideRightTopOutsideLeftCenterCenterLeftCenterCenterCenterRightOutsideRightCenterOutsideLeftBottomBottomLeftBottomCenterBottomRightOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghij -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-1511710467 .fill-N1{fill:#0A0F25;} - .d2-1511710467 .fill-N2{fill:#676C7E;} - .d2-1511710467 .fill-N3{fill:#9499AB;} - .d2-1511710467 .fill-N4{fill:#CFD2DD;} - .d2-1511710467 .fill-N5{fill:#DEE1EB;} - .d2-1511710467 .fill-N6{fill:#EEF1F8;} - .d2-1511710467 .fill-N7{fill:#FFFFFF;} - .d2-1511710467 .fill-B1{fill:#0D32B2;} - .d2-1511710467 .fill-B2{fill:#0D32B2;} - .d2-1511710467 .fill-B3{fill:#E3E9FD;} - .d2-1511710467 .fill-B4{fill:#E3E9FD;} - .d2-1511710467 .fill-B5{fill:#EDF0FD;} - .d2-1511710467 .fill-B6{fill:#F7F8FE;} - .d2-1511710467 .fill-AA2{fill:#4A6FF3;} - .d2-1511710467 .fill-AA4{fill:#EDF0FD;} - .d2-1511710467 .fill-AA5{fill:#F7F8FE;} - .d2-1511710467 .fill-AB4{fill:#EDF0FD;} - .d2-1511710467 .fill-AB5{fill:#F7F8FE;} - .d2-1511710467 .stroke-N1{stroke:#0A0F25;} - .d2-1511710467 .stroke-N2{stroke:#676C7E;} - .d2-1511710467 .stroke-N3{stroke:#9499AB;} - .d2-1511710467 .stroke-N4{stroke:#CFD2DD;} - .d2-1511710467 .stroke-N5{stroke:#DEE1EB;} - .d2-1511710467 .stroke-N6{stroke:#EEF1F8;} - .d2-1511710467 .stroke-N7{stroke:#FFFFFF;} - .d2-1511710467 .stroke-B1{stroke:#0D32B2;} - .d2-1511710467 .stroke-B2{stroke:#0D32B2;} - .d2-1511710467 .stroke-B3{stroke:#E3E9FD;} - .d2-1511710467 .stroke-B4{stroke:#E3E9FD;} - .d2-1511710467 .stroke-B5{stroke:#EDF0FD;} - .d2-1511710467 .stroke-B6{stroke:#F7F8FE;} - .d2-1511710467 .stroke-AA2{stroke:#4A6FF3;} - .d2-1511710467 .stroke-AA4{stroke:#EDF0FD;} - .d2-1511710467 .stroke-AA5{stroke:#F7F8FE;} - .d2-1511710467 .stroke-AB4{stroke:#EDF0FD;} - .d2-1511710467 .stroke-AB5{stroke:#F7F8FE;} - .d2-1511710467 .background-color-N1{background-color:#0A0F25;} - .d2-1511710467 .background-color-N2{background-color:#676C7E;} - .d2-1511710467 .background-color-N3{background-color:#9499AB;} - .d2-1511710467 .background-color-N4{background-color:#CFD2DD;} - .d2-1511710467 .background-color-N5{background-color:#DEE1EB;} - .d2-1511710467 .background-color-N6{background-color:#EEF1F8;} - .d2-1511710467 .background-color-N7{background-color:#FFFFFF;} - .d2-1511710467 .background-color-B1{background-color:#0D32B2;} - .d2-1511710467 .background-color-B2{background-color:#0D32B2;} - .d2-1511710467 .background-color-B3{background-color:#E3E9FD;} - .d2-1511710467 .background-color-B4{background-color:#E3E9FD;} - .d2-1511710467 .background-color-B5{background-color:#EDF0FD;} - .d2-1511710467 .background-color-B6{background-color:#F7F8FE;} - .d2-1511710467 .background-color-AA2{background-color:#4A6FF3;} - .d2-1511710467 .background-color-AA4{background-color:#EDF0FD;} - .d2-1511710467 .background-color-AA5{background-color:#F7F8FE;} - .d2-1511710467 .background-color-AB4{background-color:#EDF0FD;} - .d2-1511710467 .background-color-AB5{background-color:#F7F8FE;} - .d2-1511710467 .color-N1{color:#0A0F25;} - .d2-1511710467 .color-N2{color:#676C7E;} - .d2-1511710467 .color-N3{color:#9499AB;} - .d2-1511710467 .color-N4{color:#CFD2DD;} - .d2-1511710467 .color-N5{color:#DEE1EB;} - .d2-1511710467 .color-N6{color:#EEF1F8;} - .d2-1511710467 .color-N7{color:#FFFFFF;} - .d2-1511710467 .color-B1{color:#0D32B2;} - .d2-1511710467 .color-B2{color:#0D32B2;} - .d2-1511710467 .color-B3{color:#E3E9FD;} - .d2-1511710467 .color-B4{color:#E3E9FD;} - .d2-1511710467 .color-B5{color:#EDF0FD;} - .d2-1511710467 .color-B6{color:#F7F8FE;} - .d2-1511710467 .color-AA2{color:#4A6FF3;} - .d2-1511710467 .color-AA4{color:#EDF0FD;} - .d2-1511710467 .color-AA5{color:#F7F8FE;} - .d2-1511710467 .color-AB4{color:#EDF0FD;} - .d2-1511710467 .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}]]>OutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopTopLeftTopCenterTopRightOutsideRightTopOutsideLeftCenterCenterLeftCenterCenterCenterRightOutsideRightCenterOutsideLeftBottomBottomLeftBottomCenterBottomRightOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightaaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbbbcccccccccccccccccccccdddddddddddddddddddddeeeeeeeeeeeeeeeeeeeeefffffffffffffffffffffggggggggggggggggggggghhhhhhhhhhhhhhhhhhhhhiiiiiiiiiiiiiiiiiiiiijjjjjjjjjjjjjjjjjjjjj -======= - .d2-133537183 .fill-N1{fill:#0A0F25;} - .d2-133537183 .fill-N2{fill:#676C7E;} - .d2-133537183 .fill-N3{fill:#9499AB;} - .d2-133537183 .fill-N4{fill:#CFD2DD;} - .d2-133537183 .fill-N5{fill:#DEE1EB;} - .d2-133537183 .fill-N6{fill:#EEF1F8;} - .d2-133537183 .fill-N7{fill:#FFFFFF;} - .d2-133537183 .fill-B1{fill:#0D32B2;} - .d2-133537183 .fill-B2{fill:#0D32B2;} - .d2-133537183 .fill-B3{fill:#E3E9FD;} - .d2-133537183 .fill-B4{fill:#E3E9FD;} - .d2-133537183 .fill-B5{fill:#EDF0FD;} - .d2-133537183 .fill-B6{fill:#F7F8FE;} - .d2-133537183 .fill-AA2{fill:#4A6FF3;} - .d2-133537183 .fill-AA4{fill:#EDF0FD;} - .d2-133537183 .fill-AA5{fill:#F7F8FE;} - .d2-133537183 .fill-AB4{fill:#EDF0FD;} - .d2-133537183 .fill-AB5{fill:#F7F8FE;} - .d2-133537183 .stroke-N1{stroke:#0A0F25;} - .d2-133537183 .stroke-N2{stroke:#676C7E;} - .d2-133537183 .stroke-N3{stroke:#9499AB;} - .d2-133537183 .stroke-N4{stroke:#CFD2DD;} - .d2-133537183 .stroke-N5{stroke:#DEE1EB;} - .d2-133537183 .stroke-N6{stroke:#EEF1F8;} - .d2-133537183 .stroke-N7{stroke:#FFFFFF;} - .d2-133537183 .stroke-B1{stroke:#0D32B2;} - .d2-133537183 .stroke-B2{stroke:#0D32B2;} - .d2-133537183 .stroke-B3{stroke:#E3E9FD;} - .d2-133537183 .stroke-B4{stroke:#E3E9FD;} - .d2-133537183 .stroke-B5{stroke:#EDF0FD;} - .d2-133537183 .stroke-B6{stroke:#F7F8FE;} - .d2-133537183 .stroke-AA2{stroke:#4A6FF3;} - .d2-133537183 .stroke-AA4{stroke:#EDF0FD;} - .d2-133537183 .stroke-AA5{stroke:#F7F8FE;} - .d2-133537183 .stroke-AB4{stroke:#EDF0FD;} - .d2-133537183 .stroke-AB5{stroke:#F7F8FE;} - .d2-133537183 .background-color-N1{background-color:#0A0F25;} - .d2-133537183 .background-color-N2{background-color:#676C7E;} - .d2-133537183 .background-color-N3{background-color:#9499AB;} - .d2-133537183 .background-color-N4{background-color:#CFD2DD;} - .d2-133537183 .background-color-N5{background-color:#DEE1EB;} - .d2-133537183 .background-color-N6{background-color:#EEF1F8;} - .d2-133537183 .background-color-N7{background-color:#FFFFFF;} - .d2-133537183 .background-color-B1{background-color:#0D32B2;} - .d2-133537183 .background-color-B2{background-color:#0D32B2;} - .d2-133537183 .background-color-B3{background-color:#E3E9FD;} - .d2-133537183 .background-color-B4{background-color:#E3E9FD;} - .d2-133537183 .background-color-B5{background-color:#EDF0FD;} - .d2-133537183 .background-color-B6{background-color:#F7F8FE;} - .d2-133537183 .background-color-AA2{background-color:#4A6FF3;} - .d2-133537183 .background-color-AA4{background-color:#EDF0FD;} - .d2-133537183 .background-color-AA5{background-color:#F7F8FE;} - .d2-133537183 .background-color-AB4{background-color:#EDF0FD;} - .d2-133537183 .background-color-AB5{background-color:#F7F8FE;} - .d2-133537183 .color-N1{color:#0A0F25;} - .d2-133537183 .color-N2{color:#676C7E;} - .d2-133537183 .color-N3{color:#9499AB;} - .d2-133537183 .color-N4{color:#CFD2DD;} - .d2-133537183 .color-N5{color:#DEE1EB;} - .d2-133537183 .color-N6{color:#EEF1F8;} - .d2-133537183 .color-N7{color:#FFFFFF;} - .d2-133537183 .color-B1{color:#0D32B2;} - .d2-133537183 .color-B2{color:#0D32B2;} - .d2-133537183 .color-B3{color:#E3E9FD;} - .d2-133537183 .color-B4{color:#E3E9FD;} - .d2-133537183 .color-B5{color:#EDF0FD;} - .d2-133537183 .color-B6{color:#F7F8FE;} - .d2-133537183 .color-AA2{color:#4A6FF3;} - .d2-133537183 .color-AA4{color:#EDF0FD;} - .d2-133537183 .color-AA5{color:#F7F8FE;} - .d2-133537183 .color-AB4{color:#EDF0FD;} - .d2-133537183 .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}]]>OutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopTopLeftTopCenterTopRightOutsideRightTopOutsideLeftCenterCenterLeftCenterCenterCenterRightOutsideRightCenterOutsideLeftBottomBottomLeftBottomCenterBottomRightOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightaaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbbbcccccccccccccccccccccdddddddddddddddddddddeeeeeeeeeeeeeeeeeeeeefffffffffffffffffffffggggggggggggggggggggghhhhhhhhhhhhhhhhhhhhhiiiiiiiiiiiiiiiiiiiiijjjjjjjjjjjjjjjjjjjjj ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-1289720173 .fill-N1{fill:#0A0F25;} + .d2-1289720173 .fill-N2{fill:#676C7E;} + .d2-1289720173 .fill-N3{fill:#9499AB;} + .d2-1289720173 .fill-N4{fill:#CFD2DD;} + .d2-1289720173 .fill-N5{fill:#DEE1EB;} + .d2-1289720173 .fill-N6{fill:#EEF1F8;} + .d2-1289720173 .fill-N7{fill:#FFFFFF;} + .d2-1289720173 .fill-B1{fill:#0D32B2;} + .d2-1289720173 .fill-B2{fill:#0D32B2;} + .d2-1289720173 .fill-B3{fill:#E3E9FD;} + .d2-1289720173 .fill-B4{fill:#E3E9FD;} + .d2-1289720173 .fill-B5{fill:#EDF0FD;} + .d2-1289720173 .fill-B6{fill:#F7F8FE;} + .d2-1289720173 .fill-AA2{fill:#4A6FF3;} + .d2-1289720173 .fill-AA4{fill:#EDF0FD;} + .d2-1289720173 .fill-AA5{fill:#F7F8FE;} + .d2-1289720173 .fill-AB4{fill:#EDF0FD;} + .d2-1289720173 .fill-AB5{fill:#F7F8FE;} + .d2-1289720173 .stroke-N1{stroke:#0A0F25;} + .d2-1289720173 .stroke-N2{stroke:#676C7E;} + .d2-1289720173 .stroke-N3{stroke:#9499AB;} + .d2-1289720173 .stroke-N4{stroke:#CFD2DD;} + .d2-1289720173 .stroke-N5{stroke:#DEE1EB;} + .d2-1289720173 .stroke-N6{stroke:#EEF1F8;} + .d2-1289720173 .stroke-N7{stroke:#FFFFFF;} + .d2-1289720173 .stroke-B1{stroke:#0D32B2;} + .d2-1289720173 .stroke-B2{stroke:#0D32B2;} + .d2-1289720173 .stroke-B3{stroke:#E3E9FD;} + .d2-1289720173 .stroke-B4{stroke:#E3E9FD;} + .d2-1289720173 .stroke-B5{stroke:#EDF0FD;} + .d2-1289720173 .stroke-B6{stroke:#F7F8FE;} + .d2-1289720173 .stroke-AA2{stroke:#4A6FF3;} + .d2-1289720173 .stroke-AA4{stroke:#EDF0FD;} + .d2-1289720173 .stroke-AA5{stroke:#F7F8FE;} + .d2-1289720173 .stroke-AB4{stroke:#EDF0FD;} + .d2-1289720173 .stroke-AB5{stroke:#F7F8FE;} + .d2-1289720173 .background-color-N1{background-color:#0A0F25;} + .d2-1289720173 .background-color-N2{background-color:#676C7E;} + .d2-1289720173 .background-color-N3{background-color:#9499AB;} + .d2-1289720173 .background-color-N4{background-color:#CFD2DD;} + .d2-1289720173 .background-color-N5{background-color:#DEE1EB;} + .d2-1289720173 .background-color-N6{background-color:#EEF1F8;} + .d2-1289720173 .background-color-N7{background-color:#FFFFFF;} + .d2-1289720173 .background-color-B1{background-color:#0D32B2;} + .d2-1289720173 .background-color-B2{background-color:#0D32B2;} + .d2-1289720173 .background-color-B3{background-color:#E3E9FD;} + .d2-1289720173 .background-color-B4{background-color:#E3E9FD;} + .d2-1289720173 .background-color-B5{background-color:#EDF0FD;} + .d2-1289720173 .background-color-B6{background-color:#F7F8FE;} + .d2-1289720173 .background-color-AA2{background-color:#4A6FF3;} + .d2-1289720173 .background-color-AA4{background-color:#EDF0FD;} + .d2-1289720173 .background-color-AA5{background-color:#F7F8FE;} + .d2-1289720173 .background-color-AB4{background-color:#EDF0FD;} + .d2-1289720173 .background-color-AB5{background-color:#F7F8FE;} + .d2-1289720173 .color-N1{color:#0A0F25;} + .d2-1289720173 .color-N2{color:#676C7E;} + .d2-1289720173 .color-N3{color:#9499AB;} + .d2-1289720173 .color-N4{color:#CFD2DD;} + .d2-1289720173 .color-N5{color:#DEE1EB;} + .d2-1289720173 .color-N6{color:#EEF1F8;} + .d2-1289720173 .color-N7{color:#FFFFFF;} + .d2-1289720173 .color-B1{color:#0D32B2;} + .d2-1289720173 .color-B2{color:#0D32B2;} + .d2-1289720173 .color-B3{color:#E3E9FD;} + .d2-1289720173 .color-B4{color:#E3E9FD;} + .d2-1289720173 .color-B5{color:#EDF0FD;} + .d2-1289720173 .color-B6{color:#F7F8FE;} + .d2-1289720173 .color-AA2{color:#4A6FF3;} + .d2-1289720173 .color-AA4{color:#EDF0FD;} + .d2-1289720173 .color-AA5{color:#F7F8FE;} + .d2-1289720173 .color-AB4{color:#EDF0FD;} + .d2-1289720173 .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}]]>OutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopTopLeftTopCenterTopRightOutsideRightTopOutsideLeftCenterCenterLeftCenterCenterCenterRightOutsideRightCenterOutsideLeftBottomBottomLeftBottomCenterBottomRightOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghijabcdefghij diff --git a/e2etests/testdata/stable/grid_nested_simple_edges/dagre/sketch.exp.svg b/e2etests/testdata/stable/grid_nested_simple_edges/dagre/sketch.exp.svg index db85187a1..2b9cc1677 100644 --- a/e2etests/testdata/stable/grid_nested_simple_edges/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_nested_simple_edges/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -outer-gridouter-containerinner-gridcontaineretcgridcontainerabcdegf123123456nested containerh78i -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-383791548 .fill-N1{fill:#0A0F25;} - .d2-383791548 .fill-N2{fill:#676C7E;} - .d2-383791548 .fill-N3{fill:#9499AB;} - .d2-383791548 .fill-N4{fill:#CFD2DD;} - .d2-383791548 .fill-N5{fill:#DEE1EB;} - .d2-383791548 .fill-N6{fill:#EEF1F8;} - .d2-383791548 .fill-N7{fill:#FFFFFF;} - .d2-383791548 .fill-B1{fill:#0D32B2;} - .d2-383791548 .fill-B2{fill:#0D32B2;} - .d2-383791548 .fill-B3{fill:#E3E9FD;} - .d2-383791548 .fill-B4{fill:#E3E9FD;} - .d2-383791548 .fill-B5{fill:#EDF0FD;} - .d2-383791548 .fill-B6{fill:#F7F8FE;} - .d2-383791548 .fill-AA2{fill:#4A6FF3;} - .d2-383791548 .fill-AA4{fill:#EDF0FD;} - .d2-383791548 .fill-AA5{fill:#F7F8FE;} - .d2-383791548 .fill-AB4{fill:#EDF0FD;} - .d2-383791548 .fill-AB5{fill:#F7F8FE;} - .d2-383791548 .stroke-N1{stroke:#0A0F25;} - .d2-383791548 .stroke-N2{stroke:#676C7E;} - .d2-383791548 .stroke-N3{stroke:#9499AB;} - .d2-383791548 .stroke-N4{stroke:#CFD2DD;} - .d2-383791548 .stroke-N5{stroke:#DEE1EB;} - .d2-383791548 .stroke-N6{stroke:#EEF1F8;} - .d2-383791548 .stroke-N7{stroke:#FFFFFF;} - .d2-383791548 .stroke-B1{stroke:#0D32B2;} - .d2-383791548 .stroke-B2{stroke:#0D32B2;} - .d2-383791548 .stroke-B3{stroke:#E3E9FD;} - .d2-383791548 .stroke-B4{stroke:#E3E9FD;} - .d2-383791548 .stroke-B5{stroke:#EDF0FD;} - .d2-383791548 .stroke-B6{stroke:#F7F8FE;} - .d2-383791548 .stroke-AA2{stroke:#4A6FF3;} - .d2-383791548 .stroke-AA4{stroke:#EDF0FD;} - .d2-383791548 .stroke-AA5{stroke:#F7F8FE;} - .d2-383791548 .stroke-AB4{stroke:#EDF0FD;} - .d2-383791548 .stroke-AB5{stroke:#F7F8FE;} - .d2-383791548 .background-color-N1{background-color:#0A0F25;} - .d2-383791548 .background-color-N2{background-color:#676C7E;} - .d2-383791548 .background-color-N3{background-color:#9499AB;} - .d2-383791548 .background-color-N4{background-color:#CFD2DD;} - .d2-383791548 .background-color-N5{background-color:#DEE1EB;} - .d2-383791548 .background-color-N6{background-color:#EEF1F8;} - .d2-383791548 .background-color-N7{background-color:#FFFFFF;} - .d2-383791548 .background-color-B1{background-color:#0D32B2;} - .d2-383791548 .background-color-B2{background-color:#0D32B2;} - .d2-383791548 .background-color-B3{background-color:#E3E9FD;} - .d2-383791548 .background-color-B4{background-color:#E3E9FD;} - .d2-383791548 .background-color-B5{background-color:#EDF0FD;} - .d2-383791548 .background-color-B6{background-color:#F7F8FE;} - .d2-383791548 .background-color-AA2{background-color:#4A6FF3;} - .d2-383791548 .background-color-AA4{background-color:#EDF0FD;} - .d2-383791548 .background-color-AA5{background-color:#F7F8FE;} - .d2-383791548 .background-color-AB4{background-color:#EDF0FD;} - .d2-383791548 .background-color-AB5{background-color:#F7F8FE;} - .d2-383791548 .color-N1{color:#0A0F25;} - .d2-383791548 .color-N2{color:#676C7E;} - .d2-383791548 .color-N3{color:#9499AB;} - .d2-383791548 .color-N4{color:#CFD2DD;} - .d2-383791548 .color-N5{color:#DEE1EB;} - .d2-383791548 .color-N6{color:#EEF1F8;} - .d2-383791548 .color-N7{color:#FFFFFF;} - .d2-383791548 .color-B1{color:#0D32B2;} - .d2-383791548 .color-B2{color:#0D32B2;} - .d2-383791548 .color-B3{color:#E3E9FD;} - .d2-383791548 .color-B4{color:#E3E9FD;} - .d2-383791548 .color-B5{color:#EDF0FD;} - .d2-383791548 .color-B6{color:#F7F8FE;} - .d2-383791548 .color-AA2{color:#4A6FF3;} - .d2-383791548 .color-AA4{color:#EDF0FD;} - .d2-383791548 .color-AA5{color:#F7F8FE;} - .d2-383791548 .color-AB4{color:#EDF0FD;} - .d2-383791548 .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}]]>outer-gridouter-containerinner-gridcontaineretcgridcontainerabcdegf123123456nested containerh78i -======= .d2-2065775566 .fill-N1{fill:#0A0F25;} .d2-2065775566 .fill-N2{fill:#676C7E;} .d2-2065775566 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-2065775566 .color-AA4{color:#EDF0FD;} .d2-2065775566 .color-AA5{color:#F7F8FE;} .d2-2065775566 .color-AB4{color:#EDF0FD;} - .d2-2065775566 .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}]]>outer-gridouter-containerinner-gridcontaineretcgridcontainerabcdegf123123456nested containerh78i ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-2065775566 .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}]]>outer-gridouter-containerinner-gridcontaineretcgridcontainerabcdegf123123456nested containerh78i diff --git a/e2etests/testdata/stable/grid_nested_simple_edges/elk/sketch.exp.svg b/e2etests/testdata/stable/grid_nested_simple_edges/elk/sketch.exp.svg index a8b359236..b0a52c23b 100644 --- a/e2etests/testdata/stable/grid_nested_simple_edges/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/grid_nested_simple_edges/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -outer-gridouter-containerinner-gridcontaineretcgridcontainerabcdegf123123456nested containerh78i -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-1249027147 .fill-N1{fill:#0A0F25;} - .d2-1249027147 .fill-N2{fill:#676C7E;} - .d2-1249027147 .fill-N3{fill:#9499AB;} - .d2-1249027147 .fill-N4{fill:#CFD2DD;} - .d2-1249027147 .fill-N5{fill:#DEE1EB;} - .d2-1249027147 .fill-N6{fill:#EEF1F8;} - .d2-1249027147 .fill-N7{fill:#FFFFFF;} - .d2-1249027147 .fill-B1{fill:#0D32B2;} - .d2-1249027147 .fill-B2{fill:#0D32B2;} - .d2-1249027147 .fill-B3{fill:#E3E9FD;} - .d2-1249027147 .fill-B4{fill:#E3E9FD;} - .d2-1249027147 .fill-B5{fill:#EDF0FD;} - .d2-1249027147 .fill-B6{fill:#F7F8FE;} - .d2-1249027147 .fill-AA2{fill:#4A6FF3;} - .d2-1249027147 .fill-AA4{fill:#EDF0FD;} - .d2-1249027147 .fill-AA5{fill:#F7F8FE;} - .d2-1249027147 .fill-AB4{fill:#EDF0FD;} - .d2-1249027147 .fill-AB5{fill:#F7F8FE;} - .d2-1249027147 .stroke-N1{stroke:#0A0F25;} - .d2-1249027147 .stroke-N2{stroke:#676C7E;} - .d2-1249027147 .stroke-N3{stroke:#9499AB;} - .d2-1249027147 .stroke-N4{stroke:#CFD2DD;} - .d2-1249027147 .stroke-N5{stroke:#DEE1EB;} - .d2-1249027147 .stroke-N6{stroke:#EEF1F8;} - .d2-1249027147 .stroke-N7{stroke:#FFFFFF;} - .d2-1249027147 .stroke-B1{stroke:#0D32B2;} - .d2-1249027147 .stroke-B2{stroke:#0D32B2;} - .d2-1249027147 .stroke-B3{stroke:#E3E9FD;} - .d2-1249027147 .stroke-B4{stroke:#E3E9FD;} - .d2-1249027147 .stroke-B5{stroke:#EDF0FD;} - .d2-1249027147 .stroke-B6{stroke:#F7F8FE;} - .d2-1249027147 .stroke-AA2{stroke:#4A6FF3;} - .d2-1249027147 .stroke-AA4{stroke:#EDF0FD;} - .d2-1249027147 .stroke-AA5{stroke:#F7F8FE;} - .d2-1249027147 .stroke-AB4{stroke:#EDF0FD;} - .d2-1249027147 .stroke-AB5{stroke:#F7F8FE;} - .d2-1249027147 .background-color-N1{background-color:#0A0F25;} - .d2-1249027147 .background-color-N2{background-color:#676C7E;} - .d2-1249027147 .background-color-N3{background-color:#9499AB;} - .d2-1249027147 .background-color-N4{background-color:#CFD2DD;} - .d2-1249027147 .background-color-N5{background-color:#DEE1EB;} - .d2-1249027147 .background-color-N6{background-color:#EEF1F8;} - .d2-1249027147 .background-color-N7{background-color:#FFFFFF;} - .d2-1249027147 .background-color-B1{background-color:#0D32B2;} - .d2-1249027147 .background-color-B2{background-color:#0D32B2;} - .d2-1249027147 .background-color-B3{background-color:#E3E9FD;} - .d2-1249027147 .background-color-B4{background-color:#E3E9FD;} - .d2-1249027147 .background-color-B5{background-color:#EDF0FD;} - .d2-1249027147 .background-color-B6{background-color:#F7F8FE;} - .d2-1249027147 .background-color-AA2{background-color:#4A6FF3;} - .d2-1249027147 .background-color-AA4{background-color:#EDF0FD;} - .d2-1249027147 .background-color-AA5{background-color:#F7F8FE;} - .d2-1249027147 .background-color-AB4{background-color:#EDF0FD;} - .d2-1249027147 .background-color-AB5{background-color:#F7F8FE;} - .d2-1249027147 .color-N1{color:#0A0F25;} - .d2-1249027147 .color-N2{color:#676C7E;} - .d2-1249027147 .color-N3{color:#9499AB;} - .d2-1249027147 .color-N4{color:#CFD2DD;} - .d2-1249027147 .color-N5{color:#DEE1EB;} - .d2-1249027147 .color-N6{color:#EEF1F8;} - .d2-1249027147 .color-N7{color:#FFFFFF;} - .d2-1249027147 .color-B1{color:#0D32B2;} - .d2-1249027147 .color-B2{color:#0D32B2;} - .d2-1249027147 .color-B3{color:#E3E9FD;} - .d2-1249027147 .color-B4{color:#E3E9FD;} - .d2-1249027147 .color-B5{color:#EDF0FD;} - .d2-1249027147 .color-B6{color:#F7F8FE;} - .d2-1249027147 .color-AA2{color:#4A6FF3;} - .d2-1249027147 .color-AA4{color:#EDF0FD;} - .d2-1249027147 .color-AA5{color:#F7F8FE;} - .d2-1249027147 .color-AB4{color:#EDF0FD;} - .d2-1249027147 .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}]]>outer-gridouter-containerinner-gridcontaineretcgridcontainerabcdegf123123456nested containerh78i -======= .d2-3631546089 .fill-N1{fill:#0A0F25;} .d2-3631546089 .fill-N2{fill:#676C7E;} .d2-3631546089 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-3631546089 .color-AA4{color:#EDF0FD;} .d2-3631546089 .color-AA5{color:#F7F8FE;} .d2-3631546089 .color-AB4{color:#EDF0FD;} - .d2-3631546089 .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}]]>outer-gridouter-containerinner-gridcontaineretcgridcontainerabcdegf123123456nested containerh78i ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-3631546089 .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}]]>outer-gridouter-containerinner-gridcontaineretcgridcontainerabcdegf123123456nested containerh78i diff --git a/e2etests/testdata/stable/hr/dagre/sketch.exp.svg b/e2etests/testdata/stable/hr/dagre/sketch.exp.svg index 5dbc8bfdd..518875ddd 100644 --- a/e2etests/testdata/stable/hr/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/hr/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -non containercontainerimageDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRight -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-2566192971 .fill-N1{fill:#0A0F25;} - .d2-2566192971 .fill-N2{fill:#676C7E;} - .d2-2566192971 .fill-N3{fill:#9499AB;} - .d2-2566192971 .fill-N4{fill:#CFD2DD;} - .d2-2566192971 .fill-N5{fill:#DEE1EB;} - .d2-2566192971 .fill-N6{fill:#EEF1F8;} - .d2-2566192971 .fill-N7{fill:#FFFFFF;} - .d2-2566192971 .fill-B1{fill:#0D32B2;} - .d2-2566192971 .fill-B2{fill:#0D32B2;} - .d2-2566192971 .fill-B3{fill:#E3E9FD;} - .d2-2566192971 .fill-B4{fill:#E3E9FD;} - .d2-2566192971 .fill-B5{fill:#EDF0FD;} - .d2-2566192971 .fill-B6{fill:#F7F8FE;} - .d2-2566192971 .fill-AA2{fill:#4A6FF3;} - .d2-2566192971 .fill-AA4{fill:#EDF0FD;} - .d2-2566192971 .fill-AA5{fill:#F7F8FE;} - .d2-2566192971 .fill-AB4{fill:#EDF0FD;} - .d2-2566192971 .fill-AB5{fill:#F7F8FE;} - .d2-2566192971 .stroke-N1{stroke:#0A0F25;} - .d2-2566192971 .stroke-N2{stroke:#676C7E;} - .d2-2566192971 .stroke-N3{stroke:#9499AB;} - .d2-2566192971 .stroke-N4{stroke:#CFD2DD;} - .d2-2566192971 .stroke-N5{stroke:#DEE1EB;} - .d2-2566192971 .stroke-N6{stroke:#EEF1F8;} - .d2-2566192971 .stroke-N7{stroke:#FFFFFF;} - .d2-2566192971 .stroke-B1{stroke:#0D32B2;} - .d2-2566192971 .stroke-B2{stroke:#0D32B2;} - .d2-2566192971 .stroke-B3{stroke:#E3E9FD;} - .d2-2566192971 .stroke-B4{stroke:#E3E9FD;} - .d2-2566192971 .stroke-B5{stroke:#EDF0FD;} - .d2-2566192971 .stroke-B6{stroke:#F7F8FE;} - .d2-2566192971 .stroke-AA2{stroke:#4A6FF3;} - .d2-2566192971 .stroke-AA4{stroke:#EDF0FD;} - .d2-2566192971 .stroke-AA5{stroke:#F7F8FE;} - .d2-2566192971 .stroke-AB4{stroke:#EDF0FD;} - .d2-2566192971 .stroke-AB5{stroke:#F7F8FE;} - .d2-2566192971 .background-color-N1{background-color:#0A0F25;} - .d2-2566192971 .background-color-N2{background-color:#676C7E;} - .d2-2566192971 .background-color-N3{background-color:#9499AB;} - .d2-2566192971 .background-color-N4{background-color:#CFD2DD;} - .d2-2566192971 .background-color-N5{background-color:#DEE1EB;} - .d2-2566192971 .background-color-N6{background-color:#EEF1F8;} - .d2-2566192971 .background-color-N7{background-color:#FFFFFF;} - .d2-2566192971 .background-color-B1{background-color:#0D32B2;} - .d2-2566192971 .background-color-B2{background-color:#0D32B2;} - .d2-2566192971 .background-color-B3{background-color:#E3E9FD;} - .d2-2566192971 .background-color-B4{background-color:#E3E9FD;} - .d2-2566192971 .background-color-B5{background-color:#EDF0FD;} - .d2-2566192971 .background-color-B6{background-color:#F7F8FE;} - .d2-2566192971 .background-color-AA2{background-color:#4A6FF3;} - .d2-2566192971 .background-color-AA4{background-color:#EDF0FD;} - .d2-2566192971 .background-color-AA5{background-color:#F7F8FE;} - .d2-2566192971 .background-color-AB4{background-color:#EDF0FD;} - .d2-2566192971 .background-color-AB5{background-color:#F7F8FE;} - .d2-2566192971 .color-N1{color:#0A0F25;} - .d2-2566192971 .color-N2{color:#676C7E;} - .d2-2566192971 .color-N3{color:#9499AB;} - .d2-2566192971 .color-N4{color:#CFD2DD;} - .d2-2566192971 .color-N5{color:#DEE1EB;} - .d2-2566192971 .color-N6{color:#EEF1F8;} - .d2-2566192971 .color-N7{color:#FFFFFF;} - .d2-2566192971 .color-B1{color:#0D32B2;} - .d2-2566192971 .color-B2{color:#0D32B2;} - .d2-2566192971 .color-B3{color:#E3E9FD;} - .d2-2566192971 .color-B4{color:#E3E9FD;} - .d2-2566192971 .color-B5{color:#EDF0FD;} - .d2-2566192971 .color-B6{color:#F7F8FE;} - .d2-2566192971 .color-AA2{color:#4A6FF3;} - .d2-2566192971 .color-AA4{color:#EDF0FD;} - .d2-2566192971 .color-AA5{color:#F7F8FE;} - .d2-2566192971 .color-AB4{color:#EDF0FD;} - .d2-2566192971 .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}]]>non containercontainerimageDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRight -======= .d2-3363565171 .fill-N1{fill:#0A0F25;} .d2-3363565171 .fill-N2{fill:#676C7E;} .d2-3363565171 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-3363565171 .color-AA4{color:#EDF0FD;} .d2-3363565171 .color-AA5{color:#F7F8FE;} .d2-3363565171 .color-AB4{color:#EDF0FD;} - .d2-3363565171 .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}]]>non containercontainerimageDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRight ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-3363565171 .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}]]>non containercontainerimageDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRight diff --git a/e2etests/testdata/stable/icon_positions/elk/sketch.exp.svg b/e2etests/testdata/stable/icon_positions/elk/sketch.exp.svg index 4b7882def..2140f6165 100644 --- a/e2etests/testdata/stable/icon_positions/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/icon_positions/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -non containercontainerimageDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRight -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-3768176013 .fill-N1{fill:#0A0F25;} - .d2-3768176013 .fill-N2{fill:#676C7E;} - .d2-3768176013 .fill-N3{fill:#9499AB;} - .d2-3768176013 .fill-N4{fill:#CFD2DD;} - .d2-3768176013 .fill-N5{fill:#DEE1EB;} - .d2-3768176013 .fill-N6{fill:#EEF1F8;} - .d2-3768176013 .fill-N7{fill:#FFFFFF;} - .d2-3768176013 .fill-B1{fill:#0D32B2;} - .d2-3768176013 .fill-B2{fill:#0D32B2;} - .d2-3768176013 .fill-B3{fill:#E3E9FD;} - .d2-3768176013 .fill-B4{fill:#E3E9FD;} - .d2-3768176013 .fill-B5{fill:#EDF0FD;} - .d2-3768176013 .fill-B6{fill:#F7F8FE;} - .d2-3768176013 .fill-AA2{fill:#4A6FF3;} - .d2-3768176013 .fill-AA4{fill:#EDF0FD;} - .d2-3768176013 .fill-AA5{fill:#F7F8FE;} - .d2-3768176013 .fill-AB4{fill:#EDF0FD;} - .d2-3768176013 .fill-AB5{fill:#F7F8FE;} - .d2-3768176013 .stroke-N1{stroke:#0A0F25;} - .d2-3768176013 .stroke-N2{stroke:#676C7E;} - .d2-3768176013 .stroke-N3{stroke:#9499AB;} - .d2-3768176013 .stroke-N4{stroke:#CFD2DD;} - .d2-3768176013 .stroke-N5{stroke:#DEE1EB;} - .d2-3768176013 .stroke-N6{stroke:#EEF1F8;} - .d2-3768176013 .stroke-N7{stroke:#FFFFFF;} - .d2-3768176013 .stroke-B1{stroke:#0D32B2;} - .d2-3768176013 .stroke-B2{stroke:#0D32B2;} - .d2-3768176013 .stroke-B3{stroke:#E3E9FD;} - .d2-3768176013 .stroke-B4{stroke:#E3E9FD;} - .d2-3768176013 .stroke-B5{stroke:#EDF0FD;} - .d2-3768176013 .stroke-B6{stroke:#F7F8FE;} - .d2-3768176013 .stroke-AA2{stroke:#4A6FF3;} - .d2-3768176013 .stroke-AA4{stroke:#EDF0FD;} - .d2-3768176013 .stroke-AA5{stroke:#F7F8FE;} - .d2-3768176013 .stroke-AB4{stroke:#EDF0FD;} - .d2-3768176013 .stroke-AB5{stroke:#F7F8FE;} - .d2-3768176013 .background-color-N1{background-color:#0A0F25;} - .d2-3768176013 .background-color-N2{background-color:#676C7E;} - .d2-3768176013 .background-color-N3{background-color:#9499AB;} - .d2-3768176013 .background-color-N4{background-color:#CFD2DD;} - .d2-3768176013 .background-color-N5{background-color:#DEE1EB;} - .d2-3768176013 .background-color-N6{background-color:#EEF1F8;} - .d2-3768176013 .background-color-N7{background-color:#FFFFFF;} - .d2-3768176013 .background-color-B1{background-color:#0D32B2;} - .d2-3768176013 .background-color-B2{background-color:#0D32B2;} - .d2-3768176013 .background-color-B3{background-color:#E3E9FD;} - .d2-3768176013 .background-color-B4{background-color:#E3E9FD;} - .d2-3768176013 .background-color-B5{background-color:#EDF0FD;} - .d2-3768176013 .background-color-B6{background-color:#F7F8FE;} - .d2-3768176013 .background-color-AA2{background-color:#4A6FF3;} - .d2-3768176013 .background-color-AA4{background-color:#EDF0FD;} - .d2-3768176013 .background-color-AA5{background-color:#F7F8FE;} - .d2-3768176013 .background-color-AB4{background-color:#EDF0FD;} - .d2-3768176013 .background-color-AB5{background-color:#F7F8FE;} - .d2-3768176013 .color-N1{color:#0A0F25;} - .d2-3768176013 .color-N2{color:#676C7E;} - .d2-3768176013 .color-N3{color:#9499AB;} - .d2-3768176013 .color-N4{color:#CFD2DD;} - .d2-3768176013 .color-N5{color:#DEE1EB;} - .d2-3768176013 .color-N6{color:#EEF1F8;} - .d2-3768176013 .color-N7{color:#FFFFFF;} - .d2-3768176013 .color-B1{color:#0D32B2;} - .d2-3768176013 .color-B2{color:#0D32B2;} - .d2-3768176013 .color-B3{color:#E3E9FD;} - .d2-3768176013 .color-B4{color:#E3E9FD;} - .d2-3768176013 .color-B5{color:#EDF0FD;} - .d2-3768176013 .color-B6{color:#F7F8FE;} - .d2-3768176013 .color-AA2{color:#4A6FF3;} - .d2-3768176013 .color-AA4{color:#EDF0FD;} - .d2-3768176013 .color-AA5{color:#F7F8FE;} - .d2-3768176013 .color-AB4{color:#EDF0FD;} - .d2-3768176013 .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}]]>non containercontainerimageDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRight -======= .d2-2563151469 .fill-N1{fill:#0A0F25;} .d2-2563151469 .fill-N2{fill:#676C7E;} .d2-2563151469 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-2563151469 .color-AA4{color:#EDF0FD;} .d2-2563151469 .color-AA5{color:#F7F8FE;} .d2-2563151469 .color-AB4{color:#EDF0FD;} - .d2-2563151469 .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}]]>non containercontainerimageDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRight ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-2563151469 .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}]]>non containercontainerimageDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRight diff --git a/e2etests/testdata/stable/images/dagre/sketch.exp.svg b/e2etests/testdata/stable/images/dagre/sketch.exp.svg index ae1650cf6..d181f3335 100644 --- a/e2etests/testdata/stable/images/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/images/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -ab -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-4027458821 .fill-N1{fill:#0A0F25;} - .d2-4027458821 .fill-N2{fill:#676C7E;} - .d2-4027458821 .fill-N3{fill:#9499AB;} - .d2-4027458821 .fill-N4{fill:#CFD2DD;} - .d2-4027458821 .fill-N5{fill:#DEE1EB;} - .d2-4027458821 .fill-N6{fill:#EEF1F8;} - .d2-4027458821 .fill-N7{fill:#FFFFFF;} - .d2-4027458821 .fill-B1{fill:#0D32B2;} - .d2-4027458821 .fill-B2{fill:#0D32B2;} - .d2-4027458821 .fill-B3{fill:#E3E9FD;} - .d2-4027458821 .fill-B4{fill:#E3E9FD;} - .d2-4027458821 .fill-B5{fill:#EDF0FD;} - .d2-4027458821 .fill-B6{fill:#F7F8FE;} - .d2-4027458821 .fill-AA2{fill:#4A6FF3;} - .d2-4027458821 .fill-AA4{fill:#EDF0FD;} - .d2-4027458821 .fill-AA5{fill:#F7F8FE;} - .d2-4027458821 .fill-AB4{fill:#EDF0FD;} - .d2-4027458821 .fill-AB5{fill:#F7F8FE;} - .d2-4027458821 .stroke-N1{stroke:#0A0F25;} - .d2-4027458821 .stroke-N2{stroke:#676C7E;} - .d2-4027458821 .stroke-N3{stroke:#9499AB;} - .d2-4027458821 .stroke-N4{stroke:#CFD2DD;} - .d2-4027458821 .stroke-N5{stroke:#DEE1EB;} - .d2-4027458821 .stroke-N6{stroke:#EEF1F8;} - .d2-4027458821 .stroke-N7{stroke:#FFFFFF;} - .d2-4027458821 .stroke-B1{stroke:#0D32B2;} - .d2-4027458821 .stroke-B2{stroke:#0D32B2;} - .d2-4027458821 .stroke-B3{stroke:#E3E9FD;} - .d2-4027458821 .stroke-B4{stroke:#E3E9FD;} - .d2-4027458821 .stroke-B5{stroke:#EDF0FD;} - .d2-4027458821 .stroke-B6{stroke:#F7F8FE;} - .d2-4027458821 .stroke-AA2{stroke:#4A6FF3;} - .d2-4027458821 .stroke-AA4{stroke:#EDF0FD;} - .d2-4027458821 .stroke-AA5{stroke:#F7F8FE;} - .d2-4027458821 .stroke-AB4{stroke:#EDF0FD;} - .d2-4027458821 .stroke-AB5{stroke:#F7F8FE;} - .d2-4027458821 .background-color-N1{background-color:#0A0F25;} - .d2-4027458821 .background-color-N2{background-color:#676C7E;} - .d2-4027458821 .background-color-N3{background-color:#9499AB;} - .d2-4027458821 .background-color-N4{background-color:#CFD2DD;} - .d2-4027458821 .background-color-N5{background-color:#DEE1EB;} - .d2-4027458821 .background-color-N6{background-color:#EEF1F8;} - .d2-4027458821 .background-color-N7{background-color:#FFFFFF;} - .d2-4027458821 .background-color-B1{background-color:#0D32B2;} - .d2-4027458821 .background-color-B2{background-color:#0D32B2;} - .d2-4027458821 .background-color-B3{background-color:#E3E9FD;} - .d2-4027458821 .background-color-B4{background-color:#E3E9FD;} - .d2-4027458821 .background-color-B5{background-color:#EDF0FD;} - .d2-4027458821 .background-color-B6{background-color:#F7F8FE;} - .d2-4027458821 .background-color-AA2{background-color:#4A6FF3;} - .d2-4027458821 .background-color-AA4{background-color:#EDF0FD;} - .d2-4027458821 .background-color-AA5{background-color:#F7F8FE;} - .d2-4027458821 .background-color-AB4{background-color:#EDF0FD;} - .d2-4027458821 .background-color-AB5{background-color:#F7F8FE;} - .d2-4027458821 .color-N1{color:#0A0F25;} - .d2-4027458821 .color-N2{color:#676C7E;} - .d2-4027458821 .color-N3{color:#9499AB;} - .d2-4027458821 .color-N4{color:#CFD2DD;} - .d2-4027458821 .color-N5{color:#DEE1EB;} - .d2-4027458821 .color-N6{color:#EEF1F8;} - .d2-4027458821 .color-N7{color:#FFFFFF;} - .d2-4027458821 .color-B1{color:#0D32B2;} - .d2-4027458821 .color-B2{color:#0D32B2;} - .d2-4027458821 .color-B3{color:#E3E9FD;} - .d2-4027458821 .color-B4{color:#E3E9FD;} - .d2-4027458821 .color-B5{color:#EDF0FD;} - .d2-4027458821 .color-B6{color:#F7F8FE;} - .d2-4027458821 .color-AA2{color:#4A6FF3;} - .d2-4027458821 .color-AA4{color:#EDF0FD;} - .d2-4027458821 .color-AA5{color:#F7F8FE;} - .d2-4027458821 .color-AB4{color:#EDF0FD;} - .d2-4027458821 .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 -======= .d2-1273604111 .fill-N1{fill:#0A0F25;} .d2-1273604111 .fill-N2{fill:#676C7E;} .d2-1273604111 .fill-N3{fill:#9499AB;} @@ -252,8 +89,7 @@ .d2-1273604111 .color-AA4{color:#EDF0FD;} .d2-1273604111 .color-AA5{color:#F7F8FE;} .d2-1273604111 .color-AB4{color:#EDF0FD;} - .d2-1273604111 .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 ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-1273604111 .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 diff --git a/e2etests/testdata/stable/images/elk/sketch.exp.svg b/e2etests/testdata/stable/images/elk/sketch.exp.svg index ea197e7a4..47457678e 100644 --- a/e2etests/testdata/stable/images/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/images/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -ab -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-733997694 .fill-N1{fill:#0A0F25;} - .d2-733997694 .fill-N2{fill:#676C7E;} - .d2-733997694 .fill-N3{fill:#9499AB;} - .d2-733997694 .fill-N4{fill:#CFD2DD;} - .d2-733997694 .fill-N5{fill:#DEE1EB;} - .d2-733997694 .fill-N6{fill:#EEF1F8;} - .d2-733997694 .fill-N7{fill:#FFFFFF;} - .d2-733997694 .fill-B1{fill:#0D32B2;} - .d2-733997694 .fill-B2{fill:#0D32B2;} - .d2-733997694 .fill-B3{fill:#E3E9FD;} - .d2-733997694 .fill-B4{fill:#E3E9FD;} - .d2-733997694 .fill-B5{fill:#EDF0FD;} - .d2-733997694 .fill-B6{fill:#F7F8FE;} - .d2-733997694 .fill-AA2{fill:#4A6FF3;} - .d2-733997694 .fill-AA4{fill:#EDF0FD;} - .d2-733997694 .fill-AA5{fill:#F7F8FE;} - .d2-733997694 .fill-AB4{fill:#EDF0FD;} - .d2-733997694 .fill-AB5{fill:#F7F8FE;} - .d2-733997694 .stroke-N1{stroke:#0A0F25;} - .d2-733997694 .stroke-N2{stroke:#676C7E;} - .d2-733997694 .stroke-N3{stroke:#9499AB;} - .d2-733997694 .stroke-N4{stroke:#CFD2DD;} - .d2-733997694 .stroke-N5{stroke:#DEE1EB;} - .d2-733997694 .stroke-N6{stroke:#EEF1F8;} - .d2-733997694 .stroke-N7{stroke:#FFFFFF;} - .d2-733997694 .stroke-B1{stroke:#0D32B2;} - .d2-733997694 .stroke-B2{stroke:#0D32B2;} - .d2-733997694 .stroke-B3{stroke:#E3E9FD;} - .d2-733997694 .stroke-B4{stroke:#E3E9FD;} - .d2-733997694 .stroke-B5{stroke:#EDF0FD;} - .d2-733997694 .stroke-B6{stroke:#F7F8FE;} - .d2-733997694 .stroke-AA2{stroke:#4A6FF3;} - .d2-733997694 .stroke-AA4{stroke:#EDF0FD;} - .d2-733997694 .stroke-AA5{stroke:#F7F8FE;} - .d2-733997694 .stroke-AB4{stroke:#EDF0FD;} - .d2-733997694 .stroke-AB5{stroke:#F7F8FE;} - .d2-733997694 .background-color-N1{background-color:#0A0F25;} - .d2-733997694 .background-color-N2{background-color:#676C7E;} - .d2-733997694 .background-color-N3{background-color:#9499AB;} - .d2-733997694 .background-color-N4{background-color:#CFD2DD;} - .d2-733997694 .background-color-N5{background-color:#DEE1EB;} - .d2-733997694 .background-color-N6{background-color:#EEF1F8;} - .d2-733997694 .background-color-N7{background-color:#FFFFFF;} - .d2-733997694 .background-color-B1{background-color:#0D32B2;} - .d2-733997694 .background-color-B2{background-color:#0D32B2;} - .d2-733997694 .background-color-B3{background-color:#E3E9FD;} - .d2-733997694 .background-color-B4{background-color:#E3E9FD;} - .d2-733997694 .background-color-B5{background-color:#EDF0FD;} - .d2-733997694 .background-color-B6{background-color:#F7F8FE;} - .d2-733997694 .background-color-AA2{background-color:#4A6FF3;} - .d2-733997694 .background-color-AA4{background-color:#EDF0FD;} - .d2-733997694 .background-color-AA5{background-color:#F7F8FE;} - .d2-733997694 .background-color-AB4{background-color:#EDF0FD;} - .d2-733997694 .background-color-AB5{background-color:#F7F8FE;} - .d2-733997694 .color-N1{color:#0A0F25;} - .d2-733997694 .color-N2{color:#676C7E;} - .d2-733997694 .color-N3{color:#9499AB;} - .d2-733997694 .color-N4{color:#CFD2DD;} - .d2-733997694 .color-N5{color:#DEE1EB;} - .d2-733997694 .color-N6{color:#EEF1F8;} - .d2-733997694 .color-N7{color:#FFFFFF;} - .d2-733997694 .color-B1{color:#0D32B2;} - .d2-733997694 .color-B2{color:#0D32B2;} - .d2-733997694 .color-B3{color:#E3E9FD;} - .d2-733997694 .color-B4{color:#E3E9FD;} - .d2-733997694 .color-B5{color:#EDF0FD;} - .d2-733997694 .color-B6{color:#F7F8FE;} - .d2-733997694 .color-AA2{color:#4A6FF3;} - .d2-733997694 .color-AA4{color:#EDF0FD;} - .d2-733997694 .color-AA5{color:#F7F8FE;} - .d2-733997694 .color-AB4{color:#EDF0FD;} - .d2-733997694 .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 -======= .d2-3786807752 .fill-N1{fill:#0A0F25;} .d2-3786807752 .fill-N2{fill:#676C7E;} .d2-3786807752 .fill-N3{fill:#9499AB;} @@ -252,8 +89,7 @@ .d2-3786807752 .color-AA4{color:#EDF0FD;} .d2-3786807752 .color-AA5{color:#F7F8FE;} .d2-3786807752 .color-AB4{color:#EDF0FD;} - .d2-3786807752 .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 ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-3786807752 .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 diff --git a/e2etests/testdata/stable/investigate/dagre/sketch.exp.svg b/e2etests/testdata/stable/investigate/dagre/sketch.exp.svg index 5ca796820..92f7aba9d 100644 --- a/e2etests/testdata/stable/investigate/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/investigate/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -aabbccddffiijjkkllnnssuuwwrmyyeegghhmmmmooppqqrrttvvxxzzabac 123456 -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-2604789973 .fill-N1{fill:#0A0F25;} - .d2-2604789973 .fill-N2{fill:#676C7E;} - .d2-2604789973 .fill-N3{fill:#9499AB;} - .d2-2604789973 .fill-N4{fill:#CFD2DD;} - .d2-2604789973 .fill-N5{fill:#DEE1EB;} - .d2-2604789973 .fill-N6{fill:#EEF1F8;} - .d2-2604789973 .fill-N7{fill:#FFFFFF;} - .d2-2604789973 .fill-B1{fill:#0D32B2;} - .d2-2604789973 .fill-B2{fill:#0D32B2;} - .d2-2604789973 .fill-B3{fill:#E3E9FD;} - .d2-2604789973 .fill-B4{fill:#E3E9FD;} - .d2-2604789973 .fill-B5{fill:#EDF0FD;} - .d2-2604789973 .fill-B6{fill:#F7F8FE;} - .d2-2604789973 .fill-AA2{fill:#4A6FF3;} - .d2-2604789973 .fill-AA4{fill:#EDF0FD;} - .d2-2604789973 .fill-AA5{fill:#F7F8FE;} - .d2-2604789973 .fill-AB4{fill:#EDF0FD;} - .d2-2604789973 .fill-AB5{fill:#F7F8FE;} - .d2-2604789973 .stroke-N1{stroke:#0A0F25;} - .d2-2604789973 .stroke-N2{stroke:#676C7E;} - .d2-2604789973 .stroke-N3{stroke:#9499AB;} - .d2-2604789973 .stroke-N4{stroke:#CFD2DD;} - .d2-2604789973 .stroke-N5{stroke:#DEE1EB;} - .d2-2604789973 .stroke-N6{stroke:#EEF1F8;} - .d2-2604789973 .stroke-N7{stroke:#FFFFFF;} - .d2-2604789973 .stroke-B1{stroke:#0D32B2;} - .d2-2604789973 .stroke-B2{stroke:#0D32B2;} - .d2-2604789973 .stroke-B3{stroke:#E3E9FD;} - .d2-2604789973 .stroke-B4{stroke:#E3E9FD;} - .d2-2604789973 .stroke-B5{stroke:#EDF0FD;} - .d2-2604789973 .stroke-B6{stroke:#F7F8FE;} - .d2-2604789973 .stroke-AA2{stroke:#4A6FF3;} - .d2-2604789973 .stroke-AA4{stroke:#EDF0FD;} - .d2-2604789973 .stroke-AA5{stroke:#F7F8FE;} - .d2-2604789973 .stroke-AB4{stroke:#EDF0FD;} - .d2-2604789973 .stroke-AB5{stroke:#F7F8FE;} - .d2-2604789973 .background-color-N1{background-color:#0A0F25;} - .d2-2604789973 .background-color-N2{background-color:#676C7E;} - .d2-2604789973 .background-color-N3{background-color:#9499AB;} - .d2-2604789973 .background-color-N4{background-color:#CFD2DD;} - .d2-2604789973 .background-color-N5{background-color:#DEE1EB;} - .d2-2604789973 .background-color-N6{background-color:#EEF1F8;} - .d2-2604789973 .background-color-N7{background-color:#FFFFFF;} - .d2-2604789973 .background-color-B1{background-color:#0D32B2;} - .d2-2604789973 .background-color-B2{background-color:#0D32B2;} - .d2-2604789973 .background-color-B3{background-color:#E3E9FD;} - .d2-2604789973 .background-color-B4{background-color:#E3E9FD;} - .d2-2604789973 .background-color-B5{background-color:#EDF0FD;} - .d2-2604789973 .background-color-B6{background-color:#F7F8FE;} - .d2-2604789973 .background-color-AA2{background-color:#4A6FF3;} - .d2-2604789973 .background-color-AA4{background-color:#EDF0FD;} - .d2-2604789973 .background-color-AA5{background-color:#F7F8FE;} - .d2-2604789973 .background-color-AB4{background-color:#EDF0FD;} - .d2-2604789973 .background-color-AB5{background-color:#F7F8FE;} - .d2-2604789973 .color-N1{color:#0A0F25;} - .d2-2604789973 .color-N2{color:#676C7E;} - .d2-2604789973 .color-N3{color:#9499AB;} - .d2-2604789973 .color-N4{color:#CFD2DD;} - .d2-2604789973 .color-N5{color:#DEE1EB;} - .d2-2604789973 .color-N6{color:#EEF1F8;} - .d2-2604789973 .color-N7{color:#FFFFFF;} - .d2-2604789973 .color-B1{color:#0D32B2;} - .d2-2604789973 .color-B2{color:#0D32B2;} - .d2-2604789973 .color-B3{color:#E3E9FD;} - .d2-2604789973 .color-B4{color:#E3E9FD;} - .d2-2604789973 .color-B5{color:#EDF0FD;} - .d2-2604789973 .color-B6{color:#F7F8FE;} - .d2-2604789973 .color-AA2{color:#4A6FF3;} - .d2-2604789973 .color-AA4{color:#EDF0FD;} - .d2-2604789973 .color-AA5{color:#F7F8FE;} - .d2-2604789973 .color-AB4{color:#EDF0FD;} - .d2-2604789973 .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}]]>aabbccddffiijjkkllnnssuuwwrmyyeegghhmmmmooppqqrrttvvxxzzabac 123456 -======= .d2-972689705 .fill-N1{fill:#0A0F25;} .d2-972689705 .fill-N2{fill:#676C7E;} .d2-972689705 .fill-N3{fill:#9499AB;} @@ -266,8 +103,7 @@ .d2-972689705 .color-AA4{color:#EDF0FD;} .d2-972689705 .color-AA5{color:#F7F8FE;} .d2-972689705 .color-AB4{color:#EDF0FD;} - .d2-972689705 .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}]]>aabbccddffiijjkkllnnssuuwwrmyyeegghhmmmmooppqqrrttvvxxzzabac 123456 ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-972689705 .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}]]>aabbccddffiijjkkllnnssuuwwrmyyeegghhmmmmooppqqrrttvvxxzzabac 123456 diff --git a/e2etests/testdata/stable/investigate/elk/sketch.exp.svg b/e2etests/testdata/stable/investigate/elk/sketch.exp.svg index 68c199c27..a86309a43 100644 --- a/e2etests/testdata/stable/investigate/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/investigate/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -aabbccddffiijjkkllnnssuuwwrmyyeegghhmmmmooppqqrrttvvxxzzabac 123456 -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-2930989287 .fill-N1{fill:#0A0F25;} - .d2-2930989287 .fill-N2{fill:#676C7E;} - .d2-2930989287 .fill-N3{fill:#9499AB;} - .d2-2930989287 .fill-N4{fill:#CFD2DD;} - .d2-2930989287 .fill-N5{fill:#DEE1EB;} - .d2-2930989287 .fill-N6{fill:#EEF1F8;} - .d2-2930989287 .fill-N7{fill:#FFFFFF;} - .d2-2930989287 .fill-B1{fill:#0D32B2;} - .d2-2930989287 .fill-B2{fill:#0D32B2;} - .d2-2930989287 .fill-B3{fill:#E3E9FD;} - .d2-2930989287 .fill-B4{fill:#E3E9FD;} - .d2-2930989287 .fill-B5{fill:#EDF0FD;} - .d2-2930989287 .fill-B6{fill:#F7F8FE;} - .d2-2930989287 .fill-AA2{fill:#4A6FF3;} - .d2-2930989287 .fill-AA4{fill:#EDF0FD;} - .d2-2930989287 .fill-AA5{fill:#F7F8FE;} - .d2-2930989287 .fill-AB4{fill:#EDF0FD;} - .d2-2930989287 .fill-AB5{fill:#F7F8FE;} - .d2-2930989287 .stroke-N1{stroke:#0A0F25;} - .d2-2930989287 .stroke-N2{stroke:#676C7E;} - .d2-2930989287 .stroke-N3{stroke:#9499AB;} - .d2-2930989287 .stroke-N4{stroke:#CFD2DD;} - .d2-2930989287 .stroke-N5{stroke:#DEE1EB;} - .d2-2930989287 .stroke-N6{stroke:#EEF1F8;} - .d2-2930989287 .stroke-N7{stroke:#FFFFFF;} - .d2-2930989287 .stroke-B1{stroke:#0D32B2;} - .d2-2930989287 .stroke-B2{stroke:#0D32B2;} - .d2-2930989287 .stroke-B3{stroke:#E3E9FD;} - .d2-2930989287 .stroke-B4{stroke:#E3E9FD;} - .d2-2930989287 .stroke-B5{stroke:#EDF0FD;} - .d2-2930989287 .stroke-B6{stroke:#F7F8FE;} - .d2-2930989287 .stroke-AA2{stroke:#4A6FF3;} - .d2-2930989287 .stroke-AA4{stroke:#EDF0FD;} - .d2-2930989287 .stroke-AA5{stroke:#F7F8FE;} - .d2-2930989287 .stroke-AB4{stroke:#EDF0FD;} - .d2-2930989287 .stroke-AB5{stroke:#F7F8FE;} - .d2-2930989287 .background-color-N1{background-color:#0A0F25;} - .d2-2930989287 .background-color-N2{background-color:#676C7E;} - .d2-2930989287 .background-color-N3{background-color:#9499AB;} - .d2-2930989287 .background-color-N4{background-color:#CFD2DD;} - .d2-2930989287 .background-color-N5{background-color:#DEE1EB;} - .d2-2930989287 .background-color-N6{background-color:#EEF1F8;} - .d2-2930989287 .background-color-N7{background-color:#FFFFFF;} - .d2-2930989287 .background-color-B1{background-color:#0D32B2;} - .d2-2930989287 .background-color-B2{background-color:#0D32B2;} - .d2-2930989287 .background-color-B3{background-color:#E3E9FD;} - .d2-2930989287 .background-color-B4{background-color:#E3E9FD;} - .d2-2930989287 .background-color-B5{background-color:#EDF0FD;} - .d2-2930989287 .background-color-B6{background-color:#F7F8FE;} - .d2-2930989287 .background-color-AA2{background-color:#4A6FF3;} - .d2-2930989287 .background-color-AA4{background-color:#EDF0FD;} - .d2-2930989287 .background-color-AA5{background-color:#F7F8FE;} - .d2-2930989287 .background-color-AB4{background-color:#EDF0FD;} - .d2-2930989287 .background-color-AB5{background-color:#F7F8FE;} - .d2-2930989287 .color-N1{color:#0A0F25;} - .d2-2930989287 .color-N2{color:#676C7E;} - .d2-2930989287 .color-N3{color:#9499AB;} - .d2-2930989287 .color-N4{color:#CFD2DD;} - .d2-2930989287 .color-N5{color:#DEE1EB;} - .d2-2930989287 .color-N6{color:#EEF1F8;} - .d2-2930989287 .color-N7{color:#FFFFFF;} - .d2-2930989287 .color-B1{color:#0D32B2;} - .d2-2930989287 .color-B2{color:#0D32B2;} - .d2-2930989287 .color-B3{color:#E3E9FD;} - .d2-2930989287 .color-B4{color:#E3E9FD;} - .d2-2930989287 .color-B5{color:#EDF0FD;} - .d2-2930989287 .color-B6{color:#F7F8FE;} - .d2-2930989287 .color-AA2{color:#4A6FF3;} - .d2-2930989287 .color-AA4{color:#EDF0FD;} - .d2-2930989287 .color-AA5{color:#F7F8FE;} - .d2-2930989287 .color-AB4{color:#EDF0FD;} - .d2-2930989287 .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}]]>aabbccddffiijjkkllnnssuuwwrmyyeegghhmmmmooppqqrrttvvxxzzabac 123456 -======= .d2-465613311 .fill-N1{fill:#0A0F25;} .d2-465613311 .fill-N2{fill:#676C7E;} .d2-465613311 .fill-N3{fill:#9499AB;} @@ -266,8 +103,7 @@ .d2-465613311 .color-AA4{color:#EDF0FD;} .d2-465613311 .color-AA5{color:#F7F8FE;} .d2-465613311 .color-AB4{color:#EDF0FD;} - .d2-465613311 .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}]]>aabbccddffiijjkkllnnssuuwwrmyyeegghhmmmmooppqqrrttvvxxzzabac 123456 ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-465613311 .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}]]>aabbccddffiijjkkllnnssuuwwrmyyeegghhmmmmooppqqrrttvvxxzzabac 123456 diff --git a/e2etests/testdata/stable/label-near/dagre/sketch.exp.svg b/e2etests/testdata/stable/label-near/dagre/sketch.exp.svg index 2c1263b01..0d2e230e4 100644 --- a/e2etests/testdata/stable/label-near/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/label-near/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -workerprofits -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-1582627981 .fill-N1{fill:#0A0F25;} - .d2-1582627981 .fill-N2{fill:#676C7E;} - .d2-1582627981 .fill-N3{fill:#9499AB;} - .d2-1582627981 .fill-N4{fill:#CFD2DD;} - .d2-1582627981 .fill-N5{fill:#DEE1EB;} - .d2-1582627981 .fill-N6{fill:#EEF1F8;} - .d2-1582627981 .fill-N7{fill:#FFFFFF;} - .d2-1582627981 .fill-B1{fill:#0D32B2;} - .d2-1582627981 .fill-B2{fill:#0D32B2;} - .d2-1582627981 .fill-B3{fill:#E3E9FD;} - .d2-1582627981 .fill-B4{fill:#E3E9FD;} - .d2-1582627981 .fill-B5{fill:#EDF0FD;} - .d2-1582627981 .fill-B6{fill:#F7F8FE;} - .d2-1582627981 .fill-AA2{fill:#4A6FF3;} - .d2-1582627981 .fill-AA4{fill:#EDF0FD;} - .d2-1582627981 .fill-AA5{fill:#F7F8FE;} - .d2-1582627981 .fill-AB4{fill:#EDF0FD;} - .d2-1582627981 .fill-AB5{fill:#F7F8FE;} - .d2-1582627981 .stroke-N1{stroke:#0A0F25;} - .d2-1582627981 .stroke-N2{stroke:#676C7E;} - .d2-1582627981 .stroke-N3{stroke:#9499AB;} - .d2-1582627981 .stroke-N4{stroke:#CFD2DD;} - .d2-1582627981 .stroke-N5{stroke:#DEE1EB;} - .d2-1582627981 .stroke-N6{stroke:#EEF1F8;} - .d2-1582627981 .stroke-N7{stroke:#FFFFFF;} - .d2-1582627981 .stroke-B1{stroke:#0D32B2;} - .d2-1582627981 .stroke-B2{stroke:#0D32B2;} - .d2-1582627981 .stroke-B3{stroke:#E3E9FD;} - .d2-1582627981 .stroke-B4{stroke:#E3E9FD;} - .d2-1582627981 .stroke-B5{stroke:#EDF0FD;} - .d2-1582627981 .stroke-B6{stroke:#F7F8FE;} - .d2-1582627981 .stroke-AA2{stroke:#4A6FF3;} - .d2-1582627981 .stroke-AA4{stroke:#EDF0FD;} - .d2-1582627981 .stroke-AA5{stroke:#F7F8FE;} - .d2-1582627981 .stroke-AB4{stroke:#EDF0FD;} - .d2-1582627981 .stroke-AB5{stroke:#F7F8FE;} - .d2-1582627981 .background-color-N1{background-color:#0A0F25;} - .d2-1582627981 .background-color-N2{background-color:#676C7E;} - .d2-1582627981 .background-color-N3{background-color:#9499AB;} - .d2-1582627981 .background-color-N4{background-color:#CFD2DD;} - .d2-1582627981 .background-color-N5{background-color:#DEE1EB;} - .d2-1582627981 .background-color-N6{background-color:#EEF1F8;} - .d2-1582627981 .background-color-N7{background-color:#FFFFFF;} - .d2-1582627981 .background-color-B1{background-color:#0D32B2;} - .d2-1582627981 .background-color-B2{background-color:#0D32B2;} - .d2-1582627981 .background-color-B3{background-color:#E3E9FD;} - .d2-1582627981 .background-color-B4{background-color:#E3E9FD;} - .d2-1582627981 .background-color-B5{background-color:#EDF0FD;} - .d2-1582627981 .background-color-B6{background-color:#F7F8FE;} - .d2-1582627981 .background-color-AA2{background-color:#4A6FF3;} - .d2-1582627981 .background-color-AA4{background-color:#EDF0FD;} - .d2-1582627981 .background-color-AA5{background-color:#F7F8FE;} - .d2-1582627981 .background-color-AB4{background-color:#EDF0FD;} - .d2-1582627981 .background-color-AB5{background-color:#F7F8FE;} - .d2-1582627981 .color-N1{color:#0A0F25;} - .d2-1582627981 .color-N2{color:#676C7E;} - .d2-1582627981 .color-N3{color:#9499AB;} - .d2-1582627981 .color-N4{color:#CFD2DD;} - .d2-1582627981 .color-N5{color:#DEE1EB;} - .d2-1582627981 .color-N6{color:#EEF1F8;} - .d2-1582627981 .color-N7{color:#FFFFFF;} - .d2-1582627981 .color-B1{color:#0D32B2;} - .d2-1582627981 .color-B2{color:#0D32B2;} - .d2-1582627981 .color-B3{color:#E3E9FD;} - .d2-1582627981 .color-B4{color:#E3E9FD;} - .d2-1582627981 .color-B5{color:#EDF0FD;} - .d2-1582627981 .color-B6{color:#F7F8FE;} - .d2-1582627981 .color-AA2{color:#4A6FF3;} - .d2-1582627981 .color-AA4{color:#EDF0FD;} - .d2-1582627981 .color-AA5{color:#F7F8FE;} - .d2-1582627981 .color-AB4{color:#EDF0FD;} - .d2-1582627981 .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}]]>workerprofits -======= .d2-3578601471 .fill-N1{fill:#0A0F25;} .d2-3578601471 .fill-N2{fill:#676C7E;} .d2-3578601471 .fill-N3{fill:#9499AB;} @@ -252,8 +89,7 @@ .d2-3578601471 .color-AA4{color:#EDF0FD;} .d2-3578601471 .color-AA5{color:#F7F8FE;} .d2-3578601471 .color-AB4{color:#EDF0FD;} - .d2-3578601471 .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}]]>workerprofits ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-3578601471 .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}]]>workerprofits diff --git a/e2etests/testdata/stable/label-near/elk/sketch.exp.svg b/e2etests/testdata/stable/label-near/elk/sketch.exp.svg index 422492f4a..4d2c91dbb 100644 --- a/e2etests/testdata/stable/label-near/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/label-near/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -workerprofits -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-1153667598 .fill-N1{fill:#0A0F25;} - .d2-1153667598 .fill-N2{fill:#676C7E;} - .d2-1153667598 .fill-N3{fill:#9499AB;} - .d2-1153667598 .fill-N4{fill:#CFD2DD;} - .d2-1153667598 .fill-N5{fill:#DEE1EB;} - .d2-1153667598 .fill-N6{fill:#EEF1F8;} - .d2-1153667598 .fill-N7{fill:#FFFFFF;} - .d2-1153667598 .fill-B1{fill:#0D32B2;} - .d2-1153667598 .fill-B2{fill:#0D32B2;} - .d2-1153667598 .fill-B3{fill:#E3E9FD;} - .d2-1153667598 .fill-B4{fill:#E3E9FD;} - .d2-1153667598 .fill-B5{fill:#EDF0FD;} - .d2-1153667598 .fill-B6{fill:#F7F8FE;} - .d2-1153667598 .fill-AA2{fill:#4A6FF3;} - .d2-1153667598 .fill-AA4{fill:#EDF0FD;} - .d2-1153667598 .fill-AA5{fill:#F7F8FE;} - .d2-1153667598 .fill-AB4{fill:#EDF0FD;} - .d2-1153667598 .fill-AB5{fill:#F7F8FE;} - .d2-1153667598 .stroke-N1{stroke:#0A0F25;} - .d2-1153667598 .stroke-N2{stroke:#676C7E;} - .d2-1153667598 .stroke-N3{stroke:#9499AB;} - .d2-1153667598 .stroke-N4{stroke:#CFD2DD;} - .d2-1153667598 .stroke-N5{stroke:#DEE1EB;} - .d2-1153667598 .stroke-N6{stroke:#EEF1F8;} - .d2-1153667598 .stroke-N7{stroke:#FFFFFF;} - .d2-1153667598 .stroke-B1{stroke:#0D32B2;} - .d2-1153667598 .stroke-B2{stroke:#0D32B2;} - .d2-1153667598 .stroke-B3{stroke:#E3E9FD;} - .d2-1153667598 .stroke-B4{stroke:#E3E9FD;} - .d2-1153667598 .stroke-B5{stroke:#EDF0FD;} - .d2-1153667598 .stroke-B6{stroke:#F7F8FE;} - .d2-1153667598 .stroke-AA2{stroke:#4A6FF3;} - .d2-1153667598 .stroke-AA4{stroke:#EDF0FD;} - .d2-1153667598 .stroke-AA5{stroke:#F7F8FE;} - .d2-1153667598 .stroke-AB4{stroke:#EDF0FD;} - .d2-1153667598 .stroke-AB5{stroke:#F7F8FE;} - .d2-1153667598 .background-color-N1{background-color:#0A0F25;} - .d2-1153667598 .background-color-N2{background-color:#676C7E;} - .d2-1153667598 .background-color-N3{background-color:#9499AB;} - .d2-1153667598 .background-color-N4{background-color:#CFD2DD;} - .d2-1153667598 .background-color-N5{background-color:#DEE1EB;} - .d2-1153667598 .background-color-N6{background-color:#EEF1F8;} - .d2-1153667598 .background-color-N7{background-color:#FFFFFF;} - .d2-1153667598 .background-color-B1{background-color:#0D32B2;} - .d2-1153667598 .background-color-B2{background-color:#0D32B2;} - .d2-1153667598 .background-color-B3{background-color:#E3E9FD;} - .d2-1153667598 .background-color-B4{background-color:#E3E9FD;} - .d2-1153667598 .background-color-B5{background-color:#EDF0FD;} - .d2-1153667598 .background-color-B6{background-color:#F7F8FE;} - .d2-1153667598 .background-color-AA2{background-color:#4A6FF3;} - .d2-1153667598 .background-color-AA4{background-color:#EDF0FD;} - .d2-1153667598 .background-color-AA5{background-color:#F7F8FE;} - .d2-1153667598 .background-color-AB4{background-color:#EDF0FD;} - .d2-1153667598 .background-color-AB5{background-color:#F7F8FE;} - .d2-1153667598 .color-N1{color:#0A0F25;} - .d2-1153667598 .color-N2{color:#676C7E;} - .d2-1153667598 .color-N3{color:#9499AB;} - .d2-1153667598 .color-N4{color:#CFD2DD;} - .d2-1153667598 .color-N5{color:#DEE1EB;} - .d2-1153667598 .color-N6{color:#EEF1F8;} - .d2-1153667598 .color-N7{color:#FFFFFF;} - .d2-1153667598 .color-B1{color:#0D32B2;} - .d2-1153667598 .color-B2{color:#0D32B2;} - .d2-1153667598 .color-B3{color:#E3E9FD;} - .d2-1153667598 .color-B4{color:#E3E9FD;} - .d2-1153667598 .color-B5{color:#EDF0FD;} - .d2-1153667598 .color-B6{color:#F7F8FE;} - .d2-1153667598 .color-AA2{color:#4A6FF3;} - .d2-1153667598 .color-AA4{color:#EDF0FD;} - .d2-1153667598 .color-AA5{color:#F7F8FE;} - .d2-1153667598 .color-AB4{color:#EDF0FD;} - .d2-1153667598 .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}]]>workerprofits -======= .d2-761476988 .fill-N1{fill:#0A0F25;} .d2-761476988 .fill-N2{fill:#676C7E;} .d2-761476988 .fill-N3{fill:#9499AB;} @@ -252,8 +89,7 @@ .d2-761476988 .color-AA4{color:#EDF0FD;} .d2-761476988 .color-AA5{color:#F7F8FE;} .d2-761476988 .color-AB4{color:#EDF0FD;} - .d2-761476988 .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}]]>workerprofits ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-761476988 .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}]]>workerprofits diff --git a/e2etests/testdata/stable/label_positions/dagre/sketch.exp.svg b/e2etests/testdata/stable/label_positions/dagre/sketch.exp.svg index 453911839..e6830e2df 100644 --- a/e2etests/testdata/stable/label_positions/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/label_positions/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -non containercontainerwith iconcontainer with iconDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRight -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-1304341604 .fill-N1{fill:#0A0F25;} - .d2-1304341604 .fill-N2{fill:#676C7E;} - .d2-1304341604 .fill-N3{fill:#9499AB;} - .d2-1304341604 .fill-N4{fill:#CFD2DD;} - .d2-1304341604 .fill-N5{fill:#DEE1EB;} - .d2-1304341604 .fill-N6{fill:#EEF1F8;} - .d2-1304341604 .fill-N7{fill:#FFFFFF;} - .d2-1304341604 .fill-B1{fill:#0D32B2;} - .d2-1304341604 .fill-B2{fill:#0D32B2;} - .d2-1304341604 .fill-B3{fill:#E3E9FD;} - .d2-1304341604 .fill-B4{fill:#E3E9FD;} - .d2-1304341604 .fill-B5{fill:#EDF0FD;} - .d2-1304341604 .fill-B6{fill:#F7F8FE;} - .d2-1304341604 .fill-AA2{fill:#4A6FF3;} - .d2-1304341604 .fill-AA4{fill:#EDF0FD;} - .d2-1304341604 .fill-AA5{fill:#F7F8FE;} - .d2-1304341604 .fill-AB4{fill:#EDF0FD;} - .d2-1304341604 .fill-AB5{fill:#F7F8FE;} - .d2-1304341604 .stroke-N1{stroke:#0A0F25;} - .d2-1304341604 .stroke-N2{stroke:#676C7E;} - .d2-1304341604 .stroke-N3{stroke:#9499AB;} - .d2-1304341604 .stroke-N4{stroke:#CFD2DD;} - .d2-1304341604 .stroke-N5{stroke:#DEE1EB;} - .d2-1304341604 .stroke-N6{stroke:#EEF1F8;} - .d2-1304341604 .stroke-N7{stroke:#FFFFFF;} - .d2-1304341604 .stroke-B1{stroke:#0D32B2;} - .d2-1304341604 .stroke-B2{stroke:#0D32B2;} - .d2-1304341604 .stroke-B3{stroke:#E3E9FD;} - .d2-1304341604 .stroke-B4{stroke:#E3E9FD;} - .d2-1304341604 .stroke-B5{stroke:#EDF0FD;} - .d2-1304341604 .stroke-B6{stroke:#F7F8FE;} - .d2-1304341604 .stroke-AA2{stroke:#4A6FF3;} - .d2-1304341604 .stroke-AA4{stroke:#EDF0FD;} - .d2-1304341604 .stroke-AA5{stroke:#F7F8FE;} - .d2-1304341604 .stroke-AB4{stroke:#EDF0FD;} - .d2-1304341604 .stroke-AB5{stroke:#F7F8FE;} - .d2-1304341604 .background-color-N1{background-color:#0A0F25;} - .d2-1304341604 .background-color-N2{background-color:#676C7E;} - .d2-1304341604 .background-color-N3{background-color:#9499AB;} - .d2-1304341604 .background-color-N4{background-color:#CFD2DD;} - .d2-1304341604 .background-color-N5{background-color:#DEE1EB;} - .d2-1304341604 .background-color-N6{background-color:#EEF1F8;} - .d2-1304341604 .background-color-N7{background-color:#FFFFFF;} - .d2-1304341604 .background-color-B1{background-color:#0D32B2;} - .d2-1304341604 .background-color-B2{background-color:#0D32B2;} - .d2-1304341604 .background-color-B3{background-color:#E3E9FD;} - .d2-1304341604 .background-color-B4{background-color:#E3E9FD;} - .d2-1304341604 .background-color-B5{background-color:#EDF0FD;} - .d2-1304341604 .background-color-B6{background-color:#F7F8FE;} - .d2-1304341604 .background-color-AA2{background-color:#4A6FF3;} - .d2-1304341604 .background-color-AA4{background-color:#EDF0FD;} - .d2-1304341604 .background-color-AA5{background-color:#F7F8FE;} - .d2-1304341604 .background-color-AB4{background-color:#EDF0FD;} - .d2-1304341604 .background-color-AB5{background-color:#F7F8FE;} - .d2-1304341604 .color-N1{color:#0A0F25;} - .d2-1304341604 .color-N2{color:#676C7E;} - .d2-1304341604 .color-N3{color:#9499AB;} - .d2-1304341604 .color-N4{color:#CFD2DD;} - .d2-1304341604 .color-N5{color:#DEE1EB;} - .d2-1304341604 .color-N6{color:#EEF1F8;} - .d2-1304341604 .color-N7{color:#FFFFFF;} - .d2-1304341604 .color-B1{color:#0D32B2;} - .d2-1304341604 .color-B2{color:#0D32B2;} - .d2-1304341604 .color-B3{color:#E3E9FD;} - .d2-1304341604 .color-B4{color:#E3E9FD;} - .d2-1304341604 .color-B5{color:#EDF0FD;} - .d2-1304341604 .color-B6{color:#F7F8FE;} - .d2-1304341604 .color-AA2{color:#4A6FF3;} - .d2-1304341604 .color-AA4{color:#EDF0FD;} - .d2-1304341604 .color-AA5{color:#F7F8FE;} - .d2-1304341604 .color-AB4{color:#EDF0FD;} - .d2-1304341604 .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}]]>non containercontainerwith iconcontainer with iconDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRight -======= .d2-2638316818 .fill-N1{fill:#0A0F25;} .d2-2638316818 .fill-N2{fill:#676C7E;} .d2-2638316818 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-2638316818 .color-AA4{color:#EDF0FD;} .d2-2638316818 .color-AA5{color:#F7F8FE;} .d2-2638316818 .color-AB4{color:#EDF0FD;} - .d2-2638316818 .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}]]>non containercontainerwith iconcontainer with iconDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRight ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-2638316818 .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}]]>non containercontainerwith iconcontainer with iconDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRight diff --git a/e2etests/testdata/stable/label_positions/elk/sketch.exp.svg b/e2etests/testdata/stable/label_positions/elk/sketch.exp.svg index 6cadc88fd..f006531c2 100644 --- a/e2etests/testdata/stable/label_positions/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/label_positions/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -non containercontainerwith iconcontainer with iconDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRight -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-209688564 .fill-N1{fill:#0A0F25;} - .d2-209688564 .fill-N2{fill:#676C7E;} - .d2-209688564 .fill-N3{fill:#9499AB;} - .d2-209688564 .fill-N4{fill:#CFD2DD;} - .d2-209688564 .fill-N5{fill:#DEE1EB;} - .d2-209688564 .fill-N6{fill:#EEF1F8;} - .d2-209688564 .fill-N7{fill:#FFFFFF;} - .d2-209688564 .fill-B1{fill:#0D32B2;} - .d2-209688564 .fill-B2{fill:#0D32B2;} - .d2-209688564 .fill-B3{fill:#E3E9FD;} - .d2-209688564 .fill-B4{fill:#E3E9FD;} - .d2-209688564 .fill-B5{fill:#EDF0FD;} - .d2-209688564 .fill-B6{fill:#F7F8FE;} - .d2-209688564 .fill-AA2{fill:#4A6FF3;} - .d2-209688564 .fill-AA4{fill:#EDF0FD;} - .d2-209688564 .fill-AA5{fill:#F7F8FE;} - .d2-209688564 .fill-AB4{fill:#EDF0FD;} - .d2-209688564 .fill-AB5{fill:#F7F8FE;} - .d2-209688564 .stroke-N1{stroke:#0A0F25;} - .d2-209688564 .stroke-N2{stroke:#676C7E;} - .d2-209688564 .stroke-N3{stroke:#9499AB;} - .d2-209688564 .stroke-N4{stroke:#CFD2DD;} - .d2-209688564 .stroke-N5{stroke:#DEE1EB;} - .d2-209688564 .stroke-N6{stroke:#EEF1F8;} - .d2-209688564 .stroke-N7{stroke:#FFFFFF;} - .d2-209688564 .stroke-B1{stroke:#0D32B2;} - .d2-209688564 .stroke-B2{stroke:#0D32B2;} - .d2-209688564 .stroke-B3{stroke:#E3E9FD;} - .d2-209688564 .stroke-B4{stroke:#E3E9FD;} - .d2-209688564 .stroke-B5{stroke:#EDF0FD;} - .d2-209688564 .stroke-B6{stroke:#F7F8FE;} - .d2-209688564 .stroke-AA2{stroke:#4A6FF3;} - .d2-209688564 .stroke-AA4{stroke:#EDF0FD;} - .d2-209688564 .stroke-AA5{stroke:#F7F8FE;} - .d2-209688564 .stroke-AB4{stroke:#EDF0FD;} - .d2-209688564 .stroke-AB5{stroke:#F7F8FE;} - .d2-209688564 .background-color-N1{background-color:#0A0F25;} - .d2-209688564 .background-color-N2{background-color:#676C7E;} - .d2-209688564 .background-color-N3{background-color:#9499AB;} - .d2-209688564 .background-color-N4{background-color:#CFD2DD;} - .d2-209688564 .background-color-N5{background-color:#DEE1EB;} - .d2-209688564 .background-color-N6{background-color:#EEF1F8;} - .d2-209688564 .background-color-N7{background-color:#FFFFFF;} - .d2-209688564 .background-color-B1{background-color:#0D32B2;} - .d2-209688564 .background-color-B2{background-color:#0D32B2;} - .d2-209688564 .background-color-B3{background-color:#E3E9FD;} - .d2-209688564 .background-color-B4{background-color:#E3E9FD;} - .d2-209688564 .background-color-B5{background-color:#EDF0FD;} - .d2-209688564 .background-color-B6{background-color:#F7F8FE;} - .d2-209688564 .background-color-AA2{background-color:#4A6FF3;} - .d2-209688564 .background-color-AA4{background-color:#EDF0FD;} - .d2-209688564 .background-color-AA5{background-color:#F7F8FE;} - .d2-209688564 .background-color-AB4{background-color:#EDF0FD;} - .d2-209688564 .background-color-AB5{background-color:#F7F8FE;} - .d2-209688564 .color-N1{color:#0A0F25;} - .d2-209688564 .color-N2{color:#676C7E;} - .d2-209688564 .color-N3{color:#9499AB;} - .d2-209688564 .color-N4{color:#CFD2DD;} - .d2-209688564 .color-N5{color:#DEE1EB;} - .d2-209688564 .color-N6{color:#EEF1F8;} - .d2-209688564 .color-N7{color:#FFFFFF;} - .d2-209688564 .color-B1{color:#0D32B2;} - .d2-209688564 .color-B2{color:#0D32B2;} - .d2-209688564 .color-B3{color:#E3E9FD;} - .d2-209688564 .color-B4{color:#E3E9FD;} - .d2-209688564 .color-B5{color:#EDF0FD;} - .d2-209688564 .color-B6{color:#F7F8FE;} - .d2-209688564 .color-AA2{color:#4A6FF3;} - .d2-209688564 .color-AA4{color:#EDF0FD;} - .d2-209688564 .color-AA5{color:#F7F8FE;} - .d2-209688564 .color-AB4{color:#EDF0FD;} - .d2-209688564 .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}]]>non containercontainerwith iconcontainer with iconDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRight -======= .d2-2227691374 .fill-N1{fill:#0A0F25;} .d2-2227691374 .fill-N2{fill:#676C7E;} .d2-2227691374 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-2227691374 .color-AA4{color:#EDF0FD;} .d2-2227691374 .color-AA5{color:#F7F8FE;} .d2-2227691374 .color-AB4{color:#EDF0FD;} - .d2-2227691374 .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}]]>non containercontainerwith iconcontainer with iconDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRight ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-2227691374 .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}]]>non containercontainerwith iconcontainer with iconDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRightDefaultOutsideTopLeftOutsideTopCenterOutsideTopRightOutsideLeftTopOutsideLeftMiddleOutsideLeftBottomOutsideRightTopOutsideRightMiddleOutsideRightBottomOutsideBottomLeftOutsideBottomCenterOutsideBottomRightInsideTopLeftInsideTopCenterInsideTopRightInsideMiddleLeftInsideMiddleCenterInsideMiddleRightInsideBottomLeftInsideBottomCenterInsideBottomRight diff --git a/e2etests/testdata/stable/large_arch/dagre/sketch.exp.svg b/e2etests/testdata/stable/large_arch/dagre/sketch.exp.svg index 627c016d2..28b7055a9 100644 --- a/e2etests/testdata/stable/large_arch/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/large_arch/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -abcdefghiqrjmnoszaabbeeffggklptuwxyccddv -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-2164096773 .fill-N1{fill:#0A0F25;} - .d2-2164096773 .fill-N2{fill:#676C7E;} - .d2-2164096773 .fill-N3{fill:#9499AB;} - .d2-2164096773 .fill-N4{fill:#CFD2DD;} - .d2-2164096773 .fill-N5{fill:#DEE1EB;} - .d2-2164096773 .fill-N6{fill:#EEF1F8;} - .d2-2164096773 .fill-N7{fill:#FFFFFF;} - .d2-2164096773 .fill-B1{fill:#0D32B2;} - .d2-2164096773 .fill-B2{fill:#0D32B2;} - .d2-2164096773 .fill-B3{fill:#E3E9FD;} - .d2-2164096773 .fill-B4{fill:#E3E9FD;} - .d2-2164096773 .fill-B5{fill:#EDF0FD;} - .d2-2164096773 .fill-B6{fill:#F7F8FE;} - .d2-2164096773 .fill-AA2{fill:#4A6FF3;} - .d2-2164096773 .fill-AA4{fill:#EDF0FD;} - .d2-2164096773 .fill-AA5{fill:#F7F8FE;} - .d2-2164096773 .fill-AB4{fill:#EDF0FD;} - .d2-2164096773 .fill-AB5{fill:#F7F8FE;} - .d2-2164096773 .stroke-N1{stroke:#0A0F25;} - .d2-2164096773 .stroke-N2{stroke:#676C7E;} - .d2-2164096773 .stroke-N3{stroke:#9499AB;} - .d2-2164096773 .stroke-N4{stroke:#CFD2DD;} - .d2-2164096773 .stroke-N5{stroke:#DEE1EB;} - .d2-2164096773 .stroke-N6{stroke:#EEF1F8;} - .d2-2164096773 .stroke-N7{stroke:#FFFFFF;} - .d2-2164096773 .stroke-B1{stroke:#0D32B2;} - .d2-2164096773 .stroke-B2{stroke:#0D32B2;} - .d2-2164096773 .stroke-B3{stroke:#E3E9FD;} - .d2-2164096773 .stroke-B4{stroke:#E3E9FD;} - .d2-2164096773 .stroke-B5{stroke:#EDF0FD;} - .d2-2164096773 .stroke-B6{stroke:#F7F8FE;} - .d2-2164096773 .stroke-AA2{stroke:#4A6FF3;} - .d2-2164096773 .stroke-AA4{stroke:#EDF0FD;} - .d2-2164096773 .stroke-AA5{stroke:#F7F8FE;} - .d2-2164096773 .stroke-AB4{stroke:#EDF0FD;} - .d2-2164096773 .stroke-AB5{stroke:#F7F8FE;} - .d2-2164096773 .background-color-N1{background-color:#0A0F25;} - .d2-2164096773 .background-color-N2{background-color:#676C7E;} - .d2-2164096773 .background-color-N3{background-color:#9499AB;} - .d2-2164096773 .background-color-N4{background-color:#CFD2DD;} - .d2-2164096773 .background-color-N5{background-color:#DEE1EB;} - .d2-2164096773 .background-color-N6{background-color:#EEF1F8;} - .d2-2164096773 .background-color-N7{background-color:#FFFFFF;} - .d2-2164096773 .background-color-B1{background-color:#0D32B2;} - .d2-2164096773 .background-color-B2{background-color:#0D32B2;} - .d2-2164096773 .background-color-B3{background-color:#E3E9FD;} - .d2-2164096773 .background-color-B4{background-color:#E3E9FD;} - .d2-2164096773 .background-color-B5{background-color:#EDF0FD;} - .d2-2164096773 .background-color-B6{background-color:#F7F8FE;} - .d2-2164096773 .background-color-AA2{background-color:#4A6FF3;} - .d2-2164096773 .background-color-AA4{background-color:#EDF0FD;} - .d2-2164096773 .background-color-AA5{background-color:#F7F8FE;} - .d2-2164096773 .background-color-AB4{background-color:#EDF0FD;} - .d2-2164096773 .background-color-AB5{background-color:#F7F8FE;} - .d2-2164096773 .color-N1{color:#0A0F25;} - .d2-2164096773 .color-N2{color:#676C7E;} - .d2-2164096773 .color-N3{color:#9499AB;} - .d2-2164096773 .color-N4{color:#CFD2DD;} - .d2-2164096773 .color-N5{color:#DEE1EB;} - .d2-2164096773 .color-N6{color:#EEF1F8;} - .d2-2164096773 .color-N7{color:#FFFFFF;} - .d2-2164096773 .color-B1{color:#0D32B2;} - .d2-2164096773 .color-B2{color:#0D32B2;} - .d2-2164096773 .color-B3{color:#E3E9FD;} - .d2-2164096773 .color-B4{color:#E3E9FD;} - .d2-2164096773 .color-B5{color:#EDF0FD;} - .d2-2164096773 .color-B6{color:#F7F8FE;} - .d2-2164096773 .color-AA2{color:#4A6FF3;} - .d2-2164096773 .color-AA4{color:#EDF0FD;} - .d2-2164096773 .color-AA5{color:#F7F8FE;} - .d2-2164096773 .color-AB4{color:#EDF0FD;} - .d2-2164096773 .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}]]>abcdefghiqrjmnoszaabbeeffggklptuwxyccddv -======= .d2-2857932959 .fill-N1{fill:#0A0F25;} .d2-2857932959 .fill-N2{fill:#676C7E;} .d2-2857932959 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-2857932959 .color-AA4{color:#EDF0FD;} .d2-2857932959 .color-AA5{color:#F7F8FE;} .d2-2857932959 .color-AB4{color:#EDF0FD;} - .d2-2857932959 .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}]]>abcdefghiqrjmnoszaabbeeffggklptuwxyccddv ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-2857932959 .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}]]>abcdefghiqrjmnoszaabbeeffggklptuwxyccddv diff --git a/e2etests/testdata/stable/large_arch/elk/sketch.exp.svg b/e2etests/testdata/stable/large_arch/elk/sketch.exp.svg index 16ed71d07..4aa2e68a1 100644 --- a/e2etests/testdata/stable/large_arch/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/large_arch/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -abcdefghiqrjmnoszaabbeeffggklptuwxyccddv -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-3038672767 .fill-N1{fill:#0A0F25;} - .d2-3038672767 .fill-N2{fill:#676C7E;} - .d2-3038672767 .fill-N3{fill:#9499AB;} - .d2-3038672767 .fill-N4{fill:#CFD2DD;} - .d2-3038672767 .fill-N5{fill:#DEE1EB;} - .d2-3038672767 .fill-N6{fill:#EEF1F8;} - .d2-3038672767 .fill-N7{fill:#FFFFFF;} - .d2-3038672767 .fill-B1{fill:#0D32B2;} - .d2-3038672767 .fill-B2{fill:#0D32B2;} - .d2-3038672767 .fill-B3{fill:#E3E9FD;} - .d2-3038672767 .fill-B4{fill:#E3E9FD;} - .d2-3038672767 .fill-B5{fill:#EDF0FD;} - .d2-3038672767 .fill-B6{fill:#F7F8FE;} - .d2-3038672767 .fill-AA2{fill:#4A6FF3;} - .d2-3038672767 .fill-AA4{fill:#EDF0FD;} - .d2-3038672767 .fill-AA5{fill:#F7F8FE;} - .d2-3038672767 .fill-AB4{fill:#EDF0FD;} - .d2-3038672767 .fill-AB5{fill:#F7F8FE;} - .d2-3038672767 .stroke-N1{stroke:#0A0F25;} - .d2-3038672767 .stroke-N2{stroke:#676C7E;} - .d2-3038672767 .stroke-N3{stroke:#9499AB;} - .d2-3038672767 .stroke-N4{stroke:#CFD2DD;} - .d2-3038672767 .stroke-N5{stroke:#DEE1EB;} - .d2-3038672767 .stroke-N6{stroke:#EEF1F8;} - .d2-3038672767 .stroke-N7{stroke:#FFFFFF;} - .d2-3038672767 .stroke-B1{stroke:#0D32B2;} - .d2-3038672767 .stroke-B2{stroke:#0D32B2;} - .d2-3038672767 .stroke-B3{stroke:#E3E9FD;} - .d2-3038672767 .stroke-B4{stroke:#E3E9FD;} - .d2-3038672767 .stroke-B5{stroke:#EDF0FD;} - .d2-3038672767 .stroke-B6{stroke:#F7F8FE;} - .d2-3038672767 .stroke-AA2{stroke:#4A6FF3;} - .d2-3038672767 .stroke-AA4{stroke:#EDF0FD;} - .d2-3038672767 .stroke-AA5{stroke:#F7F8FE;} - .d2-3038672767 .stroke-AB4{stroke:#EDF0FD;} - .d2-3038672767 .stroke-AB5{stroke:#F7F8FE;} - .d2-3038672767 .background-color-N1{background-color:#0A0F25;} - .d2-3038672767 .background-color-N2{background-color:#676C7E;} - .d2-3038672767 .background-color-N3{background-color:#9499AB;} - .d2-3038672767 .background-color-N4{background-color:#CFD2DD;} - .d2-3038672767 .background-color-N5{background-color:#DEE1EB;} - .d2-3038672767 .background-color-N6{background-color:#EEF1F8;} - .d2-3038672767 .background-color-N7{background-color:#FFFFFF;} - .d2-3038672767 .background-color-B1{background-color:#0D32B2;} - .d2-3038672767 .background-color-B2{background-color:#0D32B2;} - .d2-3038672767 .background-color-B3{background-color:#E3E9FD;} - .d2-3038672767 .background-color-B4{background-color:#E3E9FD;} - .d2-3038672767 .background-color-B5{background-color:#EDF0FD;} - .d2-3038672767 .background-color-B6{background-color:#F7F8FE;} - .d2-3038672767 .background-color-AA2{background-color:#4A6FF3;} - .d2-3038672767 .background-color-AA4{background-color:#EDF0FD;} - .d2-3038672767 .background-color-AA5{background-color:#F7F8FE;} - .d2-3038672767 .background-color-AB4{background-color:#EDF0FD;} - .d2-3038672767 .background-color-AB5{background-color:#F7F8FE;} - .d2-3038672767 .color-N1{color:#0A0F25;} - .d2-3038672767 .color-N2{color:#676C7E;} - .d2-3038672767 .color-N3{color:#9499AB;} - .d2-3038672767 .color-N4{color:#CFD2DD;} - .d2-3038672767 .color-N5{color:#DEE1EB;} - .d2-3038672767 .color-N6{color:#EEF1F8;} - .d2-3038672767 .color-N7{color:#FFFFFF;} - .d2-3038672767 .color-B1{color:#0D32B2;} - .d2-3038672767 .color-B2{color:#0D32B2;} - .d2-3038672767 .color-B3{color:#E3E9FD;} - .d2-3038672767 .color-B4{color:#E3E9FD;} - .d2-3038672767 .color-B5{color:#EDF0FD;} - .d2-3038672767 .color-B6{color:#F7F8FE;} - .d2-3038672767 .color-AA2{color:#4A6FF3;} - .d2-3038672767 .color-AA4{color:#EDF0FD;} - .d2-3038672767 .color-AA5{color:#F7F8FE;} - .d2-3038672767 .color-AB4{color:#EDF0FD;} - .d2-3038672767 .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}]]>abcdefghiqrjmnoszaabbeeffggklptuwxyccddv -======= .d2-442297741 .fill-N1{fill:#0A0F25;} .d2-442297741 .fill-N2{fill:#676C7E;} .d2-442297741 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-442297741 .color-AA4{color:#EDF0FD;} .d2-442297741 .color-AA5{color:#F7F8FE;} .d2-442297741 .color-AB4{color:#EDF0FD;} - .d2-442297741 .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}]]>abcdefghiqrjmnoszaabbeeffggklptuwxyccddv ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-442297741 .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}]]>abcdefghiqrjmnoszaabbeeffggklptuwxyccddv diff --git a/e2etests/testdata/stable/latex/dagre/sketch.exp.svg b/e2etests/testdata/stable/latex/dagre/sketch.exp.svg index baad80855..254141ff0 100644 --- a/e2etests/testdata/stable/latex/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/latex/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -xyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-2990259904 .fill-N1{fill:#0A0F25;} - .d2-2990259904 .fill-N2{fill:#676C7E;} - .d2-2990259904 .fill-N3{fill:#9499AB;} - .d2-2990259904 .fill-N4{fill:#CFD2DD;} - .d2-2990259904 .fill-N5{fill:#DEE1EB;} - .d2-2990259904 .fill-N6{fill:#EEF1F8;} - .d2-2990259904 .fill-N7{fill:#FFFFFF;} - .d2-2990259904 .fill-B1{fill:#0D32B2;} - .d2-2990259904 .fill-B2{fill:#0D32B2;} - .d2-2990259904 .fill-B3{fill:#E3E9FD;} - .d2-2990259904 .fill-B4{fill:#E3E9FD;} - .d2-2990259904 .fill-B5{fill:#EDF0FD;} - .d2-2990259904 .fill-B6{fill:#F7F8FE;} - .d2-2990259904 .fill-AA2{fill:#4A6FF3;} - .d2-2990259904 .fill-AA4{fill:#EDF0FD;} - .d2-2990259904 .fill-AA5{fill:#F7F8FE;} - .d2-2990259904 .fill-AB4{fill:#EDF0FD;} - .d2-2990259904 .fill-AB5{fill:#F7F8FE;} - .d2-2990259904 .stroke-N1{stroke:#0A0F25;} - .d2-2990259904 .stroke-N2{stroke:#676C7E;} - .d2-2990259904 .stroke-N3{stroke:#9499AB;} - .d2-2990259904 .stroke-N4{stroke:#CFD2DD;} - .d2-2990259904 .stroke-N5{stroke:#DEE1EB;} - .d2-2990259904 .stroke-N6{stroke:#EEF1F8;} - .d2-2990259904 .stroke-N7{stroke:#FFFFFF;} - .d2-2990259904 .stroke-B1{stroke:#0D32B2;} - .d2-2990259904 .stroke-B2{stroke:#0D32B2;} - .d2-2990259904 .stroke-B3{stroke:#E3E9FD;} - .d2-2990259904 .stroke-B4{stroke:#E3E9FD;} - .d2-2990259904 .stroke-B5{stroke:#EDF0FD;} - .d2-2990259904 .stroke-B6{stroke:#F7F8FE;} - .d2-2990259904 .stroke-AA2{stroke:#4A6FF3;} - .d2-2990259904 .stroke-AA4{stroke:#EDF0FD;} - .d2-2990259904 .stroke-AA5{stroke:#F7F8FE;} - .d2-2990259904 .stroke-AB4{stroke:#EDF0FD;} - .d2-2990259904 .stroke-AB5{stroke:#F7F8FE;} - .d2-2990259904 .background-color-N1{background-color:#0A0F25;} - .d2-2990259904 .background-color-N2{background-color:#676C7E;} - .d2-2990259904 .background-color-N3{background-color:#9499AB;} - .d2-2990259904 .background-color-N4{background-color:#CFD2DD;} - .d2-2990259904 .background-color-N5{background-color:#DEE1EB;} - .d2-2990259904 .background-color-N6{background-color:#EEF1F8;} - .d2-2990259904 .background-color-N7{background-color:#FFFFFF;} - .d2-2990259904 .background-color-B1{background-color:#0D32B2;} - .d2-2990259904 .background-color-B2{background-color:#0D32B2;} - .d2-2990259904 .background-color-B3{background-color:#E3E9FD;} - .d2-2990259904 .background-color-B4{background-color:#E3E9FD;} - .d2-2990259904 .background-color-B5{background-color:#EDF0FD;} - .d2-2990259904 .background-color-B6{background-color:#F7F8FE;} - .d2-2990259904 .background-color-AA2{background-color:#4A6FF3;} - .d2-2990259904 .background-color-AA4{background-color:#EDF0FD;} - .d2-2990259904 .background-color-AA5{background-color:#F7F8FE;} - .d2-2990259904 .background-color-AB4{background-color:#EDF0FD;} - .d2-2990259904 .background-color-AB5{background-color:#F7F8FE;} - .d2-2990259904 .color-N1{color:#0A0F25;} - .d2-2990259904 .color-N2{color:#676C7E;} - .d2-2990259904 .color-N3{color:#9499AB;} - .d2-2990259904 .color-N4{color:#CFD2DD;} - .d2-2990259904 .color-N5{color:#DEE1EB;} - .d2-2990259904 .color-N6{color:#EEF1F8;} - .d2-2990259904 .color-N7{color:#FFFFFF;} - .d2-2990259904 .color-B1{color:#0D32B2;} - .d2-2990259904 .color-B2{color:#0D32B2;} - .d2-2990259904 .color-B3{color:#E3E9FD;} - .d2-2990259904 .color-B4{color:#E3E9FD;} - .d2-2990259904 .color-B5{color:#EDF0FD;} - .d2-2990259904 .color-B6{color:#F7F8FE;} - .d2-2990259904 .color-AA2{color:#4A6FF3;} - .d2-2990259904 .color-AA4{color:#EDF0FD;} - .d2-2990259904 .color-AA5{color:#F7F8FE;} - .d2-2990259904 .color-AB4{color:#EDF0FD;} - .d2-2990259904 .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}]]>xyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! -======= - .d2-1029983806 .fill-N1{fill:#0A0F25;} - .d2-1029983806 .fill-N2{fill:#676C7E;} - .d2-1029983806 .fill-N3{fill:#9499AB;} - .d2-1029983806 .fill-N4{fill:#CFD2DD;} - .d2-1029983806 .fill-N5{fill:#DEE1EB;} - .d2-1029983806 .fill-N6{fill:#EEF1F8;} - .d2-1029983806 .fill-N7{fill:#FFFFFF;} - .d2-1029983806 .fill-B1{fill:#0D32B2;} - .d2-1029983806 .fill-B2{fill:#0D32B2;} - .d2-1029983806 .fill-B3{fill:#E3E9FD;} - .d2-1029983806 .fill-B4{fill:#E3E9FD;} - .d2-1029983806 .fill-B5{fill:#EDF0FD;} - .d2-1029983806 .fill-B6{fill:#F7F8FE;} - .d2-1029983806 .fill-AA2{fill:#4A6FF3;} - .d2-1029983806 .fill-AA4{fill:#EDF0FD;} - .d2-1029983806 .fill-AA5{fill:#F7F8FE;} - .d2-1029983806 .fill-AB4{fill:#EDF0FD;} - .d2-1029983806 .fill-AB5{fill:#F7F8FE;} - .d2-1029983806 .stroke-N1{stroke:#0A0F25;} - .d2-1029983806 .stroke-N2{stroke:#676C7E;} - .d2-1029983806 .stroke-N3{stroke:#9499AB;} - .d2-1029983806 .stroke-N4{stroke:#CFD2DD;} - .d2-1029983806 .stroke-N5{stroke:#DEE1EB;} - .d2-1029983806 .stroke-N6{stroke:#EEF1F8;} - .d2-1029983806 .stroke-N7{stroke:#FFFFFF;} - .d2-1029983806 .stroke-B1{stroke:#0D32B2;} - .d2-1029983806 .stroke-B2{stroke:#0D32B2;} - .d2-1029983806 .stroke-B3{stroke:#E3E9FD;} - .d2-1029983806 .stroke-B4{stroke:#E3E9FD;} - .d2-1029983806 .stroke-B5{stroke:#EDF0FD;} - .d2-1029983806 .stroke-B6{stroke:#F7F8FE;} - .d2-1029983806 .stroke-AA2{stroke:#4A6FF3;} - .d2-1029983806 .stroke-AA4{stroke:#EDF0FD;} - .d2-1029983806 .stroke-AA5{stroke:#F7F8FE;} - .d2-1029983806 .stroke-AB4{stroke:#EDF0FD;} - .d2-1029983806 .stroke-AB5{stroke:#F7F8FE;} - .d2-1029983806 .background-color-N1{background-color:#0A0F25;} - .d2-1029983806 .background-color-N2{background-color:#676C7E;} - .d2-1029983806 .background-color-N3{background-color:#9499AB;} - .d2-1029983806 .background-color-N4{background-color:#CFD2DD;} - .d2-1029983806 .background-color-N5{background-color:#DEE1EB;} - .d2-1029983806 .background-color-N6{background-color:#EEF1F8;} - .d2-1029983806 .background-color-N7{background-color:#FFFFFF;} - .d2-1029983806 .background-color-B1{background-color:#0D32B2;} - .d2-1029983806 .background-color-B2{background-color:#0D32B2;} - .d2-1029983806 .background-color-B3{background-color:#E3E9FD;} - .d2-1029983806 .background-color-B4{background-color:#E3E9FD;} - .d2-1029983806 .background-color-B5{background-color:#EDF0FD;} - .d2-1029983806 .background-color-B6{background-color:#F7F8FE;} - .d2-1029983806 .background-color-AA2{background-color:#4A6FF3;} - .d2-1029983806 .background-color-AA4{background-color:#EDF0FD;} - .d2-1029983806 .background-color-AA5{background-color:#F7F8FE;} - .d2-1029983806 .background-color-AB4{background-color:#EDF0FD;} - .d2-1029983806 .background-color-AB5{background-color:#F7F8FE;} - .d2-1029983806 .color-N1{color:#0A0F25;} - .d2-1029983806 .color-N2{color:#676C7E;} - .d2-1029983806 .color-N3{color:#9499AB;} - .d2-1029983806 .color-N4{color:#CFD2DD;} - .d2-1029983806 .color-N5{color:#DEE1EB;} - .d2-1029983806 .color-N6{color:#EEF1F8;} - .d2-1029983806 .color-N7{color:#FFFFFF;} - .d2-1029983806 .color-B1{color:#0D32B2;} - .d2-1029983806 .color-B2{color:#0D32B2;} - .d2-1029983806 .color-B3{color:#E3E9FD;} - .d2-1029983806 .color-B4{color:#E3E9FD;} - .d2-1029983806 .color-B5{color:#EDF0FD;} - .d2-1029983806 .color-B6{color:#F7F8FE;} - .d2-1029983806 .color-AA2{color:#4A6FF3;} - .d2-1029983806 .color-AA4{color:#EDF0FD;} - .d2-1029983806 .color-AA5{color:#F7F8FE;} - .d2-1029983806 .color-AB4{color:#EDF0FD;} - .d2-1029983806 .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}]]>xyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-1998242947 .fill-N1{fill:#0A0F25;} + .d2-1998242947 .fill-N2{fill:#676C7E;} + .d2-1998242947 .fill-N3{fill:#9499AB;} + .d2-1998242947 .fill-N4{fill:#CFD2DD;} + .d2-1998242947 .fill-N5{fill:#DEE1EB;} + .d2-1998242947 .fill-N6{fill:#EEF1F8;} + .d2-1998242947 .fill-N7{fill:#FFFFFF;} + .d2-1998242947 .fill-B1{fill:#0D32B2;} + .d2-1998242947 .fill-B2{fill:#0D32B2;} + .d2-1998242947 .fill-B3{fill:#E3E9FD;} + .d2-1998242947 .fill-B4{fill:#E3E9FD;} + .d2-1998242947 .fill-B5{fill:#EDF0FD;} + .d2-1998242947 .fill-B6{fill:#F7F8FE;} + .d2-1998242947 .fill-AA2{fill:#4A6FF3;} + .d2-1998242947 .fill-AA4{fill:#EDF0FD;} + .d2-1998242947 .fill-AA5{fill:#F7F8FE;} + .d2-1998242947 .fill-AB4{fill:#EDF0FD;} + .d2-1998242947 .fill-AB5{fill:#F7F8FE;} + .d2-1998242947 .stroke-N1{stroke:#0A0F25;} + .d2-1998242947 .stroke-N2{stroke:#676C7E;} + .d2-1998242947 .stroke-N3{stroke:#9499AB;} + .d2-1998242947 .stroke-N4{stroke:#CFD2DD;} + .d2-1998242947 .stroke-N5{stroke:#DEE1EB;} + .d2-1998242947 .stroke-N6{stroke:#EEF1F8;} + .d2-1998242947 .stroke-N7{stroke:#FFFFFF;} + .d2-1998242947 .stroke-B1{stroke:#0D32B2;} + .d2-1998242947 .stroke-B2{stroke:#0D32B2;} + .d2-1998242947 .stroke-B3{stroke:#E3E9FD;} + .d2-1998242947 .stroke-B4{stroke:#E3E9FD;} + .d2-1998242947 .stroke-B5{stroke:#EDF0FD;} + .d2-1998242947 .stroke-B6{stroke:#F7F8FE;} + .d2-1998242947 .stroke-AA2{stroke:#4A6FF3;} + .d2-1998242947 .stroke-AA4{stroke:#EDF0FD;} + .d2-1998242947 .stroke-AA5{stroke:#F7F8FE;} + .d2-1998242947 .stroke-AB4{stroke:#EDF0FD;} + .d2-1998242947 .stroke-AB5{stroke:#F7F8FE;} + .d2-1998242947 .background-color-N1{background-color:#0A0F25;} + .d2-1998242947 .background-color-N2{background-color:#676C7E;} + .d2-1998242947 .background-color-N3{background-color:#9499AB;} + .d2-1998242947 .background-color-N4{background-color:#CFD2DD;} + .d2-1998242947 .background-color-N5{background-color:#DEE1EB;} + .d2-1998242947 .background-color-N6{background-color:#EEF1F8;} + .d2-1998242947 .background-color-N7{background-color:#FFFFFF;} + .d2-1998242947 .background-color-B1{background-color:#0D32B2;} + .d2-1998242947 .background-color-B2{background-color:#0D32B2;} + .d2-1998242947 .background-color-B3{background-color:#E3E9FD;} + .d2-1998242947 .background-color-B4{background-color:#E3E9FD;} + .d2-1998242947 .background-color-B5{background-color:#EDF0FD;} + .d2-1998242947 .background-color-B6{background-color:#F7F8FE;} + .d2-1998242947 .background-color-AA2{background-color:#4A6FF3;} + .d2-1998242947 .background-color-AA4{background-color:#EDF0FD;} + .d2-1998242947 .background-color-AA5{background-color:#F7F8FE;} + .d2-1998242947 .background-color-AB4{background-color:#EDF0FD;} + .d2-1998242947 .background-color-AB5{background-color:#F7F8FE;} + .d2-1998242947 .color-N1{color:#0A0F25;} + .d2-1998242947 .color-N2{color:#676C7E;} + .d2-1998242947 .color-N3{color:#9499AB;} + .d2-1998242947 .color-N4{color:#CFD2DD;} + .d2-1998242947 .color-N5{color:#DEE1EB;} + .d2-1998242947 .color-N6{color:#EEF1F8;} + .d2-1998242947 .color-N7{color:#FFFFFF;} + .d2-1998242947 .color-B1{color:#0D32B2;} + .d2-1998242947 .color-B2{color:#0D32B2;} + .d2-1998242947 .color-B3{color:#E3E9FD;} + .d2-1998242947 .color-B4{color:#E3E9FD;} + .d2-1998242947 .color-B5{color:#EDF0FD;} + .d2-1998242947 .color-B6{color:#F7F8FE;} + .d2-1998242947 .color-AA2{color:#4A6FF3;} + .d2-1998242947 .color-AA4{color:#EDF0FD;} + .d2-1998242947 .color-AA5{color:#F7F8FE;} + .d2-1998242947 .color-AB4{color:#EDF0FD;} + .d2-1998242947 .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}]]>xyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! @@ -303,13 +129,7 @@ -<<<<<<< HEAD - -||||||| parent of 33280fed5 (fixed e2e tests) - -======= - ->>>>>>> 33280fed5 (fixed e2e tests) + diff --git a/e2etests/testdata/stable/links/elk/sketch.exp.svg b/e2etests/testdata/stable/links/elk/sketch.exp.svg index 9dc3415e2..796217326 100644 --- a/e2etests/testdata/stable/links/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/links/elk/sketch.exp.svg @@ -1,38 +1,12 @@ -<<<<<<< HEAD -<<<<<<< HEAD -xyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-1954138282 .fill-N1{fill:#0A0F25;} - .d2-1954138282 .fill-N2{fill:#676C7E;} - .d2-1954138282 .fill-N3{fill:#9499AB;} - .d2-1954138282 .fill-N4{fill:#CFD2DD;} - .d2-1954138282 .fill-N5{fill:#DEE1EB;} - .d2-1954138282 .fill-N6{fill:#EEF1F8;} - .d2-1954138282 .fill-N7{fill:#FFFFFF;} - .d2-1954138282 .fill-B1{fill:#0D32B2;} - .d2-1954138282 .fill-B2{fill:#0D32B2;} - .d2-1954138282 .fill-B3{fill:#E3E9FD;} - .d2-1954138282 .fill-B4{fill:#E3E9FD;} - .d2-1954138282 .fill-B5{fill:#EDF0FD;} - .d2-1954138282 .fill-B6{fill:#F7F8FE;} - .d2-1954138282 .fill-AA2{fill:#4A6FF3;} - .d2-1954138282 .fill-AA4{fill:#EDF0FD;} - .d2-1954138282 .fill-AA5{fill:#F7F8FE;} - .d2-1954138282 .fill-AB4{fill:#EDF0FD;} - .d2-1954138282 .fill-AB5{fill:#F7F8FE;} - .d2-1954138282 .stroke-N1{stroke:#0A0F25;} - .d2-1954138282 .stroke-N2{stroke:#676C7E;} - .d2-1954138282 .stroke-N3{stroke:#9499AB;} - .d2-1954138282 .stroke-N4{stroke:#CFD2DD;} - .d2-1954138282 .stroke-N5{stroke:#DEE1EB;} - .d2-1954138282 .stroke-N6{stroke:#EEF1F8;} - .d2-1954138282 .stroke-N7{stroke:#FFFFFF;} - .d2-1954138282 .stroke-B1{stroke:#0D32B2;} - .d2-1954138282 .stroke-B2{stroke:#0D32B2;} - .d2-1954138282 .stroke-B3{stroke:#E3E9FD;} - .d2-1954138282 .stroke-B4{stroke:#E3E9FD;} - .d2-1954138282 .stroke-B5{stroke:#EDF0FD;} - .d2-1954138282 .stroke-B6{stroke:#F7F8FE;} - .d2-1954138282 .stroke-AA2{stroke:#4A6FF3;} - .d2-1954138282 .stroke-AA4{stroke:#EDF0FD;} - .d2-1954138282 .stroke-AA5{stroke:#F7F8FE;} - .d2-1954138282 .stroke-AB4{stroke:#EDF0FD;} - .d2-1954138282 .stroke-AB5{stroke:#F7F8FE;} - .d2-1954138282 .background-color-N1{background-color:#0A0F25;} - .d2-1954138282 .background-color-N2{background-color:#676C7E;} - .d2-1954138282 .background-color-N3{background-color:#9499AB;} - .d2-1954138282 .background-color-N4{background-color:#CFD2DD;} - .d2-1954138282 .background-color-N5{background-color:#DEE1EB;} - .d2-1954138282 .background-color-N6{background-color:#EEF1F8;} - .d2-1954138282 .background-color-N7{background-color:#FFFFFF;} - .d2-1954138282 .background-color-B1{background-color:#0D32B2;} - .d2-1954138282 .background-color-B2{background-color:#0D32B2;} - .d2-1954138282 .background-color-B3{background-color:#E3E9FD;} - .d2-1954138282 .background-color-B4{background-color:#E3E9FD;} - .d2-1954138282 .background-color-B5{background-color:#EDF0FD;} - .d2-1954138282 .background-color-B6{background-color:#F7F8FE;} - .d2-1954138282 .background-color-AA2{background-color:#4A6FF3;} - .d2-1954138282 .background-color-AA4{background-color:#EDF0FD;} - .d2-1954138282 .background-color-AA5{background-color:#F7F8FE;} - .d2-1954138282 .background-color-AB4{background-color:#EDF0FD;} - .d2-1954138282 .background-color-AB5{background-color:#F7F8FE;} - .d2-1954138282 .color-N1{color:#0A0F25;} - .d2-1954138282 .color-N2{color:#676C7E;} - .d2-1954138282 .color-N3{color:#9499AB;} - .d2-1954138282 .color-N4{color:#CFD2DD;} - .d2-1954138282 .color-N5{color:#DEE1EB;} - .d2-1954138282 .color-N6{color:#EEF1F8;} - .d2-1954138282 .color-N7{color:#FFFFFF;} - .d2-1954138282 .color-B1{color:#0D32B2;} - .d2-1954138282 .color-B2{color:#0D32B2;} - .d2-1954138282 .color-B3{color:#E3E9FD;} - .d2-1954138282 .color-B4{color:#E3E9FD;} - .d2-1954138282 .color-B5{color:#EDF0FD;} - .d2-1954138282 .color-B6{color:#F7F8FE;} - .d2-1954138282 .color-AA2{color:#4A6FF3;} - .d2-1954138282 .color-AA4{color:#EDF0FD;} - .d2-1954138282 .color-AA5{color:#F7F8FE;} - .d2-1954138282 .color-AB4{color:#EDF0FD;} - .d2-1954138282 .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}]]>xyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! -======= - .d2-1733157364 .fill-N1{fill:#0A0F25;} - .d2-1733157364 .fill-N2{fill:#676C7E;} - .d2-1733157364 .fill-N3{fill:#9499AB;} - .d2-1733157364 .fill-N4{fill:#CFD2DD;} - .d2-1733157364 .fill-N5{fill:#DEE1EB;} - .d2-1733157364 .fill-N6{fill:#EEF1F8;} - .d2-1733157364 .fill-N7{fill:#FFFFFF;} - .d2-1733157364 .fill-B1{fill:#0D32B2;} - .d2-1733157364 .fill-B2{fill:#0D32B2;} - .d2-1733157364 .fill-B3{fill:#E3E9FD;} - .d2-1733157364 .fill-B4{fill:#E3E9FD;} - .d2-1733157364 .fill-B5{fill:#EDF0FD;} - .d2-1733157364 .fill-B6{fill:#F7F8FE;} - .d2-1733157364 .fill-AA2{fill:#4A6FF3;} - .d2-1733157364 .fill-AA4{fill:#EDF0FD;} - .d2-1733157364 .fill-AA5{fill:#F7F8FE;} - .d2-1733157364 .fill-AB4{fill:#EDF0FD;} - .d2-1733157364 .fill-AB5{fill:#F7F8FE;} - .d2-1733157364 .stroke-N1{stroke:#0A0F25;} - .d2-1733157364 .stroke-N2{stroke:#676C7E;} - .d2-1733157364 .stroke-N3{stroke:#9499AB;} - .d2-1733157364 .stroke-N4{stroke:#CFD2DD;} - .d2-1733157364 .stroke-N5{stroke:#DEE1EB;} - .d2-1733157364 .stroke-N6{stroke:#EEF1F8;} - .d2-1733157364 .stroke-N7{stroke:#FFFFFF;} - .d2-1733157364 .stroke-B1{stroke:#0D32B2;} - .d2-1733157364 .stroke-B2{stroke:#0D32B2;} - .d2-1733157364 .stroke-B3{stroke:#E3E9FD;} - .d2-1733157364 .stroke-B4{stroke:#E3E9FD;} - .d2-1733157364 .stroke-B5{stroke:#EDF0FD;} - .d2-1733157364 .stroke-B6{stroke:#F7F8FE;} - .d2-1733157364 .stroke-AA2{stroke:#4A6FF3;} - .d2-1733157364 .stroke-AA4{stroke:#EDF0FD;} - .d2-1733157364 .stroke-AA5{stroke:#F7F8FE;} - .d2-1733157364 .stroke-AB4{stroke:#EDF0FD;} - .d2-1733157364 .stroke-AB5{stroke:#F7F8FE;} - .d2-1733157364 .background-color-N1{background-color:#0A0F25;} - .d2-1733157364 .background-color-N2{background-color:#676C7E;} - .d2-1733157364 .background-color-N3{background-color:#9499AB;} - .d2-1733157364 .background-color-N4{background-color:#CFD2DD;} - .d2-1733157364 .background-color-N5{background-color:#DEE1EB;} - .d2-1733157364 .background-color-N6{background-color:#EEF1F8;} - .d2-1733157364 .background-color-N7{background-color:#FFFFFF;} - .d2-1733157364 .background-color-B1{background-color:#0D32B2;} - .d2-1733157364 .background-color-B2{background-color:#0D32B2;} - .d2-1733157364 .background-color-B3{background-color:#E3E9FD;} - .d2-1733157364 .background-color-B4{background-color:#E3E9FD;} - .d2-1733157364 .background-color-B5{background-color:#EDF0FD;} - .d2-1733157364 .background-color-B6{background-color:#F7F8FE;} - .d2-1733157364 .background-color-AA2{background-color:#4A6FF3;} - .d2-1733157364 .background-color-AA4{background-color:#EDF0FD;} - .d2-1733157364 .background-color-AA5{background-color:#F7F8FE;} - .d2-1733157364 .background-color-AB4{background-color:#EDF0FD;} - .d2-1733157364 .background-color-AB5{background-color:#F7F8FE;} - .d2-1733157364 .color-N1{color:#0A0F25;} - .d2-1733157364 .color-N2{color:#676C7E;} - .d2-1733157364 .color-N3{color:#9499AB;} - .d2-1733157364 .color-N4{color:#CFD2DD;} - .d2-1733157364 .color-N5{color:#DEE1EB;} - .d2-1733157364 .color-N6{color:#EEF1F8;} - .d2-1733157364 .color-N7{color:#FFFFFF;} - .d2-1733157364 .color-B1{color:#0D32B2;} - .d2-1733157364 .color-B2{color:#0D32B2;} - .d2-1733157364 .color-B3{color:#E3E9FD;} - .d2-1733157364 .color-B4{color:#E3E9FD;} - .d2-1733157364 .color-B5{color:#EDF0FD;} - .d2-1733157364 .color-B6{color:#F7F8FE;} - .d2-1733157364 .color-AA2{color:#4A6FF3;} - .d2-1733157364 .color-AA4{color:#EDF0FD;} - .d2-1733157364 .color-AA5{color:#F7F8FE;} - .d2-1733157364 .color-AB4{color:#EDF0FD;} - .d2-1733157364 .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}]]>xyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-1976704325 .fill-N1{fill:#0A0F25;} + .d2-1976704325 .fill-N2{fill:#676C7E;} + .d2-1976704325 .fill-N3{fill:#9499AB;} + .d2-1976704325 .fill-N4{fill:#CFD2DD;} + .d2-1976704325 .fill-N5{fill:#DEE1EB;} + .d2-1976704325 .fill-N6{fill:#EEF1F8;} + .d2-1976704325 .fill-N7{fill:#FFFFFF;} + .d2-1976704325 .fill-B1{fill:#0D32B2;} + .d2-1976704325 .fill-B2{fill:#0D32B2;} + .d2-1976704325 .fill-B3{fill:#E3E9FD;} + .d2-1976704325 .fill-B4{fill:#E3E9FD;} + .d2-1976704325 .fill-B5{fill:#EDF0FD;} + .d2-1976704325 .fill-B6{fill:#F7F8FE;} + .d2-1976704325 .fill-AA2{fill:#4A6FF3;} + .d2-1976704325 .fill-AA4{fill:#EDF0FD;} + .d2-1976704325 .fill-AA5{fill:#F7F8FE;} + .d2-1976704325 .fill-AB4{fill:#EDF0FD;} + .d2-1976704325 .fill-AB5{fill:#F7F8FE;} + .d2-1976704325 .stroke-N1{stroke:#0A0F25;} + .d2-1976704325 .stroke-N2{stroke:#676C7E;} + .d2-1976704325 .stroke-N3{stroke:#9499AB;} + .d2-1976704325 .stroke-N4{stroke:#CFD2DD;} + .d2-1976704325 .stroke-N5{stroke:#DEE1EB;} + .d2-1976704325 .stroke-N6{stroke:#EEF1F8;} + .d2-1976704325 .stroke-N7{stroke:#FFFFFF;} + .d2-1976704325 .stroke-B1{stroke:#0D32B2;} + .d2-1976704325 .stroke-B2{stroke:#0D32B2;} + .d2-1976704325 .stroke-B3{stroke:#E3E9FD;} + .d2-1976704325 .stroke-B4{stroke:#E3E9FD;} + .d2-1976704325 .stroke-B5{stroke:#EDF0FD;} + .d2-1976704325 .stroke-B6{stroke:#F7F8FE;} + .d2-1976704325 .stroke-AA2{stroke:#4A6FF3;} + .d2-1976704325 .stroke-AA4{stroke:#EDF0FD;} + .d2-1976704325 .stroke-AA5{stroke:#F7F8FE;} + .d2-1976704325 .stroke-AB4{stroke:#EDF0FD;} + .d2-1976704325 .stroke-AB5{stroke:#F7F8FE;} + .d2-1976704325 .background-color-N1{background-color:#0A0F25;} + .d2-1976704325 .background-color-N2{background-color:#676C7E;} + .d2-1976704325 .background-color-N3{background-color:#9499AB;} + .d2-1976704325 .background-color-N4{background-color:#CFD2DD;} + .d2-1976704325 .background-color-N5{background-color:#DEE1EB;} + .d2-1976704325 .background-color-N6{background-color:#EEF1F8;} + .d2-1976704325 .background-color-N7{background-color:#FFFFFF;} + .d2-1976704325 .background-color-B1{background-color:#0D32B2;} + .d2-1976704325 .background-color-B2{background-color:#0D32B2;} + .d2-1976704325 .background-color-B3{background-color:#E3E9FD;} + .d2-1976704325 .background-color-B4{background-color:#E3E9FD;} + .d2-1976704325 .background-color-B5{background-color:#EDF0FD;} + .d2-1976704325 .background-color-B6{background-color:#F7F8FE;} + .d2-1976704325 .background-color-AA2{background-color:#4A6FF3;} + .d2-1976704325 .background-color-AA4{background-color:#EDF0FD;} + .d2-1976704325 .background-color-AA5{background-color:#F7F8FE;} + .d2-1976704325 .background-color-AB4{background-color:#EDF0FD;} + .d2-1976704325 .background-color-AB5{background-color:#F7F8FE;} + .d2-1976704325 .color-N1{color:#0A0F25;} + .d2-1976704325 .color-N2{color:#676C7E;} + .d2-1976704325 .color-N3{color:#9499AB;} + .d2-1976704325 .color-N4{color:#CFD2DD;} + .d2-1976704325 .color-N5{color:#DEE1EB;} + .d2-1976704325 .color-N6{color:#EEF1F8;} + .d2-1976704325 .color-N7{color:#FFFFFF;} + .d2-1976704325 .color-B1{color:#0D32B2;} + .d2-1976704325 .color-B2{color:#0D32B2;} + .d2-1976704325 .color-B3{color:#E3E9FD;} + .d2-1976704325 .color-B4{color:#E3E9FD;} + .d2-1976704325 .color-B5{color:#EDF0FD;} + .d2-1976704325 .color-B6{color:#F7F8FE;} + .d2-1976704325 .color-AA2{color:#4A6FF3;} + .d2-1976704325 .color-AA4{color:#EDF0FD;} + .d2-1976704325 .color-AA5{color:#F7F8FE;} + .d2-1976704325 .color-AB4{color:#EDF0FD;} + .d2-1976704325 .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}]]>xyGee, I feel kind of LIGHT in the head now, knowing I can't make my satellite dish PAYMENTS! @@ -303,13 +129,7 @@ -<<<<<<< HEAD - -||||||| parent of 33280fed5 (fixed e2e tests) - -======= - ->>>>>>> 33280fed5 (fixed e2e tests) + diff --git a/e2etests/testdata/stable/lone_h1/dagre/sketch.exp.svg b/e2etests/testdata/stable/lone_h1/dagre/sketch.exp.svg index 3efd9ea31..3a7477f63 100644 --- a/e2etests/testdata/stable/lone_h1/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/lone_h1/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -xy hi -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-1588848796 .fill-N1{fill:#0A0F25;} - .d2-1588848796 .fill-N2{fill:#676C7E;} - .d2-1588848796 .fill-N3{fill:#9499AB;} - .d2-1588848796 .fill-N4{fill:#CFD2DD;} - .d2-1588848796 .fill-N5{fill:#DEE1EB;} - .d2-1588848796 .fill-N6{fill:#EEF1F8;} - .d2-1588848796 .fill-N7{fill:#FFFFFF;} - .d2-1588848796 .fill-B1{fill:#0D32B2;} - .d2-1588848796 .fill-B2{fill:#0D32B2;} - .d2-1588848796 .fill-B3{fill:#E3E9FD;} - .d2-1588848796 .fill-B4{fill:#E3E9FD;} - .d2-1588848796 .fill-B5{fill:#EDF0FD;} - .d2-1588848796 .fill-B6{fill:#F7F8FE;} - .d2-1588848796 .fill-AA2{fill:#4A6FF3;} - .d2-1588848796 .fill-AA4{fill:#EDF0FD;} - .d2-1588848796 .fill-AA5{fill:#F7F8FE;} - .d2-1588848796 .fill-AB4{fill:#EDF0FD;} - .d2-1588848796 .fill-AB5{fill:#F7F8FE;} - .d2-1588848796 .stroke-N1{stroke:#0A0F25;} - .d2-1588848796 .stroke-N2{stroke:#676C7E;} - .d2-1588848796 .stroke-N3{stroke:#9499AB;} - .d2-1588848796 .stroke-N4{stroke:#CFD2DD;} - .d2-1588848796 .stroke-N5{stroke:#DEE1EB;} - .d2-1588848796 .stroke-N6{stroke:#EEF1F8;} - .d2-1588848796 .stroke-N7{stroke:#FFFFFF;} - .d2-1588848796 .stroke-B1{stroke:#0D32B2;} - .d2-1588848796 .stroke-B2{stroke:#0D32B2;} - .d2-1588848796 .stroke-B3{stroke:#E3E9FD;} - .d2-1588848796 .stroke-B4{stroke:#E3E9FD;} - .d2-1588848796 .stroke-B5{stroke:#EDF0FD;} - .d2-1588848796 .stroke-B6{stroke:#F7F8FE;} - .d2-1588848796 .stroke-AA2{stroke:#4A6FF3;} - .d2-1588848796 .stroke-AA4{stroke:#EDF0FD;} - .d2-1588848796 .stroke-AA5{stroke:#F7F8FE;} - .d2-1588848796 .stroke-AB4{stroke:#EDF0FD;} - .d2-1588848796 .stroke-AB5{stroke:#F7F8FE;} - .d2-1588848796 .background-color-N1{background-color:#0A0F25;} - .d2-1588848796 .background-color-N2{background-color:#676C7E;} - .d2-1588848796 .background-color-N3{background-color:#9499AB;} - .d2-1588848796 .background-color-N4{background-color:#CFD2DD;} - .d2-1588848796 .background-color-N5{background-color:#DEE1EB;} - .d2-1588848796 .background-color-N6{background-color:#EEF1F8;} - .d2-1588848796 .background-color-N7{background-color:#FFFFFF;} - .d2-1588848796 .background-color-B1{background-color:#0D32B2;} - .d2-1588848796 .background-color-B2{background-color:#0D32B2;} - .d2-1588848796 .background-color-B3{background-color:#E3E9FD;} - .d2-1588848796 .background-color-B4{background-color:#E3E9FD;} - .d2-1588848796 .background-color-B5{background-color:#EDF0FD;} - .d2-1588848796 .background-color-B6{background-color:#F7F8FE;} - .d2-1588848796 .background-color-AA2{background-color:#4A6FF3;} - .d2-1588848796 .background-color-AA4{background-color:#EDF0FD;} - .d2-1588848796 .background-color-AA5{background-color:#F7F8FE;} - .d2-1588848796 .background-color-AB4{background-color:#EDF0FD;} - .d2-1588848796 .background-color-AB5{background-color:#F7F8FE;} - .d2-1588848796 .color-N1{color:#0A0F25;} - .d2-1588848796 .color-N2{color:#676C7E;} - .d2-1588848796 .color-N3{color:#9499AB;} - .d2-1588848796 .color-N4{color:#CFD2DD;} - .d2-1588848796 .color-N5{color:#DEE1EB;} - .d2-1588848796 .color-N6{color:#EEF1F8;} - .d2-1588848796 .color-N7{color:#FFFFFF;} - .d2-1588848796 .color-B1{color:#0D32B2;} - .d2-1588848796 .color-B2{color:#0D32B2;} - .d2-1588848796 .color-B3{color:#E3E9FD;} - .d2-1588848796 .color-B4{color:#E3E9FD;} - .d2-1588848796 .color-B5{color:#EDF0FD;} - .d2-1588848796 .color-B6{color:#F7F8FE;} - .d2-1588848796 .color-AA2{color:#4A6FF3;} - .d2-1588848796 .color-AA4{color:#EDF0FD;} - .d2-1588848796 .color-AA5{color:#F7F8FE;} - .d2-1588848796 .color-AB4{color:#EDF0FD;} - .d2-1588848796 .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 hi -======= .d2-4000994026 .fill-N1{fill:#0A0F25;} .d2-4000994026 .fill-N2{fill:#676C7E;} .d2-4000994026 .fill-N3{fill:#9499AB;} @@ -266,8 +103,7 @@ .d2-4000994026 .color-AA4{color:#EDF0FD;} .d2-4000994026 .color-AA5{color:#F7F8FE;} .d2-4000994026 .color-AB4{color:#EDF0FD;} - .d2-4000994026 .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 hi ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-4000994026 .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 hi diff --git a/e2etests/testdata/stable/mono-edge/elk/sketch.exp.svg b/e2etests/testdata/stable/mono-edge/elk/sketch.exp.svg index e44b0bee8..0badc7425 100644 --- a/e2etests/testdata/stable/mono-edge/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/mono-edge/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -xy hi -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-2882779651 .fill-N1{fill:#0A0F25;} - .d2-2882779651 .fill-N2{fill:#676C7E;} - .d2-2882779651 .fill-N3{fill:#9499AB;} - .d2-2882779651 .fill-N4{fill:#CFD2DD;} - .d2-2882779651 .fill-N5{fill:#DEE1EB;} - .d2-2882779651 .fill-N6{fill:#EEF1F8;} - .d2-2882779651 .fill-N7{fill:#FFFFFF;} - .d2-2882779651 .fill-B1{fill:#0D32B2;} - .d2-2882779651 .fill-B2{fill:#0D32B2;} - .d2-2882779651 .fill-B3{fill:#E3E9FD;} - .d2-2882779651 .fill-B4{fill:#E3E9FD;} - .d2-2882779651 .fill-B5{fill:#EDF0FD;} - .d2-2882779651 .fill-B6{fill:#F7F8FE;} - .d2-2882779651 .fill-AA2{fill:#4A6FF3;} - .d2-2882779651 .fill-AA4{fill:#EDF0FD;} - .d2-2882779651 .fill-AA5{fill:#F7F8FE;} - .d2-2882779651 .fill-AB4{fill:#EDF0FD;} - .d2-2882779651 .fill-AB5{fill:#F7F8FE;} - .d2-2882779651 .stroke-N1{stroke:#0A0F25;} - .d2-2882779651 .stroke-N2{stroke:#676C7E;} - .d2-2882779651 .stroke-N3{stroke:#9499AB;} - .d2-2882779651 .stroke-N4{stroke:#CFD2DD;} - .d2-2882779651 .stroke-N5{stroke:#DEE1EB;} - .d2-2882779651 .stroke-N6{stroke:#EEF1F8;} - .d2-2882779651 .stroke-N7{stroke:#FFFFFF;} - .d2-2882779651 .stroke-B1{stroke:#0D32B2;} - .d2-2882779651 .stroke-B2{stroke:#0D32B2;} - .d2-2882779651 .stroke-B3{stroke:#E3E9FD;} - .d2-2882779651 .stroke-B4{stroke:#E3E9FD;} - .d2-2882779651 .stroke-B5{stroke:#EDF0FD;} - .d2-2882779651 .stroke-B6{stroke:#F7F8FE;} - .d2-2882779651 .stroke-AA2{stroke:#4A6FF3;} - .d2-2882779651 .stroke-AA4{stroke:#EDF0FD;} - .d2-2882779651 .stroke-AA5{stroke:#F7F8FE;} - .d2-2882779651 .stroke-AB4{stroke:#EDF0FD;} - .d2-2882779651 .stroke-AB5{stroke:#F7F8FE;} - .d2-2882779651 .background-color-N1{background-color:#0A0F25;} - .d2-2882779651 .background-color-N2{background-color:#676C7E;} - .d2-2882779651 .background-color-N3{background-color:#9499AB;} - .d2-2882779651 .background-color-N4{background-color:#CFD2DD;} - .d2-2882779651 .background-color-N5{background-color:#DEE1EB;} - .d2-2882779651 .background-color-N6{background-color:#EEF1F8;} - .d2-2882779651 .background-color-N7{background-color:#FFFFFF;} - .d2-2882779651 .background-color-B1{background-color:#0D32B2;} - .d2-2882779651 .background-color-B2{background-color:#0D32B2;} - .d2-2882779651 .background-color-B3{background-color:#E3E9FD;} - .d2-2882779651 .background-color-B4{background-color:#E3E9FD;} - .d2-2882779651 .background-color-B5{background-color:#EDF0FD;} - .d2-2882779651 .background-color-B6{background-color:#F7F8FE;} - .d2-2882779651 .background-color-AA2{background-color:#4A6FF3;} - .d2-2882779651 .background-color-AA4{background-color:#EDF0FD;} - .d2-2882779651 .background-color-AA5{background-color:#F7F8FE;} - .d2-2882779651 .background-color-AB4{background-color:#EDF0FD;} - .d2-2882779651 .background-color-AB5{background-color:#F7F8FE;} - .d2-2882779651 .color-N1{color:#0A0F25;} - .d2-2882779651 .color-N2{color:#676C7E;} - .d2-2882779651 .color-N3{color:#9499AB;} - .d2-2882779651 .color-N4{color:#CFD2DD;} - .d2-2882779651 .color-N5{color:#DEE1EB;} - .d2-2882779651 .color-N6{color:#EEF1F8;} - .d2-2882779651 .color-N7{color:#FFFFFF;} - .d2-2882779651 .color-B1{color:#0D32B2;} - .d2-2882779651 .color-B2{color:#0D32B2;} - .d2-2882779651 .color-B3{color:#E3E9FD;} - .d2-2882779651 .color-B4{color:#E3E9FD;} - .d2-2882779651 .color-B5{color:#EDF0FD;} - .d2-2882779651 .color-B6{color:#F7F8FE;} - .d2-2882779651 .color-AA2{color:#4A6FF3;} - .d2-2882779651 .color-AA4{color:#EDF0FD;} - .d2-2882779651 .color-AA5{color:#F7F8FE;} - .d2-2882779651 .color-AB4{color:#EDF0FD;} - .d2-2882779651 .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 hi -======= .d2-2810654117 .fill-N1{fill:#0A0F25;} .d2-2810654117 .fill-N2{fill:#676C7E;} .d2-2810654117 .fill-N3{fill:#9499AB;} @@ -266,8 +103,7 @@ .d2-2810654117 .color-AA4{color:#EDF0FD;} .d2-2810654117 .color-AA5{color:#F7F8FE;} .d2-2810654117 .color-AB4{color:#EDF0FD;} - .d2-2810654117 .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 hi ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-2810654117 .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 hi diff --git a/e2etests/testdata/stable/mono-font/dagre/sketch.exp.svg b/e2etests/testdata/stable/mono-font/dagre/sketch.exp.svg index 517a04e0c..4e261a1dc 100644 --- a/e2etests/testdata/stable/mono-font/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/mono-font/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -SATELLITESTRANSMITTER SENDSENDSEND -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-1948806370 .fill-N1{fill:#0A0F25;} - .d2-1948806370 .fill-N2{fill:#676C7E;} - .d2-1948806370 .fill-N3{fill:#9499AB;} - .d2-1948806370 .fill-N4{fill:#CFD2DD;} - .d2-1948806370 .fill-N5{fill:#DEE1EB;} - .d2-1948806370 .fill-N6{fill:#EEF1F8;} - .d2-1948806370 .fill-N7{fill:#FFFFFF;} - .d2-1948806370 .fill-B1{fill:#0D32B2;} - .d2-1948806370 .fill-B2{fill:#0D32B2;} - .d2-1948806370 .fill-B3{fill:#E3E9FD;} - .d2-1948806370 .fill-B4{fill:#E3E9FD;} - .d2-1948806370 .fill-B5{fill:#EDF0FD;} - .d2-1948806370 .fill-B6{fill:#F7F8FE;} - .d2-1948806370 .fill-AA2{fill:#4A6FF3;} - .d2-1948806370 .fill-AA4{fill:#EDF0FD;} - .d2-1948806370 .fill-AA5{fill:#F7F8FE;} - .d2-1948806370 .fill-AB4{fill:#EDF0FD;} - .d2-1948806370 .fill-AB5{fill:#F7F8FE;} - .d2-1948806370 .stroke-N1{stroke:#0A0F25;} - .d2-1948806370 .stroke-N2{stroke:#676C7E;} - .d2-1948806370 .stroke-N3{stroke:#9499AB;} - .d2-1948806370 .stroke-N4{stroke:#CFD2DD;} - .d2-1948806370 .stroke-N5{stroke:#DEE1EB;} - .d2-1948806370 .stroke-N6{stroke:#EEF1F8;} - .d2-1948806370 .stroke-N7{stroke:#FFFFFF;} - .d2-1948806370 .stroke-B1{stroke:#0D32B2;} - .d2-1948806370 .stroke-B2{stroke:#0D32B2;} - .d2-1948806370 .stroke-B3{stroke:#E3E9FD;} - .d2-1948806370 .stroke-B4{stroke:#E3E9FD;} - .d2-1948806370 .stroke-B5{stroke:#EDF0FD;} - .d2-1948806370 .stroke-B6{stroke:#F7F8FE;} - .d2-1948806370 .stroke-AA2{stroke:#4A6FF3;} - .d2-1948806370 .stroke-AA4{stroke:#EDF0FD;} - .d2-1948806370 .stroke-AA5{stroke:#F7F8FE;} - .d2-1948806370 .stroke-AB4{stroke:#EDF0FD;} - .d2-1948806370 .stroke-AB5{stroke:#F7F8FE;} - .d2-1948806370 .background-color-N1{background-color:#0A0F25;} - .d2-1948806370 .background-color-N2{background-color:#676C7E;} - .d2-1948806370 .background-color-N3{background-color:#9499AB;} - .d2-1948806370 .background-color-N4{background-color:#CFD2DD;} - .d2-1948806370 .background-color-N5{background-color:#DEE1EB;} - .d2-1948806370 .background-color-N6{background-color:#EEF1F8;} - .d2-1948806370 .background-color-N7{background-color:#FFFFFF;} - .d2-1948806370 .background-color-B1{background-color:#0D32B2;} - .d2-1948806370 .background-color-B2{background-color:#0D32B2;} - .d2-1948806370 .background-color-B3{background-color:#E3E9FD;} - .d2-1948806370 .background-color-B4{background-color:#E3E9FD;} - .d2-1948806370 .background-color-B5{background-color:#EDF0FD;} - .d2-1948806370 .background-color-B6{background-color:#F7F8FE;} - .d2-1948806370 .background-color-AA2{background-color:#4A6FF3;} - .d2-1948806370 .background-color-AA4{background-color:#EDF0FD;} - .d2-1948806370 .background-color-AA5{background-color:#F7F8FE;} - .d2-1948806370 .background-color-AB4{background-color:#EDF0FD;} - .d2-1948806370 .background-color-AB5{background-color:#F7F8FE;} - .d2-1948806370 .color-N1{color:#0A0F25;} - .d2-1948806370 .color-N2{color:#676C7E;} - .d2-1948806370 .color-N3{color:#9499AB;} - .d2-1948806370 .color-N4{color:#CFD2DD;} - .d2-1948806370 .color-N5{color:#DEE1EB;} - .d2-1948806370 .color-N6{color:#EEF1F8;} - .d2-1948806370 .color-N7{color:#FFFFFF;} - .d2-1948806370 .color-B1{color:#0D32B2;} - .d2-1948806370 .color-B2{color:#0D32B2;} - .d2-1948806370 .color-B3{color:#E3E9FD;} - .d2-1948806370 .color-B4{color:#E3E9FD;} - .d2-1948806370 .color-B5{color:#EDF0FD;} - .d2-1948806370 .color-B6{color:#F7F8FE;} - .d2-1948806370 .color-AA2{color:#4A6FF3;} - .d2-1948806370 .color-AA4{color:#EDF0FD;} - .d2-1948806370 .color-AA5{color:#F7F8FE;} - .d2-1948806370 .color-AB4{color:#EDF0FD;} - .d2-1948806370 .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}]]>SATELLITESTRANSMITTER SENDSENDSEND -======= .d2-472807872 .fill-N1{fill:#0A0F25;} .d2-472807872 .fill-N2{fill:#676C7E;} .d2-472807872 .fill-N3{fill:#9499AB;} @@ -266,8 +103,7 @@ .d2-472807872 .color-AA4{color:#EDF0FD;} .d2-472807872 .color-AA5{color:#F7F8FE;} .d2-472807872 .color-AB4{color:#EDF0FD;} - .d2-472807872 .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}]]>SATELLITESTRANSMITTER SENDSENDSEND ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-472807872 .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}]]>SATELLITESTRANSMITTER SENDSENDSEND diff --git a/e2etests/testdata/stable/mono-font/elk/sketch.exp.svg b/e2etests/testdata/stable/mono-font/elk/sketch.exp.svg index cb900ece5..8a28bb315 100644 --- a/e2etests/testdata/stable/mono-font/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/mono-font/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -SATELLITESTRANSMITTER SENDSENDSEND -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-1412428584 .fill-N1{fill:#0A0F25;} - .d2-1412428584 .fill-N2{fill:#676C7E;} - .d2-1412428584 .fill-N3{fill:#9499AB;} - .d2-1412428584 .fill-N4{fill:#CFD2DD;} - .d2-1412428584 .fill-N5{fill:#DEE1EB;} - .d2-1412428584 .fill-N6{fill:#EEF1F8;} - .d2-1412428584 .fill-N7{fill:#FFFFFF;} - .d2-1412428584 .fill-B1{fill:#0D32B2;} - .d2-1412428584 .fill-B2{fill:#0D32B2;} - .d2-1412428584 .fill-B3{fill:#E3E9FD;} - .d2-1412428584 .fill-B4{fill:#E3E9FD;} - .d2-1412428584 .fill-B5{fill:#EDF0FD;} - .d2-1412428584 .fill-B6{fill:#F7F8FE;} - .d2-1412428584 .fill-AA2{fill:#4A6FF3;} - .d2-1412428584 .fill-AA4{fill:#EDF0FD;} - .d2-1412428584 .fill-AA5{fill:#F7F8FE;} - .d2-1412428584 .fill-AB4{fill:#EDF0FD;} - .d2-1412428584 .fill-AB5{fill:#F7F8FE;} - .d2-1412428584 .stroke-N1{stroke:#0A0F25;} - .d2-1412428584 .stroke-N2{stroke:#676C7E;} - .d2-1412428584 .stroke-N3{stroke:#9499AB;} - .d2-1412428584 .stroke-N4{stroke:#CFD2DD;} - .d2-1412428584 .stroke-N5{stroke:#DEE1EB;} - .d2-1412428584 .stroke-N6{stroke:#EEF1F8;} - .d2-1412428584 .stroke-N7{stroke:#FFFFFF;} - .d2-1412428584 .stroke-B1{stroke:#0D32B2;} - .d2-1412428584 .stroke-B2{stroke:#0D32B2;} - .d2-1412428584 .stroke-B3{stroke:#E3E9FD;} - .d2-1412428584 .stroke-B4{stroke:#E3E9FD;} - .d2-1412428584 .stroke-B5{stroke:#EDF0FD;} - .d2-1412428584 .stroke-B6{stroke:#F7F8FE;} - .d2-1412428584 .stroke-AA2{stroke:#4A6FF3;} - .d2-1412428584 .stroke-AA4{stroke:#EDF0FD;} - .d2-1412428584 .stroke-AA5{stroke:#F7F8FE;} - .d2-1412428584 .stroke-AB4{stroke:#EDF0FD;} - .d2-1412428584 .stroke-AB5{stroke:#F7F8FE;} - .d2-1412428584 .background-color-N1{background-color:#0A0F25;} - .d2-1412428584 .background-color-N2{background-color:#676C7E;} - .d2-1412428584 .background-color-N3{background-color:#9499AB;} - .d2-1412428584 .background-color-N4{background-color:#CFD2DD;} - .d2-1412428584 .background-color-N5{background-color:#DEE1EB;} - .d2-1412428584 .background-color-N6{background-color:#EEF1F8;} - .d2-1412428584 .background-color-N7{background-color:#FFFFFF;} - .d2-1412428584 .background-color-B1{background-color:#0D32B2;} - .d2-1412428584 .background-color-B2{background-color:#0D32B2;} - .d2-1412428584 .background-color-B3{background-color:#E3E9FD;} - .d2-1412428584 .background-color-B4{background-color:#E3E9FD;} - .d2-1412428584 .background-color-B5{background-color:#EDF0FD;} - .d2-1412428584 .background-color-B6{background-color:#F7F8FE;} - .d2-1412428584 .background-color-AA2{background-color:#4A6FF3;} - .d2-1412428584 .background-color-AA4{background-color:#EDF0FD;} - .d2-1412428584 .background-color-AA5{background-color:#F7F8FE;} - .d2-1412428584 .background-color-AB4{background-color:#EDF0FD;} - .d2-1412428584 .background-color-AB5{background-color:#F7F8FE;} - .d2-1412428584 .color-N1{color:#0A0F25;} - .d2-1412428584 .color-N2{color:#676C7E;} - .d2-1412428584 .color-N3{color:#9499AB;} - .d2-1412428584 .color-N4{color:#CFD2DD;} - .d2-1412428584 .color-N5{color:#DEE1EB;} - .d2-1412428584 .color-N6{color:#EEF1F8;} - .d2-1412428584 .color-N7{color:#FFFFFF;} - .d2-1412428584 .color-B1{color:#0D32B2;} - .d2-1412428584 .color-B2{color:#0D32B2;} - .d2-1412428584 .color-B3{color:#E3E9FD;} - .d2-1412428584 .color-B4{color:#E3E9FD;} - .d2-1412428584 .color-B5{color:#EDF0FD;} - .d2-1412428584 .color-B6{color:#F7F8FE;} - .d2-1412428584 .color-AA2{color:#4A6FF3;} - .d2-1412428584 .color-AA4{color:#EDF0FD;} - .d2-1412428584 .color-AA5{color:#F7F8FE;} - .d2-1412428584 .color-AB4{color:#EDF0FD;} - .d2-1412428584 .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}]]>SATELLITESTRANSMITTER SENDSENDSEND -======= .d2-2802467950 .fill-N1{fill:#0A0F25;} .d2-2802467950 .fill-N2{fill:#676C7E;} .d2-2802467950 .fill-N3{fill:#9499AB;} @@ -266,8 +103,7 @@ .d2-2802467950 .color-AA4{color:#EDF0FD;} .d2-2802467950 .color-AA5{color:#F7F8FE;} .d2-2802467950 .color-AB4{color:#EDF0FD;} - .d2-2802467950 .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}]]>SATELLITESTRANSMITTER SENDSENDSEND ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-2802467950 .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}]]>SATELLITESTRANSMITTER SENDSENDSEND diff --git a/e2etests/testdata/stable/multiple_box_selection/dagre/sketch.exp.svg b/e2etests/testdata/stable/multiple_box_selection/dagre/sketch.exp.svg index 04ac88c7c..8e490c8c8 100644 --- a/e2etests/testdata/stable/multiple_box_selection/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/multiple_box_selection/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -outerstartendvolume groupvolume definitionvolume -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-2094625675 .fill-N1{fill:#0A0F25;} - .d2-2094625675 .fill-N2{fill:#676C7E;} - .d2-2094625675 .fill-N3{fill:#9499AB;} - .d2-2094625675 .fill-N4{fill:#CFD2DD;} - .d2-2094625675 .fill-N5{fill:#DEE1EB;} - .d2-2094625675 .fill-N6{fill:#EEF1F8;} - .d2-2094625675 .fill-N7{fill:#FFFFFF;} - .d2-2094625675 .fill-B1{fill:#0D32B2;} - .d2-2094625675 .fill-B2{fill:#0D32B2;} - .d2-2094625675 .fill-B3{fill:#E3E9FD;} - .d2-2094625675 .fill-B4{fill:#E3E9FD;} - .d2-2094625675 .fill-B5{fill:#EDF0FD;} - .d2-2094625675 .fill-B6{fill:#F7F8FE;} - .d2-2094625675 .fill-AA2{fill:#4A6FF3;} - .d2-2094625675 .fill-AA4{fill:#EDF0FD;} - .d2-2094625675 .fill-AA5{fill:#F7F8FE;} - .d2-2094625675 .fill-AB4{fill:#EDF0FD;} - .d2-2094625675 .fill-AB5{fill:#F7F8FE;} - .d2-2094625675 .stroke-N1{stroke:#0A0F25;} - .d2-2094625675 .stroke-N2{stroke:#676C7E;} - .d2-2094625675 .stroke-N3{stroke:#9499AB;} - .d2-2094625675 .stroke-N4{stroke:#CFD2DD;} - .d2-2094625675 .stroke-N5{stroke:#DEE1EB;} - .d2-2094625675 .stroke-N6{stroke:#EEF1F8;} - .d2-2094625675 .stroke-N7{stroke:#FFFFFF;} - .d2-2094625675 .stroke-B1{stroke:#0D32B2;} - .d2-2094625675 .stroke-B2{stroke:#0D32B2;} - .d2-2094625675 .stroke-B3{stroke:#E3E9FD;} - .d2-2094625675 .stroke-B4{stroke:#E3E9FD;} - .d2-2094625675 .stroke-B5{stroke:#EDF0FD;} - .d2-2094625675 .stroke-B6{stroke:#F7F8FE;} - .d2-2094625675 .stroke-AA2{stroke:#4A6FF3;} - .d2-2094625675 .stroke-AA4{stroke:#EDF0FD;} - .d2-2094625675 .stroke-AA5{stroke:#F7F8FE;} - .d2-2094625675 .stroke-AB4{stroke:#EDF0FD;} - .d2-2094625675 .stroke-AB5{stroke:#F7F8FE;} - .d2-2094625675 .background-color-N1{background-color:#0A0F25;} - .d2-2094625675 .background-color-N2{background-color:#676C7E;} - .d2-2094625675 .background-color-N3{background-color:#9499AB;} - .d2-2094625675 .background-color-N4{background-color:#CFD2DD;} - .d2-2094625675 .background-color-N5{background-color:#DEE1EB;} - .d2-2094625675 .background-color-N6{background-color:#EEF1F8;} - .d2-2094625675 .background-color-N7{background-color:#FFFFFF;} - .d2-2094625675 .background-color-B1{background-color:#0D32B2;} - .d2-2094625675 .background-color-B2{background-color:#0D32B2;} - .d2-2094625675 .background-color-B3{background-color:#E3E9FD;} - .d2-2094625675 .background-color-B4{background-color:#E3E9FD;} - .d2-2094625675 .background-color-B5{background-color:#EDF0FD;} - .d2-2094625675 .background-color-B6{background-color:#F7F8FE;} - .d2-2094625675 .background-color-AA2{background-color:#4A6FF3;} - .d2-2094625675 .background-color-AA4{background-color:#EDF0FD;} - .d2-2094625675 .background-color-AA5{background-color:#F7F8FE;} - .d2-2094625675 .background-color-AB4{background-color:#EDF0FD;} - .d2-2094625675 .background-color-AB5{background-color:#F7F8FE;} - .d2-2094625675 .color-N1{color:#0A0F25;} - .d2-2094625675 .color-N2{color:#676C7E;} - .d2-2094625675 .color-N3{color:#9499AB;} - .d2-2094625675 .color-N4{color:#CFD2DD;} - .d2-2094625675 .color-N5{color:#DEE1EB;} - .d2-2094625675 .color-N6{color:#EEF1F8;} - .d2-2094625675 .color-N7{color:#FFFFFF;} - .d2-2094625675 .color-B1{color:#0D32B2;} - .d2-2094625675 .color-B2{color:#0D32B2;} - .d2-2094625675 .color-B3{color:#E3E9FD;} - .d2-2094625675 .color-B4{color:#E3E9FD;} - .d2-2094625675 .color-B5{color:#EDF0FD;} - .d2-2094625675 .color-B6{color:#F7F8FE;} - .d2-2094625675 .color-AA2{color:#4A6FF3;} - .d2-2094625675 .color-AA4{color:#EDF0FD;} - .d2-2094625675 .color-AA5{color:#F7F8FE;} - .d2-2094625675 .color-AB4{color:#EDF0FD;} - .d2-2094625675 .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}]]>outerstartendvolume groupvolume definitionvolume -======= .d2-1897650299 .fill-N1{fill:#0A0F25;} .d2-1897650299 .fill-N2{fill:#676C7E;} .d2-1897650299 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-1897650299 .color-AA4{color:#EDF0FD;} .d2-1897650299 .color-AA5{color:#F7F8FE;} .d2-1897650299 .color-AB4{color:#EDF0FD;} - .d2-1897650299 .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}]]>outerstartendvolume groupvolume definitionvolume ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-1897650299 .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}]]>outerstartendvolume groupvolume definitionvolume diff --git a/e2etests/testdata/stable/multiple_box_selection/elk/sketch.exp.svg b/e2etests/testdata/stable/multiple_box_selection/elk/sketch.exp.svg index 221b9ef43..e573a5b55 100644 --- a/e2etests/testdata/stable/multiple_box_selection/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/multiple_box_selection/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -outerstartendvolume groupvolume definitionvolume -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-236292005 .fill-N1{fill:#0A0F25;} - .d2-236292005 .fill-N2{fill:#676C7E;} - .d2-236292005 .fill-N3{fill:#9499AB;} - .d2-236292005 .fill-N4{fill:#CFD2DD;} - .d2-236292005 .fill-N5{fill:#DEE1EB;} - .d2-236292005 .fill-N6{fill:#EEF1F8;} - .d2-236292005 .fill-N7{fill:#FFFFFF;} - .d2-236292005 .fill-B1{fill:#0D32B2;} - .d2-236292005 .fill-B2{fill:#0D32B2;} - .d2-236292005 .fill-B3{fill:#E3E9FD;} - .d2-236292005 .fill-B4{fill:#E3E9FD;} - .d2-236292005 .fill-B5{fill:#EDF0FD;} - .d2-236292005 .fill-B6{fill:#F7F8FE;} - .d2-236292005 .fill-AA2{fill:#4A6FF3;} - .d2-236292005 .fill-AA4{fill:#EDF0FD;} - .d2-236292005 .fill-AA5{fill:#F7F8FE;} - .d2-236292005 .fill-AB4{fill:#EDF0FD;} - .d2-236292005 .fill-AB5{fill:#F7F8FE;} - .d2-236292005 .stroke-N1{stroke:#0A0F25;} - .d2-236292005 .stroke-N2{stroke:#676C7E;} - .d2-236292005 .stroke-N3{stroke:#9499AB;} - .d2-236292005 .stroke-N4{stroke:#CFD2DD;} - .d2-236292005 .stroke-N5{stroke:#DEE1EB;} - .d2-236292005 .stroke-N6{stroke:#EEF1F8;} - .d2-236292005 .stroke-N7{stroke:#FFFFFF;} - .d2-236292005 .stroke-B1{stroke:#0D32B2;} - .d2-236292005 .stroke-B2{stroke:#0D32B2;} - .d2-236292005 .stroke-B3{stroke:#E3E9FD;} - .d2-236292005 .stroke-B4{stroke:#E3E9FD;} - .d2-236292005 .stroke-B5{stroke:#EDF0FD;} - .d2-236292005 .stroke-B6{stroke:#F7F8FE;} - .d2-236292005 .stroke-AA2{stroke:#4A6FF3;} - .d2-236292005 .stroke-AA4{stroke:#EDF0FD;} - .d2-236292005 .stroke-AA5{stroke:#F7F8FE;} - .d2-236292005 .stroke-AB4{stroke:#EDF0FD;} - .d2-236292005 .stroke-AB5{stroke:#F7F8FE;} - .d2-236292005 .background-color-N1{background-color:#0A0F25;} - .d2-236292005 .background-color-N2{background-color:#676C7E;} - .d2-236292005 .background-color-N3{background-color:#9499AB;} - .d2-236292005 .background-color-N4{background-color:#CFD2DD;} - .d2-236292005 .background-color-N5{background-color:#DEE1EB;} - .d2-236292005 .background-color-N6{background-color:#EEF1F8;} - .d2-236292005 .background-color-N7{background-color:#FFFFFF;} - .d2-236292005 .background-color-B1{background-color:#0D32B2;} - .d2-236292005 .background-color-B2{background-color:#0D32B2;} - .d2-236292005 .background-color-B3{background-color:#E3E9FD;} - .d2-236292005 .background-color-B4{background-color:#E3E9FD;} - .d2-236292005 .background-color-B5{background-color:#EDF0FD;} - .d2-236292005 .background-color-B6{background-color:#F7F8FE;} - .d2-236292005 .background-color-AA2{background-color:#4A6FF3;} - .d2-236292005 .background-color-AA4{background-color:#EDF0FD;} - .d2-236292005 .background-color-AA5{background-color:#F7F8FE;} - .d2-236292005 .background-color-AB4{background-color:#EDF0FD;} - .d2-236292005 .background-color-AB5{background-color:#F7F8FE;} - .d2-236292005 .color-N1{color:#0A0F25;} - .d2-236292005 .color-N2{color:#676C7E;} - .d2-236292005 .color-N3{color:#9499AB;} - .d2-236292005 .color-N4{color:#CFD2DD;} - .d2-236292005 .color-N5{color:#DEE1EB;} - .d2-236292005 .color-N6{color:#EEF1F8;} - .d2-236292005 .color-N7{color:#FFFFFF;} - .d2-236292005 .color-B1{color:#0D32B2;} - .d2-236292005 .color-B2{color:#0D32B2;} - .d2-236292005 .color-B3{color:#E3E9FD;} - .d2-236292005 .color-B4{color:#E3E9FD;} - .d2-236292005 .color-B5{color:#EDF0FD;} - .d2-236292005 .color-B6{color:#F7F8FE;} - .d2-236292005 .color-AA2{color:#4A6FF3;} - .d2-236292005 .color-AA4{color:#EDF0FD;} - .d2-236292005 .color-AA5{color:#F7F8FE;} - .d2-236292005 .color-AB4{color:#EDF0FD;} - .d2-236292005 .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}]]>outerstartendvolume groupvolume definitionvolume -======= .d2-4093003925 .fill-N1{fill:#0A0F25;} .d2-4093003925 .fill-N2{fill:#676C7E;} .d2-4093003925 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-4093003925 .color-AA4{color:#EDF0FD;} .d2-4093003925 .color-AA5{color:#F7F8FE;} .d2-4093003925 .color-AB4{color:#EDF0FD;} - .d2-4093003925 .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}]]>outerstartendvolume groupvolume definitionvolume ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-4093003925 .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}]]>outerstartendvolume groupvolume definitionvolume diff --git a/e2etests/testdata/stable/multiple_offset/dagre/sketch.exp.svg b/e2etests/testdata/stable/multiple_offset/dagre/sketch.exp.svg index e5c1ae00b..ce0d957be 100644 --- a/e2etests/testdata/stable/multiple_offset/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/multiple_offset/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -n1n2n3 -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-4084110625 .fill-N1{fill:#0A0F25;} - .d2-4084110625 .fill-N2{fill:#676C7E;} - .d2-4084110625 .fill-N3{fill:#9499AB;} - .d2-4084110625 .fill-N4{fill:#CFD2DD;} - .d2-4084110625 .fill-N5{fill:#DEE1EB;} - .d2-4084110625 .fill-N6{fill:#EEF1F8;} - .d2-4084110625 .fill-N7{fill:#FFFFFF;} - .d2-4084110625 .fill-B1{fill:#0D32B2;} - .d2-4084110625 .fill-B2{fill:#0D32B2;} - .d2-4084110625 .fill-B3{fill:#E3E9FD;} - .d2-4084110625 .fill-B4{fill:#E3E9FD;} - .d2-4084110625 .fill-B5{fill:#EDF0FD;} - .d2-4084110625 .fill-B6{fill:#F7F8FE;} - .d2-4084110625 .fill-AA2{fill:#4A6FF3;} - .d2-4084110625 .fill-AA4{fill:#EDF0FD;} - .d2-4084110625 .fill-AA5{fill:#F7F8FE;} - .d2-4084110625 .fill-AB4{fill:#EDF0FD;} - .d2-4084110625 .fill-AB5{fill:#F7F8FE;} - .d2-4084110625 .stroke-N1{stroke:#0A0F25;} - .d2-4084110625 .stroke-N2{stroke:#676C7E;} - .d2-4084110625 .stroke-N3{stroke:#9499AB;} - .d2-4084110625 .stroke-N4{stroke:#CFD2DD;} - .d2-4084110625 .stroke-N5{stroke:#DEE1EB;} - .d2-4084110625 .stroke-N6{stroke:#EEF1F8;} - .d2-4084110625 .stroke-N7{stroke:#FFFFFF;} - .d2-4084110625 .stroke-B1{stroke:#0D32B2;} - .d2-4084110625 .stroke-B2{stroke:#0D32B2;} - .d2-4084110625 .stroke-B3{stroke:#E3E9FD;} - .d2-4084110625 .stroke-B4{stroke:#E3E9FD;} - .d2-4084110625 .stroke-B5{stroke:#EDF0FD;} - .d2-4084110625 .stroke-B6{stroke:#F7F8FE;} - .d2-4084110625 .stroke-AA2{stroke:#4A6FF3;} - .d2-4084110625 .stroke-AA4{stroke:#EDF0FD;} - .d2-4084110625 .stroke-AA5{stroke:#F7F8FE;} - .d2-4084110625 .stroke-AB4{stroke:#EDF0FD;} - .d2-4084110625 .stroke-AB5{stroke:#F7F8FE;} - .d2-4084110625 .background-color-N1{background-color:#0A0F25;} - .d2-4084110625 .background-color-N2{background-color:#676C7E;} - .d2-4084110625 .background-color-N3{background-color:#9499AB;} - .d2-4084110625 .background-color-N4{background-color:#CFD2DD;} - .d2-4084110625 .background-color-N5{background-color:#DEE1EB;} - .d2-4084110625 .background-color-N6{background-color:#EEF1F8;} - .d2-4084110625 .background-color-N7{background-color:#FFFFFF;} - .d2-4084110625 .background-color-B1{background-color:#0D32B2;} - .d2-4084110625 .background-color-B2{background-color:#0D32B2;} - .d2-4084110625 .background-color-B3{background-color:#E3E9FD;} - .d2-4084110625 .background-color-B4{background-color:#E3E9FD;} - .d2-4084110625 .background-color-B5{background-color:#EDF0FD;} - .d2-4084110625 .background-color-B6{background-color:#F7F8FE;} - .d2-4084110625 .background-color-AA2{background-color:#4A6FF3;} - .d2-4084110625 .background-color-AA4{background-color:#EDF0FD;} - .d2-4084110625 .background-color-AA5{background-color:#F7F8FE;} - .d2-4084110625 .background-color-AB4{background-color:#EDF0FD;} - .d2-4084110625 .background-color-AB5{background-color:#F7F8FE;} - .d2-4084110625 .color-N1{color:#0A0F25;} - .d2-4084110625 .color-N2{color:#676C7E;} - .d2-4084110625 .color-N3{color:#9499AB;} - .d2-4084110625 .color-N4{color:#CFD2DD;} - .d2-4084110625 .color-N5{color:#DEE1EB;} - .d2-4084110625 .color-N6{color:#EEF1F8;} - .d2-4084110625 .color-N7{color:#FFFFFF;} - .d2-4084110625 .color-B1{color:#0D32B2;} - .d2-4084110625 .color-B2{color:#0D32B2;} - .d2-4084110625 .color-B3{color:#E3E9FD;} - .d2-4084110625 .color-B4{color:#E3E9FD;} - .d2-4084110625 .color-B5{color:#EDF0FD;} - .d2-4084110625 .color-B6{color:#F7F8FE;} - .d2-4084110625 .color-AA2{color:#4A6FF3;} - .d2-4084110625 .color-AA4{color:#EDF0FD;} - .d2-4084110625 .color-AA5{color:#F7F8FE;} - .d2-4084110625 .color-AB4{color:#EDF0FD;} - .d2-4084110625 .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}]]>n1n2n3 -======= .d2-2610931625 .fill-N1{fill:#0A0F25;} .d2-2610931625 .fill-N2{fill:#676C7E;} .d2-2610931625 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-2610931625 .color-AA4{color:#EDF0FD;} .d2-2610931625 .color-AA5{color:#F7F8FE;} .d2-2610931625 .color-AB4{color:#EDF0FD;} - .d2-2610931625 .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}]]>n1n2n3 ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-2610931625 .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}]]>n1n2n3 n4n5 @@ -278,16 +114,8 @@ a -<<<<<<< HEAD -b +b -||||||| parent of 33280fed5 (fixed e2e tests) -b - -======= -b - ->>>>>>> 33280fed5 (fixed e2e tests) diff --git a/e2etests/testdata/stable/multiple_offset/elk/sketch.exp.svg b/e2etests/testdata/stable/multiple_offset/elk/sketch.exp.svg index d4ce054a6..a5a21a9f7 100644 --- a/e2etests/testdata/stable/multiple_offset/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/multiple_offset/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -n1n2n3 -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-4020186194 .fill-N1{fill:#0A0F25;} - .d2-4020186194 .fill-N2{fill:#676C7E;} - .d2-4020186194 .fill-N3{fill:#9499AB;} - .d2-4020186194 .fill-N4{fill:#CFD2DD;} - .d2-4020186194 .fill-N5{fill:#DEE1EB;} - .d2-4020186194 .fill-N6{fill:#EEF1F8;} - .d2-4020186194 .fill-N7{fill:#FFFFFF;} - .d2-4020186194 .fill-B1{fill:#0D32B2;} - .d2-4020186194 .fill-B2{fill:#0D32B2;} - .d2-4020186194 .fill-B3{fill:#E3E9FD;} - .d2-4020186194 .fill-B4{fill:#E3E9FD;} - .d2-4020186194 .fill-B5{fill:#EDF0FD;} - .d2-4020186194 .fill-B6{fill:#F7F8FE;} - .d2-4020186194 .fill-AA2{fill:#4A6FF3;} - .d2-4020186194 .fill-AA4{fill:#EDF0FD;} - .d2-4020186194 .fill-AA5{fill:#F7F8FE;} - .d2-4020186194 .fill-AB4{fill:#EDF0FD;} - .d2-4020186194 .fill-AB5{fill:#F7F8FE;} - .d2-4020186194 .stroke-N1{stroke:#0A0F25;} - .d2-4020186194 .stroke-N2{stroke:#676C7E;} - .d2-4020186194 .stroke-N3{stroke:#9499AB;} - .d2-4020186194 .stroke-N4{stroke:#CFD2DD;} - .d2-4020186194 .stroke-N5{stroke:#DEE1EB;} - .d2-4020186194 .stroke-N6{stroke:#EEF1F8;} - .d2-4020186194 .stroke-N7{stroke:#FFFFFF;} - .d2-4020186194 .stroke-B1{stroke:#0D32B2;} - .d2-4020186194 .stroke-B2{stroke:#0D32B2;} - .d2-4020186194 .stroke-B3{stroke:#E3E9FD;} - .d2-4020186194 .stroke-B4{stroke:#E3E9FD;} - .d2-4020186194 .stroke-B5{stroke:#EDF0FD;} - .d2-4020186194 .stroke-B6{stroke:#F7F8FE;} - .d2-4020186194 .stroke-AA2{stroke:#4A6FF3;} - .d2-4020186194 .stroke-AA4{stroke:#EDF0FD;} - .d2-4020186194 .stroke-AA5{stroke:#F7F8FE;} - .d2-4020186194 .stroke-AB4{stroke:#EDF0FD;} - .d2-4020186194 .stroke-AB5{stroke:#F7F8FE;} - .d2-4020186194 .background-color-N1{background-color:#0A0F25;} - .d2-4020186194 .background-color-N2{background-color:#676C7E;} - .d2-4020186194 .background-color-N3{background-color:#9499AB;} - .d2-4020186194 .background-color-N4{background-color:#CFD2DD;} - .d2-4020186194 .background-color-N5{background-color:#DEE1EB;} - .d2-4020186194 .background-color-N6{background-color:#EEF1F8;} - .d2-4020186194 .background-color-N7{background-color:#FFFFFF;} - .d2-4020186194 .background-color-B1{background-color:#0D32B2;} - .d2-4020186194 .background-color-B2{background-color:#0D32B2;} - .d2-4020186194 .background-color-B3{background-color:#E3E9FD;} - .d2-4020186194 .background-color-B4{background-color:#E3E9FD;} - .d2-4020186194 .background-color-B5{background-color:#EDF0FD;} - .d2-4020186194 .background-color-B6{background-color:#F7F8FE;} - .d2-4020186194 .background-color-AA2{background-color:#4A6FF3;} - .d2-4020186194 .background-color-AA4{background-color:#EDF0FD;} - .d2-4020186194 .background-color-AA5{background-color:#F7F8FE;} - .d2-4020186194 .background-color-AB4{background-color:#EDF0FD;} - .d2-4020186194 .background-color-AB5{background-color:#F7F8FE;} - .d2-4020186194 .color-N1{color:#0A0F25;} - .d2-4020186194 .color-N2{color:#676C7E;} - .d2-4020186194 .color-N3{color:#9499AB;} - .d2-4020186194 .color-N4{color:#CFD2DD;} - .d2-4020186194 .color-N5{color:#DEE1EB;} - .d2-4020186194 .color-N6{color:#EEF1F8;} - .d2-4020186194 .color-N7{color:#FFFFFF;} - .d2-4020186194 .color-B1{color:#0D32B2;} - .d2-4020186194 .color-B2{color:#0D32B2;} - .d2-4020186194 .color-B3{color:#E3E9FD;} - .d2-4020186194 .color-B4{color:#E3E9FD;} - .d2-4020186194 .color-B5{color:#EDF0FD;} - .d2-4020186194 .color-B6{color:#F7F8FE;} - .d2-4020186194 .color-AA2{color:#4A6FF3;} - .d2-4020186194 .color-AA4{color:#EDF0FD;} - .d2-4020186194 .color-AA5{color:#F7F8FE;} - .d2-4020186194 .color-AB4{color:#EDF0FD;} - .d2-4020186194 .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}]]>n1n2n3 -======= .d2-2037312574 .fill-N1{fill:#0A0F25;} .d2-2037312574 .fill-N2{fill:#676C7E;} .d2-2037312574 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-2037312574 .color-AA4{color:#EDF0FD;} .d2-2037312574 .color-AA5{color:#F7F8FE;} .d2-2037312574 .color-AB4{color:#EDF0FD;} - .d2-2037312574 .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}]]>n1n2n3 ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-2037312574 .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}]]>n1n2n3 n4n5 @@ -278,13 +114,7 @@ a -<<<<<<< HEAD -b -||||||| parent of 33280fed5 (fixed e2e tests) -b -======= -b ->>>>>>> 33280fed5 (fixed e2e tests) +b diff --git a/e2etests/testdata/stable/multiple_offset_left/dagre/sketch.exp.svg b/e2etests/testdata/stable/multiple_offset_left/dagre/sketch.exp.svg index eb989b548..da8d4b69f 100644 --- a/e2etests/testdata/stable/multiple_offset_left/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/multiple_offset_left/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -n1n2n3 -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-3651601834 .fill-N1{fill:#0A0F25;} - .d2-3651601834 .fill-N2{fill:#676C7E;} - .d2-3651601834 .fill-N3{fill:#9499AB;} - .d2-3651601834 .fill-N4{fill:#CFD2DD;} - .d2-3651601834 .fill-N5{fill:#DEE1EB;} - .d2-3651601834 .fill-N6{fill:#EEF1F8;} - .d2-3651601834 .fill-N7{fill:#FFFFFF;} - .d2-3651601834 .fill-B1{fill:#0D32B2;} - .d2-3651601834 .fill-B2{fill:#0D32B2;} - .d2-3651601834 .fill-B3{fill:#E3E9FD;} - .d2-3651601834 .fill-B4{fill:#E3E9FD;} - .d2-3651601834 .fill-B5{fill:#EDF0FD;} - .d2-3651601834 .fill-B6{fill:#F7F8FE;} - .d2-3651601834 .fill-AA2{fill:#4A6FF3;} - .d2-3651601834 .fill-AA4{fill:#EDF0FD;} - .d2-3651601834 .fill-AA5{fill:#F7F8FE;} - .d2-3651601834 .fill-AB4{fill:#EDF0FD;} - .d2-3651601834 .fill-AB5{fill:#F7F8FE;} - .d2-3651601834 .stroke-N1{stroke:#0A0F25;} - .d2-3651601834 .stroke-N2{stroke:#676C7E;} - .d2-3651601834 .stroke-N3{stroke:#9499AB;} - .d2-3651601834 .stroke-N4{stroke:#CFD2DD;} - .d2-3651601834 .stroke-N5{stroke:#DEE1EB;} - .d2-3651601834 .stroke-N6{stroke:#EEF1F8;} - .d2-3651601834 .stroke-N7{stroke:#FFFFFF;} - .d2-3651601834 .stroke-B1{stroke:#0D32B2;} - .d2-3651601834 .stroke-B2{stroke:#0D32B2;} - .d2-3651601834 .stroke-B3{stroke:#E3E9FD;} - .d2-3651601834 .stroke-B4{stroke:#E3E9FD;} - .d2-3651601834 .stroke-B5{stroke:#EDF0FD;} - .d2-3651601834 .stroke-B6{stroke:#F7F8FE;} - .d2-3651601834 .stroke-AA2{stroke:#4A6FF3;} - .d2-3651601834 .stroke-AA4{stroke:#EDF0FD;} - .d2-3651601834 .stroke-AA5{stroke:#F7F8FE;} - .d2-3651601834 .stroke-AB4{stroke:#EDF0FD;} - .d2-3651601834 .stroke-AB5{stroke:#F7F8FE;} - .d2-3651601834 .background-color-N1{background-color:#0A0F25;} - .d2-3651601834 .background-color-N2{background-color:#676C7E;} - .d2-3651601834 .background-color-N3{background-color:#9499AB;} - .d2-3651601834 .background-color-N4{background-color:#CFD2DD;} - .d2-3651601834 .background-color-N5{background-color:#DEE1EB;} - .d2-3651601834 .background-color-N6{background-color:#EEF1F8;} - .d2-3651601834 .background-color-N7{background-color:#FFFFFF;} - .d2-3651601834 .background-color-B1{background-color:#0D32B2;} - .d2-3651601834 .background-color-B2{background-color:#0D32B2;} - .d2-3651601834 .background-color-B3{background-color:#E3E9FD;} - .d2-3651601834 .background-color-B4{background-color:#E3E9FD;} - .d2-3651601834 .background-color-B5{background-color:#EDF0FD;} - .d2-3651601834 .background-color-B6{background-color:#F7F8FE;} - .d2-3651601834 .background-color-AA2{background-color:#4A6FF3;} - .d2-3651601834 .background-color-AA4{background-color:#EDF0FD;} - .d2-3651601834 .background-color-AA5{background-color:#F7F8FE;} - .d2-3651601834 .background-color-AB4{background-color:#EDF0FD;} - .d2-3651601834 .background-color-AB5{background-color:#F7F8FE;} - .d2-3651601834 .color-N1{color:#0A0F25;} - .d2-3651601834 .color-N2{color:#676C7E;} - .d2-3651601834 .color-N3{color:#9499AB;} - .d2-3651601834 .color-N4{color:#CFD2DD;} - .d2-3651601834 .color-N5{color:#DEE1EB;} - .d2-3651601834 .color-N6{color:#EEF1F8;} - .d2-3651601834 .color-N7{color:#FFFFFF;} - .d2-3651601834 .color-B1{color:#0D32B2;} - .d2-3651601834 .color-B2{color:#0D32B2;} - .d2-3651601834 .color-B3{color:#E3E9FD;} - .d2-3651601834 .color-B4{color:#E3E9FD;} - .d2-3651601834 .color-B5{color:#EDF0FD;} - .d2-3651601834 .color-B6{color:#F7F8FE;} - .d2-3651601834 .color-AA2{color:#4A6FF3;} - .d2-3651601834 .color-AA4{color:#EDF0FD;} - .d2-3651601834 .color-AA5{color:#F7F8FE;} - .d2-3651601834 .color-AB4{color:#EDF0FD;} - .d2-3651601834 .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}]]>n1n2n3 -======= .d2-2219946450 .fill-N1{fill:#0A0F25;} .d2-2219946450 .fill-N2{fill:#676C7E;} .d2-2219946450 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-2219946450 .color-AA4{color:#EDF0FD;} .d2-2219946450 .color-AA5{color:#F7F8FE;} .d2-2219946450 .color-AB4{color:#EDF0FD;} - .d2-2219946450 .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}]]>n1n2n3 ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-2219946450 .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}]]>n1n2n3 n4n5 @@ -278,13 +114,7 @@ a -<<<<<<< HEAD -b -||||||| parent of 33280fed5 (fixed e2e tests) -b -======= -b ->>>>>>> 33280fed5 (fixed e2e tests) +b diff --git a/e2etests/testdata/stable/multiple_offset_left/elk/sketch.exp.svg b/e2etests/testdata/stable/multiple_offset_left/elk/sketch.exp.svg index e64f05099..133e45ca4 100644 --- a/e2etests/testdata/stable/multiple_offset_left/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/multiple_offset_left/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -n1n2n3 -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-2183146186 .fill-N1{fill:#0A0F25;} - .d2-2183146186 .fill-N2{fill:#676C7E;} - .d2-2183146186 .fill-N3{fill:#9499AB;} - .d2-2183146186 .fill-N4{fill:#CFD2DD;} - .d2-2183146186 .fill-N5{fill:#DEE1EB;} - .d2-2183146186 .fill-N6{fill:#EEF1F8;} - .d2-2183146186 .fill-N7{fill:#FFFFFF;} - .d2-2183146186 .fill-B1{fill:#0D32B2;} - .d2-2183146186 .fill-B2{fill:#0D32B2;} - .d2-2183146186 .fill-B3{fill:#E3E9FD;} - .d2-2183146186 .fill-B4{fill:#E3E9FD;} - .d2-2183146186 .fill-B5{fill:#EDF0FD;} - .d2-2183146186 .fill-B6{fill:#F7F8FE;} - .d2-2183146186 .fill-AA2{fill:#4A6FF3;} - .d2-2183146186 .fill-AA4{fill:#EDF0FD;} - .d2-2183146186 .fill-AA5{fill:#F7F8FE;} - .d2-2183146186 .fill-AB4{fill:#EDF0FD;} - .d2-2183146186 .fill-AB5{fill:#F7F8FE;} - .d2-2183146186 .stroke-N1{stroke:#0A0F25;} - .d2-2183146186 .stroke-N2{stroke:#676C7E;} - .d2-2183146186 .stroke-N3{stroke:#9499AB;} - .d2-2183146186 .stroke-N4{stroke:#CFD2DD;} - .d2-2183146186 .stroke-N5{stroke:#DEE1EB;} - .d2-2183146186 .stroke-N6{stroke:#EEF1F8;} - .d2-2183146186 .stroke-N7{stroke:#FFFFFF;} - .d2-2183146186 .stroke-B1{stroke:#0D32B2;} - .d2-2183146186 .stroke-B2{stroke:#0D32B2;} - .d2-2183146186 .stroke-B3{stroke:#E3E9FD;} - .d2-2183146186 .stroke-B4{stroke:#E3E9FD;} - .d2-2183146186 .stroke-B5{stroke:#EDF0FD;} - .d2-2183146186 .stroke-B6{stroke:#F7F8FE;} - .d2-2183146186 .stroke-AA2{stroke:#4A6FF3;} - .d2-2183146186 .stroke-AA4{stroke:#EDF0FD;} - .d2-2183146186 .stroke-AA5{stroke:#F7F8FE;} - .d2-2183146186 .stroke-AB4{stroke:#EDF0FD;} - .d2-2183146186 .stroke-AB5{stroke:#F7F8FE;} - .d2-2183146186 .background-color-N1{background-color:#0A0F25;} - .d2-2183146186 .background-color-N2{background-color:#676C7E;} - .d2-2183146186 .background-color-N3{background-color:#9499AB;} - .d2-2183146186 .background-color-N4{background-color:#CFD2DD;} - .d2-2183146186 .background-color-N5{background-color:#DEE1EB;} - .d2-2183146186 .background-color-N6{background-color:#EEF1F8;} - .d2-2183146186 .background-color-N7{background-color:#FFFFFF;} - .d2-2183146186 .background-color-B1{background-color:#0D32B2;} - .d2-2183146186 .background-color-B2{background-color:#0D32B2;} - .d2-2183146186 .background-color-B3{background-color:#E3E9FD;} - .d2-2183146186 .background-color-B4{background-color:#E3E9FD;} - .d2-2183146186 .background-color-B5{background-color:#EDF0FD;} - .d2-2183146186 .background-color-B6{background-color:#F7F8FE;} - .d2-2183146186 .background-color-AA2{background-color:#4A6FF3;} - .d2-2183146186 .background-color-AA4{background-color:#EDF0FD;} - .d2-2183146186 .background-color-AA5{background-color:#F7F8FE;} - .d2-2183146186 .background-color-AB4{background-color:#EDF0FD;} - .d2-2183146186 .background-color-AB5{background-color:#F7F8FE;} - .d2-2183146186 .color-N1{color:#0A0F25;} - .d2-2183146186 .color-N2{color:#676C7E;} - .d2-2183146186 .color-N3{color:#9499AB;} - .d2-2183146186 .color-N4{color:#CFD2DD;} - .d2-2183146186 .color-N5{color:#DEE1EB;} - .d2-2183146186 .color-N6{color:#EEF1F8;} - .d2-2183146186 .color-N7{color:#FFFFFF;} - .d2-2183146186 .color-B1{color:#0D32B2;} - .d2-2183146186 .color-B2{color:#0D32B2;} - .d2-2183146186 .color-B3{color:#E3E9FD;} - .d2-2183146186 .color-B4{color:#E3E9FD;} - .d2-2183146186 .color-B5{color:#EDF0FD;} - .d2-2183146186 .color-B6{color:#F7F8FE;} - .d2-2183146186 .color-AA2{color:#4A6FF3;} - .d2-2183146186 .color-AA4{color:#EDF0FD;} - .d2-2183146186 .color-AA5{color:#F7F8FE;} - .d2-2183146186 .color-AB4{color:#EDF0FD;} - .d2-2183146186 .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}]]>n1n2n3 -======= .d2-942166334 .fill-N1{fill:#0A0F25;} .d2-942166334 .fill-N2{fill:#676C7E;} .d2-942166334 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-942166334 .color-AA4{color:#EDF0FD;} .d2-942166334 .color-AA5{color:#F7F8FE;} .d2-942166334 .color-AB4{color:#EDF0FD;} - .d2-942166334 .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}]]>n1n2n3 ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-942166334 .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}]]>n1n2n3 n4n5 @@ -278,13 +114,7 @@ a -<<<<<<< HEAD -b -||||||| parent of 33280fed5 (fixed e2e tests) -b -======= -b ->>>>>>> 33280fed5 (fixed e2e tests) +b diff --git a/e2etests/testdata/stable/multiple_trees/dagre/sketch.exp.svg b/e2etests/testdata/stable/multiple_trees/dagre/sketch.exp.svg index 345408e86..97d98303f 100644 --- a/e2etests/testdata/stable/multiple_trees/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/multiple_trees/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -abcdefghijklmnopqrstuvw -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-2062740197 .fill-N1{fill:#0A0F25;} - .d2-2062740197 .fill-N2{fill:#676C7E;} - .d2-2062740197 .fill-N3{fill:#9499AB;} - .d2-2062740197 .fill-N4{fill:#CFD2DD;} - .d2-2062740197 .fill-N5{fill:#DEE1EB;} - .d2-2062740197 .fill-N6{fill:#EEF1F8;} - .d2-2062740197 .fill-N7{fill:#FFFFFF;} - .d2-2062740197 .fill-B1{fill:#0D32B2;} - .d2-2062740197 .fill-B2{fill:#0D32B2;} - .d2-2062740197 .fill-B3{fill:#E3E9FD;} - .d2-2062740197 .fill-B4{fill:#E3E9FD;} - .d2-2062740197 .fill-B5{fill:#EDF0FD;} - .d2-2062740197 .fill-B6{fill:#F7F8FE;} - .d2-2062740197 .fill-AA2{fill:#4A6FF3;} - .d2-2062740197 .fill-AA4{fill:#EDF0FD;} - .d2-2062740197 .fill-AA5{fill:#F7F8FE;} - .d2-2062740197 .fill-AB4{fill:#EDF0FD;} - .d2-2062740197 .fill-AB5{fill:#F7F8FE;} - .d2-2062740197 .stroke-N1{stroke:#0A0F25;} - .d2-2062740197 .stroke-N2{stroke:#676C7E;} - .d2-2062740197 .stroke-N3{stroke:#9499AB;} - .d2-2062740197 .stroke-N4{stroke:#CFD2DD;} - .d2-2062740197 .stroke-N5{stroke:#DEE1EB;} - .d2-2062740197 .stroke-N6{stroke:#EEF1F8;} - .d2-2062740197 .stroke-N7{stroke:#FFFFFF;} - .d2-2062740197 .stroke-B1{stroke:#0D32B2;} - .d2-2062740197 .stroke-B2{stroke:#0D32B2;} - .d2-2062740197 .stroke-B3{stroke:#E3E9FD;} - .d2-2062740197 .stroke-B4{stroke:#E3E9FD;} - .d2-2062740197 .stroke-B5{stroke:#EDF0FD;} - .d2-2062740197 .stroke-B6{stroke:#F7F8FE;} - .d2-2062740197 .stroke-AA2{stroke:#4A6FF3;} - .d2-2062740197 .stroke-AA4{stroke:#EDF0FD;} - .d2-2062740197 .stroke-AA5{stroke:#F7F8FE;} - .d2-2062740197 .stroke-AB4{stroke:#EDF0FD;} - .d2-2062740197 .stroke-AB5{stroke:#F7F8FE;} - .d2-2062740197 .background-color-N1{background-color:#0A0F25;} - .d2-2062740197 .background-color-N2{background-color:#676C7E;} - .d2-2062740197 .background-color-N3{background-color:#9499AB;} - .d2-2062740197 .background-color-N4{background-color:#CFD2DD;} - .d2-2062740197 .background-color-N5{background-color:#DEE1EB;} - .d2-2062740197 .background-color-N6{background-color:#EEF1F8;} - .d2-2062740197 .background-color-N7{background-color:#FFFFFF;} - .d2-2062740197 .background-color-B1{background-color:#0D32B2;} - .d2-2062740197 .background-color-B2{background-color:#0D32B2;} - .d2-2062740197 .background-color-B3{background-color:#E3E9FD;} - .d2-2062740197 .background-color-B4{background-color:#E3E9FD;} - .d2-2062740197 .background-color-B5{background-color:#EDF0FD;} - .d2-2062740197 .background-color-B6{background-color:#F7F8FE;} - .d2-2062740197 .background-color-AA2{background-color:#4A6FF3;} - .d2-2062740197 .background-color-AA4{background-color:#EDF0FD;} - .d2-2062740197 .background-color-AA5{background-color:#F7F8FE;} - .d2-2062740197 .background-color-AB4{background-color:#EDF0FD;} - .d2-2062740197 .background-color-AB5{background-color:#F7F8FE;} - .d2-2062740197 .color-N1{color:#0A0F25;} - .d2-2062740197 .color-N2{color:#676C7E;} - .d2-2062740197 .color-N3{color:#9499AB;} - .d2-2062740197 .color-N4{color:#CFD2DD;} - .d2-2062740197 .color-N5{color:#DEE1EB;} - .d2-2062740197 .color-N6{color:#EEF1F8;} - .d2-2062740197 .color-N7{color:#FFFFFF;} - .d2-2062740197 .color-B1{color:#0D32B2;} - .d2-2062740197 .color-B2{color:#0D32B2;} - .d2-2062740197 .color-B3{color:#E3E9FD;} - .d2-2062740197 .color-B4{color:#E3E9FD;} - .d2-2062740197 .color-B5{color:#EDF0FD;} - .d2-2062740197 .color-B6{color:#F7F8FE;} - .d2-2062740197 .color-AA2{color:#4A6FF3;} - .d2-2062740197 .color-AA4{color:#EDF0FD;} - .d2-2062740197 .color-AA5{color:#F7F8FE;} - .d2-2062740197 .color-AB4{color:#EDF0FD;} - .d2-2062740197 .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}]]>abcdefghijklmnopqrstuvw -======= .d2-1191862573 .fill-N1{fill:#0A0F25;} .d2-1191862573 .fill-N2{fill:#676C7E;} .d2-1191862573 .fill-N3{fill:#9499AB;} @@ -252,8 +89,7 @@ .d2-1191862573 .color-AA4{color:#EDF0FD;} .d2-1191862573 .color-AA5{color:#F7F8FE;} .d2-1191862573 .color-AB4{color:#EDF0FD;} - .d2-1191862573 .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}]]>abcdefghijklmnopqrstuvw ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-1191862573 .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}]]>abcdefghijklmnopqrstuvw diff --git a/e2etests/testdata/stable/multiple_trees/elk/sketch.exp.svg b/e2etests/testdata/stable/multiple_trees/elk/sketch.exp.svg index 1d307c820..3834fa4ad 100644 --- a/e2etests/testdata/stable/multiple_trees/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/multiple_trees/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -abcdefghijklmnopqrstuvw -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-183457136 .fill-N1{fill:#0A0F25;} - .d2-183457136 .fill-N2{fill:#676C7E;} - .d2-183457136 .fill-N3{fill:#9499AB;} - .d2-183457136 .fill-N4{fill:#CFD2DD;} - .d2-183457136 .fill-N5{fill:#DEE1EB;} - .d2-183457136 .fill-N6{fill:#EEF1F8;} - .d2-183457136 .fill-N7{fill:#FFFFFF;} - .d2-183457136 .fill-B1{fill:#0D32B2;} - .d2-183457136 .fill-B2{fill:#0D32B2;} - .d2-183457136 .fill-B3{fill:#E3E9FD;} - .d2-183457136 .fill-B4{fill:#E3E9FD;} - .d2-183457136 .fill-B5{fill:#EDF0FD;} - .d2-183457136 .fill-B6{fill:#F7F8FE;} - .d2-183457136 .fill-AA2{fill:#4A6FF3;} - .d2-183457136 .fill-AA4{fill:#EDF0FD;} - .d2-183457136 .fill-AA5{fill:#F7F8FE;} - .d2-183457136 .fill-AB4{fill:#EDF0FD;} - .d2-183457136 .fill-AB5{fill:#F7F8FE;} - .d2-183457136 .stroke-N1{stroke:#0A0F25;} - .d2-183457136 .stroke-N2{stroke:#676C7E;} - .d2-183457136 .stroke-N3{stroke:#9499AB;} - .d2-183457136 .stroke-N4{stroke:#CFD2DD;} - .d2-183457136 .stroke-N5{stroke:#DEE1EB;} - .d2-183457136 .stroke-N6{stroke:#EEF1F8;} - .d2-183457136 .stroke-N7{stroke:#FFFFFF;} - .d2-183457136 .stroke-B1{stroke:#0D32B2;} - .d2-183457136 .stroke-B2{stroke:#0D32B2;} - .d2-183457136 .stroke-B3{stroke:#E3E9FD;} - .d2-183457136 .stroke-B4{stroke:#E3E9FD;} - .d2-183457136 .stroke-B5{stroke:#EDF0FD;} - .d2-183457136 .stroke-B6{stroke:#F7F8FE;} - .d2-183457136 .stroke-AA2{stroke:#4A6FF3;} - .d2-183457136 .stroke-AA4{stroke:#EDF0FD;} - .d2-183457136 .stroke-AA5{stroke:#F7F8FE;} - .d2-183457136 .stroke-AB4{stroke:#EDF0FD;} - .d2-183457136 .stroke-AB5{stroke:#F7F8FE;} - .d2-183457136 .background-color-N1{background-color:#0A0F25;} - .d2-183457136 .background-color-N2{background-color:#676C7E;} - .d2-183457136 .background-color-N3{background-color:#9499AB;} - .d2-183457136 .background-color-N4{background-color:#CFD2DD;} - .d2-183457136 .background-color-N5{background-color:#DEE1EB;} - .d2-183457136 .background-color-N6{background-color:#EEF1F8;} - .d2-183457136 .background-color-N7{background-color:#FFFFFF;} - .d2-183457136 .background-color-B1{background-color:#0D32B2;} - .d2-183457136 .background-color-B2{background-color:#0D32B2;} - .d2-183457136 .background-color-B3{background-color:#E3E9FD;} - .d2-183457136 .background-color-B4{background-color:#E3E9FD;} - .d2-183457136 .background-color-B5{background-color:#EDF0FD;} - .d2-183457136 .background-color-B6{background-color:#F7F8FE;} - .d2-183457136 .background-color-AA2{background-color:#4A6FF3;} - .d2-183457136 .background-color-AA4{background-color:#EDF0FD;} - .d2-183457136 .background-color-AA5{background-color:#F7F8FE;} - .d2-183457136 .background-color-AB4{background-color:#EDF0FD;} - .d2-183457136 .background-color-AB5{background-color:#F7F8FE;} - .d2-183457136 .color-N1{color:#0A0F25;} - .d2-183457136 .color-N2{color:#676C7E;} - .d2-183457136 .color-N3{color:#9499AB;} - .d2-183457136 .color-N4{color:#CFD2DD;} - .d2-183457136 .color-N5{color:#DEE1EB;} - .d2-183457136 .color-N6{color:#EEF1F8;} - .d2-183457136 .color-N7{color:#FFFFFF;} - .d2-183457136 .color-B1{color:#0D32B2;} - .d2-183457136 .color-B2{color:#0D32B2;} - .d2-183457136 .color-B3{color:#E3E9FD;} - .d2-183457136 .color-B4{color:#E3E9FD;} - .d2-183457136 .color-B5{color:#EDF0FD;} - .d2-183457136 .color-B6{color:#F7F8FE;} - .d2-183457136 .color-AA2{color:#4A6FF3;} - .d2-183457136 .color-AA4{color:#EDF0FD;} - .d2-183457136 .color-AA5{color:#F7F8FE;} - .d2-183457136 .color-AB4{color:#EDF0FD;} - .d2-183457136 .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}]]>abcdefghijklmnopqrstuvw -======= .d2-483835560 .fill-N1{fill:#0A0F25;} .d2-483835560 .fill-N2{fill:#676C7E;} .d2-483835560 .fill-N3{fill:#9499AB;} @@ -252,8 +89,7 @@ .d2-483835560 .color-AA4{color:#EDF0FD;} .d2-483835560 .color-AA5{color:#F7F8FE;} .d2-483835560 .color-AB4{color:#EDF0FD;} - .d2-483835560 .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}]]>abcdefghijklmnopqrstuvw ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-483835560 .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}]]>abcdefghijklmnopqrstuvw diff --git a/e2etests/testdata/stable/n22_e32/dagre/sketch.exp.svg b/e2etests/testdata/stable/n22_e32/dagre/sketch.exp.svg index 50edc2377..7ac69e243 100644 --- a/e2etests/testdata/stable/n22_e32/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/n22_e32/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -abcdefghijklmnopqrstu -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-2756959702 .fill-N1{fill:#0A0F25;} - .d2-2756959702 .fill-N2{fill:#676C7E;} - .d2-2756959702 .fill-N3{fill:#9499AB;} - .d2-2756959702 .fill-N4{fill:#CFD2DD;} - .d2-2756959702 .fill-N5{fill:#DEE1EB;} - .d2-2756959702 .fill-N6{fill:#EEF1F8;} - .d2-2756959702 .fill-N7{fill:#FFFFFF;} - .d2-2756959702 .fill-B1{fill:#0D32B2;} - .d2-2756959702 .fill-B2{fill:#0D32B2;} - .d2-2756959702 .fill-B3{fill:#E3E9FD;} - .d2-2756959702 .fill-B4{fill:#E3E9FD;} - .d2-2756959702 .fill-B5{fill:#EDF0FD;} - .d2-2756959702 .fill-B6{fill:#F7F8FE;} - .d2-2756959702 .fill-AA2{fill:#4A6FF3;} - .d2-2756959702 .fill-AA4{fill:#EDF0FD;} - .d2-2756959702 .fill-AA5{fill:#F7F8FE;} - .d2-2756959702 .fill-AB4{fill:#EDF0FD;} - .d2-2756959702 .fill-AB5{fill:#F7F8FE;} - .d2-2756959702 .stroke-N1{stroke:#0A0F25;} - .d2-2756959702 .stroke-N2{stroke:#676C7E;} - .d2-2756959702 .stroke-N3{stroke:#9499AB;} - .d2-2756959702 .stroke-N4{stroke:#CFD2DD;} - .d2-2756959702 .stroke-N5{stroke:#DEE1EB;} - .d2-2756959702 .stroke-N6{stroke:#EEF1F8;} - .d2-2756959702 .stroke-N7{stroke:#FFFFFF;} - .d2-2756959702 .stroke-B1{stroke:#0D32B2;} - .d2-2756959702 .stroke-B2{stroke:#0D32B2;} - .d2-2756959702 .stroke-B3{stroke:#E3E9FD;} - .d2-2756959702 .stroke-B4{stroke:#E3E9FD;} - .d2-2756959702 .stroke-B5{stroke:#EDF0FD;} - .d2-2756959702 .stroke-B6{stroke:#F7F8FE;} - .d2-2756959702 .stroke-AA2{stroke:#4A6FF3;} - .d2-2756959702 .stroke-AA4{stroke:#EDF0FD;} - .d2-2756959702 .stroke-AA5{stroke:#F7F8FE;} - .d2-2756959702 .stroke-AB4{stroke:#EDF0FD;} - .d2-2756959702 .stroke-AB5{stroke:#F7F8FE;} - .d2-2756959702 .background-color-N1{background-color:#0A0F25;} - .d2-2756959702 .background-color-N2{background-color:#676C7E;} - .d2-2756959702 .background-color-N3{background-color:#9499AB;} - .d2-2756959702 .background-color-N4{background-color:#CFD2DD;} - .d2-2756959702 .background-color-N5{background-color:#DEE1EB;} - .d2-2756959702 .background-color-N6{background-color:#EEF1F8;} - .d2-2756959702 .background-color-N7{background-color:#FFFFFF;} - .d2-2756959702 .background-color-B1{background-color:#0D32B2;} - .d2-2756959702 .background-color-B2{background-color:#0D32B2;} - .d2-2756959702 .background-color-B3{background-color:#E3E9FD;} - .d2-2756959702 .background-color-B4{background-color:#E3E9FD;} - .d2-2756959702 .background-color-B5{background-color:#EDF0FD;} - .d2-2756959702 .background-color-B6{background-color:#F7F8FE;} - .d2-2756959702 .background-color-AA2{background-color:#4A6FF3;} - .d2-2756959702 .background-color-AA4{background-color:#EDF0FD;} - .d2-2756959702 .background-color-AA5{background-color:#F7F8FE;} - .d2-2756959702 .background-color-AB4{background-color:#EDF0FD;} - .d2-2756959702 .background-color-AB5{background-color:#F7F8FE;} - .d2-2756959702 .color-N1{color:#0A0F25;} - .d2-2756959702 .color-N2{color:#676C7E;} - .d2-2756959702 .color-N3{color:#9499AB;} - .d2-2756959702 .color-N4{color:#CFD2DD;} - .d2-2756959702 .color-N5{color:#DEE1EB;} - .d2-2756959702 .color-N6{color:#EEF1F8;} - .d2-2756959702 .color-N7{color:#FFFFFF;} - .d2-2756959702 .color-B1{color:#0D32B2;} - .d2-2756959702 .color-B2{color:#0D32B2;} - .d2-2756959702 .color-B3{color:#E3E9FD;} - .d2-2756959702 .color-B4{color:#E3E9FD;} - .d2-2756959702 .color-B5{color:#EDF0FD;} - .d2-2756959702 .color-B6{color:#F7F8FE;} - .d2-2756959702 .color-AA2{color:#4A6FF3;} - .d2-2756959702 .color-AA4{color:#EDF0FD;} - .d2-2756959702 .color-AA5{color:#F7F8FE;} - .d2-2756959702 .color-AB4{color:#EDF0FD;} - .d2-2756959702 .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}]]>abcdefghijklmnopqrstu -======= .d2-1683454100 .fill-N1{fill:#0A0F25;} .d2-1683454100 .fill-N2{fill:#676C7E;} .d2-1683454100 .fill-N3{fill:#9499AB;} @@ -252,8 +89,7 @@ .d2-1683454100 .color-AA4{color:#EDF0FD;} .d2-1683454100 .color-AA5{color:#F7F8FE;} .d2-1683454100 .color-AB4{color:#EDF0FD;} - .d2-1683454100 .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}]]>abcdefghijklmnopqrstu ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-1683454100 .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}]]>abcdefghijklmnopqrstu diff --git a/e2etests/testdata/stable/n22_e32/elk/sketch.exp.svg b/e2etests/testdata/stable/n22_e32/elk/sketch.exp.svg index 7c2d9327f..389935043 100644 --- a/e2etests/testdata/stable/n22_e32/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/n22_e32/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -abcdefghijklmnopqrstu -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-502227939 .fill-N1{fill:#0A0F25;} - .d2-502227939 .fill-N2{fill:#676C7E;} - .d2-502227939 .fill-N3{fill:#9499AB;} - .d2-502227939 .fill-N4{fill:#CFD2DD;} - .d2-502227939 .fill-N5{fill:#DEE1EB;} - .d2-502227939 .fill-N6{fill:#EEF1F8;} - .d2-502227939 .fill-N7{fill:#FFFFFF;} - .d2-502227939 .fill-B1{fill:#0D32B2;} - .d2-502227939 .fill-B2{fill:#0D32B2;} - .d2-502227939 .fill-B3{fill:#E3E9FD;} - .d2-502227939 .fill-B4{fill:#E3E9FD;} - .d2-502227939 .fill-B5{fill:#EDF0FD;} - .d2-502227939 .fill-B6{fill:#F7F8FE;} - .d2-502227939 .fill-AA2{fill:#4A6FF3;} - .d2-502227939 .fill-AA4{fill:#EDF0FD;} - .d2-502227939 .fill-AA5{fill:#F7F8FE;} - .d2-502227939 .fill-AB4{fill:#EDF0FD;} - .d2-502227939 .fill-AB5{fill:#F7F8FE;} - .d2-502227939 .stroke-N1{stroke:#0A0F25;} - .d2-502227939 .stroke-N2{stroke:#676C7E;} - .d2-502227939 .stroke-N3{stroke:#9499AB;} - .d2-502227939 .stroke-N4{stroke:#CFD2DD;} - .d2-502227939 .stroke-N5{stroke:#DEE1EB;} - .d2-502227939 .stroke-N6{stroke:#EEF1F8;} - .d2-502227939 .stroke-N7{stroke:#FFFFFF;} - .d2-502227939 .stroke-B1{stroke:#0D32B2;} - .d2-502227939 .stroke-B2{stroke:#0D32B2;} - .d2-502227939 .stroke-B3{stroke:#E3E9FD;} - .d2-502227939 .stroke-B4{stroke:#E3E9FD;} - .d2-502227939 .stroke-B5{stroke:#EDF0FD;} - .d2-502227939 .stroke-B6{stroke:#F7F8FE;} - .d2-502227939 .stroke-AA2{stroke:#4A6FF3;} - .d2-502227939 .stroke-AA4{stroke:#EDF0FD;} - .d2-502227939 .stroke-AA5{stroke:#F7F8FE;} - .d2-502227939 .stroke-AB4{stroke:#EDF0FD;} - .d2-502227939 .stroke-AB5{stroke:#F7F8FE;} - .d2-502227939 .background-color-N1{background-color:#0A0F25;} - .d2-502227939 .background-color-N2{background-color:#676C7E;} - .d2-502227939 .background-color-N3{background-color:#9499AB;} - .d2-502227939 .background-color-N4{background-color:#CFD2DD;} - .d2-502227939 .background-color-N5{background-color:#DEE1EB;} - .d2-502227939 .background-color-N6{background-color:#EEF1F8;} - .d2-502227939 .background-color-N7{background-color:#FFFFFF;} - .d2-502227939 .background-color-B1{background-color:#0D32B2;} - .d2-502227939 .background-color-B2{background-color:#0D32B2;} - .d2-502227939 .background-color-B3{background-color:#E3E9FD;} - .d2-502227939 .background-color-B4{background-color:#E3E9FD;} - .d2-502227939 .background-color-B5{background-color:#EDF0FD;} - .d2-502227939 .background-color-B6{background-color:#F7F8FE;} - .d2-502227939 .background-color-AA2{background-color:#4A6FF3;} - .d2-502227939 .background-color-AA4{background-color:#EDF0FD;} - .d2-502227939 .background-color-AA5{background-color:#F7F8FE;} - .d2-502227939 .background-color-AB4{background-color:#EDF0FD;} - .d2-502227939 .background-color-AB5{background-color:#F7F8FE;} - .d2-502227939 .color-N1{color:#0A0F25;} - .d2-502227939 .color-N2{color:#676C7E;} - .d2-502227939 .color-N3{color:#9499AB;} - .d2-502227939 .color-N4{color:#CFD2DD;} - .d2-502227939 .color-N5{color:#DEE1EB;} - .d2-502227939 .color-N6{color:#EEF1F8;} - .d2-502227939 .color-N7{color:#FFFFFF;} - .d2-502227939 .color-B1{color:#0D32B2;} - .d2-502227939 .color-B2{color:#0D32B2;} - .d2-502227939 .color-B3{color:#E3E9FD;} - .d2-502227939 .color-B4{color:#E3E9FD;} - .d2-502227939 .color-B5{color:#EDF0FD;} - .d2-502227939 .color-B6{color:#F7F8FE;} - .d2-502227939 .color-AA2{color:#4A6FF3;} - .d2-502227939 .color-AA4{color:#EDF0FD;} - .d2-502227939 .color-AA5{color:#F7F8FE;} - .d2-502227939 .color-AB4{color:#EDF0FD;} - .d2-502227939 .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}]]>abcdefghijklmnopqrstu -======= .d2-1525222109 .fill-N1{fill:#0A0F25;} .d2-1525222109 .fill-N2{fill:#676C7E;} .d2-1525222109 .fill-N3{fill:#9499AB;} @@ -252,8 +89,7 @@ .d2-1525222109 .color-AA4{color:#EDF0FD;} .d2-1525222109 .color-AA5{color:#F7F8FE;} .d2-1525222109 .color-AB4{color:#EDF0FD;} - .d2-1525222109 .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}]]>abcdefghijklmnopqrstu ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-1525222109 .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}]]>abcdefghijklmnopqrstu diff --git a/e2etests/testdata/stable/near_keys_for_container#01/dagre/sketch.exp.svg b/e2etests/testdata/stable/near_keys_for_container#01/dagre/sketch.exp.svg index c75126b12..c8edb299c 100644 --- a/e2etests/testdata/stable/near_keys_for_container#01/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/near_keys_for_container#01/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -xyzababcdabcdabcdbaccd -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-4283156917 .fill-N1{fill:#0A0F25;} - .d2-4283156917 .fill-N2{fill:#676C7E;} - .d2-4283156917 .fill-N3{fill:#9499AB;} - .d2-4283156917 .fill-N4{fill:#CFD2DD;} - .d2-4283156917 .fill-N5{fill:#DEE1EB;} - .d2-4283156917 .fill-N6{fill:#EEF1F8;} - .d2-4283156917 .fill-N7{fill:#FFFFFF;} - .d2-4283156917 .fill-B1{fill:#0D32B2;} - .d2-4283156917 .fill-B2{fill:#0D32B2;} - .d2-4283156917 .fill-B3{fill:#E3E9FD;} - .d2-4283156917 .fill-B4{fill:#E3E9FD;} - .d2-4283156917 .fill-B5{fill:#EDF0FD;} - .d2-4283156917 .fill-B6{fill:#F7F8FE;} - .d2-4283156917 .fill-AA2{fill:#4A6FF3;} - .d2-4283156917 .fill-AA4{fill:#EDF0FD;} - .d2-4283156917 .fill-AA5{fill:#F7F8FE;} - .d2-4283156917 .fill-AB4{fill:#EDF0FD;} - .d2-4283156917 .fill-AB5{fill:#F7F8FE;} - .d2-4283156917 .stroke-N1{stroke:#0A0F25;} - .d2-4283156917 .stroke-N2{stroke:#676C7E;} - .d2-4283156917 .stroke-N3{stroke:#9499AB;} - .d2-4283156917 .stroke-N4{stroke:#CFD2DD;} - .d2-4283156917 .stroke-N5{stroke:#DEE1EB;} - .d2-4283156917 .stroke-N6{stroke:#EEF1F8;} - .d2-4283156917 .stroke-N7{stroke:#FFFFFF;} - .d2-4283156917 .stroke-B1{stroke:#0D32B2;} - .d2-4283156917 .stroke-B2{stroke:#0D32B2;} - .d2-4283156917 .stroke-B3{stroke:#E3E9FD;} - .d2-4283156917 .stroke-B4{stroke:#E3E9FD;} - .d2-4283156917 .stroke-B5{stroke:#EDF0FD;} - .d2-4283156917 .stroke-B6{stroke:#F7F8FE;} - .d2-4283156917 .stroke-AA2{stroke:#4A6FF3;} - .d2-4283156917 .stroke-AA4{stroke:#EDF0FD;} - .d2-4283156917 .stroke-AA5{stroke:#F7F8FE;} - .d2-4283156917 .stroke-AB4{stroke:#EDF0FD;} - .d2-4283156917 .stroke-AB5{stroke:#F7F8FE;} - .d2-4283156917 .background-color-N1{background-color:#0A0F25;} - .d2-4283156917 .background-color-N2{background-color:#676C7E;} - .d2-4283156917 .background-color-N3{background-color:#9499AB;} - .d2-4283156917 .background-color-N4{background-color:#CFD2DD;} - .d2-4283156917 .background-color-N5{background-color:#DEE1EB;} - .d2-4283156917 .background-color-N6{background-color:#EEF1F8;} - .d2-4283156917 .background-color-N7{background-color:#FFFFFF;} - .d2-4283156917 .background-color-B1{background-color:#0D32B2;} - .d2-4283156917 .background-color-B2{background-color:#0D32B2;} - .d2-4283156917 .background-color-B3{background-color:#E3E9FD;} - .d2-4283156917 .background-color-B4{background-color:#E3E9FD;} - .d2-4283156917 .background-color-B5{background-color:#EDF0FD;} - .d2-4283156917 .background-color-B6{background-color:#F7F8FE;} - .d2-4283156917 .background-color-AA2{background-color:#4A6FF3;} - .d2-4283156917 .background-color-AA4{background-color:#EDF0FD;} - .d2-4283156917 .background-color-AA5{background-color:#F7F8FE;} - .d2-4283156917 .background-color-AB4{background-color:#EDF0FD;} - .d2-4283156917 .background-color-AB5{background-color:#F7F8FE;} - .d2-4283156917 .color-N1{color:#0A0F25;} - .d2-4283156917 .color-N2{color:#676C7E;} - .d2-4283156917 .color-N3{color:#9499AB;} - .d2-4283156917 .color-N4{color:#CFD2DD;} - .d2-4283156917 .color-N5{color:#DEE1EB;} - .d2-4283156917 .color-N6{color:#EEF1F8;} - .d2-4283156917 .color-N7{color:#FFFFFF;} - .d2-4283156917 .color-B1{color:#0D32B2;} - .d2-4283156917 .color-B2{color:#0D32B2;} - .d2-4283156917 .color-B3{color:#E3E9FD;} - .d2-4283156917 .color-B4{color:#E3E9FD;} - .d2-4283156917 .color-B5{color:#EDF0FD;} - .d2-4283156917 .color-B6{color:#F7F8FE;} - .d2-4283156917 .color-AA2{color:#4A6FF3;} - .d2-4283156917 .color-AA4{color:#EDF0FD;} - .d2-4283156917 .color-AA5{color:#F7F8FE;} - .d2-4283156917 .color-AB4{color:#EDF0FD;} - .d2-4283156917 .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}]]>xyzababcdabcdabcdbaccd -======= .d2-1048288769 .fill-N1{fill:#0A0F25;} .d2-1048288769 .fill-N2{fill:#676C7E;} .d2-1048288769 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-1048288769 .color-AA4{color:#EDF0FD;} .d2-1048288769 .color-AA5{color:#F7F8FE;} .d2-1048288769 .color-AB4{color:#EDF0FD;} - .d2-1048288769 .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}]]>xyzababcdabcdabcdbaccd ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-1048288769 .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}]]>xyzababcdabcdabcdbaccd diff --git a/e2etests/testdata/stable/near_keys_for_container#01/elk/sketch.exp.svg b/e2etests/testdata/stable/near_keys_for_container#01/elk/sketch.exp.svg index 3f148e992..31161acfd 100644 --- a/e2etests/testdata/stable/near_keys_for_container#01/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/near_keys_for_container#01/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -xyzababcdabcdabcdbaccd -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-355368884 .fill-N1{fill:#0A0F25;} - .d2-355368884 .fill-N2{fill:#676C7E;} - .d2-355368884 .fill-N3{fill:#9499AB;} - .d2-355368884 .fill-N4{fill:#CFD2DD;} - .d2-355368884 .fill-N5{fill:#DEE1EB;} - .d2-355368884 .fill-N6{fill:#EEF1F8;} - .d2-355368884 .fill-N7{fill:#FFFFFF;} - .d2-355368884 .fill-B1{fill:#0D32B2;} - .d2-355368884 .fill-B2{fill:#0D32B2;} - .d2-355368884 .fill-B3{fill:#E3E9FD;} - .d2-355368884 .fill-B4{fill:#E3E9FD;} - .d2-355368884 .fill-B5{fill:#EDF0FD;} - .d2-355368884 .fill-B6{fill:#F7F8FE;} - .d2-355368884 .fill-AA2{fill:#4A6FF3;} - .d2-355368884 .fill-AA4{fill:#EDF0FD;} - .d2-355368884 .fill-AA5{fill:#F7F8FE;} - .d2-355368884 .fill-AB4{fill:#EDF0FD;} - .d2-355368884 .fill-AB5{fill:#F7F8FE;} - .d2-355368884 .stroke-N1{stroke:#0A0F25;} - .d2-355368884 .stroke-N2{stroke:#676C7E;} - .d2-355368884 .stroke-N3{stroke:#9499AB;} - .d2-355368884 .stroke-N4{stroke:#CFD2DD;} - .d2-355368884 .stroke-N5{stroke:#DEE1EB;} - .d2-355368884 .stroke-N6{stroke:#EEF1F8;} - .d2-355368884 .stroke-N7{stroke:#FFFFFF;} - .d2-355368884 .stroke-B1{stroke:#0D32B2;} - .d2-355368884 .stroke-B2{stroke:#0D32B2;} - .d2-355368884 .stroke-B3{stroke:#E3E9FD;} - .d2-355368884 .stroke-B4{stroke:#E3E9FD;} - .d2-355368884 .stroke-B5{stroke:#EDF0FD;} - .d2-355368884 .stroke-B6{stroke:#F7F8FE;} - .d2-355368884 .stroke-AA2{stroke:#4A6FF3;} - .d2-355368884 .stroke-AA4{stroke:#EDF0FD;} - .d2-355368884 .stroke-AA5{stroke:#F7F8FE;} - .d2-355368884 .stroke-AB4{stroke:#EDF0FD;} - .d2-355368884 .stroke-AB5{stroke:#F7F8FE;} - .d2-355368884 .background-color-N1{background-color:#0A0F25;} - .d2-355368884 .background-color-N2{background-color:#676C7E;} - .d2-355368884 .background-color-N3{background-color:#9499AB;} - .d2-355368884 .background-color-N4{background-color:#CFD2DD;} - .d2-355368884 .background-color-N5{background-color:#DEE1EB;} - .d2-355368884 .background-color-N6{background-color:#EEF1F8;} - .d2-355368884 .background-color-N7{background-color:#FFFFFF;} - .d2-355368884 .background-color-B1{background-color:#0D32B2;} - .d2-355368884 .background-color-B2{background-color:#0D32B2;} - .d2-355368884 .background-color-B3{background-color:#E3E9FD;} - .d2-355368884 .background-color-B4{background-color:#E3E9FD;} - .d2-355368884 .background-color-B5{background-color:#EDF0FD;} - .d2-355368884 .background-color-B6{background-color:#F7F8FE;} - .d2-355368884 .background-color-AA2{background-color:#4A6FF3;} - .d2-355368884 .background-color-AA4{background-color:#EDF0FD;} - .d2-355368884 .background-color-AA5{background-color:#F7F8FE;} - .d2-355368884 .background-color-AB4{background-color:#EDF0FD;} - .d2-355368884 .background-color-AB5{background-color:#F7F8FE;} - .d2-355368884 .color-N1{color:#0A0F25;} - .d2-355368884 .color-N2{color:#676C7E;} - .d2-355368884 .color-N3{color:#9499AB;} - .d2-355368884 .color-N4{color:#CFD2DD;} - .d2-355368884 .color-N5{color:#DEE1EB;} - .d2-355368884 .color-N6{color:#EEF1F8;} - .d2-355368884 .color-N7{color:#FFFFFF;} - .d2-355368884 .color-B1{color:#0D32B2;} - .d2-355368884 .color-B2{color:#0D32B2;} - .d2-355368884 .color-B3{color:#E3E9FD;} - .d2-355368884 .color-B4{color:#E3E9FD;} - .d2-355368884 .color-B5{color:#EDF0FD;} - .d2-355368884 .color-B6{color:#F7F8FE;} - .d2-355368884 .color-AA2{color:#4A6FF3;} - .d2-355368884 .color-AA4{color:#EDF0FD;} - .d2-355368884 .color-AA5{color:#F7F8FE;} - .d2-355368884 .color-AB4{color:#EDF0FD;} - .d2-355368884 .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}]]>xyzababcdabcdabcdbaccd -======= .d2-3487940360 .fill-N1{fill:#0A0F25;} .d2-3487940360 .fill-N2{fill:#676C7E;} .d2-3487940360 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-3487940360 .color-AA4{color:#EDF0FD;} .d2-3487940360 .color-AA5{color:#F7F8FE;} .d2-3487940360 .color-AB4{color:#EDF0FD;} - .d2-3487940360 .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}]]>xyzababcdabcdabcdbaccd ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-3487940360 .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}]]>xyzababcdabcdabcdbaccd diff --git a/e2etests/testdata/stable/nested_diagram_types/dagre/sketch.exp.svg b/e2etests/testdata/stable/nested_diagram_types/dagre/sketch.exp.svg index d78086a21..1f77e0219 100644 --- a/e2etests/testdata/stable/nested_diagram_types/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/nested_diagram_types/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -abc12312xyxyz yzuvw -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-1081163781 .fill-N1{fill:#0A0F25;} - .d2-1081163781 .fill-N2{fill:#676C7E;} - .d2-1081163781 .fill-N3{fill:#9499AB;} - .d2-1081163781 .fill-N4{fill:#CFD2DD;} - .d2-1081163781 .fill-N5{fill:#DEE1EB;} - .d2-1081163781 .fill-N6{fill:#EEF1F8;} - .d2-1081163781 .fill-N7{fill:#FFFFFF;} - .d2-1081163781 .fill-B1{fill:#0D32B2;} - .d2-1081163781 .fill-B2{fill:#0D32B2;} - .d2-1081163781 .fill-B3{fill:#E3E9FD;} - .d2-1081163781 .fill-B4{fill:#E3E9FD;} - .d2-1081163781 .fill-B5{fill:#EDF0FD;} - .d2-1081163781 .fill-B6{fill:#F7F8FE;} - .d2-1081163781 .fill-AA2{fill:#4A6FF3;} - .d2-1081163781 .fill-AA4{fill:#EDF0FD;} - .d2-1081163781 .fill-AA5{fill:#F7F8FE;} - .d2-1081163781 .fill-AB4{fill:#EDF0FD;} - .d2-1081163781 .fill-AB5{fill:#F7F8FE;} - .d2-1081163781 .stroke-N1{stroke:#0A0F25;} - .d2-1081163781 .stroke-N2{stroke:#676C7E;} - .d2-1081163781 .stroke-N3{stroke:#9499AB;} - .d2-1081163781 .stroke-N4{stroke:#CFD2DD;} - .d2-1081163781 .stroke-N5{stroke:#DEE1EB;} - .d2-1081163781 .stroke-N6{stroke:#EEF1F8;} - .d2-1081163781 .stroke-N7{stroke:#FFFFFF;} - .d2-1081163781 .stroke-B1{stroke:#0D32B2;} - .d2-1081163781 .stroke-B2{stroke:#0D32B2;} - .d2-1081163781 .stroke-B3{stroke:#E3E9FD;} - .d2-1081163781 .stroke-B4{stroke:#E3E9FD;} - .d2-1081163781 .stroke-B5{stroke:#EDF0FD;} - .d2-1081163781 .stroke-B6{stroke:#F7F8FE;} - .d2-1081163781 .stroke-AA2{stroke:#4A6FF3;} - .d2-1081163781 .stroke-AA4{stroke:#EDF0FD;} - .d2-1081163781 .stroke-AA5{stroke:#F7F8FE;} - .d2-1081163781 .stroke-AB4{stroke:#EDF0FD;} - .d2-1081163781 .stroke-AB5{stroke:#F7F8FE;} - .d2-1081163781 .background-color-N1{background-color:#0A0F25;} - .d2-1081163781 .background-color-N2{background-color:#676C7E;} - .d2-1081163781 .background-color-N3{background-color:#9499AB;} - .d2-1081163781 .background-color-N4{background-color:#CFD2DD;} - .d2-1081163781 .background-color-N5{background-color:#DEE1EB;} - .d2-1081163781 .background-color-N6{background-color:#EEF1F8;} - .d2-1081163781 .background-color-N7{background-color:#FFFFFF;} - .d2-1081163781 .background-color-B1{background-color:#0D32B2;} - .d2-1081163781 .background-color-B2{background-color:#0D32B2;} - .d2-1081163781 .background-color-B3{background-color:#E3E9FD;} - .d2-1081163781 .background-color-B4{background-color:#E3E9FD;} - .d2-1081163781 .background-color-B5{background-color:#EDF0FD;} - .d2-1081163781 .background-color-B6{background-color:#F7F8FE;} - .d2-1081163781 .background-color-AA2{background-color:#4A6FF3;} - .d2-1081163781 .background-color-AA4{background-color:#EDF0FD;} - .d2-1081163781 .background-color-AA5{background-color:#F7F8FE;} - .d2-1081163781 .background-color-AB4{background-color:#EDF0FD;} - .d2-1081163781 .background-color-AB5{background-color:#F7F8FE;} - .d2-1081163781 .color-N1{color:#0A0F25;} - .d2-1081163781 .color-N2{color:#676C7E;} - .d2-1081163781 .color-N3{color:#9499AB;} - .d2-1081163781 .color-N4{color:#CFD2DD;} - .d2-1081163781 .color-N5{color:#DEE1EB;} - .d2-1081163781 .color-N6{color:#EEF1F8;} - .d2-1081163781 .color-N7{color:#FFFFFF;} - .d2-1081163781 .color-B1{color:#0D32B2;} - .d2-1081163781 .color-B2{color:#0D32B2;} - .d2-1081163781 .color-B3{color:#E3E9FD;} - .d2-1081163781 .color-B4{color:#E3E9FD;} - .d2-1081163781 .color-B5{color:#EDF0FD;} - .d2-1081163781 .color-B6{color:#F7F8FE;} - .d2-1081163781 .color-AA2{color:#4A6FF3;} - .d2-1081163781 .color-AA4{color:#EDF0FD;} - .d2-1081163781 .color-AA5{color:#F7F8FE;} - .d2-1081163781 .color-AB4{color:#EDF0FD;} - .d2-1081163781 .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}]]>abc12312xyxyz yzuvw -======= .d2-2186548987 .fill-N1{fill:#0A0F25;} .d2-2186548987 .fill-N2{fill:#676C7E;} .d2-2186548987 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-2186548987 .color-AA4{color:#EDF0FD;} .d2-2186548987 .color-AA5{color:#F7F8FE;} .d2-2186548987 .color-AB4{color:#EDF0FD;} - .d2-2186548987 .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}]]>abc12312xyxyz yzuvw ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-2186548987 .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}]]>abc12312xyxyz yzuvw diff --git a/e2etests/testdata/stable/nested_diagram_types/elk/sketch.exp.svg b/e2etests/testdata/stable/nested_diagram_types/elk/sketch.exp.svg index 7671810bb..68b5ad8b9 100644 --- a/e2etests/testdata/stable/nested_diagram_types/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/nested_diagram_types/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -abc12312xyxyz yzuvw -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-678101793 .fill-N1{fill:#0A0F25;} - .d2-678101793 .fill-N2{fill:#676C7E;} - .d2-678101793 .fill-N3{fill:#9499AB;} - .d2-678101793 .fill-N4{fill:#CFD2DD;} - .d2-678101793 .fill-N5{fill:#DEE1EB;} - .d2-678101793 .fill-N6{fill:#EEF1F8;} - .d2-678101793 .fill-N7{fill:#FFFFFF;} - .d2-678101793 .fill-B1{fill:#0D32B2;} - .d2-678101793 .fill-B2{fill:#0D32B2;} - .d2-678101793 .fill-B3{fill:#E3E9FD;} - .d2-678101793 .fill-B4{fill:#E3E9FD;} - .d2-678101793 .fill-B5{fill:#EDF0FD;} - .d2-678101793 .fill-B6{fill:#F7F8FE;} - .d2-678101793 .fill-AA2{fill:#4A6FF3;} - .d2-678101793 .fill-AA4{fill:#EDF0FD;} - .d2-678101793 .fill-AA5{fill:#F7F8FE;} - .d2-678101793 .fill-AB4{fill:#EDF0FD;} - .d2-678101793 .fill-AB5{fill:#F7F8FE;} - .d2-678101793 .stroke-N1{stroke:#0A0F25;} - .d2-678101793 .stroke-N2{stroke:#676C7E;} - .d2-678101793 .stroke-N3{stroke:#9499AB;} - .d2-678101793 .stroke-N4{stroke:#CFD2DD;} - .d2-678101793 .stroke-N5{stroke:#DEE1EB;} - .d2-678101793 .stroke-N6{stroke:#EEF1F8;} - .d2-678101793 .stroke-N7{stroke:#FFFFFF;} - .d2-678101793 .stroke-B1{stroke:#0D32B2;} - .d2-678101793 .stroke-B2{stroke:#0D32B2;} - .d2-678101793 .stroke-B3{stroke:#E3E9FD;} - .d2-678101793 .stroke-B4{stroke:#E3E9FD;} - .d2-678101793 .stroke-B5{stroke:#EDF0FD;} - .d2-678101793 .stroke-B6{stroke:#F7F8FE;} - .d2-678101793 .stroke-AA2{stroke:#4A6FF3;} - .d2-678101793 .stroke-AA4{stroke:#EDF0FD;} - .d2-678101793 .stroke-AA5{stroke:#F7F8FE;} - .d2-678101793 .stroke-AB4{stroke:#EDF0FD;} - .d2-678101793 .stroke-AB5{stroke:#F7F8FE;} - .d2-678101793 .background-color-N1{background-color:#0A0F25;} - .d2-678101793 .background-color-N2{background-color:#676C7E;} - .d2-678101793 .background-color-N3{background-color:#9499AB;} - .d2-678101793 .background-color-N4{background-color:#CFD2DD;} - .d2-678101793 .background-color-N5{background-color:#DEE1EB;} - .d2-678101793 .background-color-N6{background-color:#EEF1F8;} - .d2-678101793 .background-color-N7{background-color:#FFFFFF;} - .d2-678101793 .background-color-B1{background-color:#0D32B2;} - .d2-678101793 .background-color-B2{background-color:#0D32B2;} - .d2-678101793 .background-color-B3{background-color:#E3E9FD;} - .d2-678101793 .background-color-B4{background-color:#E3E9FD;} - .d2-678101793 .background-color-B5{background-color:#EDF0FD;} - .d2-678101793 .background-color-B6{background-color:#F7F8FE;} - .d2-678101793 .background-color-AA2{background-color:#4A6FF3;} - .d2-678101793 .background-color-AA4{background-color:#EDF0FD;} - .d2-678101793 .background-color-AA5{background-color:#F7F8FE;} - .d2-678101793 .background-color-AB4{background-color:#EDF0FD;} - .d2-678101793 .background-color-AB5{background-color:#F7F8FE;} - .d2-678101793 .color-N1{color:#0A0F25;} - .d2-678101793 .color-N2{color:#676C7E;} - .d2-678101793 .color-N3{color:#9499AB;} - .d2-678101793 .color-N4{color:#CFD2DD;} - .d2-678101793 .color-N5{color:#DEE1EB;} - .d2-678101793 .color-N6{color:#EEF1F8;} - .d2-678101793 .color-N7{color:#FFFFFF;} - .d2-678101793 .color-B1{color:#0D32B2;} - .d2-678101793 .color-B2{color:#0D32B2;} - .d2-678101793 .color-B3{color:#E3E9FD;} - .d2-678101793 .color-B4{color:#E3E9FD;} - .d2-678101793 .color-B5{color:#EDF0FD;} - .d2-678101793 .color-B6{color:#F7F8FE;} - .d2-678101793 .color-AA2{color:#4A6FF3;} - .d2-678101793 .color-AA4{color:#EDF0FD;} - .d2-678101793 .color-AA5{color:#F7F8FE;} - .d2-678101793 .color-AB4{color:#EDF0FD;} - .d2-678101793 .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}]]>abc12312xyxyz yzuvw -======= .d2-2310225815 .fill-N1{fill:#0A0F25;} .d2-2310225815 .fill-N2{fill:#676C7E;} .d2-2310225815 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-2310225815 .color-AA4{color:#EDF0FD;} .d2-2310225815 .color-AA5{color:#F7F8FE;} .d2-2310225815 .color-AB4{color:#EDF0FD;} - .d2-2310225815 .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}]]>abc12312xyxyz yzuvw ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-2310225815 .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}]]>abc12312xyxyz yzuvw diff --git a/e2etests/testdata/stable/nesting_power/dagre/sketch.exp.svg b/e2etests/testdata/stable/nesting_power/dagre/sketch.exp.svg index c106136da..26456cd22 100644 --- a/e2etests/testdata/stable/nesting_power/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/nesting_power/dagre/sketch.exp.svg @@ -1,26 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -12Foo Bazhello -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-1160589039 .fill-N1{fill:#0A0F25;} - .d2-1160589039 .fill-N2{fill:#676C7E;} - .d2-1160589039 .fill-N3{fill:#9499AB;} - .d2-1160589039 .fill-N4{fill:#CFD2DD;} - .d2-1160589039 .fill-N5{fill:#DEE1EB;} - .d2-1160589039 .fill-N6{fill:#EEF1F8;} - .d2-1160589039 .fill-N7{fill:#FFFFFF;} - .d2-1160589039 .fill-B1{fill:#0D32B2;} - .d2-1160589039 .fill-B2{fill:#0D32B2;} - .d2-1160589039 .fill-B3{fill:#E3E9FD;} - .d2-1160589039 .fill-B4{fill:#E3E9FD;} - .d2-1160589039 .fill-B5{fill:#EDF0FD;} - .d2-1160589039 .fill-B6{fill:#F7F8FE;} - .d2-1160589039 .fill-AA2{fill:#4A6FF3;} - .d2-1160589039 .fill-AA4{fill:#EDF0FD;} - .d2-1160589039 .fill-AA5{fill:#F7F8FE;} - .d2-1160589039 .fill-AB4{fill:#EDF0FD;} - .d2-1160589039 .fill-AB5{fill:#F7F8FE;} - .d2-1160589039 .stroke-N1{stroke:#0A0F25;} - .d2-1160589039 .stroke-N2{stroke:#676C7E;} - .d2-1160589039 .stroke-N3{stroke:#9499AB;} - .d2-1160589039 .stroke-N4{stroke:#CFD2DD;} - .d2-1160589039 .stroke-N5{stroke:#DEE1EB;} - .d2-1160589039 .stroke-N6{stroke:#EEF1F8;} - .d2-1160589039 .stroke-N7{stroke:#FFFFFF;} - .d2-1160589039 .stroke-B1{stroke:#0D32B2;} - .d2-1160589039 .stroke-B2{stroke:#0D32B2;} - .d2-1160589039 .stroke-B3{stroke:#E3E9FD;} - .d2-1160589039 .stroke-B4{stroke:#E3E9FD;} - .d2-1160589039 .stroke-B5{stroke:#EDF0FD;} - .d2-1160589039 .stroke-B6{stroke:#F7F8FE;} - .d2-1160589039 .stroke-AA2{stroke:#4A6FF3;} - .d2-1160589039 .stroke-AA4{stroke:#EDF0FD;} - .d2-1160589039 .stroke-AA5{stroke:#F7F8FE;} - .d2-1160589039 .stroke-AB4{stroke:#EDF0FD;} - .d2-1160589039 .stroke-AB5{stroke:#F7F8FE;} - .d2-1160589039 .background-color-N1{background-color:#0A0F25;} - .d2-1160589039 .background-color-N2{background-color:#676C7E;} - .d2-1160589039 .background-color-N3{background-color:#9499AB;} - .d2-1160589039 .background-color-N4{background-color:#CFD2DD;} - .d2-1160589039 .background-color-N5{background-color:#DEE1EB;} - .d2-1160589039 .background-color-N6{background-color:#EEF1F8;} - .d2-1160589039 .background-color-N7{background-color:#FFFFFF;} - .d2-1160589039 .background-color-B1{background-color:#0D32B2;} - .d2-1160589039 .background-color-B2{background-color:#0D32B2;} - .d2-1160589039 .background-color-B3{background-color:#E3E9FD;} - .d2-1160589039 .background-color-B4{background-color:#E3E9FD;} - .d2-1160589039 .background-color-B5{background-color:#EDF0FD;} - .d2-1160589039 .background-color-B6{background-color:#F7F8FE;} - .d2-1160589039 .background-color-AA2{background-color:#4A6FF3;} - .d2-1160589039 .background-color-AA4{background-color:#EDF0FD;} - .d2-1160589039 .background-color-AA5{background-color:#F7F8FE;} - .d2-1160589039 .background-color-AB4{background-color:#EDF0FD;} - .d2-1160589039 .background-color-AB5{background-color:#F7F8FE;} - .d2-1160589039 .color-N1{color:#0A0F25;} - .d2-1160589039 .color-N2{color:#676C7E;} - .d2-1160589039 .color-N3{color:#9499AB;} - .d2-1160589039 .color-N4{color:#CFD2DD;} - .d2-1160589039 .color-N5{color:#DEE1EB;} - .d2-1160589039 .color-N6{color:#EEF1F8;} - .d2-1160589039 .color-N7{color:#FFFFFF;} - .d2-1160589039 .color-B1{color:#0D32B2;} - .d2-1160589039 .color-B2{color:#0D32B2;} - .d2-1160589039 .color-B3{color:#E3E9FD;} - .d2-1160589039 .color-B4{color:#E3E9FD;} - .d2-1160589039 .color-B5{color:#EDF0FD;} - .d2-1160589039 .color-B6{color:#F7F8FE;} - .d2-1160589039 .color-AA2{color:#4A6FF3;} - .d2-1160589039 .color-AA4{color:#EDF0FD;} - .d2-1160589039 .color-AA5{color:#F7F8FE;} - .d2-1160589039 .color-AB4{color:#EDF0FD;} - .d2-1160589039 .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}]]>12Foo Bazhello -======= .d2-815763335 .fill-N1{fill:#0A0F25;} .d2-815763335 .fill-N2{fill:#676C7E;} .d2-815763335 .fill-N3{fill:#9499AB;} @@ -252,8 +89,7 @@ .d2-815763335 .color-AA4{color:#EDF0FD;} .d2-815763335 .color-AA5{color:#F7F8FE;} .d2-815763335 .color-AB4{color:#EDF0FD;} - .d2-815763335 .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}]]>12Foo Bazhello ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-815763335 .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}]]>12Foo Bazhello diff --git a/e2etests/testdata/stable/number_connections/elk/sketch.exp.svg b/e2etests/testdata/stable/number_connections/elk/sketch.exp.svg index 4ab4b2f78..8dce04f6c 100644 --- a/e2etests/testdata/stable/number_connections/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/number_connections/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -12Foo Bazhello -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-1005771847 .fill-N1{fill:#0A0F25;} - .d2-1005771847 .fill-N2{fill:#676C7E;} - .d2-1005771847 .fill-N3{fill:#9499AB;} - .d2-1005771847 .fill-N4{fill:#CFD2DD;} - .d2-1005771847 .fill-N5{fill:#DEE1EB;} - .d2-1005771847 .fill-N6{fill:#EEF1F8;} - .d2-1005771847 .fill-N7{fill:#FFFFFF;} - .d2-1005771847 .fill-B1{fill:#0D32B2;} - .d2-1005771847 .fill-B2{fill:#0D32B2;} - .d2-1005771847 .fill-B3{fill:#E3E9FD;} - .d2-1005771847 .fill-B4{fill:#E3E9FD;} - .d2-1005771847 .fill-B5{fill:#EDF0FD;} - .d2-1005771847 .fill-B6{fill:#F7F8FE;} - .d2-1005771847 .fill-AA2{fill:#4A6FF3;} - .d2-1005771847 .fill-AA4{fill:#EDF0FD;} - .d2-1005771847 .fill-AA5{fill:#F7F8FE;} - .d2-1005771847 .fill-AB4{fill:#EDF0FD;} - .d2-1005771847 .fill-AB5{fill:#F7F8FE;} - .d2-1005771847 .stroke-N1{stroke:#0A0F25;} - .d2-1005771847 .stroke-N2{stroke:#676C7E;} - .d2-1005771847 .stroke-N3{stroke:#9499AB;} - .d2-1005771847 .stroke-N4{stroke:#CFD2DD;} - .d2-1005771847 .stroke-N5{stroke:#DEE1EB;} - .d2-1005771847 .stroke-N6{stroke:#EEF1F8;} - .d2-1005771847 .stroke-N7{stroke:#FFFFFF;} - .d2-1005771847 .stroke-B1{stroke:#0D32B2;} - .d2-1005771847 .stroke-B2{stroke:#0D32B2;} - .d2-1005771847 .stroke-B3{stroke:#E3E9FD;} - .d2-1005771847 .stroke-B4{stroke:#E3E9FD;} - .d2-1005771847 .stroke-B5{stroke:#EDF0FD;} - .d2-1005771847 .stroke-B6{stroke:#F7F8FE;} - .d2-1005771847 .stroke-AA2{stroke:#4A6FF3;} - .d2-1005771847 .stroke-AA4{stroke:#EDF0FD;} - .d2-1005771847 .stroke-AA5{stroke:#F7F8FE;} - .d2-1005771847 .stroke-AB4{stroke:#EDF0FD;} - .d2-1005771847 .stroke-AB5{stroke:#F7F8FE;} - .d2-1005771847 .background-color-N1{background-color:#0A0F25;} - .d2-1005771847 .background-color-N2{background-color:#676C7E;} - .d2-1005771847 .background-color-N3{background-color:#9499AB;} - .d2-1005771847 .background-color-N4{background-color:#CFD2DD;} - .d2-1005771847 .background-color-N5{background-color:#DEE1EB;} - .d2-1005771847 .background-color-N6{background-color:#EEF1F8;} - .d2-1005771847 .background-color-N7{background-color:#FFFFFF;} - .d2-1005771847 .background-color-B1{background-color:#0D32B2;} - .d2-1005771847 .background-color-B2{background-color:#0D32B2;} - .d2-1005771847 .background-color-B3{background-color:#E3E9FD;} - .d2-1005771847 .background-color-B4{background-color:#E3E9FD;} - .d2-1005771847 .background-color-B5{background-color:#EDF0FD;} - .d2-1005771847 .background-color-B6{background-color:#F7F8FE;} - .d2-1005771847 .background-color-AA2{background-color:#4A6FF3;} - .d2-1005771847 .background-color-AA4{background-color:#EDF0FD;} - .d2-1005771847 .background-color-AA5{background-color:#F7F8FE;} - .d2-1005771847 .background-color-AB4{background-color:#EDF0FD;} - .d2-1005771847 .background-color-AB5{background-color:#F7F8FE;} - .d2-1005771847 .color-N1{color:#0A0F25;} - .d2-1005771847 .color-N2{color:#676C7E;} - .d2-1005771847 .color-N3{color:#9499AB;} - .d2-1005771847 .color-N4{color:#CFD2DD;} - .d2-1005771847 .color-N5{color:#DEE1EB;} - .d2-1005771847 .color-N6{color:#EEF1F8;} - .d2-1005771847 .color-N7{color:#FFFFFF;} - .d2-1005771847 .color-B1{color:#0D32B2;} - .d2-1005771847 .color-B2{color:#0D32B2;} - .d2-1005771847 .color-B3{color:#E3E9FD;} - .d2-1005771847 .color-B4{color:#E3E9FD;} - .d2-1005771847 .color-B5{color:#EDF0FD;} - .d2-1005771847 .color-B6{color:#F7F8FE;} - .d2-1005771847 .color-AA2{color:#4A6FF3;} - .d2-1005771847 .color-AA4{color:#EDF0FD;} - .d2-1005771847 .color-AA5{color:#F7F8FE;} - .d2-1005771847 .color-AB4{color:#EDF0FD;} - .d2-1005771847 .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}]]>12Foo Bazhello -======= .d2-28525603 .fill-N1{fill:#0A0F25;} .d2-28525603 .fill-N2{fill:#676C7E;} .d2-28525603 .fill-N3{fill:#9499AB;} @@ -252,8 +89,7 @@ .d2-28525603 .color-AA4{color:#EDF0FD;} .d2-28525603 .color-AA5{color:#F7F8FE;} .d2-28525603 .color-AB4{color:#EDF0FD;} - .d2-28525603 .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}]]>12Foo Bazhello ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-28525603 .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}]]>12Foo Bazhello diff --git a/e2etests/testdata/stable/one_container_loop/dagre/sketch.exp.svg b/e2etests/testdata/stable/one_container_loop/dagre/sketch.exp.svg index 45c952e07..d7cd0beef 100644 --- a/e2etests/testdata/stable/one_container_loop/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/one_container_loop/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -acdefgbh -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-4157992462 .fill-N1{fill:#0A0F25;} - .d2-4157992462 .fill-N2{fill:#676C7E;} - .d2-4157992462 .fill-N3{fill:#9499AB;} - .d2-4157992462 .fill-N4{fill:#CFD2DD;} - .d2-4157992462 .fill-N5{fill:#DEE1EB;} - .d2-4157992462 .fill-N6{fill:#EEF1F8;} - .d2-4157992462 .fill-N7{fill:#FFFFFF;} - .d2-4157992462 .fill-B1{fill:#0D32B2;} - .d2-4157992462 .fill-B2{fill:#0D32B2;} - .d2-4157992462 .fill-B3{fill:#E3E9FD;} - .d2-4157992462 .fill-B4{fill:#E3E9FD;} - .d2-4157992462 .fill-B5{fill:#EDF0FD;} - .d2-4157992462 .fill-B6{fill:#F7F8FE;} - .d2-4157992462 .fill-AA2{fill:#4A6FF3;} - .d2-4157992462 .fill-AA4{fill:#EDF0FD;} - .d2-4157992462 .fill-AA5{fill:#F7F8FE;} - .d2-4157992462 .fill-AB4{fill:#EDF0FD;} - .d2-4157992462 .fill-AB5{fill:#F7F8FE;} - .d2-4157992462 .stroke-N1{stroke:#0A0F25;} - .d2-4157992462 .stroke-N2{stroke:#676C7E;} - .d2-4157992462 .stroke-N3{stroke:#9499AB;} - .d2-4157992462 .stroke-N4{stroke:#CFD2DD;} - .d2-4157992462 .stroke-N5{stroke:#DEE1EB;} - .d2-4157992462 .stroke-N6{stroke:#EEF1F8;} - .d2-4157992462 .stroke-N7{stroke:#FFFFFF;} - .d2-4157992462 .stroke-B1{stroke:#0D32B2;} - .d2-4157992462 .stroke-B2{stroke:#0D32B2;} - .d2-4157992462 .stroke-B3{stroke:#E3E9FD;} - .d2-4157992462 .stroke-B4{stroke:#E3E9FD;} - .d2-4157992462 .stroke-B5{stroke:#EDF0FD;} - .d2-4157992462 .stroke-B6{stroke:#F7F8FE;} - .d2-4157992462 .stroke-AA2{stroke:#4A6FF3;} - .d2-4157992462 .stroke-AA4{stroke:#EDF0FD;} - .d2-4157992462 .stroke-AA5{stroke:#F7F8FE;} - .d2-4157992462 .stroke-AB4{stroke:#EDF0FD;} - .d2-4157992462 .stroke-AB5{stroke:#F7F8FE;} - .d2-4157992462 .background-color-N1{background-color:#0A0F25;} - .d2-4157992462 .background-color-N2{background-color:#676C7E;} - .d2-4157992462 .background-color-N3{background-color:#9499AB;} - .d2-4157992462 .background-color-N4{background-color:#CFD2DD;} - .d2-4157992462 .background-color-N5{background-color:#DEE1EB;} - .d2-4157992462 .background-color-N6{background-color:#EEF1F8;} - .d2-4157992462 .background-color-N7{background-color:#FFFFFF;} - .d2-4157992462 .background-color-B1{background-color:#0D32B2;} - .d2-4157992462 .background-color-B2{background-color:#0D32B2;} - .d2-4157992462 .background-color-B3{background-color:#E3E9FD;} - .d2-4157992462 .background-color-B4{background-color:#E3E9FD;} - .d2-4157992462 .background-color-B5{background-color:#EDF0FD;} - .d2-4157992462 .background-color-B6{background-color:#F7F8FE;} - .d2-4157992462 .background-color-AA2{background-color:#4A6FF3;} - .d2-4157992462 .background-color-AA4{background-color:#EDF0FD;} - .d2-4157992462 .background-color-AA5{background-color:#F7F8FE;} - .d2-4157992462 .background-color-AB4{background-color:#EDF0FD;} - .d2-4157992462 .background-color-AB5{background-color:#F7F8FE;} - .d2-4157992462 .color-N1{color:#0A0F25;} - .d2-4157992462 .color-N2{color:#676C7E;} - .d2-4157992462 .color-N3{color:#9499AB;} - .d2-4157992462 .color-N4{color:#CFD2DD;} - .d2-4157992462 .color-N5{color:#DEE1EB;} - .d2-4157992462 .color-N6{color:#EEF1F8;} - .d2-4157992462 .color-N7{color:#FFFFFF;} - .d2-4157992462 .color-B1{color:#0D32B2;} - .d2-4157992462 .color-B2{color:#0D32B2;} - .d2-4157992462 .color-B3{color:#E3E9FD;} - .d2-4157992462 .color-B4{color:#E3E9FD;} - .d2-4157992462 .color-B5{color:#EDF0FD;} - .d2-4157992462 .color-B6{color:#F7F8FE;} - .d2-4157992462 .color-AA2{color:#4A6FF3;} - .d2-4157992462 .color-AA4{color:#EDF0FD;} - .d2-4157992462 .color-AA5{color:#F7F8FE;} - .d2-4157992462 .color-AB4{color:#EDF0FD;} - .d2-4157992462 .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}]]>acdefgbh -======= .d2-1562824148 .fill-N1{fill:#0A0F25;} .d2-1562824148 .fill-N2{fill:#676C7E;} .d2-1562824148 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-1562824148 .color-AA4{color:#EDF0FD;} .d2-1562824148 .color-AA5{color:#F7F8FE;} .d2-1562824148 .color-AB4{color:#EDF0FD;} - .d2-1562824148 .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}]]>acdefgbh ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-1562824148 .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}]]>acdefgbh diff --git a/e2etests/testdata/stable/one_container_loop/elk/sketch.exp.svg b/e2etests/testdata/stable/one_container_loop/elk/sketch.exp.svg index 58291380a..428123efa 100644 --- a/e2etests/testdata/stable/one_container_loop/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/one_container_loop/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -acdefgbh -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-1784891775 .fill-N1{fill:#0A0F25;} - .d2-1784891775 .fill-N2{fill:#676C7E;} - .d2-1784891775 .fill-N3{fill:#9499AB;} - .d2-1784891775 .fill-N4{fill:#CFD2DD;} - .d2-1784891775 .fill-N5{fill:#DEE1EB;} - .d2-1784891775 .fill-N6{fill:#EEF1F8;} - .d2-1784891775 .fill-N7{fill:#FFFFFF;} - .d2-1784891775 .fill-B1{fill:#0D32B2;} - .d2-1784891775 .fill-B2{fill:#0D32B2;} - .d2-1784891775 .fill-B3{fill:#E3E9FD;} - .d2-1784891775 .fill-B4{fill:#E3E9FD;} - .d2-1784891775 .fill-B5{fill:#EDF0FD;} - .d2-1784891775 .fill-B6{fill:#F7F8FE;} - .d2-1784891775 .fill-AA2{fill:#4A6FF3;} - .d2-1784891775 .fill-AA4{fill:#EDF0FD;} - .d2-1784891775 .fill-AA5{fill:#F7F8FE;} - .d2-1784891775 .fill-AB4{fill:#EDF0FD;} - .d2-1784891775 .fill-AB5{fill:#F7F8FE;} - .d2-1784891775 .stroke-N1{stroke:#0A0F25;} - .d2-1784891775 .stroke-N2{stroke:#676C7E;} - .d2-1784891775 .stroke-N3{stroke:#9499AB;} - .d2-1784891775 .stroke-N4{stroke:#CFD2DD;} - .d2-1784891775 .stroke-N5{stroke:#DEE1EB;} - .d2-1784891775 .stroke-N6{stroke:#EEF1F8;} - .d2-1784891775 .stroke-N7{stroke:#FFFFFF;} - .d2-1784891775 .stroke-B1{stroke:#0D32B2;} - .d2-1784891775 .stroke-B2{stroke:#0D32B2;} - .d2-1784891775 .stroke-B3{stroke:#E3E9FD;} - .d2-1784891775 .stroke-B4{stroke:#E3E9FD;} - .d2-1784891775 .stroke-B5{stroke:#EDF0FD;} - .d2-1784891775 .stroke-B6{stroke:#F7F8FE;} - .d2-1784891775 .stroke-AA2{stroke:#4A6FF3;} - .d2-1784891775 .stroke-AA4{stroke:#EDF0FD;} - .d2-1784891775 .stroke-AA5{stroke:#F7F8FE;} - .d2-1784891775 .stroke-AB4{stroke:#EDF0FD;} - .d2-1784891775 .stroke-AB5{stroke:#F7F8FE;} - .d2-1784891775 .background-color-N1{background-color:#0A0F25;} - .d2-1784891775 .background-color-N2{background-color:#676C7E;} - .d2-1784891775 .background-color-N3{background-color:#9499AB;} - .d2-1784891775 .background-color-N4{background-color:#CFD2DD;} - .d2-1784891775 .background-color-N5{background-color:#DEE1EB;} - .d2-1784891775 .background-color-N6{background-color:#EEF1F8;} - .d2-1784891775 .background-color-N7{background-color:#FFFFFF;} - .d2-1784891775 .background-color-B1{background-color:#0D32B2;} - .d2-1784891775 .background-color-B2{background-color:#0D32B2;} - .d2-1784891775 .background-color-B3{background-color:#E3E9FD;} - .d2-1784891775 .background-color-B4{background-color:#E3E9FD;} - .d2-1784891775 .background-color-B5{background-color:#EDF0FD;} - .d2-1784891775 .background-color-B6{background-color:#F7F8FE;} - .d2-1784891775 .background-color-AA2{background-color:#4A6FF3;} - .d2-1784891775 .background-color-AA4{background-color:#EDF0FD;} - .d2-1784891775 .background-color-AA5{background-color:#F7F8FE;} - .d2-1784891775 .background-color-AB4{background-color:#EDF0FD;} - .d2-1784891775 .background-color-AB5{background-color:#F7F8FE;} - .d2-1784891775 .color-N1{color:#0A0F25;} - .d2-1784891775 .color-N2{color:#676C7E;} - .d2-1784891775 .color-N3{color:#9499AB;} - .d2-1784891775 .color-N4{color:#CFD2DD;} - .d2-1784891775 .color-N5{color:#DEE1EB;} - .d2-1784891775 .color-N6{color:#EEF1F8;} - .d2-1784891775 .color-N7{color:#FFFFFF;} - .d2-1784891775 .color-B1{color:#0D32B2;} - .d2-1784891775 .color-B2{color:#0D32B2;} - .d2-1784891775 .color-B3{color:#E3E9FD;} - .d2-1784891775 .color-B4{color:#E3E9FD;} - .d2-1784891775 .color-B5{color:#EDF0FD;} - .d2-1784891775 .color-B6{color:#F7F8FE;} - .d2-1784891775 .color-AA2{color:#4A6FF3;} - .d2-1784891775 .color-AA4{color:#EDF0FD;} - .d2-1784891775 .color-AA5{color:#F7F8FE;} - .d2-1784891775 .color-AB4{color:#EDF0FD;} - .d2-1784891775 .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}]]>acdefgbh -======= .d2-4240902393 .fill-N1{fill:#0A0F25;} .d2-4240902393 .fill-N2{fill:#676C7E;} .d2-4240902393 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-4240902393 .color-AA4{color:#EDF0FD;} .d2-4240902393 .color-AA5{color:#F7F8FE;} .d2-4240902393 .color-AB4{color:#EDF0FD;} - .d2-4240902393 .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}]]>acdefgbh ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-4240902393 .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}]]>acdefgbh diff --git a/e2etests/testdata/stable/one_three_one_container/dagre/sketch.exp.svg b/e2etests/testdata/stable/one_three_one_container/dagre/sketch.exp.svg index 4b168d525..69972201d 100644 --- a/e2etests/testdata/stable/one_three_one_container/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/one_three_one_container/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -top2abcbottomstartend -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-3393164995 .fill-N1{fill:#0A0F25;} - .d2-3393164995 .fill-N2{fill:#676C7E;} - .d2-3393164995 .fill-N3{fill:#9499AB;} - .d2-3393164995 .fill-N4{fill:#CFD2DD;} - .d2-3393164995 .fill-N5{fill:#DEE1EB;} - .d2-3393164995 .fill-N6{fill:#EEF1F8;} - .d2-3393164995 .fill-N7{fill:#FFFFFF;} - .d2-3393164995 .fill-B1{fill:#0D32B2;} - .d2-3393164995 .fill-B2{fill:#0D32B2;} - .d2-3393164995 .fill-B3{fill:#E3E9FD;} - .d2-3393164995 .fill-B4{fill:#E3E9FD;} - .d2-3393164995 .fill-B5{fill:#EDF0FD;} - .d2-3393164995 .fill-B6{fill:#F7F8FE;} - .d2-3393164995 .fill-AA2{fill:#4A6FF3;} - .d2-3393164995 .fill-AA4{fill:#EDF0FD;} - .d2-3393164995 .fill-AA5{fill:#F7F8FE;} - .d2-3393164995 .fill-AB4{fill:#EDF0FD;} - .d2-3393164995 .fill-AB5{fill:#F7F8FE;} - .d2-3393164995 .stroke-N1{stroke:#0A0F25;} - .d2-3393164995 .stroke-N2{stroke:#676C7E;} - .d2-3393164995 .stroke-N3{stroke:#9499AB;} - .d2-3393164995 .stroke-N4{stroke:#CFD2DD;} - .d2-3393164995 .stroke-N5{stroke:#DEE1EB;} - .d2-3393164995 .stroke-N6{stroke:#EEF1F8;} - .d2-3393164995 .stroke-N7{stroke:#FFFFFF;} - .d2-3393164995 .stroke-B1{stroke:#0D32B2;} - .d2-3393164995 .stroke-B2{stroke:#0D32B2;} - .d2-3393164995 .stroke-B3{stroke:#E3E9FD;} - .d2-3393164995 .stroke-B4{stroke:#E3E9FD;} - .d2-3393164995 .stroke-B5{stroke:#EDF0FD;} - .d2-3393164995 .stroke-B6{stroke:#F7F8FE;} - .d2-3393164995 .stroke-AA2{stroke:#4A6FF3;} - .d2-3393164995 .stroke-AA4{stroke:#EDF0FD;} - .d2-3393164995 .stroke-AA5{stroke:#F7F8FE;} - .d2-3393164995 .stroke-AB4{stroke:#EDF0FD;} - .d2-3393164995 .stroke-AB5{stroke:#F7F8FE;} - .d2-3393164995 .background-color-N1{background-color:#0A0F25;} - .d2-3393164995 .background-color-N2{background-color:#676C7E;} - .d2-3393164995 .background-color-N3{background-color:#9499AB;} - .d2-3393164995 .background-color-N4{background-color:#CFD2DD;} - .d2-3393164995 .background-color-N5{background-color:#DEE1EB;} - .d2-3393164995 .background-color-N6{background-color:#EEF1F8;} - .d2-3393164995 .background-color-N7{background-color:#FFFFFF;} - .d2-3393164995 .background-color-B1{background-color:#0D32B2;} - .d2-3393164995 .background-color-B2{background-color:#0D32B2;} - .d2-3393164995 .background-color-B3{background-color:#E3E9FD;} - .d2-3393164995 .background-color-B4{background-color:#E3E9FD;} - .d2-3393164995 .background-color-B5{background-color:#EDF0FD;} - .d2-3393164995 .background-color-B6{background-color:#F7F8FE;} - .d2-3393164995 .background-color-AA2{background-color:#4A6FF3;} - .d2-3393164995 .background-color-AA4{background-color:#EDF0FD;} - .d2-3393164995 .background-color-AA5{background-color:#F7F8FE;} - .d2-3393164995 .background-color-AB4{background-color:#EDF0FD;} - .d2-3393164995 .background-color-AB5{background-color:#F7F8FE;} - .d2-3393164995 .color-N1{color:#0A0F25;} - .d2-3393164995 .color-N2{color:#676C7E;} - .d2-3393164995 .color-N3{color:#9499AB;} - .d2-3393164995 .color-N4{color:#CFD2DD;} - .d2-3393164995 .color-N5{color:#DEE1EB;} - .d2-3393164995 .color-N6{color:#EEF1F8;} - .d2-3393164995 .color-N7{color:#FFFFFF;} - .d2-3393164995 .color-B1{color:#0D32B2;} - .d2-3393164995 .color-B2{color:#0D32B2;} - .d2-3393164995 .color-B3{color:#E3E9FD;} - .d2-3393164995 .color-B4{color:#E3E9FD;} - .d2-3393164995 .color-B5{color:#EDF0FD;} - .d2-3393164995 .color-B6{color:#F7F8FE;} - .d2-3393164995 .color-AA2{color:#4A6FF3;} - .d2-3393164995 .color-AA4{color:#EDF0FD;} - .d2-3393164995 .color-AA5{color:#F7F8FE;} - .d2-3393164995 .color-AB4{color:#EDF0FD;} - .d2-3393164995 .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}]]>top2abcbottomstartend -======= .d2-3620310379 .fill-N1{fill:#0A0F25;} .d2-3620310379 .fill-N2{fill:#676C7E;} .d2-3620310379 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-3620310379 .color-AA4{color:#EDF0FD;} .d2-3620310379 .color-AA5{color:#F7F8FE;} .d2-3620310379 .color-AB4{color:#EDF0FD;} - .d2-3620310379 .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}]]>top2abcbottomstartend ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-3620310379 .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}]]>top2abcbottomstartend diff --git a/e2etests/testdata/stable/one_three_one_container/elk/sketch.exp.svg b/e2etests/testdata/stable/one_three_one_container/elk/sketch.exp.svg index 090060d2e..1b4bd920f 100644 --- a/e2etests/testdata/stable/one_three_one_container/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/one_three_one_container/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -top2abcbottomstartend -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-1048954117 .fill-N1{fill:#0A0F25;} - .d2-1048954117 .fill-N2{fill:#676C7E;} - .d2-1048954117 .fill-N3{fill:#9499AB;} - .d2-1048954117 .fill-N4{fill:#CFD2DD;} - .d2-1048954117 .fill-N5{fill:#DEE1EB;} - .d2-1048954117 .fill-N6{fill:#EEF1F8;} - .d2-1048954117 .fill-N7{fill:#FFFFFF;} - .d2-1048954117 .fill-B1{fill:#0D32B2;} - .d2-1048954117 .fill-B2{fill:#0D32B2;} - .d2-1048954117 .fill-B3{fill:#E3E9FD;} - .d2-1048954117 .fill-B4{fill:#E3E9FD;} - .d2-1048954117 .fill-B5{fill:#EDF0FD;} - .d2-1048954117 .fill-B6{fill:#F7F8FE;} - .d2-1048954117 .fill-AA2{fill:#4A6FF3;} - .d2-1048954117 .fill-AA4{fill:#EDF0FD;} - .d2-1048954117 .fill-AA5{fill:#F7F8FE;} - .d2-1048954117 .fill-AB4{fill:#EDF0FD;} - .d2-1048954117 .fill-AB5{fill:#F7F8FE;} - .d2-1048954117 .stroke-N1{stroke:#0A0F25;} - .d2-1048954117 .stroke-N2{stroke:#676C7E;} - .d2-1048954117 .stroke-N3{stroke:#9499AB;} - .d2-1048954117 .stroke-N4{stroke:#CFD2DD;} - .d2-1048954117 .stroke-N5{stroke:#DEE1EB;} - .d2-1048954117 .stroke-N6{stroke:#EEF1F8;} - .d2-1048954117 .stroke-N7{stroke:#FFFFFF;} - .d2-1048954117 .stroke-B1{stroke:#0D32B2;} - .d2-1048954117 .stroke-B2{stroke:#0D32B2;} - .d2-1048954117 .stroke-B3{stroke:#E3E9FD;} - .d2-1048954117 .stroke-B4{stroke:#E3E9FD;} - .d2-1048954117 .stroke-B5{stroke:#EDF0FD;} - .d2-1048954117 .stroke-B6{stroke:#F7F8FE;} - .d2-1048954117 .stroke-AA2{stroke:#4A6FF3;} - .d2-1048954117 .stroke-AA4{stroke:#EDF0FD;} - .d2-1048954117 .stroke-AA5{stroke:#F7F8FE;} - .d2-1048954117 .stroke-AB4{stroke:#EDF0FD;} - .d2-1048954117 .stroke-AB5{stroke:#F7F8FE;} - .d2-1048954117 .background-color-N1{background-color:#0A0F25;} - .d2-1048954117 .background-color-N2{background-color:#676C7E;} - .d2-1048954117 .background-color-N3{background-color:#9499AB;} - .d2-1048954117 .background-color-N4{background-color:#CFD2DD;} - .d2-1048954117 .background-color-N5{background-color:#DEE1EB;} - .d2-1048954117 .background-color-N6{background-color:#EEF1F8;} - .d2-1048954117 .background-color-N7{background-color:#FFFFFF;} - .d2-1048954117 .background-color-B1{background-color:#0D32B2;} - .d2-1048954117 .background-color-B2{background-color:#0D32B2;} - .d2-1048954117 .background-color-B3{background-color:#E3E9FD;} - .d2-1048954117 .background-color-B4{background-color:#E3E9FD;} - .d2-1048954117 .background-color-B5{background-color:#EDF0FD;} - .d2-1048954117 .background-color-B6{background-color:#F7F8FE;} - .d2-1048954117 .background-color-AA2{background-color:#4A6FF3;} - .d2-1048954117 .background-color-AA4{background-color:#EDF0FD;} - .d2-1048954117 .background-color-AA5{background-color:#F7F8FE;} - .d2-1048954117 .background-color-AB4{background-color:#EDF0FD;} - .d2-1048954117 .background-color-AB5{background-color:#F7F8FE;} - .d2-1048954117 .color-N1{color:#0A0F25;} - .d2-1048954117 .color-N2{color:#676C7E;} - .d2-1048954117 .color-N3{color:#9499AB;} - .d2-1048954117 .color-N4{color:#CFD2DD;} - .d2-1048954117 .color-N5{color:#DEE1EB;} - .d2-1048954117 .color-N6{color:#EEF1F8;} - .d2-1048954117 .color-N7{color:#FFFFFF;} - .d2-1048954117 .color-B1{color:#0D32B2;} - .d2-1048954117 .color-B2{color:#0D32B2;} - .d2-1048954117 .color-B3{color:#E3E9FD;} - .d2-1048954117 .color-B4{color:#E3E9FD;} - .d2-1048954117 .color-B5{color:#EDF0FD;} - .d2-1048954117 .color-B6{color:#F7F8FE;} - .d2-1048954117 .color-AA2{color:#4A6FF3;} - .d2-1048954117 .color-AA4{color:#EDF0FD;} - .d2-1048954117 .color-AA5{color:#F7F8FE;} - .d2-1048954117 .color-AB4{color:#EDF0FD;} - .d2-1048954117 .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}]]>top2abcbottomstartend -======= .d2-3777529529 .fill-N1{fill:#0A0F25;} .d2-3777529529 .fill-N2{fill:#676C7E;} .d2-3777529529 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-3777529529 .color-AA4{color:#EDF0FD;} .d2-3777529529 .color-AA5{color:#F7F8FE;} .d2-3777529529 .color-AB4{color:#EDF0FD;} - .d2-3777529529 .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}]]>top2abcbottomstartend ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-3777529529 .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}]]>top2abcbottomstartend diff --git a/e2etests/testdata/stable/outside_bottom_labels/dagre/sketch.exp.svg b/e2etests/testdata/stable/outside_bottom_labels/dagre/sketch.exp.svg index f290b71c0..fc49ed052 100644 --- a/e2etests/testdata/stable/outside_bottom_labels/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/outside_bottom_labels/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -Daphne SnickerdoodlePrudence McSnortlePolly Pizzazzle -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-467777836 .fill-N1{fill:#0A0F25;} - .d2-467777836 .fill-N2{fill:#676C7E;} - .d2-467777836 .fill-N3{fill:#9499AB;} - .d2-467777836 .fill-N4{fill:#CFD2DD;} - .d2-467777836 .fill-N5{fill:#DEE1EB;} - .d2-467777836 .fill-N6{fill:#EEF1F8;} - .d2-467777836 .fill-N7{fill:#FFFFFF;} - .d2-467777836 .fill-B1{fill:#0D32B2;} - .d2-467777836 .fill-B2{fill:#0D32B2;} - .d2-467777836 .fill-B3{fill:#E3E9FD;} - .d2-467777836 .fill-B4{fill:#E3E9FD;} - .d2-467777836 .fill-B5{fill:#EDF0FD;} - .d2-467777836 .fill-B6{fill:#F7F8FE;} - .d2-467777836 .fill-AA2{fill:#4A6FF3;} - .d2-467777836 .fill-AA4{fill:#EDF0FD;} - .d2-467777836 .fill-AA5{fill:#F7F8FE;} - .d2-467777836 .fill-AB4{fill:#EDF0FD;} - .d2-467777836 .fill-AB5{fill:#F7F8FE;} - .d2-467777836 .stroke-N1{stroke:#0A0F25;} - .d2-467777836 .stroke-N2{stroke:#676C7E;} - .d2-467777836 .stroke-N3{stroke:#9499AB;} - .d2-467777836 .stroke-N4{stroke:#CFD2DD;} - .d2-467777836 .stroke-N5{stroke:#DEE1EB;} - .d2-467777836 .stroke-N6{stroke:#EEF1F8;} - .d2-467777836 .stroke-N7{stroke:#FFFFFF;} - .d2-467777836 .stroke-B1{stroke:#0D32B2;} - .d2-467777836 .stroke-B2{stroke:#0D32B2;} - .d2-467777836 .stroke-B3{stroke:#E3E9FD;} - .d2-467777836 .stroke-B4{stroke:#E3E9FD;} - .d2-467777836 .stroke-B5{stroke:#EDF0FD;} - .d2-467777836 .stroke-B6{stroke:#F7F8FE;} - .d2-467777836 .stroke-AA2{stroke:#4A6FF3;} - .d2-467777836 .stroke-AA4{stroke:#EDF0FD;} - .d2-467777836 .stroke-AA5{stroke:#F7F8FE;} - .d2-467777836 .stroke-AB4{stroke:#EDF0FD;} - .d2-467777836 .stroke-AB5{stroke:#F7F8FE;} - .d2-467777836 .background-color-N1{background-color:#0A0F25;} - .d2-467777836 .background-color-N2{background-color:#676C7E;} - .d2-467777836 .background-color-N3{background-color:#9499AB;} - .d2-467777836 .background-color-N4{background-color:#CFD2DD;} - .d2-467777836 .background-color-N5{background-color:#DEE1EB;} - .d2-467777836 .background-color-N6{background-color:#EEF1F8;} - .d2-467777836 .background-color-N7{background-color:#FFFFFF;} - .d2-467777836 .background-color-B1{background-color:#0D32B2;} - .d2-467777836 .background-color-B2{background-color:#0D32B2;} - .d2-467777836 .background-color-B3{background-color:#E3E9FD;} - .d2-467777836 .background-color-B4{background-color:#E3E9FD;} - .d2-467777836 .background-color-B5{background-color:#EDF0FD;} - .d2-467777836 .background-color-B6{background-color:#F7F8FE;} - .d2-467777836 .background-color-AA2{background-color:#4A6FF3;} - .d2-467777836 .background-color-AA4{background-color:#EDF0FD;} - .d2-467777836 .background-color-AA5{background-color:#F7F8FE;} - .d2-467777836 .background-color-AB4{background-color:#EDF0FD;} - .d2-467777836 .background-color-AB5{background-color:#F7F8FE;} - .d2-467777836 .color-N1{color:#0A0F25;} - .d2-467777836 .color-N2{color:#676C7E;} - .d2-467777836 .color-N3{color:#9499AB;} - .d2-467777836 .color-N4{color:#CFD2DD;} - .d2-467777836 .color-N5{color:#DEE1EB;} - .d2-467777836 .color-N6{color:#EEF1F8;} - .d2-467777836 .color-N7{color:#FFFFFF;} - .d2-467777836 .color-B1{color:#0D32B2;} - .d2-467777836 .color-B2{color:#0D32B2;} - .d2-467777836 .color-B3{color:#E3E9FD;} - .d2-467777836 .color-B4{color:#E3E9FD;} - .d2-467777836 .color-B5{color:#EDF0FD;} - .d2-467777836 .color-B6{color:#F7F8FE;} - .d2-467777836 .color-AA2{color:#4A6FF3;} - .d2-467777836 .color-AA4{color:#EDF0FD;} - .d2-467777836 .color-AA5{color:#F7F8FE;} - .d2-467777836 .color-AB4{color:#EDF0FD;} - .d2-467777836 .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}]]>Daphne SnickerdoodlePrudence McSnortlePolly Pizzazzle -======= .d2-2875667596 .fill-N1{fill:#0A0F25;} .d2-2875667596 .fill-N2{fill:#676C7E;} .d2-2875667596 .fill-N3{fill:#9499AB;} @@ -252,8 +89,7 @@ .d2-2875667596 .color-AA4{color:#EDF0FD;} .d2-2875667596 .color-AA5{color:#F7F8FE;} .d2-2875667596 .color-AB4{color:#EDF0FD;} - .d2-2875667596 .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}]]>Daphne SnickerdoodlePrudence McSnortlePolly Pizzazzle ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-2875667596 .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}]]>Daphne SnickerdoodlePrudence McSnortlePolly Pizzazzle diff --git a/e2etests/testdata/stable/outside_bottom_labels/elk/sketch.exp.svg b/e2etests/testdata/stable/outside_bottom_labels/elk/sketch.exp.svg index e8b829a1b..db331309c 100644 --- a/e2etests/testdata/stable/outside_bottom_labels/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/outside_bottom_labels/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -Daphne SnickerdoodlePrudence McSnortlePolly Pizzazzle -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-1996782705 .fill-N1{fill:#0A0F25;} - .d2-1996782705 .fill-N2{fill:#676C7E;} - .d2-1996782705 .fill-N3{fill:#9499AB;} - .d2-1996782705 .fill-N4{fill:#CFD2DD;} - .d2-1996782705 .fill-N5{fill:#DEE1EB;} - .d2-1996782705 .fill-N6{fill:#EEF1F8;} - .d2-1996782705 .fill-N7{fill:#FFFFFF;} - .d2-1996782705 .fill-B1{fill:#0D32B2;} - .d2-1996782705 .fill-B2{fill:#0D32B2;} - .d2-1996782705 .fill-B3{fill:#E3E9FD;} - .d2-1996782705 .fill-B4{fill:#E3E9FD;} - .d2-1996782705 .fill-B5{fill:#EDF0FD;} - .d2-1996782705 .fill-B6{fill:#F7F8FE;} - .d2-1996782705 .fill-AA2{fill:#4A6FF3;} - .d2-1996782705 .fill-AA4{fill:#EDF0FD;} - .d2-1996782705 .fill-AA5{fill:#F7F8FE;} - .d2-1996782705 .fill-AB4{fill:#EDF0FD;} - .d2-1996782705 .fill-AB5{fill:#F7F8FE;} - .d2-1996782705 .stroke-N1{stroke:#0A0F25;} - .d2-1996782705 .stroke-N2{stroke:#676C7E;} - .d2-1996782705 .stroke-N3{stroke:#9499AB;} - .d2-1996782705 .stroke-N4{stroke:#CFD2DD;} - .d2-1996782705 .stroke-N5{stroke:#DEE1EB;} - .d2-1996782705 .stroke-N6{stroke:#EEF1F8;} - .d2-1996782705 .stroke-N7{stroke:#FFFFFF;} - .d2-1996782705 .stroke-B1{stroke:#0D32B2;} - .d2-1996782705 .stroke-B2{stroke:#0D32B2;} - .d2-1996782705 .stroke-B3{stroke:#E3E9FD;} - .d2-1996782705 .stroke-B4{stroke:#E3E9FD;} - .d2-1996782705 .stroke-B5{stroke:#EDF0FD;} - .d2-1996782705 .stroke-B6{stroke:#F7F8FE;} - .d2-1996782705 .stroke-AA2{stroke:#4A6FF3;} - .d2-1996782705 .stroke-AA4{stroke:#EDF0FD;} - .d2-1996782705 .stroke-AA5{stroke:#F7F8FE;} - .d2-1996782705 .stroke-AB4{stroke:#EDF0FD;} - .d2-1996782705 .stroke-AB5{stroke:#F7F8FE;} - .d2-1996782705 .background-color-N1{background-color:#0A0F25;} - .d2-1996782705 .background-color-N2{background-color:#676C7E;} - .d2-1996782705 .background-color-N3{background-color:#9499AB;} - .d2-1996782705 .background-color-N4{background-color:#CFD2DD;} - .d2-1996782705 .background-color-N5{background-color:#DEE1EB;} - .d2-1996782705 .background-color-N6{background-color:#EEF1F8;} - .d2-1996782705 .background-color-N7{background-color:#FFFFFF;} - .d2-1996782705 .background-color-B1{background-color:#0D32B2;} - .d2-1996782705 .background-color-B2{background-color:#0D32B2;} - .d2-1996782705 .background-color-B3{background-color:#E3E9FD;} - .d2-1996782705 .background-color-B4{background-color:#E3E9FD;} - .d2-1996782705 .background-color-B5{background-color:#EDF0FD;} - .d2-1996782705 .background-color-B6{background-color:#F7F8FE;} - .d2-1996782705 .background-color-AA2{background-color:#4A6FF3;} - .d2-1996782705 .background-color-AA4{background-color:#EDF0FD;} - .d2-1996782705 .background-color-AA5{background-color:#F7F8FE;} - .d2-1996782705 .background-color-AB4{background-color:#EDF0FD;} - .d2-1996782705 .background-color-AB5{background-color:#F7F8FE;} - .d2-1996782705 .color-N1{color:#0A0F25;} - .d2-1996782705 .color-N2{color:#676C7E;} - .d2-1996782705 .color-N3{color:#9499AB;} - .d2-1996782705 .color-N4{color:#CFD2DD;} - .d2-1996782705 .color-N5{color:#DEE1EB;} - .d2-1996782705 .color-N6{color:#EEF1F8;} - .d2-1996782705 .color-N7{color:#FFFFFF;} - .d2-1996782705 .color-B1{color:#0D32B2;} - .d2-1996782705 .color-B2{color:#0D32B2;} - .d2-1996782705 .color-B3{color:#E3E9FD;} - .d2-1996782705 .color-B4{color:#E3E9FD;} - .d2-1996782705 .color-B5{color:#EDF0FD;} - .d2-1996782705 .color-B6{color:#F7F8FE;} - .d2-1996782705 .color-AA2{color:#4A6FF3;} - .d2-1996782705 .color-AA4{color:#EDF0FD;} - .d2-1996782705 .color-AA5{color:#F7F8FE;} - .d2-1996782705 .color-AB4{color:#EDF0FD;} - .d2-1996782705 .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}]]>Daphne SnickerdoodlePrudence McSnortlePolly Pizzazzle -======= .d2-1572108005 .fill-N1{fill:#0A0F25;} .d2-1572108005 .fill-N2{fill:#676C7E;} .d2-1572108005 .fill-N3{fill:#9499AB;} @@ -252,8 +89,7 @@ .d2-1572108005 .color-AA4{color:#EDF0FD;} .d2-1572108005 .color-AA5{color:#F7F8FE;} .d2-1572108005 .color-AB4{color:#EDF0FD;} - .d2-1572108005 .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}]]>Daphne SnickerdoodlePrudence McSnortlePolly Pizzazzle ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-1572108005 .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}]]>Daphne SnickerdoodlePrudence McSnortlePolly Pizzazzle diff --git a/e2etests/testdata/stable/overlapping_child_label/dagre/sketch.exp.svg b/e2etests/testdata/stable/overlapping_child_label/dagre/sketch.exp.svg index 874ba6b0d..dfa1539eb 100644 --- a/e2etests/testdata/stable/overlapping_child_label/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/overlapping_child_label/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -heyyaaaacccceeeeeeeeeeeeeeeeeeeyoheybbbbddddfffffffffff -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-1567359250 .fill-N1{fill:#0A0F25;} - .d2-1567359250 .fill-N2{fill:#676C7E;} - .d2-1567359250 .fill-N3{fill:#9499AB;} - .d2-1567359250 .fill-N4{fill:#CFD2DD;} - .d2-1567359250 .fill-N5{fill:#DEE1EB;} - .d2-1567359250 .fill-N6{fill:#EEF1F8;} - .d2-1567359250 .fill-N7{fill:#FFFFFF;} - .d2-1567359250 .fill-B1{fill:#0D32B2;} - .d2-1567359250 .fill-B2{fill:#0D32B2;} - .d2-1567359250 .fill-B3{fill:#E3E9FD;} - .d2-1567359250 .fill-B4{fill:#E3E9FD;} - .d2-1567359250 .fill-B5{fill:#EDF0FD;} - .d2-1567359250 .fill-B6{fill:#F7F8FE;} - .d2-1567359250 .fill-AA2{fill:#4A6FF3;} - .d2-1567359250 .fill-AA4{fill:#EDF0FD;} - .d2-1567359250 .fill-AA5{fill:#F7F8FE;} - .d2-1567359250 .fill-AB4{fill:#EDF0FD;} - .d2-1567359250 .fill-AB5{fill:#F7F8FE;} - .d2-1567359250 .stroke-N1{stroke:#0A0F25;} - .d2-1567359250 .stroke-N2{stroke:#676C7E;} - .d2-1567359250 .stroke-N3{stroke:#9499AB;} - .d2-1567359250 .stroke-N4{stroke:#CFD2DD;} - .d2-1567359250 .stroke-N5{stroke:#DEE1EB;} - .d2-1567359250 .stroke-N6{stroke:#EEF1F8;} - .d2-1567359250 .stroke-N7{stroke:#FFFFFF;} - .d2-1567359250 .stroke-B1{stroke:#0D32B2;} - .d2-1567359250 .stroke-B2{stroke:#0D32B2;} - .d2-1567359250 .stroke-B3{stroke:#E3E9FD;} - .d2-1567359250 .stroke-B4{stroke:#E3E9FD;} - .d2-1567359250 .stroke-B5{stroke:#EDF0FD;} - .d2-1567359250 .stroke-B6{stroke:#F7F8FE;} - .d2-1567359250 .stroke-AA2{stroke:#4A6FF3;} - .d2-1567359250 .stroke-AA4{stroke:#EDF0FD;} - .d2-1567359250 .stroke-AA5{stroke:#F7F8FE;} - .d2-1567359250 .stroke-AB4{stroke:#EDF0FD;} - .d2-1567359250 .stroke-AB5{stroke:#F7F8FE;} - .d2-1567359250 .background-color-N1{background-color:#0A0F25;} - .d2-1567359250 .background-color-N2{background-color:#676C7E;} - .d2-1567359250 .background-color-N3{background-color:#9499AB;} - .d2-1567359250 .background-color-N4{background-color:#CFD2DD;} - .d2-1567359250 .background-color-N5{background-color:#DEE1EB;} - .d2-1567359250 .background-color-N6{background-color:#EEF1F8;} - .d2-1567359250 .background-color-N7{background-color:#FFFFFF;} - .d2-1567359250 .background-color-B1{background-color:#0D32B2;} - .d2-1567359250 .background-color-B2{background-color:#0D32B2;} - .d2-1567359250 .background-color-B3{background-color:#E3E9FD;} - .d2-1567359250 .background-color-B4{background-color:#E3E9FD;} - .d2-1567359250 .background-color-B5{background-color:#EDF0FD;} - .d2-1567359250 .background-color-B6{background-color:#F7F8FE;} - .d2-1567359250 .background-color-AA2{background-color:#4A6FF3;} - .d2-1567359250 .background-color-AA4{background-color:#EDF0FD;} - .d2-1567359250 .background-color-AA5{background-color:#F7F8FE;} - .d2-1567359250 .background-color-AB4{background-color:#EDF0FD;} - .d2-1567359250 .background-color-AB5{background-color:#F7F8FE;} - .d2-1567359250 .color-N1{color:#0A0F25;} - .d2-1567359250 .color-N2{color:#676C7E;} - .d2-1567359250 .color-N3{color:#9499AB;} - .d2-1567359250 .color-N4{color:#CFD2DD;} - .d2-1567359250 .color-N5{color:#DEE1EB;} - .d2-1567359250 .color-N6{color:#EEF1F8;} - .d2-1567359250 .color-N7{color:#FFFFFF;} - .d2-1567359250 .color-B1{color:#0D32B2;} - .d2-1567359250 .color-B2{color:#0D32B2;} - .d2-1567359250 .color-B3{color:#E3E9FD;} - .d2-1567359250 .color-B4{color:#E3E9FD;} - .d2-1567359250 .color-B5{color:#EDF0FD;} - .d2-1567359250 .color-B6{color:#F7F8FE;} - .d2-1567359250 .color-AA2{color:#4A6FF3;} - .d2-1567359250 .color-AA4{color:#EDF0FD;} - .d2-1567359250 .color-AA5{color:#F7F8FE;} - .d2-1567359250 .color-AB4{color:#EDF0FD;} - .d2-1567359250 .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}]]>heyyaaaacccceeeeeeeeeeeeeeeeeeeyoheybbbbddddfffffffffff -======= .d2-864913672 .fill-N1{fill:#0A0F25;} .d2-864913672 .fill-N2{fill:#676C7E;} .d2-864913672 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-864913672 .color-AA4{color:#EDF0FD;} .d2-864913672 .color-AA5{color:#F7F8FE;} .d2-864913672 .color-AB4{color:#EDF0FD;} - .d2-864913672 .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}]]>heyyaaaacccceeeeeeeeeeeeeeeeeeeyoheybbbbddddfffffffffff ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-864913672 .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}]]>heyyaaaacccceeeeeeeeeeeeeeeeeeeyoheybbbbddddfffffffffff diff --git a/e2etests/testdata/stable/overlapping_child_label/elk/sketch.exp.svg b/e2etests/testdata/stable/overlapping_child_label/elk/sketch.exp.svg index 33d1f877b..477eec754 100644 --- a/e2etests/testdata/stable/overlapping_child_label/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/overlapping_child_label/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -heyyaaaacccceeeeeeeeeeeeeeeeeeeyoheybbbbddddfffffffffff -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-1950801162 .fill-N1{fill:#0A0F25;} - .d2-1950801162 .fill-N2{fill:#676C7E;} - .d2-1950801162 .fill-N3{fill:#9499AB;} - .d2-1950801162 .fill-N4{fill:#CFD2DD;} - .d2-1950801162 .fill-N5{fill:#DEE1EB;} - .d2-1950801162 .fill-N6{fill:#EEF1F8;} - .d2-1950801162 .fill-N7{fill:#FFFFFF;} - .d2-1950801162 .fill-B1{fill:#0D32B2;} - .d2-1950801162 .fill-B2{fill:#0D32B2;} - .d2-1950801162 .fill-B3{fill:#E3E9FD;} - .d2-1950801162 .fill-B4{fill:#E3E9FD;} - .d2-1950801162 .fill-B5{fill:#EDF0FD;} - .d2-1950801162 .fill-B6{fill:#F7F8FE;} - .d2-1950801162 .fill-AA2{fill:#4A6FF3;} - .d2-1950801162 .fill-AA4{fill:#EDF0FD;} - .d2-1950801162 .fill-AA5{fill:#F7F8FE;} - .d2-1950801162 .fill-AB4{fill:#EDF0FD;} - .d2-1950801162 .fill-AB5{fill:#F7F8FE;} - .d2-1950801162 .stroke-N1{stroke:#0A0F25;} - .d2-1950801162 .stroke-N2{stroke:#676C7E;} - .d2-1950801162 .stroke-N3{stroke:#9499AB;} - .d2-1950801162 .stroke-N4{stroke:#CFD2DD;} - .d2-1950801162 .stroke-N5{stroke:#DEE1EB;} - .d2-1950801162 .stroke-N6{stroke:#EEF1F8;} - .d2-1950801162 .stroke-N7{stroke:#FFFFFF;} - .d2-1950801162 .stroke-B1{stroke:#0D32B2;} - .d2-1950801162 .stroke-B2{stroke:#0D32B2;} - .d2-1950801162 .stroke-B3{stroke:#E3E9FD;} - .d2-1950801162 .stroke-B4{stroke:#E3E9FD;} - .d2-1950801162 .stroke-B5{stroke:#EDF0FD;} - .d2-1950801162 .stroke-B6{stroke:#F7F8FE;} - .d2-1950801162 .stroke-AA2{stroke:#4A6FF3;} - .d2-1950801162 .stroke-AA4{stroke:#EDF0FD;} - .d2-1950801162 .stroke-AA5{stroke:#F7F8FE;} - .d2-1950801162 .stroke-AB4{stroke:#EDF0FD;} - .d2-1950801162 .stroke-AB5{stroke:#F7F8FE;} - .d2-1950801162 .background-color-N1{background-color:#0A0F25;} - .d2-1950801162 .background-color-N2{background-color:#676C7E;} - .d2-1950801162 .background-color-N3{background-color:#9499AB;} - .d2-1950801162 .background-color-N4{background-color:#CFD2DD;} - .d2-1950801162 .background-color-N5{background-color:#DEE1EB;} - .d2-1950801162 .background-color-N6{background-color:#EEF1F8;} - .d2-1950801162 .background-color-N7{background-color:#FFFFFF;} - .d2-1950801162 .background-color-B1{background-color:#0D32B2;} - .d2-1950801162 .background-color-B2{background-color:#0D32B2;} - .d2-1950801162 .background-color-B3{background-color:#E3E9FD;} - .d2-1950801162 .background-color-B4{background-color:#E3E9FD;} - .d2-1950801162 .background-color-B5{background-color:#EDF0FD;} - .d2-1950801162 .background-color-B6{background-color:#F7F8FE;} - .d2-1950801162 .background-color-AA2{background-color:#4A6FF3;} - .d2-1950801162 .background-color-AA4{background-color:#EDF0FD;} - .d2-1950801162 .background-color-AA5{background-color:#F7F8FE;} - .d2-1950801162 .background-color-AB4{background-color:#EDF0FD;} - .d2-1950801162 .background-color-AB5{background-color:#F7F8FE;} - .d2-1950801162 .color-N1{color:#0A0F25;} - .d2-1950801162 .color-N2{color:#676C7E;} - .d2-1950801162 .color-N3{color:#9499AB;} - .d2-1950801162 .color-N4{color:#CFD2DD;} - .d2-1950801162 .color-N5{color:#DEE1EB;} - .d2-1950801162 .color-N6{color:#EEF1F8;} - .d2-1950801162 .color-N7{color:#FFFFFF;} - .d2-1950801162 .color-B1{color:#0D32B2;} - .d2-1950801162 .color-B2{color:#0D32B2;} - .d2-1950801162 .color-B3{color:#E3E9FD;} - .d2-1950801162 .color-B4{color:#E3E9FD;} - .d2-1950801162 .color-B5{color:#EDF0FD;} - .d2-1950801162 .color-B6{color:#F7F8FE;} - .d2-1950801162 .color-AA2{color:#4A6FF3;} - .d2-1950801162 .color-AA4{color:#EDF0FD;} - .d2-1950801162 .color-AA5{color:#F7F8FE;} - .d2-1950801162 .color-AB4{color:#EDF0FD;} - .d2-1950801162 .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}]]>heyyaaaacccceeeeeeeeeeeeeeeeeeeyoheybbbbddddfffffffffff -======= .d2-1244222456 .fill-N1{fill:#0A0F25;} .d2-1244222456 .fill-N2{fill:#676C7E;} .d2-1244222456 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-1244222456 .color-AA4{color:#EDF0FD;} .d2-1244222456 .color-AA5{color:#F7F8FE;} .d2-1244222456 .color-AB4{color:#EDF0FD;} - .d2-1244222456 .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}]]>heyyaaaacccceeeeeeeeeeeeeeeeeeeyoheybbbbddddfffffffffff ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-1244222456 .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}]]>heyyaaaacccceeeeeeeeeeeeeeeeeeeyoheybbbbddddfffffffffff diff --git a/e2etests/testdata/stable/overlapping_image_container_labels/dagre/sketch.exp.svg b/e2etests/testdata/stable/overlapping_image_container_labels/dagre/sketch.exp.svg index 235f2872b..d4994e999 100644 --- a/e2etests/testdata/stable/overlapping_image_container_labels/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/overlapping_image_container_labels/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -rootcontainerrootleft2rightrootinnerrootinnerleft2rightleft2right to inner left2to inner rightto inner left2to inner rightto left2 container rootto right container root -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-824629014 .fill-N1{fill:#0A0F25;} - .d2-824629014 .fill-N2{fill:#676C7E;} - .d2-824629014 .fill-N3{fill:#9499AB;} - .d2-824629014 .fill-N4{fill:#CFD2DD;} - .d2-824629014 .fill-N5{fill:#DEE1EB;} - .d2-824629014 .fill-N6{fill:#EEF1F8;} - .d2-824629014 .fill-N7{fill:#FFFFFF;} - .d2-824629014 .fill-B1{fill:#0D32B2;} - .d2-824629014 .fill-B2{fill:#0D32B2;} - .d2-824629014 .fill-B3{fill:#E3E9FD;} - .d2-824629014 .fill-B4{fill:#E3E9FD;} - .d2-824629014 .fill-B5{fill:#EDF0FD;} - .d2-824629014 .fill-B6{fill:#F7F8FE;} - .d2-824629014 .fill-AA2{fill:#4A6FF3;} - .d2-824629014 .fill-AA4{fill:#EDF0FD;} - .d2-824629014 .fill-AA5{fill:#F7F8FE;} - .d2-824629014 .fill-AB4{fill:#EDF0FD;} - .d2-824629014 .fill-AB5{fill:#F7F8FE;} - .d2-824629014 .stroke-N1{stroke:#0A0F25;} - .d2-824629014 .stroke-N2{stroke:#676C7E;} - .d2-824629014 .stroke-N3{stroke:#9499AB;} - .d2-824629014 .stroke-N4{stroke:#CFD2DD;} - .d2-824629014 .stroke-N5{stroke:#DEE1EB;} - .d2-824629014 .stroke-N6{stroke:#EEF1F8;} - .d2-824629014 .stroke-N7{stroke:#FFFFFF;} - .d2-824629014 .stroke-B1{stroke:#0D32B2;} - .d2-824629014 .stroke-B2{stroke:#0D32B2;} - .d2-824629014 .stroke-B3{stroke:#E3E9FD;} - .d2-824629014 .stroke-B4{stroke:#E3E9FD;} - .d2-824629014 .stroke-B5{stroke:#EDF0FD;} - .d2-824629014 .stroke-B6{stroke:#F7F8FE;} - .d2-824629014 .stroke-AA2{stroke:#4A6FF3;} - .d2-824629014 .stroke-AA4{stroke:#EDF0FD;} - .d2-824629014 .stroke-AA5{stroke:#F7F8FE;} - .d2-824629014 .stroke-AB4{stroke:#EDF0FD;} - .d2-824629014 .stroke-AB5{stroke:#F7F8FE;} - .d2-824629014 .background-color-N1{background-color:#0A0F25;} - .d2-824629014 .background-color-N2{background-color:#676C7E;} - .d2-824629014 .background-color-N3{background-color:#9499AB;} - .d2-824629014 .background-color-N4{background-color:#CFD2DD;} - .d2-824629014 .background-color-N5{background-color:#DEE1EB;} - .d2-824629014 .background-color-N6{background-color:#EEF1F8;} - .d2-824629014 .background-color-N7{background-color:#FFFFFF;} - .d2-824629014 .background-color-B1{background-color:#0D32B2;} - .d2-824629014 .background-color-B2{background-color:#0D32B2;} - .d2-824629014 .background-color-B3{background-color:#E3E9FD;} - .d2-824629014 .background-color-B4{background-color:#E3E9FD;} - .d2-824629014 .background-color-B5{background-color:#EDF0FD;} - .d2-824629014 .background-color-B6{background-color:#F7F8FE;} - .d2-824629014 .background-color-AA2{background-color:#4A6FF3;} - .d2-824629014 .background-color-AA4{background-color:#EDF0FD;} - .d2-824629014 .background-color-AA5{background-color:#F7F8FE;} - .d2-824629014 .background-color-AB4{background-color:#EDF0FD;} - .d2-824629014 .background-color-AB5{background-color:#F7F8FE;} - .d2-824629014 .color-N1{color:#0A0F25;} - .d2-824629014 .color-N2{color:#676C7E;} - .d2-824629014 .color-N3{color:#9499AB;} - .d2-824629014 .color-N4{color:#CFD2DD;} - .d2-824629014 .color-N5{color:#DEE1EB;} - .d2-824629014 .color-N6{color:#EEF1F8;} - .d2-824629014 .color-N7{color:#FFFFFF;} - .d2-824629014 .color-B1{color:#0D32B2;} - .d2-824629014 .color-B2{color:#0D32B2;} - .d2-824629014 .color-B3{color:#E3E9FD;} - .d2-824629014 .color-B4{color:#E3E9FD;} - .d2-824629014 .color-B5{color:#EDF0FD;} - .d2-824629014 .color-B6{color:#F7F8FE;} - .d2-824629014 .color-AA2{color:#4A6FF3;} - .d2-824629014 .color-AA4{color:#EDF0FD;} - .d2-824629014 .color-AA5{color:#F7F8FE;} - .d2-824629014 .color-AB4{color:#EDF0FD;} - .d2-824629014 .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}]]>rootcontainerrootleft2rightrootinnerrootinnerleft2rightleft2right to inner left2to inner rightto inner left2to inner rightto left2 container rootto right container root -======= .d2-1870728008 .fill-N1{fill:#0A0F25;} .d2-1870728008 .fill-N2{fill:#676C7E;} .d2-1870728008 .fill-N3{fill:#9499AB;} @@ -266,8 +103,7 @@ .d2-1870728008 .color-AA4{color:#EDF0FD;} .d2-1870728008 .color-AA5{color:#F7F8FE;} .d2-1870728008 .color-AB4{color:#EDF0FD;} - .d2-1870728008 .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}]]>rootcontainerrootleft2rightrootinnerrootinnerleft2rightleft2right to inner left2to inner rightto inner left2to inner rightto left2 container rootto right container root ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-1870728008 .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}]]>rootcontainerrootleft2rightrootinnerrootinnerleft2rightleft2right to inner left2to inner rightto inner left2to inner rightto left2 container rootto right container root diff --git a/e2etests/testdata/stable/overlapping_image_container_labels/elk/sketch.exp.svg b/e2etests/testdata/stable/overlapping_image_container_labels/elk/sketch.exp.svg index b54c1189e..533af1963 100644 --- a/e2etests/testdata/stable/overlapping_image_container_labels/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/overlapping_image_container_labels/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -rootcontainerrootleft2rightrootinnerrootinnerleft2rightleft2right to inner left2to inner rightto inner left2to inner rightto left2 container rootto right container root -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-2207580108 .fill-N1{fill:#0A0F25;} - .d2-2207580108 .fill-N2{fill:#676C7E;} - .d2-2207580108 .fill-N3{fill:#9499AB;} - .d2-2207580108 .fill-N4{fill:#CFD2DD;} - .d2-2207580108 .fill-N5{fill:#DEE1EB;} - .d2-2207580108 .fill-N6{fill:#EEF1F8;} - .d2-2207580108 .fill-N7{fill:#FFFFFF;} - .d2-2207580108 .fill-B1{fill:#0D32B2;} - .d2-2207580108 .fill-B2{fill:#0D32B2;} - .d2-2207580108 .fill-B3{fill:#E3E9FD;} - .d2-2207580108 .fill-B4{fill:#E3E9FD;} - .d2-2207580108 .fill-B5{fill:#EDF0FD;} - .d2-2207580108 .fill-B6{fill:#F7F8FE;} - .d2-2207580108 .fill-AA2{fill:#4A6FF3;} - .d2-2207580108 .fill-AA4{fill:#EDF0FD;} - .d2-2207580108 .fill-AA5{fill:#F7F8FE;} - .d2-2207580108 .fill-AB4{fill:#EDF0FD;} - .d2-2207580108 .fill-AB5{fill:#F7F8FE;} - .d2-2207580108 .stroke-N1{stroke:#0A0F25;} - .d2-2207580108 .stroke-N2{stroke:#676C7E;} - .d2-2207580108 .stroke-N3{stroke:#9499AB;} - .d2-2207580108 .stroke-N4{stroke:#CFD2DD;} - .d2-2207580108 .stroke-N5{stroke:#DEE1EB;} - .d2-2207580108 .stroke-N6{stroke:#EEF1F8;} - .d2-2207580108 .stroke-N7{stroke:#FFFFFF;} - .d2-2207580108 .stroke-B1{stroke:#0D32B2;} - .d2-2207580108 .stroke-B2{stroke:#0D32B2;} - .d2-2207580108 .stroke-B3{stroke:#E3E9FD;} - .d2-2207580108 .stroke-B4{stroke:#E3E9FD;} - .d2-2207580108 .stroke-B5{stroke:#EDF0FD;} - .d2-2207580108 .stroke-B6{stroke:#F7F8FE;} - .d2-2207580108 .stroke-AA2{stroke:#4A6FF3;} - .d2-2207580108 .stroke-AA4{stroke:#EDF0FD;} - .d2-2207580108 .stroke-AA5{stroke:#F7F8FE;} - .d2-2207580108 .stroke-AB4{stroke:#EDF0FD;} - .d2-2207580108 .stroke-AB5{stroke:#F7F8FE;} - .d2-2207580108 .background-color-N1{background-color:#0A0F25;} - .d2-2207580108 .background-color-N2{background-color:#676C7E;} - .d2-2207580108 .background-color-N3{background-color:#9499AB;} - .d2-2207580108 .background-color-N4{background-color:#CFD2DD;} - .d2-2207580108 .background-color-N5{background-color:#DEE1EB;} - .d2-2207580108 .background-color-N6{background-color:#EEF1F8;} - .d2-2207580108 .background-color-N7{background-color:#FFFFFF;} - .d2-2207580108 .background-color-B1{background-color:#0D32B2;} - .d2-2207580108 .background-color-B2{background-color:#0D32B2;} - .d2-2207580108 .background-color-B3{background-color:#E3E9FD;} - .d2-2207580108 .background-color-B4{background-color:#E3E9FD;} - .d2-2207580108 .background-color-B5{background-color:#EDF0FD;} - .d2-2207580108 .background-color-B6{background-color:#F7F8FE;} - .d2-2207580108 .background-color-AA2{background-color:#4A6FF3;} - .d2-2207580108 .background-color-AA4{background-color:#EDF0FD;} - .d2-2207580108 .background-color-AA5{background-color:#F7F8FE;} - .d2-2207580108 .background-color-AB4{background-color:#EDF0FD;} - .d2-2207580108 .background-color-AB5{background-color:#F7F8FE;} - .d2-2207580108 .color-N1{color:#0A0F25;} - .d2-2207580108 .color-N2{color:#676C7E;} - .d2-2207580108 .color-N3{color:#9499AB;} - .d2-2207580108 .color-N4{color:#CFD2DD;} - .d2-2207580108 .color-N5{color:#DEE1EB;} - .d2-2207580108 .color-N6{color:#EEF1F8;} - .d2-2207580108 .color-N7{color:#FFFFFF;} - .d2-2207580108 .color-B1{color:#0D32B2;} - .d2-2207580108 .color-B2{color:#0D32B2;} - .d2-2207580108 .color-B3{color:#E3E9FD;} - .d2-2207580108 .color-B4{color:#E3E9FD;} - .d2-2207580108 .color-B5{color:#EDF0FD;} - .d2-2207580108 .color-B6{color:#F7F8FE;} - .d2-2207580108 .color-AA2{color:#4A6FF3;} - .d2-2207580108 .color-AA4{color:#EDF0FD;} - .d2-2207580108 .color-AA5{color:#F7F8FE;} - .d2-2207580108 .color-AB4{color:#EDF0FD;} - .d2-2207580108 .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}]]>rootcontainerrootleft2rightrootinnerrootinnerleft2rightleft2right to inner left2to inner rightto inner left2to inner rightto left2 container rootto right container root -======= .d2-1620395766 .fill-N1{fill:#0A0F25;} .d2-1620395766 .fill-N2{fill:#676C7E;} .d2-1620395766 .fill-N3{fill:#9499AB;} @@ -266,8 +103,7 @@ .d2-1620395766 .color-AA4{color:#EDF0FD;} .d2-1620395766 .color-AA5{color:#F7F8FE;} .d2-1620395766 .color-AB4{color:#EDF0FD;} - .d2-1620395766 .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}]]>rootcontainerrootleft2rightrootinnerrootinnerleft2rightleft2right to inner left2to inner rightto inner left2to inner rightto left2 container rootto right container root ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-1620395766 .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}]]>rootcontainerrootleft2rightrootinnerrootinnerleft2rightleft2right to inner left2to inner rightto inner left2to inner rightto left2 container rootto right container root diff --git a/e2etests/testdata/stable/p/dagre/sketch.exp.svg b/e2etests/testdata/stable/p/dagre/sketch.exp.svg index e1c31ced0..d34566d59 100644 --- a/e2etests/testdata/stable/p/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/p/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -xyz hello -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-1241499041 .fill-N1{fill:#0A0F25;} - .d2-1241499041 .fill-N2{fill:#676C7E;} - .d2-1241499041 .fill-N3{fill:#9499AB;} - .d2-1241499041 .fill-N4{fill:#CFD2DD;} - .d2-1241499041 .fill-N5{fill:#DEE1EB;} - .d2-1241499041 .fill-N6{fill:#EEF1F8;} - .d2-1241499041 .fill-N7{fill:#FFFFFF;} - .d2-1241499041 .fill-B1{fill:#0D32B2;} - .d2-1241499041 .fill-B2{fill:#0D32B2;} - .d2-1241499041 .fill-B3{fill:#E3E9FD;} - .d2-1241499041 .fill-B4{fill:#E3E9FD;} - .d2-1241499041 .fill-B5{fill:#EDF0FD;} - .d2-1241499041 .fill-B6{fill:#F7F8FE;} - .d2-1241499041 .fill-AA2{fill:#4A6FF3;} - .d2-1241499041 .fill-AA4{fill:#EDF0FD;} - .d2-1241499041 .fill-AA5{fill:#F7F8FE;} - .d2-1241499041 .fill-AB4{fill:#EDF0FD;} - .d2-1241499041 .fill-AB5{fill:#F7F8FE;} - .d2-1241499041 .stroke-N1{stroke:#0A0F25;} - .d2-1241499041 .stroke-N2{stroke:#676C7E;} - .d2-1241499041 .stroke-N3{stroke:#9499AB;} - .d2-1241499041 .stroke-N4{stroke:#CFD2DD;} - .d2-1241499041 .stroke-N5{stroke:#DEE1EB;} - .d2-1241499041 .stroke-N6{stroke:#EEF1F8;} - .d2-1241499041 .stroke-N7{stroke:#FFFFFF;} - .d2-1241499041 .stroke-B1{stroke:#0D32B2;} - .d2-1241499041 .stroke-B2{stroke:#0D32B2;} - .d2-1241499041 .stroke-B3{stroke:#E3E9FD;} - .d2-1241499041 .stroke-B4{stroke:#E3E9FD;} - .d2-1241499041 .stroke-B5{stroke:#EDF0FD;} - .d2-1241499041 .stroke-B6{stroke:#F7F8FE;} - .d2-1241499041 .stroke-AA2{stroke:#4A6FF3;} - .d2-1241499041 .stroke-AA4{stroke:#EDF0FD;} - .d2-1241499041 .stroke-AA5{stroke:#F7F8FE;} - .d2-1241499041 .stroke-AB4{stroke:#EDF0FD;} - .d2-1241499041 .stroke-AB5{stroke:#F7F8FE;} - .d2-1241499041 .background-color-N1{background-color:#0A0F25;} - .d2-1241499041 .background-color-N2{background-color:#676C7E;} - .d2-1241499041 .background-color-N3{background-color:#9499AB;} - .d2-1241499041 .background-color-N4{background-color:#CFD2DD;} - .d2-1241499041 .background-color-N5{background-color:#DEE1EB;} - .d2-1241499041 .background-color-N6{background-color:#EEF1F8;} - .d2-1241499041 .background-color-N7{background-color:#FFFFFF;} - .d2-1241499041 .background-color-B1{background-color:#0D32B2;} - .d2-1241499041 .background-color-B2{background-color:#0D32B2;} - .d2-1241499041 .background-color-B3{background-color:#E3E9FD;} - .d2-1241499041 .background-color-B4{background-color:#E3E9FD;} - .d2-1241499041 .background-color-B5{background-color:#EDF0FD;} - .d2-1241499041 .background-color-B6{background-color:#F7F8FE;} - .d2-1241499041 .background-color-AA2{background-color:#4A6FF3;} - .d2-1241499041 .background-color-AA4{background-color:#EDF0FD;} - .d2-1241499041 .background-color-AA5{background-color:#F7F8FE;} - .d2-1241499041 .background-color-AB4{background-color:#EDF0FD;} - .d2-1241499041 .background-color-AB5{background-color:#F7F8FE;} - .d2-1241499041 .color-N1{color:#0A0F25;} - .d2-1241499041 .color-N2{color:#676C7E;} - .d2-1241499041 .color-N3{color:#9499AB;} - .d2-1241499041 .color-N4{color:#CFD2DD;} - .d2-1241499041 .color-N5{color:#DEE1EB;} - .d2-1241499041 .color-N6{color:#EEF1F8;} - .d2-1241499041 .color-N7{color:#FFFFFF;} - .d2-1241499041 .color-B1{color:#0D32B2;} - .d2-1241499041 .color-B2{color:#0D32B2;} - .d2-1241499041 .color-B3{color:#E3E9FD;} - .d2-1241499041 .color-B4{color:#E3E9FD;} - .d2-1241499041 .color-B5{color:#EDF0FD;} - .d2-1241499041 .color-B6{color:#F7F8FE;} - .d2-1241499041 .color-AA2{color:#4A6FF3;} - .d2-1241499041 .color-AA4{color:#EDF0FD;} - .d2-1241499041 .color-AA5{color:#F7F8FE;} - .d2-1241499041 .color-AB4{color:#EDF0FD;} - .d2-1241499041 .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}]]>xyz hello -======= .d2-2505876363 .fill-N1{fill:#0A0F25;} .d2-2505876363 .fill-N2{fill:#676C7E;} .d2-2505876363 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-2505876363 .color-AA4{color:#EDF0FD;} .d2-2505876363 .color-AA5{color:#F7F8FE;} .d2-2505876363 .color-AB4{color:#EDF0FD;} - .d2-2505876363 .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}]]>xyz hello ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-2505876363 .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}]]>xyz hello diff --git a/e2etests/testdata/stable/self-referencing/elk/sketch.exp.svg b/e2etests/testdata/stable/self-referencing/elk/sketch.exp.svg index 6ee7ae1ba..a9dc862f6 100644 --- a/e2etests/testdata/stable/self-referencing/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/self-referencing/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -xyz hello -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-2878633398 .fill-N1{fill:#0A0F25;} - .d2-2878633398 .fill-N2{fill:#676C7E;} - .d2-2878633398 .fill-N3{fill:#9499AB;} - .d2-2878633398 .fill-N4{fill:#CFD2DD;} - .d2-2878633398 .fill-N5{fill:#DEE1EB;} - .d2-2878633398 .fill-N6{fill:#EEF1F8;} - .d2-2878633398 .fill-N7{fill:#FFFFFF;} - .d2-2878633398 .fill-B1{fill:#0D32B2;} - .d2-2878633398 .fill-B2{fill:#0D32B2;} - .d2-2878633398 .fill-B3{fill:#E3E9FD;} - .d2-2878633398 .fill-B4{fill:#E3E9FD;} - .d2-2878633398 .fill-B5{fill:#EDF0FD;} - .d2-2878633398 .fill-B6{fill:#F7F8FE;} - .d2-2878633398 .fill-AA2{fill:#4A6FF3;} - .d2-2878633398 .fill-AA4{fill:#EDF0FD;} - .d2-2878633398 .fill-AA5{fill:#F7F8FE;} - .d2-2878633398 .fill-AB4{fill:#EDF0FD;} - .d2-2878633398 .fill-AB5{fill:#F7F8FE;} - .d2-2878633398 .stroke-N1{stroke:#0A0F25;} - .d2-2878633398 .stroke-N2{stroke:#676C7E;} - .d2-2878633398 .stroke-N3{stroke:#9499AB;} - .d2-2878633398 .stroke-N4{stroke:#CFD2DD;} - .d2-2878633398 .stroke-N5{stroke:#DEE1EB;} - .d2-2878633398 .stroke-N6{stroke:#EEF1F8;} - .d2-2878633398 .stroke-N7{stroke:#FFFFFF;} - .d2-2878633398 .stroke-B1{stroke:#0D32B2;} - .d2-2878633398 .stroke-B2{stroke:#0D32B2;} - .d2-2878633398 .stroke-B3{stroke:#E3E9FD;} - .d2-2878633398 .stroke-B4{stroke:#E3E9FD;} - .d2-2878633398 .stroke-B5{stroke:#EDF0FD;} - .d2-2878633398 .stroke-B6{stroke:#F7F8FE;} - .d2-2878633398 .stroke-AA2{stroke:#4A6FF3;} - .d2-2878633398 .stroke-AA4{stroke:#EDF0FD;} - .d2-2878633398 .stroke-AA5{stroke:#F7F8FE;} - .d2-2878633398 .stroke-AB4{stroke:#EDF0FD;} - .d2-2878633398 .stroke-AB5{stroke:#F7F8FE;} - .d2-2878633398 .background-color-N1{background-color:#0A0F25;} - .d2-2878633398 .background-color-N2{background-color:#676C7E;} - .d2-2878633398 .background-color-N3{background-color:#9499AB;} - .d2-2878633398 .background-color-N4{background-color:#CFD2DD;} - .d2-2878633398 .background-color-N5{background-color:#DEE1EB;} - .d2-2878633398 .background-color-N6{background-color:#EEF1F8;} - .d2-2878633398 .background-color-N7{background-color:#FFFFFF;} - .d2-2878633398 .background-color-B1{background-color:#0D32B2;} - .d2-2878633398 .background-color-B2{background-color:#0D32B2;} - .d2-2878633398 .background-color-B3{background-color:#E3E9FD;} - .d2-2878633398 .background-color-B4{background-color:#E3E9FD;} - .d2-2878633398 .background-color-B5{background-color:#EDF0FD;} - .d2-2878633398 .background-color-B6{background-color:#F7F8FE;} - .d2-2878633398 .background-color-AA2{background-color:#4A6FF3;} - .d2-2878633398 .background-color-AA4{background-color:#EDF0FD;} - .d2-2878633398 .background-color-AA5{background-color:#F7F8FE;} - .d2-2878633398 .background-color-AB4{background-color:#EDF0FD;} - .d2-2878633398 .background-color-AB5{background-color:#F7F8FE;} - .d2-2878633398 .color-N1{color:#0A0F25;} - .d2-2878633398 .color-N2{color:#676C7E;} - .d2-2878633398 .color-N3{color:#9499AB;} - .d2-2878633398 .color-N4{color:#CFD2DD;} - .d2-2878633398 .color-N5{color:#DEE1EB;} - .d2-2878633398 .color-N6{color:#EEF1F8;} - .d2-2878633398 .color-N7{color:#FFFFFF;} - .d2-2878633398 .color-B1{color:#0D32B2;} - .d2-2878633398 .color-B2{color:#0D32B2;} - .d2-2878633398 .color-B3{color:#E3E9FD;} - .d2-2878633398 .color-B4{color:#E3E9FD;} - .d2-2878633398 .color-B5{color:#EDF0FD;} - .d2-2878633398 .color-B6{color:#F7F8FE;} - .d2-2878633398 .color-AA2{color:#4A6FF3;} - .d2-2878633398 .color-AA4{color:#EDF0FD;} - .d2-2878633398 .color-AA5{color:#F7F8FE;} - .d2-2878633398 .color-AB4{color:#EDF0FD;} - .d2-2878633398 .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}]]>xyz hello -======= .d2-2990203384 .fill-N1{fill:#0A0F25;} .d2-2990203384 .fill-N2{fill:#676C7E;} .d2-2990203384 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-2990203384 .color-AA4{color:#EDF0FD;} .d2-2990203384 .color-AA5{color:#F7F8FE;} .d2-2990203384 .color-AB4{color:#EDF0FD;} - .d2-2990203384 .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}]]>xyz hello ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-2990203384 .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}]]>xyz hello diff --git a/e2etests/testdata/stable/sequence-inter-span-self/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence-inter-span-self/dagre/sketch.exp.svg index 929d42027..94961341a 100644 --- a/e2etests/testdata/stable/sequence-inter-span-self/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence-inter-span-self/dagre/sketch.exp.svg @@ -1,26 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -AB fooredirectbar - -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-366098480 .fill-N1{fill:#0A0F25;} - .d2-366098480 .fill-N2{fill:#676C7E;} - .d2-366098480 .fill-N3{fill:#9499AB;} - .d2-366098480 .fill-N4{fill:#CFD2DD;} - .d2-366098480 .fill-N5{fill:#DEE1EB;} - .d2-366098480 .fill-N6{fill:#EEF1F8;} - .d2-366098480 .fill-N7{fill:#FFFFFF;} - .d2-366098480 .fill-B1{fill:#0D32B2;} - .d2-366098480 .fill-B2{fill:#0D32B2;} - .d2-366098480 .fill-B3{fill:#E3E9FD;} - .d2-366098480 .fill-B4{fill:#E3E9FD;} - .d2-366098480 .fill-B5{fill:#EDF0FD;} - .d2-366098480 .fill-B6{fill:#F7F8FE;} - .d2-366098480 .fill-AA2{fill:#4A6FF3;} - .d2-366098480 .fill-AA4{fill:#EDF0FD;} - .d2-366098480 .fill-AA5{fill:#F7F8FE;} - .d2-366098480 .fill-AB4{fill:#EDF0FD;} - .d2-366098480 .fill-AB5{fill:#F7F8FE;} - .d2-366098480 .stroke-N1{stroke:#0A0F25;} - .d2-366098480 .stroke-N2{stroke:#676C7E;} - .d2-366098480 .stroke-N3{stroke:#9499AB;} - .d2-366098480 .stroke-N4{stroke:#CFD2DD;} - .d2-366098480 .stroke-N5{stroke:#DEE1EB;} - .d2-366098480 .stroke-N6{stroke:#EEF1F8;} - .d2-366098480 .stroke-N7{stroke:#FFFFFF;} - .d2-366098480 .stroke-B1{stroke:#0D32B2;} - .d2-366098480 .stroke-B2{stroke:#0D32B2;} - .d2-366098480 .stroke-B3{stroke:#E3E9FD;} - .d2-366098480 .stroke-B4{stroke:#E3E9FD;} - .d2-366098480 .stroke-B5{stroke:#EDF0FD;} - .d2-366098480 .stroke-B6{stroke:#F7F8FE;} - .d2-366098480 .stroke-AA2{stroke:#4A6FF3;} - .d2-366098480 .stroke-AA4{stroke:#EDF0FD;} - .d2-366098480 .stroke-AA5{stroke:#F7F8FE;} - .d2-366098480 .stroke-AB4{stroke:#EDF0FD;} - .d2-366098480 .stroke-AB5{stroke:#F7F8FE;} - .d2-366098480 .background-color-N1{background-color:#0A0F25;} - .d2-366098480 .background-color-N2{background-color:#676C7E;} - .d2-366098480 .background-color-N3{background-color:#9499AB;} - .d2-366098480 .background-color-N4{background-color:#CFD2DD;} - .d2-366098480 .background-color-N5{background-color:#DEE1EB;} - .d2-366098480 .background-color-N6{background-color:#EEF1F8;} - .d2-366098480 .background-color-N7{background-color:#FFFFFF;} - .d2-366098480 .background-color-B1{background-color:#0D32B2;} - .d2-366098480 .background-color-B2{background-color:#0D32B2;} - .d2-366098480 .background-color-B3{background-color:#E3E9FD;} - .d2-366098480 .background-color-B4{background-color:#E3E9FD;} - .d2-366098480 .background-color-B5{background-color:#EDF0FD;} - .d2-366098480 .background-color-B6{background-color:#F7F8FE;} - .d2-366098480 .background-color-AA2{background-color:#4A6FF3;} - .d2-366098480 .background-color-AA4{background-color:#EDF0FD;} - .d2-366098480 .background-color-AA5{background-color:#F7F8FE;} - .d2-366098480 .background-color-AB4{background-color:#EDF0FD;} - .d2-366098480 .background-color-AB5{background-color:#F7F8FE;} - .d2-366098480 .color-N1{color:#0A0F25;} - .d2-366098480 .color-N2{color:#676C7E;} - .d2-366098480 .color-N3{color:#9499AB;} - .d2-366098480 .color-N4{color:#CFD2DD;} - .d2-366098480 .color-N5{color:#DEE1EB;} - .d2-366098480 .color-N6{color:#EEF1F8;} - .d2-366098480 .color-N7{color:#FFFFFF;} - .d2-366098480 .color-B1{color:#0D32B2;} - .d2-366098480 .color-B2{color:#0D32B2;} - .d2-366098480 .color-B3{color:#E3E9FD;} - .d2-366098480 .color-B4{color:#E3E9FD;} - .d2-366098480 .color-B5{color:#EDF0FD;} - .d2-366098480 .color-B6{color:#F7F8FE;} - .d2-366098480 .color-AA2{color:#4A6FF3;} - .d2-366098480 .color-AA4{color:#EDF0FD;} - .d2-366098480 .color-AA5{color:#F7F8FE;} - .d2-366098480 .color-AB4{color:#EDF0FD;} - .d2-366098480 .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-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 - ->>>>>>> 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;} @@ -415,9 +96,8 @@ .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 + .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) 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 929d42027..94961341a 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,26 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -AB fooredirectbar - -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-366098480 .fill-N1{fill:#0A0F25;} - .d2-366098480 .fill-N2{fill:#676C7E;} - .d2-366098480 .fill-N3{fill:#9499AB;} - .d2-366098480 .fill-N4{fill:#CFD2DD;} - .d2-366098480 .fill-N5{fill:#DEE1EB;} - .d2-366098480 .fill-N6{fill:#EEF1F8;} - .d2-366098480 .fill-N7{fill:#FFFFFF;} - .d2-366098480 .fill-B1{fill:#0D32B2;} - .d2-366098480 .fill-B2{fill:#0D32B2;} - .d2-366098480 .fill-B3{fill:#E3E9FD;} - .d2-366098480 .fill-B4{fill:#E3E9FD;} - .d2-366098480 .fill-B5{fill:#EDF0FD;} - .d2-366098480 .fill-B6{fill:#F7F8FE;} - .d2-366098480 .fill-AA2{fill:#4A6FF3;} - .d2-366098480 .fill-AA4{fill:#EDF0FD;} - .d2-366098480 .fill-AA5{fill:#F7F8FE;} - .d2-366098480 .fill-AB4{fill:#EDF0FD;} - .d2-366098480 .fill-AB5{fill:#F7F8FE;} - .d2-366098480 .stroke-N1{stroke:#0A0F25;} - .d2-366098480 .stroke-N2{stroke:#676C7E;} - .d2-366098480 .stroke-N3{stroke:#9499AB;} - .d2-366098480 .stroke-N4{stroke:#CFD2DD;} - .d2-366098480 .stroke-N5{stroke:#DEE1EB;} - .d2-366098480 .stroke-N6{stroke:#EEF1F8;} - .d2-366098480 .stroke-N7{stroke:#FFFFFF;} - .d2-366098480 .stroke-B1{stroke:#0D32B2;} - .d2-366098480 .stroke-B2{stroke:#0D32B2;} - .d2-366098480 .stroke-B3{stroke:#E3E9FD;} - .d2-366098480 .stroke-B4{stroke:#E3E9FD;} - .d2-366098480 .stroke-B5{stroke:#EDF0FD;} - .d2-366098480 .stroke-B6{stroke:#F7F8FE;} - .d2-366098480 .stroke-AA2{stroke:#4A6FF3;} - .d2-366098480 .stroke-AA4{stroke:#EDF0FD;} - .d2-366098480 .stroke-AA5{stroke:#F7F8FE;} - .d2-366098480 .stroke-AB4{stroke:#EDF0FD;} - .d2-366098480 .stroke-AB5{stroke:#F7F8FE;} - .d2-366098480 .background-color-N1{background-color:#0A0F25;} - .d2-366098480 .background-color-N2{background-color:#676C7E;} - .d2-366098480 .background-color-N3{background-color:#9499AB;} - .d2-366098480 .background-color-N4{background-color:#CFD2DD;} - .d2-366098480 .background-color-N5{background-color:#DEE1EB;} - .d2-366098480 .background-color-N6{background-color:#EEF1F8;} - .d2-366098480 .background-color-N7{background-color:#FFFFFF;} - .d2-366098480 .background-color-B1{background-color:#0D32B2;} - .d2-366098480 .background-color-B2{background-color:#0D32B2;} - .d2-366098480 .background-color-B3{background-color:#E3E9FD;} - .d2-366098480 .background-color-B4{background-color:#E3E9FD;} - .d2-366098480 .background-color-B5{background-color:#EDF0FD;} - .d2-366098480 .background-color-B6{background-color:#F7F8FE;} - .d2-366098480 .background-color-AA2{background-color:#4A6FF3;} - .d2-366098480 .background-color-AA4{background-color:#EDF0FD;} - .d2-366098480 .background-color-AA5{background-color:#F7F8FE;} - .d2-366098480 .background-color-AB4{background-color:#EDF0FD;} - .d2-366098480 .background-color-AB5{background-color:#F7F8FE;} - .d2-366098480 .color-N1{color:#0A0F25;} - .d2-366098480 .color-N2{color:#676C7E;} - .d2-366098480 .color-N3{color:#9499AB;} - .d2-366098480 .color-N4{color:#CFD2DD;} - .d2-366098480 .color-N5{color:#DEE1EB;} - .d2-366098480 .color-N6{color:#EEF1F8;} - .d2-366098480 .color-N7{color:#FFFFFF;} - .d2-366098480 .color-B1{color:#0D32B2;} - .d2-366098480 .color-B2{color:#0D32B2;} - .d2-366098480 .color-B3{color:#E3E9FD;} - .d2-366098480 .color-B4{color:#E3E9FD;} - .d2-366098480 .color-B5{color:#EDF0FD;} - .d2-366098480 .color-B6{color:#F7F8FE;} - .d2-366098480 .color-AA2{color:#4A6FF3;} - .d2-366098480 .color-AA4{color:#EDF0FD;} - .d2-366098480 .color-AA5{color:#F7F8FE;} - .d2-366098480 .color-AB4{color:#EDF0FD;} - .d2-366098480 .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-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 - ->>>>>>> 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;} @@ -415,9 +96,8 @@ .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 + .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) 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 b91ddee18..09494c7c1 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,26 +1,6 @@ -<<<<<<< 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 - -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-1469363795 .fill-N1{fill:#0A0F25;} - .d2-1469363795 .fill-N2{fill:#676C7E;} - .d2-1469363795 .fill-N3{fill:#9499AB;} - .d2-1469363795 .fill-N4{fill:#CFD2DD;} - .d2-1469363795 .fill-N5{fill:#DEE1EB;} - .d2-1469363795 .fill-N6{fill:#EEF1F8;} - .d2-1469363795 .fill-N7{fill:#FFFFFF;} - .d2-1469363795 .fill-B1{fill:#0D32B2;} - .d2-1469363795 .fill-B2{fill:#0D32B2;} - .d2-1469363795 .fill-B3{fill:#E3E9FD;} - .d2-1469363795 .fill-B4{fill:#E3E9FD;} - .d2-1469363795 .fill-B5{fill:#EDF0FD;} - .d2-1469363795 .fill-B6{fill:#F7F8FE;} - .d2-1469363795 .fill-AA2{fill:#4A6FF3;} - .d2-1469363795 .fill-AA4{fill:#EDF0FD;} - .d2-1469363795 .fill-AA5{fill:#F7F8FE;} - .d2-1469363795 .fill-AB4{fill:#EDF0FD;} - .d2-1469363795 .fill-AB5{fill:#F7F8FE;} - .d2-1469363795 .stroke-N1{stroke:#0A0F25;} - .d2-1469363795 .stroke-N2{stroke:#676C7E;} - .d2-1469363795 .stroke-N3{stroke:#9499AB;} - .d2-1469363795 .stroke-N4{stroke:#CFD2DD;} - .d2-1469363795 .stroke-N5{stroke:#DEE1EB;} - .d2-1469363795 .stroke-N6{stroke:#EEF1F8;} - .d2-1469363795 .stroke-N7{stroke:#FFFFFF;} - .d2-1469363795 .stroke-B1{stroke:#0D32B2;} - .d2-1469363795 .stroke-B2{stroke:#0D32B2;} - .d2-1469363795 .stroke-B3{stroke:#E3E9FD;} - .d2-1469363795 .stroke-B4{stroke:#E3E9FD;} - .d2-1469363795 .stroke-B5{stroke:#EDF0FD;} - .d2-1469363795 .stroke-B6{stroke:#F7F8FE;} - .d2-1469363795 .stroke-AA2{stroke:#4A6FF3;} - .d2-1469363795 .stroke-AA4{stroke:#EDF0FD;} - .d2-1469363795 .stroke-AA5{stroke:#F7F8FE;} - .d2-1469363795 .stroke-AB4{stroke:#EDF0FD;} - .d2-1469363795 .stroke-AB5{stroke:#F7F8FE;} - .d2-1469363795 .background-color-N1{background-color:#0A0F25;} - .d2-1469363795 .background-color-N2{background-color:#676C7E;} - .d2-1469363795 .background-color-N3{background-color:#9499AB;} - .d2-1469363795 .background-color-N4{background-color:#CFD2DD;} - .d2-1469363795 .background-color-N5{background-color:#DEE1EB;} - .d2-1469363795 .background-color-N6{background-color:#EEF1F8;} - .d2-1469363795 .background-color-N7{background-color:#FFFFFF;} - .d2-1469363795 .background-color-B1{background-color:#0D32B2;} - .d2-1469363795 .background-color-B2{background-color:#0D32B2;} - .d2-1469363795 .background-color-B3{background-color:#E3E9FD;} - .d2-1469363795 .background-color-B4{background-color:#E3E9FD;} - .d2-1469363795 .background-color-B5{background-color:#EDF0FD;} - .d2-1469363795 .background-color-B6{background-color:#F7F8FE;} - .d2-1469363795 .background-color-AA2{background-color:#4A6FF3;} - .d2-1469363795 .background-color-AA4{background-color:#EDF0FD;} - .d2-1469363795 .background-color-AA5{background-color:#F7F8FE;} - .d2-1469363795 .background-color-AB4{background-color:#EDF0FD;} - .d2-1469363795 .background-color-AB5{background-color:#F7F8FE;} - .d2-1469363795 .color-N1{color:#0A0F25;} - .d2-1469363795 .color-N2{color:#676C7E;} - .d2-1469363795 .color-N3{color:#9499AB;} - .d2-1469363795 .color-N4{color:#CFD2DD;} - .d2-1469363795 .color-N5{color:#DEE1EB;} - .d2-1469363795 .color-N6{color:#EEF1F8;} - .d2-1469363795 .color-N7{color:#FFFFFF;} - .d2-1469363795 .color-B1{color:#0D32B2;} - .d2-1469363795 .color-B2{color:#0D32B2;} - .d2-1469363795 .color-B3{color:#E3E9FD;} - .d2-1469363795 .color-B4{color:#E3E9FD;} - .d2-1469363795 .color-B5{color:#EDF0FD;} - .d2-1469363795 .color-B6{color:#F7F8FE;} - .d2-1469363795 .color-AA2{color:#4A6FF3;} - .d2-1469363795 .color-AA4{color:#EDF0FD;} - .d2-1469363795 .color-AA5{color:#F7F8FE;} - .d2-1469363795 .color-AB4{color:#EDF0FD;} - .d2-1469363795 .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-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 - ->>>>>>> 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;} @@ -415,9 +96,8 @@ .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 + .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) 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 b91ddee18..09494c7c1 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,26 +1,6 @@ -<<<<<<< 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 - -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-1469363795 .fill-N1{fill:#0A0F25;} - .d2-1469363795 .fill-N2{fill:#676C7E;} - .d2-1469363795 .fill-N3{fill:#9499AB;} - .d2-1469363795 .fill-N4{fill:#CFD2DD;} - .d2-1469363795 .fill-N5{fill:#DEE1EB;} - .d2-1469363795 .fill-N6{fill:#EEF1F8;} - .d2-1469363795 .fill-N7{fill:#FFFFFF;} - .d2-1469363795 .fill-B1{fill:#0D32B2;} - .d2-1469363795 .fill-B2{fill:#0D32B2;} - .d2-1469363795 .fill-B3{fill:#E3E9FD;} - .d2-1469363795 .fill-B4{fill:#E3E9FD;} - .d2-1469363795 .fill-B5{fill:#EDF0FD;} - .d2-1469363795 .fill-B6{fill:#F7F8FE;} - .d2-1469363795 .fill-AA2{fill:#4A6FF3;} - .d2-1469363795 .fill-AA4{fill:#EDF0FD;} - .d2-1469363795 .fill-AA5{fill:#F7F8FE;} - .d2-1469363795 .fill-AB4{fill:#EDF0FD;} - .d2-1469363795 .fill-AB5{fill:#F7F8FE;} - .d2-1469363795 .stroke-N1{stroke:#0A0F25;} - .d2-1469363795 .stroke-N2{stroke:#676C7E;} - .d2-1469363795 .stroke-N3{stroke:#9499AB;} - .d2-1469363795 .stroke-N4{stroke:#CFD2DD;} - .d2-1469363795 .stroke-N5{stroke:#DEE1EB;} - .d2-1469363795 .stroke-N6{stroke:#EEF1F8;} - .d2-1469363795 .stroke-N7{stroke:#FFFFFF;} - .d2-1469363795 .stroke-B1{stroke:#0D32B2;} - .d2-1469363795 .stroke-B2{stroke:#0D32B2;} - .d2-1469363795 .stroke-B3{stroke:#E3E9FD;} - .d2-1469363795 .stroke-B4{stroke:#E3E9FD;} - .d2-1469363795 .stroke-B5{stroke:#EDF0FD;} - .d2-1469363795 .stroke-B6{stroke:#F7F8FE;} - .d2-1469363795 .stroke-AA2{stroke:#4A6FF3;} - .d2-1469363795 .stroke-AA4{stroke:#EDF0FD;} - .d2-1469363795 .stroke-AA5{stroke:#F7F8FE;} - .d2-1469363795 .stroke-AB4{stroke:#EDF0FD;} - .d2-1469363795 .stroke-AB5{stroke:#F7F8FE;} - .d2-1469363795 .background-color-N1{background-color:#0A0F25;} - .d2-1469363795 .background-color-N2{background-color:#676C7E;} - .d2-1469363795 .background-color-N3{background-color:#9499AB;} - .d2-1469363795 .background-color-N4{background-color:#CFD2DD;} - .d2-1469363795 .background-color-N5{background-color:#DEE1EB;} - .d2-1469363795 .background-color-N6{background-color:#EEF1F8;} - .d2-1469363795 .background-color-N7{background-color:#FFFFFF;} - .d2-1469363795 .background-color-B1{background-color:#0D32B2;} - .d2-1469363795 .background-color-B2{background-color:#0D32B2;} - .d2-1469363795 .background-color-B3{background-color:#E3E9FD;} - .d2-1469363795 .background-color-B4{background-color:#E3E9FD;} - .d2-1469363795 .background-color-B5{background-color:#EDF0FD;} - .d2-1469363795 .background-color-B6{background-color:#F7F8FE;} - .d2-1469363795 .background-color-AA2{background-color:#4A6FF3;} - .d2-1469363795 .background-color-AA4{background-color:#EDF0FD;} - .d2-1469363795 .background-color-AA5{background-color:#F7F8FE;} - .d2-1469363795 .background-color-AB4{background-color:#EDF0FD;} - .d2-1469363795 .background-color-AB5{background-color:#F7F8FE;} - .d2-1469363795 .color-N1{color:#0A0F25;} - .d2-1469363795 .color-N2{color:#676C7E;} - .d2-1469363795 .color-N3{color:#9499AB;} - .d2-1469363795 .color-N4{color:#CFD2DD;} - .d2-1469363795 .color-N5{color:#DEE1EB;} - .d2-1469363795 .color-N6{color:#EEF1F8;} - .d2-1469363795 .color-N7{color:#FFFFFF;} - .d2-1469363795 .color-B1{color:#0D32B2;} - .d2-1469363795 .color-B2{color:#0D32B2;} - .d2-1469363795 .color-B3{color:#E3E9FD;} - .d2-1469363795 .color-B4{color:#E3E9FD;} - .d2-1469363795 .color-B5{color:#EDF0FD;} - .d2-1469363795 .color-B6{color:#F7F8FE;} - .d2-1469363795 .color-AA2{color:#4A6FF3;} - .d2-1469363795 .color-AA4{color:#EDF0FD;} - .d2-1469363795 .color-AA5{color:#F7F8FE;} - .d2-1469363795 .color-AB4{color:#EDF0FD;} - .d2-1469363795 .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-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 - ->>>>>>> 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;} @@ -415,9 +96,8 @@ .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 + .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) 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 4dc38587b..339ee5238 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,26 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -a labelblabelsa class+public() boolvoid-private() intvoidcloudyyyy:= 5 -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-2933327511 .fill-N1{fill:#0A0F25;} - .d2-2933327511 .fill-N2{fill:#676C7E;} - .d2-2933327511 .fill-N3{fill:#9499AB;} - .d2-2933327511 .fill-N4{fill:#CFD2DD;} - .d2-2933327511 .fill-N5{fill:#DEE1EB;} - .d2-2933327511 .fill-N6{fill:#EEF1F8;} - .d2-2933327511 .fill-N7{fill:#FFFFFF;} - .d2-2933327511 .fill-B1{fill:#0D32B2;} - .d2-2933327511 .fill-B2{fill:#0D32B2;} - .d2-2933327511 .fill-B3{fill:#E3E9FD;} - .d2-2933327511 .fill-B4{fill:#E3E9FD;} - .d2-2933327511 .fill-B5{fill:#EDF0FD;} - .d2-2933327511 .fill-B6{fill:#F7F8FE;} - .d2-2933327511 .fill-AA2{fill:#4A6FF3;} - .d2-2933327511 .fill-AA4{fill:#EDF0FD;} - .d2-2933327511 .fill-AA5{fill:#F7F8FE;} - .d2-2933327511 .fill-AB4{fill:#EDF0FD;} - .d2-2933327511 .fill-AB5{fill:#F7F8FE;} - .d2-2933327511 .stroke-N1{stroke:#0A0F25;} - .d2-2933327511 .stroke-N2{stroke:#676C7E;} - .d2-2933327511 .stroke-N3{stroke:#9499AB;} - .d2-2933327511 .stroke-N4{stroke:#CFD2DD;} - .d2-2933327511 .stroke-N5{stroke:#DEE1EB;} - .d2-2933327511 .stroke-N6{stroke:#EEF1F8;} - .d2-2933327511 .stroke-N7{stroke:#FFFFFF;} - .d2-2933327511 .stroke-B1{stroke:#0D32B2;} - .d2-2933327511 .stroke-B2{stroke:#0D32B2;} - .d2-2933327511 .stroke-B3{stroke:#E3E9FD;} - .d2-2933327511 .stroke-B4{stroke:#E3E9FD;} - .d2-2933327511 .stroke-B5{stroke:#EDF0FD;} - .d2-2933327511 .stroke-B6{stroke:#F7F8FE;} - .d2-2933327511 .stroke-AA2{stroke:#4A6FF3;} - .d2-2933327511 .stroke-AA4{stroke:#EDF0FD;} - .d2-2933327511 .stroke-AA5{stroke:#F7F8FE;} - .d2-2933327511 .stroke-AB4{stroke:#EDF0FD;} - .d2-2933327511 .stroke-AB5{stroke:#F7F8FE;} - .d2-2933327511 .background-color-N1{background-color:#0A0F25;} - .d2-2933327511 .background-color-N2{background-color:#676C7E;} - .d2-2933327511 .background-color-N3{background-color:#9499AB;} - .d2-2933327511 .background-color-N4{background-color:#CFD2DD;} - .d2-2933327511 .background-color-N5{background-color:#DEE1EB;} - .d2-2933327511 .background-color-N6{background-color:#EEF1F8;} - .d2-2933327511 .background-color-N7{background-color:#FFFFFF;} - .d2-2933327511 .background-color-B1{background-color:#0D32B2;} - .d2-2933327511 .background-color-B2{background-color:#0D32B2;} - .d2-2933327511 .background-color-B3{background-color:#E3E9FD;} - .d2-2933327511 .background-color-B4{background-color:#E3E9FD;} - .d2-2933327511 .background-color-B5{background-color:#EDF0FD;} - .d2-2933327511 .background-color-B6{background-color:#F7F8FE;} - .d2-2933327511 .background-color-AA2{background-color:#4A6FF3;} - .d2-2933327511 .background-color-AA4{background-color:#EDF0FD;} - .d2-2933327511 .background-color-AA5{background-color:#F7F8FE;} - .d2-2933327511 .background-color-AB4{background-color:#EDF0FD;} - .d2-2933327511 .background-color-AB5{background-color:#F7F8FE;} - .d2-2933327511 .color-N1{color:#0A0F25;} - .d2-2933327511 .color-N2{color:#676C7E;} - .d2-2933327511 .color-N3{color:#9499AB;} - .d2-2933327511 .color-N4{color:#CFD2DD;} - .d2-2933327511 .color-N5{color:#DEE1EB;} - .d2-2933327511 .color-N6{color:#EEF1F8;} - .d2-2933327511 .color-N7{color:#FFFFFF;} - .d2-2933327511 .color-B1{color:#0D32B2;} - .d2-2933327511 .color-B2{color:#0D32B2;} - .d2-2933327511 .color-B3{color:#E3E9FD;} - .d2-2933327511 .color-B4{color:#E3E9FD;} - .d2-2933327511 .color-B5{color:#EDF0FD;} - .d2-2933327511 .color-B6{color:#F7F8FE;} - .d2-2933327511 .color-AA2{color:#4A6FF3;} - .d2-2933327511 .color-AA4{color:#EDF0FD;} - .d2-2933327511 .color-AA5{color:#F7F8FE;} - .d2-2933327511 .color-AB4{color:#EDF0FD;} - .d2-2933327511 .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() intvoidcloudyyyy:= 5 -======= - .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() intvoidcloudyyyy:= 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() intvoidcloudyyyy:= 5 -======= .d2-3769254545 .fill-N1{fill:#0A0F25;} .d2-3769254545 .fill-N2{fill:#676C7E;} .d2-3769254545 .fill-N3{fill:#9499AB;} @@ -425,39 +110,12 @@ .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() intvoidcloudyyyy:= 5 ->>>>>>> cb2f2823c (Fix changes) + .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() intvoidcloudyyyy:= 5 := 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 +fmt.Printf("%d", b)cyldiadocssix cornersa random iconoverpackdocs pagetoohard o saysinglepersona queuea squarea step at a timedatausersidintnamevarchar result := callThisFunction(obj, 5) midthis sideother side -||||||| parent of 33280fed5 (fixed e2e tests) -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 - -======= -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) 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 4dc38587b..339ee5238 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,26 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -a labelblabelsa class+public() boolvoid-private() intvoidcloudyyyy:= 5 -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-2933327511 .fill-N1{fill:#0A0F25;} - .d2-2933327511 .fill-N2{fill:#676C7E;} - .d2-2933327511 .fill-N3{fill:#9499AB;} - .d2-2933327511 .fill-N4{fill:#CFD2DD;} - .d2-2933327511 .fill-N5{fill:#DEE1EB;} - .d2-2933327511 .fill-N6{fill:#EEF1F8;} - .d2-2933327511 .fill-N7{fill:#FFFFFF;} - .d2-2933327511 .fill-B1{fill:#0D32B2;} - .d2-2933327511 .fill-B2{fill:#0D32B2;} - .d2-2933327511 .fill-B3{fill:#E3E9FD;} - .d2-2933327511 .fill-B4{fill:#E3E9FD;} - .d2-2933327511 .fill-B5{fill:#EDF0FD;} - .d2-2933327511 .fill-B6{fill:#F7F8FE;} - .d2-2933327511 .fill-AA2{fill:#4A6FF3;} - .d2-2933327511 .fill-AA4{fill:#EDF0FD;} - .d2-2933327511 .fill-AA5{fill:#F7F8FE;} - .d2-2933327511 .fill-AB4{fill:#EDF0FD;} - .d2-2933327511 .fill-AB5{fill:#F7F8FE;} - .d2-2933327511 .stroke-N1{stroke:#0A0F25;} - .d2-2933327511 .stroke-N2{stroke:#676C7E;} - .d2-2933327511 .stroke-N3{stroke:#9499AB;} - .d2-2933327511 .stroke-N4{stroke:#CFD2DD;} - .d2-2933327511 .stroke-N5{stroke:#DEE1EB;} - .d2-2933327511 .stroke-N6{stroke:#EEF1F8;} - .d2-2933327511 .stroke-N7{stroke:#FFFFFF;} - .d2-2933327511 .stroke-B1{stroke:#0D32B2;} - .d2-2933327511 .stroke-B2{stroke:#0D32B2;} - .d2-2933327511 .stroke-B3{stroke:#E3E9FD;} - .d2-2933327511 .stroke-B4{stroke:#E3E9FD;} - .d2-2933327511 .stroke-B5{stroke:#EDF0FD;} - .d2-2933327511 .stroke-B6{stroke:#F7F8FE;} - .d2-2933327511 .stroke-AA2{stroke:#4A6FF3;} - .d2-2933327511 .stroke-AA4{stroke:#EDF0FD;} - .d2-2933327511 .stroke-AA5{stroke:#F7F8FE;} - .d2-2933327511 .stroke-AB4{stroke:#EDF0FD;} - .d2-2933327511 .stroke-AB5{stroke:#F7F8FE;} - .d2-2933327511 .background-color-N1{background-color:#0A0F25;} - .d2-2933327511 .background-color-N2{background-color:#676C7E;} - .d2-2933327511 .background-color-N3{background-color:#9499AB;} - .d2-2933327511 .background-color-N4{background-color:#CFD2DD;} - .d2-2933327511 .background-color-N5{background-color:#DEE1EB;} - .d2-2933327511 .background-color-N6{background-color:#EEF1F8;} - .d2-2933327511 .background-color-N7{background-color:#FFFFFF;} - .d2-2933327511 .background-color-B1{background-color:#0D32B2;} - .d2-2933327511 .background-color-B2{background-color:#0D32B2;} - .d2-2933327511 .background-color-B3{background-color:#E3E9FD;} - .d2-2933327511 .background-color-B4{background-color:#E3E9FD;} - .d2-2933327511 .background-color-B5{background-color:#EDF0FD;} - .d2-2933327511 .background-color-B6{background-color:#F7F8FE;} - .d2-2933327511 .background-color-AA2{background-color:#4A6FF3;} - .d2-2933327511 .background-color-AA4{background-color:#EDF0FD;} - .d2-2933327511 .background-color-AA5{background-color:#F7F8FE;} - .d2-2933327511 .background-color-AB4{background-color:#EDF0FD;} - .d2-2933327511 .background-color-AB5{background-color:#F7F8FE;} - .d2-2933327511 .color-N1{color:#0A0F25;} - .d2-2933327511 .color-N2{color:#676C7E;} - .d2-2933327511 .color-N3{color:#9499AB;} - .d2-2933327511 .color-N4{color:#CFD2DD;} - .d2-2933327511 .color-N5{color:#DEE1EB;} - .d2-2933327511 .color-N6{color:#EEF1F8;} - .d2-2933327511 .color-N7{color:#FFFFFF;} - .d2-2933327511 .color-B1{color:#0D32B2;} - .d2-2933327511 .color-B2{color:#0D32B2;} - .d2-2933327511 .color-B3{color:#E3E9FD;} - .d2-2933327511 .color-B4{color:#E3E9FD;} - .d2-2933327511 .color-B5{color:#EDF0FD;} - .d2-2933327511 .color-B6{color:#F7F8FE;} - .d2-2933327511 .color-AA2{color:#4A6FF3;} - .d2-2933327511 .color-AA4{color:#EDF0FD;} - .d2-2933327511 .color-AA5{color:#F7F8FE;} - .d2-2933327511 .color-AB4{color:#EDF0FD;} - .d2-2933327511 .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() intvoidcloudyyyy:= 5 -======= - .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() intvoidcloudyyyy:= 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() intvoidcloudyyyy:= 5 -======= .d2-3769254545 .fill-N1{fill:#0A0F25;} .d2-3769254545 .fill-N2{fill:#676C7E;} .d2-3769254545 .fill-N3{fill:#9499AB;} @@ -425,39 +110,12 @@ .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() intvoidcloudyyyy:= 5 ->>>>>>> cb2f2823c (Fix changes) + .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() intvoidcloudyyyy:= 5 := 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 +fmt.Printf("%d", b)cyldiadocssix cornersa random iconoverpackdocs pagetoohard o saysinglepersona queuea squarea step at a timedatausersidintnamevarchar result := callThisFunction(obj, 5) midthis sideother side -||||||| parent of 33280fed5 (fixed e2e tests) -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 - -======= -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) 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 2c6c8e009..32e235328 100644 --- a/e2etests/testdata/stable/sequence_diagram_distance/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_distance/dagre/sketch.exp.svg @@ -1,26 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -alicebob what does it mean to be well-adjustedThe ability to play bridge or golf as if they were games - -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-3430647392 .fill-N1{fill:#0A0F25;} - .d2-3430647392 .fill-N2{fill:#676C7E;} - .d2-3430647392 .fill-N3{fill:#9499AB;} - .d2-3430647392 .fill-N4{fill:#CFD2DD;} - .d2-3430647392 .fill-N5{fill:#DEE1EB;} - .d2-3430647392 .fill-N6{fill:#EEF1F8;} - .d2-3430647392 .fill-N7{fill:#FFFFFF;} - .d2-3430647392 .fill-B1{fill:#0D32B2;} - .d2-3430647392 .fill-B2{fill:#0D32B2;} - .d2-3430647392 .fill-B3{fill:#E3E9FD;} - .d2-3430647392 .fill-B4{fill:#E3E9FD;} - .d2-3430647392 .fill-B5{fill:#EDF0FD;} - .d2-3430647392 .fill-B6{fill:#F7F8FE;} - .d2-3430647392 .fill-AA2{fill:#4A6FF3;} - .d2-3430647392 .fill-AA4{fill:#EDF0FD;} - .d2-3430647392 .fill-AA5{fill:#F7F8FE;} - .d2-3430647392 .fill-AB4{fill:#EDF0FD;} - .d2-3430647392 .fill-AB5{fill:#F7F8FE;} - .d2-3430647392 .stroke-N1{stroke:#0A0F25;} - .d2-3430647392 .stroke-N2{stroke:#676C7E;} - .d2-3430647392 .stroke-N3{stroke:#9499AB;} - .d2-3430647392 .stroke-N4{stroke:#CFD2DD;} - .d2-3430647392 .stroke-N5{stroke:#DEE1EB;} - .d2-3430647392 .stroke-N6{stroke:#EEF1F8;} - .d2-3430647392 .stroke-N7{stroke:#FFFFFF;} - .d2-3430647392 .stroke-B1{stroke:#0D32B2;} - .d2-3430647392 .stroke-B2{stroke:#0D32B2;} - .d2-3430647392 .stroke-B3{stroke:#E3E9FD;} - .d2-3430647392 .stroke-B4{stroke:#E3E9FD;} - .d2-3430647392 .stroke-B5{stroke:#EDF0FD;} - .d2-3430647392 .stroke-B6{stroke:#F7F8FE;} - .d2-3430647392 .stroke-AA2{stroke:#4A6FF3;} - .d2-3430647392 .stroke-AA4{stroke:#EDF0FD;} - .d2-3430647392 .stroke-AA5{stroke:#F7F8FE;} - .d2-3430647392 .stroke-AB4{stroke:#EDF0FD;} - .d2-3430647392 .stroke-AB5{stroke:#F7F8FE;} - .d2-3430647392 .background-color-N1{background-color:#0A0F25;} - .d2-3430647392 .background-color-N2{background-color:#676C7E;} - .d2-3430647392 .background-color-N3{background-color:#9499AB;} - .d2-3430647392 .background-color-N4{background-color:#CFD2DD;} - .d2-3430647392 .background-color-N5{background-color:#DEE1EB;} - .d2-3430647392 .background-color-N6{background-color:#EEF1F8;} - .d2-3430647392 .background-color-N7{background-color:#FFFFFF;} - .d2-3430647392 .background-color-B1{background-color:#0D32B2;} - .d2-3430647392 .background-color-B2{background-color:#0D32B2;} - .d2-3430647392 .background-color-B3{background-color:#E3E9FD;} - .d2-3430647392 .background-color-B4{background-color:#E3E9FD;} - .d2-3430647392 .background-color-B5{background-color:#EDF0FD;} - .d2-3430647392 .background-color-B6{background-color:#F7F8FE;} - .d2-3430647392 .background-color-AA2{background-color:#4A6FF3;} - .d2-3430647392 .background-color-AA4{background-color:#EDF0FD;} - .d2-3430647392 .background-color-AA5{background-color:#F7F8FE;} - .d2-3430647392 .background-color-AB4{background-color:#EDF0FD;} - .d2-3430647392 .background-color-AB5{background-color:#F7F8FE;} - .d2-3430647392 .color-N1{color:#0A0F25;} - .d2-3430647392 .color-N2{color:#676C7E;} - .d2-3430647392 .color-N3{color:#9499AB;} - .d2-3430647392 .color-N4{color:#CFD2DD;} - .d2-3430647392 .color-N5{color:#DEE1EB;} - .d2-3430647392 .color-N6{color:#EEF1F8;} - .d2-3430647392 .color-N7{color:#FFFFFF;} - .d2-3430647392 .color-B1{color:#0D32B2;} - .d2-3430647392 .color-B2{color:#0D32B2;} - .d2-3430647392 .color-B3{color:#E3E9FD;} - .d2-3430647392 .color-B4{color:#E3E9FD;} - .d2-3430647392 .color-B5{color:#EDF0FD;} - .d2-3430647392 .color-B6{color:#F7F8FE;} - .d2-3430647392 .color-AA2{color:#4A6FF3;} - .d2-3430647392 .color-AA4{color:#EDF0FD;} - .d2-3430647392 .color-AA5{color:#F7F8FE;} - .d2-3430647392 .color-AB4{color:#EDF0FD;} - .d2-3430647392 .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-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 - ->>>>>>> 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;} @@ -415,9 +96,8 @@ .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 + .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) 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 2c6c8e009..32e235328 100644 --- a/e2etests/testdata/stable/sequence_diagram_distance/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_distance/elk/sketch.exp.svg @@ -1,26 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -alicebob what does it mean to be well-adjustedThe ability to play bridge or golf as if they were games - -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-3430647392 .fill-N1{fill:#0A0F25;} - .d2-3430647392 .fill-N2{fill:#676C7E;} - .d2-3430647392 .fill-N3{fill:#9499AB;} - .d2-3430647392 .fill-N4{fill:#CFD2DD;} - .d2-3430647392 .fill-N5{fill:#DEE1EB;} - .d2-3430647392 .fill-N6{fill:#EEF1F8;} - .d2-3430647392 .fill-N7{fill:#FFFFFF;} - .d2-3430647392 .fill-B1{fill:#0D32B2;} - .d2-3430647392 .fill-B2{fill:#0D32B2;} - .d2-3430647392 .fill-B3{fill:#E3E9FD;} - .d2-3430647392 .fill-B4{fill:#E3E9FD;} - .d2-3430647392 .fill-B5{fill:#EDF0FD;} - .d2-3430647392 .fill-B6{fill:#F7F8FE;} - .d2-3430647392 .fill-AA2{fill:#4A6FF3;} - .d2-3430647392 .fill-AA4{fill:#EDF0FD;} - .d2-3430647392 .fill-AA5{fill:#F7F8FE;} - .d2-3430647392 .fill-AB4{fill:#EDF0FD;} - .d2-3430647392 .fill-AB5{fill:#F7F8FE;} - .d2-3430647392 .stroke-N1{stroke:#0A0F25;} - .d2-3430647392 .stroke-N2{stroke:#676C7E;} - .d2-3430647392 .stroke-N3{stroke:#9499AB;} - .d2-3430647392 .stroke-N4{stroke:#CFD2DD;} - .d2-3430647392 .stroke-N5{stroke:#DEE1EB;} - .d2-3430647392 .stroke-N6{stroke:#EEF1F8;} - .d2-3430647392 .stroke-N7{stroke:#FFFFFF;} - .d2-3430647392 .stroke-B1{stroke:#0D32B2;} - .d2-3430647392 .stroke-B2{stroke:#0D32B2;} - .d2-3430647392 .stroke-B3{stroke:#E3E9FD;} - .d2-3430647392 .stroke-B4{stroke:#E3E9FD;} - .d2-3430647392 .stroke-B5{stroke:#EDF0FD;} - .d2-3430647392 .stroke-B6{stroke:#F7F8FE;} - .d2-3430647392 .stroke-AA2{stroke:#4A6FF3;} - .d2-3430647392 .stroke-AA4{stroke:#EDF0FD;} - .d2-3430647392 .stroke-AA5{stroke:#F7F8FE;} - .d2-3430647392 .stroke-AB4{stroke:#EDF0FD;} - .d2-3430647392 .stroke-AB5{stroke:#F7F8FE;} - .d2-3430647392 .background-color-N1{background-color:#0A0F25;} - .d2-3430647392 .background-color-N2{background-color:#676C7E;} - .d2-3430647392 .background-color-N3{background-color:#9499AB;} - .d2-3430647392 .background-color-N4{background-color:#CFD2DD;} - .d2-3430647392 .background-color-N5{background-color:#DEE1EB;} - .d2-3430647392 .background-color-N6{background-color:#EEF1F8;} - .d2-3430647392 .background-color-N7{background-color:#FFFFFF;} - .d2-3430647392 .background-color-B1{background-color:#0D32B2;} - .d2-3430647392 .background-color-B2{background-color:#0D32B2;} - .d2-3430647392 .background-color-B3{background-color:#E3E9FD;} - .d2-3430647392 .background-color-B4{background-color:#E3E9FD;} - .d2-3430647392 .background-color-B5{background-color:#EDF0FD;} - .d2-3430647392 .background-color-B6{background-color:#F7F8FE;} - .d2-3430647392 .background-color-AA2{background-color:#4A6FF3;} - .d2-3430647392 .background-color-AA4{background-color:#EDF0FD;} - .d2-3430647392 .background-color-AA5{background-color:#F7F8FE;} - .d2-3430647392 .background-color-AB4{background-color:#EDF0FD;} - .d2-3430647392 .background-color-AB5{background-color:#F7F8FE;} - .d2-3430647392 .color-N1{color:#0A0F25;} - .d2-3430647392 .color-N2{color:#676C7E;} - .d2-3430647392 .color-N3{color:#9499AB;} - .d2-3430647392 .color-N4{color:#CFD2DD;} - .d2-3430647392 .color-N5{color:#DEE1EB;} - .d2-3430647392 .color-N6{color:#EEF1F8;} - .d2-3430647392 .color-N7{color:#FFFFFF;} - .d2-3430647392 .color-B1{color:#0D32B2;} - .d2-3430647392 .color-B2{color:#0D32B2;} - .d2-3430647392 .color-B3{color:#E3E9FD;} - .d2-3430647392 .color-B4{color:#E3E9FD;} - .d2-3430647392 .color-B5{color:#EDF0FD;} - .d2-3430647392 .color-B6{color:#F7F8FE;} - .d2-3430647392 .color-AA2{color:#4A6FF3;} - .d2-3430647392 .color-AA4{color:#EDF0FD;} - .d2-3430647392 .color-AA5{color:#F7F8FE;} - .d2-3430647392 .color-AB4{color:#EDF0FD;} - .d2-3430647392 .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-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 - ->>>>>>> 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;} @@ -415,9 +96,8 @@ .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 + .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) 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 ea3731630..c8326ad63 100644 --- a/e2etests/testdata/stable/sequence_diagram_groups/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_groups/dagre/sketch.exp.svg @@ -1,26 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -abcdggggroup 1group bchoonested guy lalaeyokayokaywhat would arnold saythis note - -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-2935354269 .fill-N1{fill:#0A0F25;} - .d2-2935354269 .fill-N2{fill:#676C7E;} - .d2-2935354269 .fill-N3{fill:#9499AB;} - .d2-2935354269 .fill-N4{fill:#CFD2DD;} - .d2-2935354269 .fill-N5{fill:#DEE1EB;} - .d2-2935354269 .fill-N6{fill:#EEF1F8;} - .d2-2935354269 .fill-N7{fill:#FFFFFF;} - .d2-2935354269 .fill-B1{fill:#0D32B2;} - .d2-2935354269 .fill-B2{fill:#0D32B2;} - .d2-2935354269 .fill-B3{fill:#E3E9FD;} - .d2-2935354269 .fill-B4{fill:#E3E9FD;} - .d2-2935354269 .fill-B5{fill:#EDF0FD;} - .d2-2935354269 .fill-B6{fill:#F7F8FE;} - .d2-2935354269 .fill-AA2{fill:#4A6FF3;} - .d2-2935354269 .fill-AA4{fill:#EDF0FD;} - .d2-2935354269 .fill-AA5{fill:#F7F8FE;} - .d2-2935354269 .fill-AB4{fill:#EDF0FD;} - .d2-2935354269 .fill-AB5{fill:#F7F8FE;} - .d2-2935354269 .stroke-N1{stroke:#0A0F25;} - .d2-2935354269 .stroke-N2{stroke:#676C7E;} - .d2-2935354269 .stroke-N3{stroke:#9499AB;} - .d2-2935354269 .stroke-N4{stroke:#CFD2DD;} - .d2-2935354269 .stroke-N5{stroke:#DEE1EB;} - .d2-2935354269 .stroke-N6{stroke:#EEF1F8;} - .d2-2935354269 .stroke-N7{stroke:#FFFFFF;} - .d2-2935354269 .stroke-B1{stroke:#0D32B2;} - .d2-2935354269 .stroke-B2{stroke:#0D32B2;} - .d2-2935354269 .stroke-B3{stroke:#E3E9FD;} - .d2-2935354269 .stroke-B4{stroke:#E3E9FD;} - .d2-2935354269 .stroke-B5{stroke:#EDF0FD;} - .d2-2935354269 .stroke-B6{stroke:#F7F8FE;} - .d2-2935354269 .stroke-AA2{stroke:#4A6FF3;} - .d2-2935354269 .stroke-AA4{stroke:#EDF0FD;} - .d2-2935354269 .stroke-AA5{stroke:#F7F8FE;} - .d2-2935354269 .stroke-AB4{stroke:#EDF0FD;} - .d2-2935354269 .stroke-AB5{stroke:#F7F8FE;} - .d2-2935354269 .background-color-N1{background-color:#0A0F25;} - .d2-2935354269 .background-color-N2{background-color:#676C7E;} - .d2-2935354269 .background-color-N3{background-color:#9499AB;} - .d2-2935354269 .background-color-N4{background-color:#CFD2DD;} - .d2-2935354269 .background-color-N5{background-color:#DEE1EB;} - .d2-2935354269 .background-color-N6{background-color:#EEF1F8;} - .d2-2935354269 .background-color-N7{background-color:#FFFFFF;} - .d2-2935354269 .background-color-B1{background-color:#0D32B2;} - .d2-2935354269 .background-color-B2{background-color:#0D32B2;} - .d2-2935354269 .background-color-B3{background-color:#E3E9FD;} - .d2-2935354269 .background-color-B4{background-color:#E3E9FD;} - .d2-2935354269 .background-color-B5{background-color:#EDF0FD;} - .d2-2935354269 .background-color-B6{background-color:#F7F8FE;} - .d2-2935354269 .background-color-AA2{background-color:#4A6FF3;} - .d2-2935354269 .background-color-AA4{background-color:#EDF0FD;} - .d2-2935354269 .background-color-AA5{background-color:#F7F8FE;} - .d2-2935354269 .background-color-AB4{background-color:#EDF0FD;} - .d2-2935354269 .background-color-AB5{background-color:#F7F8FE;} - .d2-2935354269 .color-N1{color:#0A0F25;} - .d2-2935354269 .color-N2{color:#676C7E;} - .d2-2935354269 .color-N3{color:#9499AB;} - .d2-2935354269 .color-N4{color:#CFD2DD;} - .d2-2935354269 .color-N5{color:#DEE1EB;} - .d2-2935354269 .color-N6{color:#EEF1F8;} - .d2-2935354269 .color-N7{color:#FFFFFF;} - .d2-2935354269 .color-B1{color:#0D32B2;} - .d2-2935354269 .color-B2{color:#0D32B2;} - .d2-2935354269 .color-B3{color:#E3E9FD;} - .d2-2935354269 .color-B4{color:#E3E9FD;} - .d2-2935354269 .color-B5{color:#EDF0FD;} - .d2-2935354269 .color-B6{color:#F7F8FE;} - .d2-2935354269 .color-AA2{color:#4A6FF3;} - .d2-2935354269 .color-AA4{color:#EDF0FD;} - .d2-2935354269 .color-AA5{color:#F7F8FE;} - .d2-2935354269 .color-AB4{color:#EDF0FD;} - .d2-2935354269 .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-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 - ->>>>>>> 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;} @@ -415,9 +96,8 @@ .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 + .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) 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 ea3731630..c8326ad63 100644 --- a/e2etests/testdata/stable/sequence_diagram_groups/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_groups/elk/sketch.exp.svg @@ -1,26 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -abcdggggroup 1group bchoonested guy lalaeyokayokaywhat would arnold saythis note - -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-2935354269 .fill-N1{fill:#0A0F25;} - .d2-2935354269 .fill-N2{fill:#676C7E;} - .d2-2935354269 .fill-N3{fill:#9499AB;} - .d2-2935354269 .fill-N4{fill:#CFD2DD;} - .d2-2935354269 .fill-N5{fill:#DEE1EB;} - .d2-2935354269 .fill-N6{fill:#EEF1F8;} - .d2-2935354269 .fill-N7{fill:#FFFFFF;} - .d2-2935354269 .fill-B1{fill:#0D32B2;} - .d2-2935354269 .fill-B2{fill:#0D32B2;} - .d2-2935354269 .fill-B3{fill:#E3E9FD;} - .d2-2935354269 .fill-B4{fill:#E3E9FD;} - .d2-2935354269 .fill-B5{fill:#EDF0FD;} - .d2-2935354269 .fill-B6{fill:#F7F8FE;} - .d2-2935354269 .fill-AA2{fill:#4A6FF3;} - .d2-2935354269 .fill-AA4{fill:#EDF0FD;} - .d2-2935354269 .fill-AA5{fill:#F7F8FE;} - .d2-2935354269 .fill-AB4{fill:#EDF0FD;} - .d2-2935354269 .fill-AB5{fill:#F7F8FE;} - .d2-2935354269 .stroke-N1{stroke:#0A0F25;} - .d2-2935354269 .stroke-N2{stroke:#676C7E;} - .d2-2935354269 .stroke-N3{stroke:#9499AB;} - .d2-2935354269 .stroke-N4{stroke:#CFD2DD;} - .d2-2935354269 .stroke-N5{stroke:#DEE1EB;} - .d2-2935354269 .stroke-N6{stroke:#EEF1F8;} - .d2-2935354269 .stroke-N7{stroke:#FFFFFF;} - .d2-2935354269 .stroke-B1{stroke:#0D32B2;} - .d2-2935354269 .stroke-B2{stroke:#0D32B2;} - .d2-2935354269 .stroke-B3{stroke:#E3E9FD;} - .d2-2935354269 .stroke-B4{stroke:#E3E9FD;} - .d2-2935354269 .stroke-B5{stroke:#EDF0FD;} - .d2-2935354269 .stroke-B6{stroke:#F7F8FE;} - .d2-2935354269 .stroke-AA2{stroke:#4A6FF3;} - .d2-2935354269 .stroke-AA4{stroke:#EDF0FD;} - .d2-2935354269 .stroke-AA5{stroke:#F7F8FE;} - .d2-2935354269 .stroke-AB4{stroke:#EDF0FD;} - .d2-2935354269 .stroke-AB5{stroke:#F7F8FE;} - .d2-2935354269 .background-color-N1{background-color:#0A0F25;} - .d2-2935354269 .background-color-N2{background-color:#676C7E;} - .d2-2935354269 .background-color-N3{background-color:#9499AB;} - .d2-2935354269 .background-color-N4{background-color:#CFD2DD;} - .d2-2935354269 .background-color-N5{background-color:#DEE1EB;} - .d2-2935354269 .background-color-N6{background-color:#EEF1F8;} - .d2-2935354269 .background-color-N7{background-color:#FFFFFF;} - .d2-2935354269 .background-color-B1{background-color:#0D32B2;} - .d2-2935354269 .background-color-B2{background-color:#0D32B2;} - .d2-2935354269 .background-color-B3{background-color:#E3E9FD;} - .d2-2935354269 .background-color-B4{background-color:#E3E9FD;} - .d2-2935354269 .background-color-B5{background-color:#EDF0FD;} - .d2-2935354269 .background-color-B6{background-color:#F7F8FE;} - .d2-2935354269 .background-color-AA2{background-color:#4A6FF3;} - .d2-2935354269 .background-color-AA4{background-color:#EDF0FD;} - .d2-2935354269 .background-color-AA5{background-color:#F7F8FE;} - .d2-2935354269 .background-color-AB4{background-color:#EDF0FD;} - .d2-2935354269 .background-color-AB5{background-color:#F7F8FE;} - .d2-2935354269 .color-N1{color:#0A0F25;} - .d2-2935354269 .color-N2{color:#676C7E;} - .d2-2935354269 .color-N3{color:#9499AB;} - .d2-2935354269 .color-N4{color:#CFD2DD;} - .d2-2935354269 .color-N5{color:#DEE1EB;} - .d2-2935354269 .color-N6{color:#EEF1F8;} - .d2-2935354269 .color-N7{color:#FFFFFF;} - .d2-2935354269 .color-B1{color:#0D32B2;} - .d2-2935354269 .color-B2{color:#0D32B2;} - .d2-2935354269 .color-B3{color:#E3E9FD;} - .d2-2935354269 .color-B4{color:#E3E9FD;} - .d2-2935354269 .color-B5{color:#EDF0FD;} - .d2-2935354269 .color-B6{color:#F7F8FE;} - .d2-2935354269 .color-AA2{color:#4A6FF3;} - .d2-2935354269 .color-AA4{color:#EDF0FD;} - .d2-2935354269 .color-AA5{color:#F7F8FE;} - .d2-2935354269 .color-AB4{color:#EDF0FD;} - .d2-2935354269 .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-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 - ->>>>>>> 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;} @@ -415,9 +96,8 @@ .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 + .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) 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 377f8cfeb..47bdd0864 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,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -ab a note here to remember that padding must consider notes toojustalongnotehere -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-1523442205 .fill-N1{fill:#0A0F25;} - .d2-1523442205 .fill-N2{fill:#676C7E;} - .d2-1523442205 .fill-N3{fill:#9499AB;} - .d2-1523442205 .fill-N4{fill:#CFD2DD;} - .d2-1523442205 .fill-N5{fill:#DEE1EB;} - .d2-1523442205 .fill-N6{fill:#EEF1F8;} - .d2-1523442205 .fill-N7{fill:#FFFFFF;} - .d2-1523442205 .fill-B1{fill:#0D32B2;} - .d2-1523442205 .fill-B2{fill:#0D32B2;} - .d2-1523442205 .fill-B3{fill:#E3E9FD;} - .d2-1523442205 .fill-B4{fill:#E3E9FD;} - .d2-1523442205 .fill-B5{fill:#EDF0FD;} - .d2-1523442205 .fill-B6{fill:#F7F8FE;} - .d2-1523442205 .fill-AA2{fill:#4A6FF3;} - .d2-1523442205 .fill-AA4{fill:#EDF0FD;} - .d2-1523442205 .fill-AA5{fill:#F7F8FE;} - .d2-1523442205 .fill-AB4{fill:#EDF0FD;} - .d2-1523442205 .fill-AB5{fill:#F7F8FE;} - .d2-1523442205 .stroke-N1{stroke:#0A0F25;} - .d2-1523442205 .stroke-N2{stroke:#676C7E;} - .d2-1523442205 .stroke-N3{stroke:#9499AB;} - .d2-1523442205 .stroke-N4{stroke:#CFD2DD;} - .d2-1523442205 .stroke-N5{stroke:#DEE1EB;} - .d2-1523442205 .stroke-N6{stroke:#EEF1F8;} - .d2-1523442205 .stroke-N7{stroke:#FFFFFF;} - .d2-1523442205 .stroke-B1{stroke:#0D32B2;} - .d2-1523442205 .stroke-B2{stroke:#0D32B2;} - .d2-1523442205 .stroke-B3{stroke:#E3E9FD;} - .d2-1523442205 .stroke-B4{stroke:#E3E9FD;} - .d2-1523442205 .stroke-B5{stroke:#EDF0FD;} - .d2-1523442205 .stroke-B6{stroke:#F7F8FE;} - .d2-1523442205 .stroke-AA2{stroke:#4A6FF3;} - .d2-1523442205 .stroke-AA4{stroke:#EDF0FD;} - .d2-1523442205 .stroke-AA5{stroke:#F7F8FE;} - .d2-1523442205 .stroke-AB4{stroke:#EDF0FD;} - .d2-1523442205 .stroke-AB5{stroke:#F7F8FE;} - .d2-1523442205 .background-color-N1{background-color:#0A0F25;} - .d2-1523442205 .background-color-N2{background-color:#676C7E;} - .d2-1523442205 .background-color-N3{background-color:#9499AB;} - .d2-1523442205 .background-color-N4{background-color:#CFD2DD;} - .d2-1523442205 .background-color-N5{background-color:#DEE1EB;} - .d2-1523442205 .background-color-N6{background-color:#EEF1F8;} - .d2-1523442205 .background-color-N7{background-color:#FFFFFF;} - .d2-1523442205 .background-color-B1{background-color:#0D32B2;} - .d2-1523442205 .background-color-B2{background-color:#0D32B2;} - .d2-1523442205 .background-color-B3{background-color:#E3E9FD;} - .d2-1523442205 .background-color-B4{background-color:#E3E9FD;} - .d2-1523442205 .background-color-B5{background-color:#EDF0FD;} - .d2-1523442205 .background-color-B6{background-color:#F7F8FE;} - .d2-1523442205 .background-color-AA2{background-color:#4A6FF3;} - .d2-1523442205 .background-color-AA4{background-color:#EDF0FD;} - .d2-1523442205 .background-color-AA5{background-color:#F7F8FE;} - .d2-1523442205 .background-color-AB4{background-color:#EDF0FD;} - .d2-1523442205 .background-color-AB5{background-color:#F7F8FE;} - .d2-1523442205 .color-N1{color:#0A0F25;} - .d2-1523442205 .color-N2{color:#676C7E;} - .d2-1523442205 .color-N3{color:#9499AB;} - .d2-1523442205 .color-N4{color:#CFD2DD;} - .d2-1523442205 .color-N5{color:#DEE1EB;} - .d2-1523442205 .color-N6{color:#EEF1F8;} - .d2-1523442205 .color-N7{color:#FFFFFF;} - .d2-1523442205 .color-B1{color:#0D32B2;} - .d2-1523442205 .color-B2{color:#0D32B2;} - .d2-1523442205 .color-B3{color:#E3E9FD;} - .d2-1523442205 .color-B4{color:#E3E9FD;} - .d2-1523442205 .color-B5{color:#EDF0FD;} - .d2-1523442205 .color-B6{color:#F7F8FE;} - .d2-1523442205 .color-AA2{color:#4A6FF3;} - .d2-1523442205 .color-AA4{color:#EDF0FD;} - .d2-1523442205 .color-AA5{color:#F7F8FE;} - .d2-1523442205 .color-AB4{color:#EDF0FD;} - .d2-1523442205 .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 note here to remember that padding must consider notes toojustalongnotehere -======= .d2-2741266979 .fill-N1{fill:#0A0F25;} .d2-2741266979 .fill-N2{fill:#676C7E;} .d2-2741266979 .fill-N3{fill:#9499AB;} @@ -252,8 +89,7 @@ .d2-2741266979 .color-AA4{color:#EDF0FD;} .d2-2741266979 .color-AA5{color:#F7F8FE;} .d2-2741266979 .color-AB4{color:#EDF0FD;} - .d2-2741266979 .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 note here to remember that padding must consider notes toojustalongnotehere ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-2741266979 .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 note here to remember that padding must consider notes toojustalongnotehere diff --git a/e2etests/testdata/stable/sequence_diagram_long_note/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_long_note/elk/sketch.exp.svg index 377f8cfeb..47bdd0864 100644 --- a/e2etests/testdata/stable/sequence_diagram_long_note/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_long_note/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -ab a note here to remember that padding must consider notes toojustalongnotehere -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-1523442205 .fill-N1{fill:#0A0F25;} - .d2-1523442205 .fill-N2{fill:#676C7E;} - .d2-1523442205 .fill-N3{fill:#9499AB;} - .d2-1523442205 .fill-N4{fill:#CFD2DD;} - .d2-1523442205 .fill-N5{fill:#DEE1EB;} - .d2-1523442205 .fill-N6{fill:#EEF1F8;} - .d2-1523442205 .fill-N7{fill:#FFFFFF;} - .d2-1523442205 .fill-B1{fill:#0D32B2;} - .d2-1523442205 .fill-B2{fill:#0D32B2;} - .d2-1523442205 .fill-B3{fill:#E3E9FD;} - .d2-1523442205 .fill-B4{fill:#E3E9FD;} - .d2-1523442205 .fill-B5{fill:#EDF0FD;} - .d2-1523442205 .fill-B6{fill:#F7F8FE;} - .d2-1523442205 .fill-AA2{fill:#4A6FF3;} - .d2-1523442205 .fill-AA4{fill:#EDF0FD;} - .d2-1523442205 .fill-AA5{fill:#F7F8FE;} - .d2-1523442205 .fill-AB4{fill:#EDF0FD;} - .d2-1523442205 .fill-AB5{fill:#F7F8FE;} - .d2-1523442205 .stroke-N1{stroke:#0A0F25;} - .d2-1523442205 .stroke-N2{stroke:#676C7E;} - .d2-1523442205 .stroke-N3{stroke:#9499AB;} - .d2-1523442205 .stroke-N4{stroke:#CFD2DD;} - .d2-1523442205 .stroke-N5{stroke:#DEE1EB;} - .d2-1523442205 .stroke-N6{stroke:#EEF1F8;} - .d2-1523442205 .stroke-N7{stroke:#FFFFFF;} - .d2-1523442205 .stroke-B1{stroke:#0D32B2;} - .d2-1523442205 .stroke-B2{stroke:#0D32B2;} - .d2-1523442205 .stroke-B3{stroke:#E3E9FD;} - .d2-1523442205 .stroke-B4{stroke:#E3E9FD;} - .d2-1523442205 .stroke-B5{stroke:#EDF0FD;} - .d2-1523442205 .stroke-B6{stroke:#F7F8FE;} - .d2-1523442205 .stroke-AA2{stroke:#4A6FF3;} - .d2-1523442205 .stroke-AA4{stroke:#EDF0FD;} - .d2-1523442205 .stroke-AA5{stroke:#F7F8FE;} - .d2-1523442205 .stroke-AB4{stroke:#EDF0FD;} - .d2-1523442205 .stroke-AB5{stroke:#F7F8FE;} - .d2-1523442205 .background-color-N1{background-color:#0A0F25;} - .d2-1523442205 .background-color-N2{background-color:#676C7E;} - .d2-1523442205 .background-color-N3{background-color:#9499AB;} - .d2-1523442205 .background-color-N4{background-color:#CFD2DD;} - .d2-1523442205 .background-color-N5{background-color:#DEE1EB;} - .d2-1523442205 .background-color-N6{background-color:#EEF1F8;} - .d2-1523442205 .background-color-N7{background-color:#FFFFFF;} - .d2-1523442205 .background-color-B1{background-color:#0D32B2;} - .d2-1523442205 .background-color-B2{background-color:#0D32B2;} - .d2-1523442205 .background-color-B3{background-color:#E3E9FD;} - .d2-1523442205 .background-color-B4{background-color:#E3E9FD;} - .d2-1523442205 .background-color-B5{background-color:#EDF0FD;} - .d2-1523442205 .background-color-B6{background-color:#F7F8FE;} - .d2-1523442205 .background-color-AA2{background-color:#4A6FF3;} - .d2-1523442205 .background-color-AA4{background-color:#EDF0FD;} - .d2-1523442205 .background-color-AA5{background-color:#F7F8FE;} - .d2-1523442205 .background-color-AB4{background-color:#EDF0FD;} - .d2-1523442205 .background-color-AB5{background-color:#F7F8FE;} - .d2-1523442205 .color-N1{color:#0A0F25;} - .d2-1523442205 .color-N2{color:#676C7E;} - .d2-1523442205 .color-N3{color:#9499AB;} - .d2-1523442205 .color-N4{color:#CFD2DD;} - .d2-1523442205 .color-N5{color:#DEE1EB;} - .d2-1523442205 .color-N6{color:#EEF1F8;} - .d2-1523442205 .color-N7{color:#FFFFFF;} - .d2-1523442205 .color-B1{color:#0D32B2;} - .d2-1523442205 .color-B2{color:#0D32B2;} - .d2-1523442205 .color-B3{color:#E3E9FD;} - .d2-1523442205 .color-B4{color:#E3E9FD;} - .d2-1523442205 .color-B5{color:#EDF0FD;} - .d2-1523442205 .color-B6{color:#F7F8FE;} - .d2-1523442205 .color-AA2{color:#4A6FF3;} - .d2-1523442205 .color-AA4{color:#EDF0FD;} - .d2-1523442205 .color-AA5{color:#F7F8FE;} - .d2-1523442205 .color-AB4{color:#EDF0FD;} - .d2-1523442205 .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 note here to remember that padding must consider notes toojustalongnotehere -======= .d2-2741266979 .fill-N1{fill:#0A0F25;} .d2-2741266979 .fill-N2{fill:#676C7E;} .d2-2741266979 .fill-N3{fill:#9499AB;} @@ -252,8 +89,7 @@ .d2-2741266979 .color-AA4{color:#EDF0FD;} .d2-2741266979 .color-AA5{color:#F7F8FE;} .d2-2741266979 .color-AB4{color:#EDF0FD;} - .d2-2741266979 .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 note here to remember that padding must consider notes toojustalongnotehere ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-2741266979 .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 note here to remember that padding must consider notes toojustalongnotehere diff --git a/e2etests/testdata/stable/sequence_diagram_nested_groups/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_nested_groups/dagre/sketch.exp.svg index 1f9c4bb9d..5fcc6315d 100644 --- a/e2etests/testdata/stable/sequence_diagram_nested_groups/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_nested_groups/dagre/sketch.exp.svg @@ -1,26 +1,6 @@ -<<<<<<< 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 - -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-2676799471 .fill-N1{fill:#0A0F25;} - .d2-2676799471 .fill-N2{fill:#676C7E;} - .d2-2676799471 .fill-N3{fill:#9499AB;} - .d2-2676799471 .fill-N4{fill:#CFD2DD;} - .d2-2676799471 .fill-N5{fill:#DEE1EB;} - .d2-2676799471 .fill-N6{fill:#EEF1F8;} - .d2-2676799471 .fill-N7{fill:#FFFFFF;} - .d2-2676799471 .fill-B1{fill:#0D32B2;} - .d2-2676799471 .fill-B2{fill:#0D32B2;} - .d2-2676799471 .fill-B3{fill:#E3E9FD;} - .d2-2676799471 .fill-B4{fill:#E3E9FD;} - .d2-2676799471 .fill-B5{fill:#EDF0FD;} - .d2-2676799471 .fill-B6{fill:#F7F8FE;} - .d2-2676799471 .fill-AA2{fill:#4A6FF3;} - .d2-2676799471 .fill-AA4{fill:#EDF0FD;} - .d2-2676799471 .fill-AA5{fill:#F7F8FE;} - .d2-2676799471 .fill-AB4{fill:#EDF0FD;} - .d2-2676799471 .fill-AB5{fill:#F7F8FE;} - .d2-2676799471 .stroke-N1{stroke:#0A0F25;} - .d2-2676799471 .stroke-N2{stroke:#676C7E;} - .d2-2676799471 .stroke-N3{stroke:#9499AB;} - .d2-2676799471 .stroke-N4{stroke:#CFD2DD;} - .d2-2676799471 .stroke-N5{stroke:#DEE1EB;} - .d2-2676799471 .stroke-N6{stroke:#EEF1F8;} - .d2-2676799471 .stroke-N7{stroke:#FFFFFF;} - .d2-2676799471 .stroke-B1{stroke:#0D32B2;} - .d2-2676799471 .stroke-B2{stroke:#0D32B2;} - .d2-2676799471 .stroke-B3{stroke:#E3E9FD;} - .d2-2676799471 .stroke-B4{stroke:#E3E9FD;} - .d2-2676799471 .stroke-B5{stroke:#EDF0FD;} - .d2-2676799471 .stroke-B6{stroke:#F7F8FE;} - .d2-2676799471 .stroke-AA2{stroke:#4A6FF3;} - .d2-2676799471 .stroke-AA4{stroke:#EDF0FD;} - .d2-2676799471 .stroke-AA5{stroke:#F7F8FE;} - .d2-2676799471 .stroke-AB4{stroke:#EDF0FD;} - .d2-2676799471 .stroke-AB5{stroke:#F7F8FE;} - .d2-2676799471 .background-color-N1{background-color:#0A0F25;} - .d2-2676799471 .background-color-N2{background-color:#676C7E;} - .d2-2676799471 .background-color-N3{background-color:#9499AB;} - .d2-2676799471 .background-color-N4{background-color:#CFD2DD;} - .d2-2676799471 .background-color-N5{background-color:#DEE1EB;} - .d2-2676799471 .background-color-N6{background-color:#EEF1F8;} - .d2-2676799471 .background-color-N7{background-color:#FFFFFF;} - .d2-2676799471 .background-color-B1{background-color:#0D32B2;} - .d2-2676799471 .background-color-B2{background-color:#0D32B2;} - .d2-2676799471 .background-color-B3{background-color:#E3E9FD;} - .d2-2676799471 .background-color-B4{background-color:#E3E9FD;} - .d2-2676799471 .background-color-B5{background-color:#EDF0FD;} - .d2-2676799471 .background-color-B6{background-color:#F7F8FE;} - .d2-2676799471 .background-color-AA2{background-color:#4A6FF3;} - .d2-2676799471 .background-color-AA4{background-color:#EDF0FD;} - .d2-2676799471 .background-color-AA5{background-color:#F7F8FE;} - .d2-2676799471 .background-color-AB4{background-color:#EDF0FD;} - .d2-2676799471 .background-color-AB5{background-color:#F7F8FE;} - .d2-2676799471 .color-N1{color:#0A0F25;} - .d2-2676799471 .color-N2{color:#676C7E;} - .d2-2676799471 .color-N3{color:#9499AB;} - .d2-2676799471 .color-N4{color:#CFD2DD;} - .d2-2676799471 .color-N5{color:#DEE1EB;} - .d2-2676799471 .color-N6{color:#EEF1F8;} - .d2-2676799471 .color-N7{color:#FFFFFF;} - .d2-2676799471 .color-B1{color:#0D32B2;} - .d2-2676799471 .color-B2{color:#0D32B2;} - .d2-2676799471 .color-B3{color:#E3E9FD;} - .d2-2676799471 .color-B4{color:#E3E9FD;} - .d2-2676799471 .color-B5{color:#EDF0FD;} - .d2-2676799471 .color-B6{color:#F7F8FE;} - .d2-2676799471 .color-AA2{color:#4A6FF3;} - .d2-2676799471 .color-AA4{color:#EDF0FD;} - .d2-2676799471 .color-AA5{color:#F7F8FE;} - .d2-2676799471 .color-AB4{color:#EDF0FD;} - .d2-2676799471 .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-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 - ->>>>>>> 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;} @@ -408,9 +89,8 @@ .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 + .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) 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 1f9c4bb9d..5fcc6315d 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,26 +1,6 @@ -<<<<<<< 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 - -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-2676799471 .fill-N1{fill:#0A0F25;} - .d2-2676799471 .fill-N2{fill:#676C7E;} - .d2-2676799471 .fill-N3{fill:#9499AB;} - .d2-2676799471 .fill-N4{fill:#CFD2DD;} - .d2-2676799471 .fill-N5{fill:#DEE1EB;} - .d2-2676799471 .fill-N6{fill:#EEF1F8;} - .d2-2676799471 .fill-N7{fill:#FFFFFF;} - .d2-2676799471 .fill-B1{fill:#0D32B2;} - .d2-2676799471 .fill-B2{fill:#0D32B2;} - .d2-2676799471 .fill-B3{fill:#E3E9FD;} - .d2-2676799471 .fill-B4{fill:#E3E9FD;} - .d2-2676799471 .fill-B5{fill:#EDF0FD;} - .d2-2676799471 .fill-B6{fill:#F7F8FE;} - .d2-2676799471 .fill-AA2{fill:#4A6FF3;} - .d2-2676799471 .fill-AA4{fill:#EDF0FD;} - .d2-2676799471 .fill-AA5{fill:#F7F8FE;} - .d2-2676799471 .fill-AB4{fill:#EDF0FD;} - .d2-2676799471 .fill-AB5{fill:#F7F8FE;} - .d2-2676799471 .stroke-N1{stroke:#0A0F25;} - .d2-2676799471 .stroke-N2{stroke:#676C7E;} - .d2-2676799471 .stroke-N3{stroke:#9499AB;} - .d2-2676799471 .stroke-N4{stroke:#CFD2DD;} - .d2-2676799471 .stroke-N5{stroke:#DEE1EB;} - .d2-2676799471 .stroke-N6{stroke:#EEF1F8;} - .d2-2676799471 .stroke-N7{stroke:#FFFFFF;} - .d2-2676799471 .stroke-B1{stroke:#0D32B2;} - .d2-2676799471 .stroke-B2{stroke:#0D32B2;} - .d2-2676799471 .stroke-B3{stroke:#E3E9FD;} - .d2-2676799471 .stroke-B4{stroke:#E3E9FD;} - .d2-2676799471 .stroke-B5{stroke:#EDF0FD;} - .d2-2676799471 .stroke-B6{stroke:#F7F8FE;} - .d2-2676799471 .stroke-AA2{stroke:#4A6FF3;} - .d2-2676799471 .stroke-AA4{stroke:#EDF0FD;} - .d2-2676799471 .stroke-AA5{stroke:#F7F8FE;} - .d2-2676799471 .stroke-AB4{stroke:#EDF0FD;} - .d2-2676799471 .stroke-AB5{stroke:#F7F8FE;} - .d2-2676799471 .background-color-N1{background-color:#0A0F25;} - .d2-2676799471 .background-color-N2{background-color:#676C7E;} - .d2-2676799471 .background-color-N3{background-color:#9499AB;} - .d2-2676799471 .background-color-N4{background-color:#CFD2DD;} - .d2-2676799471 .background-color-N5{background-color:#DEE1EB;} - .d2-2676799471 .background-color-N6{background-color:#EEF1F8;} - .d2-2676799471 .background-color-N7{background-color:#FFFFFF;} - .d2-2676799471 .background-color-B1{background-color:#0D32B2;} - .d2-2676799471 .background-color-B2{background-color:#0D32B2;} - .d2-2676799471 .background-color-B3{background-color:#E3E9FD;} - .d2-2676799471 .background-color-B4{background-color:#E3E9FD;} - .d2-2676799471 .background-color-B5{background-color:#EDF0FD;} - .d2-2676799471 .background-color-B6{background-color:#F7F8FE;} - .d2-2676799471 .background-color-AA2{background-color:#4A6FF3;} - .d2-2676799471 .background-color-AA4{background-color:#EDF0FD;} - .d2-2676799471 .background-color-AA5{background-color:#F7F8FE;} - .d2-2676799471 .background-color-AB4{background-color:#EDF0FD;} - .d2-2676799471 .background-color-AB5{background-color:#F7F8FE;} - .d2-2676799471 .color-N1{color:#0A0F25;} - .d2-2676799471 .color-N2{color:#676C7E;} - .d2-2676799471 .color-N3{color:#9499AB;} - .d2-2676799471 .color-N4{color:#CFD2DD;} - .d2-2676799471 .color-N5{color:#DEE1EB;} - .d2-2676799471 .color-N6{color:#EEF1F8;} - .d2-2676799471 .color-N7{color:#FFFFFF;} - .d2-2676799471 .color-B1{color:#0D32B2;} - .d2-2676799471 .color-B2{color:#0D32B2;} - .d2-2676799471 .color-B3{color:#E3E9FD;} - .d2-2676799471 .color-B4{color:#E3E9FD;} - .d2-2676799471 .color-B5{color:#EDF0FD;} - .d2-2676799471 .color-B6{color:#F7F8FE;} - .d2-2676799471 .color-AA2{color:#4A6FF3;} - .d2-2676799471 .color-AA4{color:#EDF0FD;} - .d2-2676799471 .color-AA5{color:#F7F8FE;} - .d2-2676799471 .color-AB4{color:#EDF0FD;} - .d2-2676799471 .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-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 - ->>>>>>> 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;} @@ -408,9 +89,8 @@ .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 + .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) 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 8f3e3574f..743952afa 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,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -scoreritemResponseitemessayRubricconceptitemOutcome -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-1182885304 .fill-N1{fill:#0A0F25;} - .d2-1182885304 .fill-N2{fill:#676C7E;} - .d2-1182885304 .fill-N3{fill:#9499AB;} - .d2-1182885304 .fill-N4{fill:#CFD2DD;} - .d2-1182885304 .fill-N5{fill:#DEE1EB;} - .d2-1182885304 .fill-N6{fill:#EEF1F8;} - .d2-1182885304 .fill-N7{fill:#FFFFFF;} - .d2-1182885304 .fill-B1{fill:#0D32B2;} - .d2-1182885304 .fill-B2{fill:#0D32B2;} - .d2-1182885304 .fill-B3{fill:#E3E9FD;} - .d2-1182885304 .fill-B4{fill:#E3E9FD;} - .d2-1182885304 .fill-B5{fill:#EDF0FD;} - .d2-1182885304 .fill-B6{fill:#F7F8FE;} - .d2-1182885304 .fill-AA2{fill:#4A6FF3;} - .d2-1182885304 .fill-AA4{fill:#EDF0FD;} - .d2-1182885304 .fill-AA5{fill:#F7F8FE;} - .d2-1182885304 .fill-AB4{fill:#EDF0FD;} - .d2-1182885304 .fill-AB5{fill:#F7F8FE;} - .d2-1182885304 .stroke-N1{stroke:#0A0F25;} - .d2-1182885304 .stroke-N2{stroke:#676C7E;} - .d2-1182885304 .stroke-N3{stroke:#9499AB;} - .d2-1182885304 .stroke-N4{stroke:#CFD2DD;} - .d2-1182885304 .stroke-N5{stroke:#DEE1EB;} - .d2-1182885304 .stroke-N6{stroke:#EEF1F8;} - .d2-1182885304 .stroke-N7{stroke:#FFFFFF;} - .d2-1182885304 .stroke-B1{stroke:#0D32B2;} - .d2-1182885304 .stroke-B2{stroke:#0D32B2;} - .d2-1182885304 .stroke-B3{stroke:#E3E9FD;} - .d2-1182885304 .stroke-B4{stroke:#E3E9FD;} - .d2-1182885304 .stroke-B5{stroke:#EDF0FD;} - .d2-1182885304 .stroke-B6{stroke:#F7F8FE;} - .d2-1182885304 .stroke-AA2{stroke:#4A6FF3;} - .d2-1182885304 .stroke-AA4{stroke:#EDF0FD;} - .d2-1182885304 .stroke-AA5{stroke:#F7F8FE;} - .d2-1182885304 .stroke-AB4{stroke:#EDF0FD;} - .d2-1182885304 .stroke-AB5{stroke:#F7F8FE;} - .d2-1182885304 .background-color-N1{background-color:#0A0F25;} - .d2-1182885304 .background-color-N2{background-color:#676C7E;} - .d2-1182885304 .background-color-N3{background-color:#9499AB;} - .d2-1182885304 .background-color-N4{background-color:#CFD2DD;} - .d2-1182885304 .background-color-N5{background-color:#DEE1EB;} - .d2-1182885304 .background-color-N6{background-color:#EEF1F8;} - .d2-1182885304 .background-color-N7{background-color:#FFFFFF;} - .d2-1182885304 .background-color-B1{background-color:#0D32B2;} - .d2-1182885304 .background-color-B2{background-color:#0D32B2;} - .d2-1182885304 .background-color-B3{background-color:#E3E9FD;} - .d2-1182885304 .background-color-B4{background-color:#E3E9FD;} - .d2-1182885304 .background-color-B5{background-color:#EDF0FD;} - .d2-1182885304 .background-color-B6{background-color:#F7F8FE;} - .d2-1182885304 .background-color-AA2{background-color:#4A6FF3;} - .d2-1182885304 .background-color-AA4{background-color:#EDF0FD;} - .d2-1182885304 .background-color-AA5{background-color:#F7F8FE;} - .d2-1182885304 .background-color-AB4{background-color:#EDF0FD;} - .d2-1182885304 .background-color-AB5{background-color:#F7F8FE;} - .d2-1182885304 .color-N1{color:#0A0F25;} - .d2-1182885304 .color-N2{color:#676C7E;} - .d2-1182885304 .color-N3{color:#9499AB;} - .d2-1182885304 .color-N4{color:#CFD2DD;} - .d2-1182885304 .color-N5{color:#DEE1EB;} - .d2-1182885304 .color-N6{color:#EEF1F8;} - .d2-1182885304 .color-N7{color:#FFFFFF;} - .d2-1182885304 .color-B1{color:#0D32B2;} - .d2-1182885304 .color-B2{color:#0D32B2;} - .d2-1182885304 .color-B3{color:#E3E9FD;} - .d2-1182885304 .color-B4{color:#E3E9FD;} - .d2-1182885304 .color-B5{color:#EDF0FD;} - .d2-1182885304 .color-B6{color:#F7F8FE;} - .d2-1182885304 .color-AA2{color:#4A6FF3;} - .d2-1182885304 .color-AA4{color:#EDF0FD;} - .d2-1182885304 .color-AA5{color:#F7F8FE;} - .d2-1182885304 .color-AB4{color:#EDF0FD;} - .d2-1182885304 .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 -======= .d2-2798603426 .fill-N1{fill:#0A0F25;} .d2-2798603426 .fill-N2{fill:#676C7E;} .d2-2798603426 .fill-N3{fill:#9499AB;} @@ -252,8 +89,7 @@ .d2-2798603426 .color-AA4{color:#EDF0FD;} .d2-2798603426 .color-AA5{color:#F7F8FE;} .d2-2798603426 .color-AB4{color:#EDF0FD;} - .d2-2798603426 .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 ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-2798603426 .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 diff --git a/e2etests/testdata/stable/sequence_diagram_nested_span/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_nested_span/elk/sketch.exp.svg index 8f3e3574f..743952afa 100644 --- a/e2etests/testdata/stable/sequence_diagram_nested_span/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_nested_span/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -scoreritemResponseitemessayRubricconceptitemOutcome -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-1182885304 .fill-N1{fill:#0A0F25;} - .d2-1182885304 .fill-N2{fill:#676C7E;} - .d2-1182885304 .fill-N3{fill:#9499AB;} - .d2-1182885304 .fill-N4{fill:#CFD2DD;} - .d2-1182885304 .fill-N5{fill:#DEE1EB;} - .d2-1182885304 .fill-N6{fill:#EEF1F8;} - .d2-1182885304 .fill-N7{fill:#FFFFFF;} - .d2-1182885304 .fill-B1{fill:#0D32B2;} - .d2-1182885304 .fill-B2{fill:#0D32B2;} - .d2-1182885304 .fill-B3{fill:#E3E9FD;} - .d2-1182885304 .fill-B4{fill:#E3E9FD;} - .d2-1182885304 .fill-B5{fill:#EDF0FD;} - .d2-1182885304 .fill-B6{fill:#F7F8FE;} - .d2-1182885304 .fill-AA2{fill:#4A6FF3;} - .d2-1182885304 .fill-AA4{fill:#EDF0FD;} - .d2-1182885304 .fill-AA5{fill:#F7F8FE;} - .d2-1182885304 .fill-AB4{fill:#EDF0FD;} - .d2-1182885304 .fill-AB5{fill:#F7F8FE;} - .d2-1182885304 .stroke-N1{stroke:#0A0F25;} - .d2-1182885304 .stroke-N2{stroke:#676C7E;} - .d2-1182885304 .stroke-N3{stroke:#9499AB;} - .d2-1182885304 .stroke-N4{stroke:#CFD2DD;} - .d2-1182885304 .stroke-N5{stroke:#DEE1EB;} - .d2-1182885304 .stroke-N6{stroke:#EEF1F8;} - .d2-1182885304 .stroke-N7{stroke:#FFFFFF;} - .d2-1182885304 .stroke-B1{stroke:#0D32B2;} - .d2-1182885304 .stroke-B2{stroke:#0D32B2;} - .d2-1182885304 .stroke-B3{stroke:#E3E9FD;} - .d2-1182885304 .stroke-B4{stroke:#E3E9FD;} - .d2-1182885304 .stroke-B5{stroke:#EDF0FD;} - .d2-1182885304 .stroke-B6{stroke:#F7F8FE;} - .d2-1182885304 .stroke-AA2{stroke:#4A6FF3;} - .d2-1182885304 .stroke-AA4{stroke:#EDF0FD;} - .d2-1182885304 .stroke-AA5{stroke:#F7F8FE;} - .d2-1182885304 .stroke-AB4{stroke:#EDF0FD;} - .d2-1182885304 .stroke-AB5{stroke:#F7F8FE;} - .d2-1182885304 .background-color-N1{background-color:#0A0F25;} - .d2-1182885304 .background-color-N2{background-color:#676C7E;} - .d2-1182885304 .background-color-N3{background-color:#9499AB;} - .d2-1182885304 .background-color-N4{background-color:#CFD2DD;} - .d2-1182885304 .background-color-N5{background-color:#DEE1EB;} - .d2-1182885304 .background-color-N6{background-color:#EEF1F8;} - .d2-1182885304 .background-color-N7{background-color:#FFFFFF;} - .d2-1182885304 .background-color-B1{background-color:#0D32B2;} - .d2-1182885304 .background-color-B2{background-color:#0D32B2;} - .d2-1182885304 .background-color-B3{background-color:#E3E9FD;} - .d2-1182885304 .background-color-B4{background-color:#E3E9FD;} - .d2-1182885304 .background-color-B5{background-color:#EDF0FD;} - .d2-1182885304 .background-color-B6{background-color:#F7F8FE;} - .d2-1182885304 .background-color-AA2{background-color:#4A6FF3;} - .d2-1182885304 .background-color-AA4{background-color:#EDF0FD;} - .d2-1182885304 .background-color-AA5{background-color:#F7F8FE;} - .d2-1182885304 .background-color-AB4{background-color:#EDF0FD;} - .d2-1182885304 .background-color-AB5{background-color:#F7F8FE;} - .d2-1182885304 .color-N1{color:#0A0F25;} - .d2-1182885304 .color-N2{color:#676C7E;} - .d2-1182885304 .color-N3{color:#9499AB;} - .d2-1182885304 .color-N4{color:#CFD2DD;} - .d2-1182885304 .color-N5{color:#DEE1EB;} - .d2-1182885304 .color-N6{color:#EEF1F8;} - .d2-1182885304 .color-N7{color:#FFFFFF;} - .d2-1182885304 .color-B1{color:#0D32B2;} - .d2-1182885304 .color-B2{color:#0D32B2;} - .d2-1182885304 .color-B3{color:#E3E9FD;} - .d2-1182885304 .color-B4{color:#E3E9FD;} - .d2-1182885304 .color-B5{color:#EDF0FD;} - .d2-1182885304 .color-B6{color:#F7F8FE;} - .d2-1182885304 .color-AA2{color:#4A6FF3;} - .d2-1182885304 .color-AA4{color:#EDF0FD;} - .d2-1182885304 .color-AA5{color:#F7F8FE;} - .d2-1182885304 .color-AB4{color:#EDF0FD;} - .d2-1182885304 .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 -======= .d2-2798603426 .fill-N1{fill:#0A0F25;} .d2-2798603426 .fill-N2{fill:#676C7E;} .d2-2798603426 .fill-N3{fill:#9499AB;} @@ -252,8 +89,7 @@ .d2-2798603426 .color-AA4{color:#EDF0FD;} .d2-2798603426 .color-AA5{color:#F7F8FE;} .d2-2798603426 .color-AB4{color:#EDF0FD;} - .d2-2798603426 .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 ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-2798603426 .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 diff --git a/e2etests/testdata/stable/sequence_diagram_note/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagram_note/dagre/sketch.exp.svg index 1db900d17..0ee8c760c 100644 --- a/e2etests/testdata/stable/sequence_diagram_note/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_note/dagre/sketch.exp.svg @@ -1,26 +1,6 @@ -<<<<<<< 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 - -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-404282360 .fill-N1{fill:#0A0F25;} - .d2-404282360 .fill-N2{fill:#676C7E;} - .d2-404282360 .fill-N3{fill:#9499AB;} - .d2-404282360 .fill-N4{fill:#CFD2DD;} - .d2-404282360 .fill-N5{fill:#DEE1EB;} - .d2-404282360 .fill-N6{fill:#EEF1F8;} - .d2-404282360 .fill-N7{fill:#FFFFFF;} - .d2-404282360 .fill-B1{fill:#0D32B2;} - .d2-404282360 .fill-B2{fill:#0D32B2;} - .d2-404282360 .fill-B3{fill:#E3E9FD;} - .d2-404282360 .fill-B4{fill:#E3E9FD;} - .d2-404282360 .fill-B5{fill:#EDF0FD;} - .d2-404282360 .fill-B6{fill:#F7F8FE;} - .d2-404282360 .fill-AA2{fill:#4A6FF3;} - .d2-404282360 .fill-AA4{fill:#EDF0FD;} - .d2-404282360 .fill-AA5{fill:#F7F8FE;} - .d2-404282360 .fill-AB4{fill:#EDF0FD;} - .d2-404282360 .fill-AB5{fill:#F7F8FE;} - .d2-404282360 .stroke-N1{stroke:#0A0F25;} - .d2-404282360 .stroke-N2{stroke:#676C7E;} - .d2-404282360 .stroke-N3{stroke:#9499AB;} - .d2-404282360 .stroke-N4{stroke:#CFD2DD;} - .d2-404282360 .stroke-N5{stroke:#DEE1EB;} - .d2-404282360 .stroke-N6{stroke:#EEF1F8;} - .d2-404282360 .stroke-N7{stroke:#FFFFFF;} - .d2-404282360 .stroke-B1{stroke:#0D32B2;} - .d2-404282360 .stroke-B2{stroke:#0D32B2;} - .d2-404282360 .stroke-B3{stroke:#E3E9FD;} - .d2-404282360 .stroke-B4{stroke:#E3E9FD;} - .d2-404282360 .stroke-B5{stroke:#EDF0FD;} - .d2-404282360 .stroke-B6{stroke:#F7F8FE;} - .d2-404282360 .stroke-AA2{stroke:#4A6FF3;} - .d2-404282360 .stroke-AA4{stroke:#EDF0FD;} - .d2-404282360 .stroke-AA5{stroke:#F7F8FE;} - .d2-404282360 .stroke-AB4{stroke:#EDF0FD;} - .d2-404282360 .stroke-AB5{stroke:#F7F8FE;} - .d2-404282360 .background-color-N1{background-color:#0A0F25;} - .d2-404282360 .background-color-N2{background-color:#676C7E;} - .d2-404282360 .background-color-N3{background-color:#9499AB;} - .d2-404282360 .background-color-N4{background-color:#CFD2DD;} - .d2-404282360 .background-color-N5{background-color:#DEE1EB;} - .d2-404282360 .background-color-N6{background-color:#EEF1F8;} - .d2-404282360 .background-color-N7{background-color:#FFFFFF;} - .d2-404282360 .background-color-B1{background-color:#0D32B2;} - .d2-404282360 .background-color-B2{background-color:#0D32B2;} - .d2-404282360 .background-color-B3{background-color:#E3E9FD;} - .d2-404282360 .background-color-B4{background-color:#E3E9FD;} - .d2-404282360 .background-color-B5{background-color:#EDF0FD;} - .d2-404282360 .background-color-B6{background-color:#F7F8FE;} - .d2-404282360 .background-color-AA2{background-color:#4A6FF3;} - .d2-404282360 .background-color-AA4{background-color:#EDF0FD;} - .d2-404282360 .background-color-AA5{background-color:#F7F8FE;} - .d2-404282360 .background-color-AB4{background-color:#EDF0FD;} - .d2-404282360 .background-color-AB5{background-color:#F7F8FE;} - .d2-404282360 .color-N1{color:#0A0F25;} - .d2-404282360 .color-N2{color:#676C7E;} - .d2-404282360 .color-N3{color:#9499AB;} - .d2-404282360 .color-N4{color:#CFD2DD;} - .d2-404282360 .color-N5{color:#DEE1EB;} - .d2-404282360 .color-N6{color:#EEF1F8;} - .d2-404282360 .color-N7{color:#FFFFFF;} - .d2-404282360 .color-B1{color:#0D32B2;} - .d2-404282360 .color-B2{color:#0D32B2;} - .d2-404282360 .color-B3{color:#E3E9FD;} - .d2-404282360 .color-B4{color:#E3E9FD;} - .d2-404282360 .color-B5{color:#EDF0FD;} - .d2-404282360 .color-B6{color:#F7F8FE;} - .d2-404282360 .color-AA2{color:#4A6FF3;} - .d2-404282360 .color-AA4{color:#EDF0FD;} - .d2-404282360 .color-AA5{color:#F7F8FE;} - .d2-404282360 .color-AB4{color:#EDF0FD;} - .d2-404282360 .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-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 - ->>>>>>> 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;} @@ -415,9 +96,8 @@ .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 + .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) 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 1db900d17..0ee8c760c 100644 --- a/e2etests/testdata/stable/sequence_diagram_note/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_note/elk/sketch.exp.svg @@ -1,26 +1,6 @@ -<<<<<<< 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 - -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-404282360 .fill-N1{fill:#0A0F25;} - .d2-404282360 .fill-N2{fill:#676C7E;} - .d2-404282360 .fill-N3{fill:#9499AB;} - .d2-404282360 .fill-N4{fill:#CFD2DD;} - .d2-404282360 .fill-N5{fill:#DEE1EB;} - .d2-404282360 .fill-N6{fill:#EEF1F8;} - .d2-404282360 .fill-N7{fill:#FFFFFF;} - .d2-404282360 .fill-B1{fill:#0D32B2;} - .d2-404282360 .fill-B2{fill:#0D32B2;} - .d2-404282360 .fill-B3{fill:#E3E9FD;} - .d2-404282360 .fill-B4{fill:#E3E9FD;} - .d2-404282360 .fill-B5{fill:#EDF0FD;} - .d2-404282360 .fill-B6{fill:#F7F8FE;} - .d2-404282360 .fill-AA2{fill:#4A6FF3;} - .d2-404282360 .fill-AA4{fill:#EDF0FD;} - .d2-404282360 .fill-AA5{fill:#F7F8FE;} - .d2-404282360 .fill-AB4{fill:#EDF0FD;} - .d2-404282360 .fill-AB5{fill:#F7F8FE;} - .d2-404282360 .stroke-N1{stroke:#0A0F25;} - .d2-404282360 .stroke-N2{stroke:#676C7E;} - .d2-404282360 .stroke-N3{stroke:#9499AB;} - .d2-404282360 .stroke-N4{stroke:#CFD2DD;} - .d2-404282360 .stroke-N5{stroke:#DEE1EB;} - .d2-404282360 .stroke-N6{stroke:#EEF1F8;} - .d2-404282360 .stroke-N7{stroke:#FFFFFF;} - .d2-404282360 .stroke-B1{stroke:#0D32B2;} - .d2-404282360 .stroke-B2{stroke:#0D32B2;} - .d2-404282360 .stroke-B3{stroke:#E3E9FD;} - .d2-404282360 .stroke-B4{stroke:#E3E9FD;} - .d2-404282360 .stroke-B5{stroke:#EDF0FD;} - .d2-404282360 .stroke-B6{stroke:#F7F8FE;} - .d2-404282360 .stroke-AA2{stroke:#4A6FF3;} - .d2-404282360 .stroke-AA4{stroke:#EDF0FD;} - .d2-404282360 .stroke-AA5{stroke:#F7F8FE;} - .d2-404282360 .stroke-AB4{stroke:#EDF0FD;} - .d2-404282360 .stroke-AB5{stroke:#F7F8FE;} - .d2-404282360 .background-color-N1{background-color:#0A0F25;} - .d2-404282360 .background-color-N2{background-color:#676C7E;} - .d2-404282360 .background-color-N3{background-color:#9499AB;} - .d2-404282360 .background-color-N4{background-color:#CFD2DD;} - .d2-404282360 .background-color-N5{background-color:#DEE1EB;} - .d2-404282360 .background-color-N6{background-color:#EEF1F8;} - .d2-404282360 .background-color-N7{background-color:#FFFFFF;} - .d2-404282360 .background-color-B1{background-color:#0D32B2;} - .d2-404282360 .background-color-B2{background-color:#0D32B2;} - .d2-404282360 .background-color-B3{background-color:#E3E9FD;} - .d2-404282360 .background-color-B4{background-color:#E3E9FD;} - .d2-404282360 .background-color-B5{background-color:#EDF0FD;} - .d2-404282360 .background-color-B6{background-color:#F7F8FE;} - .d2-404282360 .background-color-AA2{background-color:#4A6FF3;} - .d2-404282360 .background-color-AA4{background-color:#EDF0FD;} - .d2-404282360 .background-color-AA5{background-color:#F7F8FE;} - .d2-404282360 .background-color-AB4{background-color:#EDF0FD;} - .d2-404282360 .background-color-AB5{background-color:#F7F8FE;} - .d2-404282360 .color-N1{color:#0A0F25;} - .d2-404282360 .color-N2{color:#676C7E;} - .d2-404282360 .color-N3{color:#9499AB;} - .d2-404282360 .color-N4{color:#CFD2DD;} - .d2-404282360 .color-N5{color:#DEE1EB;} - .d2-404282360 .color-N6{color:#EEF1F8;} - .d2-404282360 .color-N7{color:#FFFFFF;} - .d2-404282360 .color-B1{color:#0D32B2;} - .d2-404282360 .color-B2{color:#0D32B2;} - .d2-404282360 .color-B3{color:#E3E9FD;} - .d2-404282360 .color-B4{color:#E3E9FD;} - .d2-404282360 .color-B5{color:#EDF0FD;} - .d2-404282360 .color-B6{color:#F7F8FE;} - .d2-404282360 .color-AA2{color:#4A6FF3;} - .d2-404282360 .color-AA4{color:#EDF0FD;} - .d2-404282360 .color-AA5{color:#F7F8FE;} - .d2-404282360 .color-AB4{color:#EDF0FD;} - .d2-404282360 .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-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 - ->>>>>>> 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;} @@ -415,9 +96,8 @@ .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 + .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) 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 5dcd5ade9..9c4442819 100644 --- a/e2etests/testdata/stable/sequence_diagram_real/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_real/dagre/sketch.exp.svg @@ -1,26 +1,6 @@ -<<<<<<< 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 - - -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-822795638 .fill-N1{fill:#0A0F25;} - .d2-822795638 .fill-N2{fill:#676C7E;} - .d2-822795638 .fill-N3{fill:#9499AB;} - .d2-822795638 .fill-N4{fill:#CFD2DD;} - .d2-822795638 .fill-N5{fill:#DEE1EB;} - .d2-822795638 .fill-N6{fill:#EEF1F8;} - .d2-822795638 .fill-N7{fill:#FFFFFF;} - .d2-822795638 .fill-B1{fill:#0D32B2;} - .d2-822795638 .fill-B2{fill:#0D32B2;} - .d2-822795638 .fill-B3{fill:#E3E9FD;} - .d2-822795638 .fill-B4{fill:#E3E9FD;} - .d2-822795638 .fill-B5{fill:#EDF0FD;} - .d2-822795638 .fill-B6{fill:#F7F8FE;} - .d2-822795638 .fill-AA2{fill:#4A6FF3;} - .d2-822795638 .fill-AA4{fill:#EDF0FD;} - .d2-822795638 .fill-AA5{fill:#F7F8FE;} - .d2-822795638 .fill-AB4{fill:#EDF0FD;} - .d2-822795638 .fill-AB5{fill:#F7F8FE;} - .d2-822795638 .stroke-N1{stroke:#0A0F25;} - .d2-822795638 .stroke-N2{stroke:#676C7E;} - .d2-822795638 .stroke-N3{stroke:#9499AB;} - .d2-822795638 .stroke-N4{stroke:#CFD2DD;} - .d2-822795638 .stroke-N5{stroke:#DEE1EB;} - .d2-822795638 .stroke-N6{stroke:#EEF1F8;} - .d2-822795638 .stroke-N7{stroke:#FFFFFF;} - .d2-822795638 .stroke-B1{stroke:#0D32B2;} - .d2-822795638 .stroke-B2{stroke:#0D32B2;} - .d2-822795638 .stroke-B3{stroke:#E3E9FD;} - .d2-822795638 .stroke-B4{stroke:#E3E9FD;} - .d2-822795638 .stroke-B5{stroke:#EDF0FD;} - .d2-822795638 .stroke-B6{stroke:#F7F8FE;} - .d2-822795638 .stroke-AA2{stroke:#4A6FF3;} - .d2-822795638 .stroke-AA4{stroke:#EDF0FD;} - .d2-822795638 .stroke-AA5{stroke:#F7F8FE;} - .d2-822795638 .stroke-AB4{stroke:#EDF0FD;} - .d2-822795638 .stroke-AB5{stroke:#F7F8FE;} - .d2-822795638 .background-color-N1{background-color:#0A0F25;} - .d2-822795638 .background-color-N2{background-color:#676C7E;} - .d2-822795638 .background-color-N3{background-color:#9499AB;} - .d2-822795638 .background-color-N4{background-color:#CFD2DD;} - .d2-822795638 .background-color-N5{background-color:#DEE1EB;} - .d2-822795638 .background-color-N6{background-color:#EEF1F8;} - .d2-822795638 .background-color-N7{background-color:#FFFFFF;} - .d2-822795638 .background-color-B1{background-color:#0D32B2;} - .d2-822795638 .background-color-B2{background-color:#0D32B2;} - .d2-822795638 .background-color-B3{background-color:#E3E9FD;} - .d2-822795638 .background-color-B4{background-color:#E3E9FD;} - .d2-822795638 .background-color-B5{background-color:#EDF0FD;} - .d2-822795638 .background-color-B6{background-color:#F7F8FE;} - .d2-822795638 .background-color-AA2{background-color:#4A6FF3;} - .d2-822795638 .background-color-AA4{background-color:#EDF0FD;} - .d2-822795638 .background-color-AA5{background-color:#F7F8FE;} - .d2-822795638 .background-color-AB4{background-color:#EDF0FD;} - .d2-822795638 .background-color-AB5{background-color:#F7F8FE;} - .d2-822795638 .color-N1{color:#0A0F25;} - .d2-822795638 .color-N2{color:#676C7E;} - .d2-822795638 .color-N3{color:#9499AB;} - .d2-822795638 .color-N4{color:#CFD2DD;} - .d2-822795638 .color-N5{color:#DEE1EB;} - .d2-822795638 .color-N6{color:#EEF1F8;} - .d2-822795638 .color-N7{color:#FFFFFF;} - .d2-822795638 .color-B1{color:#0D32B2;} - .d2-822795638 .color-B2{color:#0D32B2;} - .d2-822795638 .color-B3{color:#E3E9FD;} - .d2-822795638 .color-B4{color:#E3E9FD;} - .d2-822795638 .color-B5{color:#EDF0FD;} - .d2-822795638 .color-B6{color:#F7F8FE;} - .d2-822795638 .color-AA2{color:#4A6FF3;} - .d2-822795638 .color-AA4{color:#EDF0FD;} - .d2-822795638 .color-AA5{color:#F7F8FE;} - .d2-822795638 .color-AB4{color:#EDF0FD;} - .d2-822795638 .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 - - -======= - .d2-2661353035 .fill-N1{fill:#0A0F25;} - .d2-2661353035 .fill-N2{fill:#676C7E;} - .d2-2661353035 .fill-N3{fill:#9499AB;} - .d2-2661353035 .fill-N4{fill:#CFD2DD;} - .d2-2661353035 .fill-N5{fill:#DEE1EB;} - .d2-2661353035 .fill-N6{fill:#EEF1F8;} - .d2-2661353035 .fill-N7{fill:#FFFFFF;} - .d2-2661353035 .fill-B1{fill:#0D32B2;} - .d2-2661353035 .fill-B2{fill:#0D32B2;} - .d2-2661353035 .fill-B3{fill:#E3E9FD;} - .d2-2661353035 .fill-B4{fill:#E3E9FD;} - .d2-2661353035 .fill-B5{fill:#EDF0FD;} - .d2-2661353035 .fill-B6{fill:#F7F8FE;} - .d2-2661353035 .fill-AA2{fill:#4A6FF3;} - .d2-2661353035 .fill-AA4{fill:#EDF0FD;} - .d2-2661353035 .fill-AA5{fill:#F7F8FE;} - .d2-2661353035 .fill-AB4{fill:#EDF0FD;} - .d2-2661353035 .fill-AB5{fill:#F7F8FE;} - .d2-2661353035 .stroke-N1{stroke:#0A0F25;} - .d2-2661353035 .stroke-N2{stroke:#676C7E;} - .d2-2661353035 .stroke-N3{stroke:#9499AB;} - .d2-2661353035 .stroke-N4{stroke:#CFD2DD;} - .d2-2661353035 .stroke-N5{stroke:#DEE1EB;} - .d2-2661353035 .stroke-N6{stroke:#EEF1F8;} - .d2-2661353035 .stroke-N7{stroke:#FFFFFF;} - .d2-2661353035 .stroke-B1{stroke:#0D32B2;} - .d2-2661353035 .stroke-B2{stroke:#0D32B2;} - .d2-2661353035 .stroke-B3{stroke:#E3E9FD;} - .d2-2661353035 .stroke-B4{stroke:#E3E9FD;} - .d2-2661353035 .stroke-B5{stroke:#EDF0FD;} - .d2-2661353035 .stroke-B6{stroke:#F7F8FE;} - .d2-2661353035 .stroke-AA2{stroke:#4A6FF3;} - .d2-2661353035 .stroke-AA4{stroke:#EDF0FD;} - .d2-2661353035 .stroke-AA5{stroke:#F7F8FE;} - .d2-2661353035 .stroke-AB4{stroke:#EDF0FD;} - .d2-2661353035 .stroke-AB5{stroke:#F7F8FE;} - .d2-2661353035 .background-color-N1{background-color:#0A0F25;} - .d2-2661353035 .background-color-N2{background-color:#676C7E;} - .d2-2661353035 .background-color-N3{background-color:#9499AB;} - .d2-2661353035 .background-color-N4{background-color:#CFD2DD;} - .d2-2661353035 .background-color-N5{background-color:#DEE1EB;} - .d2-2661353035 .background-color-N6{background-color:#EEF1F8;} - .d2-2661353035 .background-color-N7{background-color:#FFFFFF;} - .d2-2661353035 .background-color-B1{background-color:#0D32B2;} - .d2-2661353035 .background-color-B2{background-color:#0D32B2;} - .d2-2661353035 .background-color-B3{background-color:#E3E9FD;} - .d2-2661353035 .background-color-B4{background-color:#E3E9FD;} - .d2-2661353035 .background-color-B5{background-color:#EDF0FD;} - .d2-2661353035 .background-color-B6{background-color:#F7F8FE;} - .d2-2661353035 .background-color-AA2{background-color:#4A6FF3;} - .d2-2661353035 .background-color-AA4{background-color:#EDF0FD;} - .d2-2661353035 .background-color-AA5{background-color:#F7F8FE;} - .d2-2661353035 .background-color-AB4{background-color:#EDF0FD;} - .d2-2661353035 .background-color-AB5{background-color:#F7F8FE;} - .d2-2661353035 .color-N1{color:#0A0F25;} - .d2-2661353035 .color-N2{color:#676C7E;} - .d2-2661353035 .color-N3{color:#9499AB;} - .d2-2661353035 .color-N4{color:#CFD2DD;} - .d2-2661353035 .color-N5{color:#DEE1EB;} - .d2-2661353035 .color-N6{color:#EEF1F8;} - .d2-2661353035 .color-N7{color:#FFFFFF;} - .d2-2661353035 .color-B1{color:#0D32B2;} - .d2-2661353035 .color-B2{color:#0D32B2;} - .d2-2661353035 .color-B3{color:#E3E9FD;} - .d2-2661353035 .color-B4{color:#E3E9FD;} - .d2-2661353035 .color-B5{color:#EDF0FD;} - .d2-2661353035 .color-B6{color:#F7F8FE;} - .d2-2661353035 .color-AA2{color:#4A6FF3;} - .d2-2661353035 .color-AA4{color:#EDF0FD;} - .d2-2661353035 .color-AA5{color:#F7F8FE;} - .d2-2661353035 .color-AB4{color:#EDF0FD;} - .d2-2661353035 .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 - - ->>>>>>> 33280fed5 (fixed e2e tests) -||||||| parent of cb2f2823c (Fix changes) - .d2-2661353035 .fill-N1{fill:#0A0F25;} - .d2-2661353035 .fill-N2{fill:#676C7E;} - .d2-2661353035 .fill-N3{fill:#9499AB;} - .d2-2661353035 .fill-N4{fill:#CFD2DD;} - .d2-2661353035 .fill-N5{fill:#DEE1EB;} - .d2-2661353035 .fill-N6{fill:#EEF1F8;} - .d2-2661353035 .fill-N7{fill:#FFFFFF;} - .d2-2661353035 .fill-B1{fill:#0D32B2;} - .d2-2661353035 .fill-B2{fill:#0D32B2;} - .d2-2661353035 .fill-B3{fill:#E3E9FD;} - .d2-2661353035 .fill-B4{fill:#E3E9FD;} - .d2-2661353035 .fill-B5{fill:#EDF0FD;} - .d2-2661353035 .fill-B6{fill:#F7F8FE;} - .d2-2661353035 .fill-AA2{fill:#4A6FF3;} - .d2-2661353035 .fill-AA4{fill:#EDF0FD;} - .d2-2661353035 .fill-AA5{fill:#F7F8FE;} - .d2-2661353035 .fill-AB4{fill:#EDF0FD;} - .d2-2661353035 .fill-AB5{fill:#F7F8FE;} - .d2-2661353035 .stroke-N1{stroke:#0A0F25;} - .d2-2661353035 .stroke-N2{stroke:#676C7E;} - .d2-2661353035 .stroke-N3{stroke:#9499AB;} - .d2-2661353035 .stroke-N4{stroke:#CFD2DD;} - .d2-2661353035 .stroke-N5{stroke:#DEE1EB;} - .d2-2661353035 .stroke-N6{stroke:#EEF1F8;} - .d2-2661353035 .stroke-N7{stroke:#FFFFFF;} - .d2-2661353035 .stroke-B1{stroke:#0D32B2;} - .d2-2661353035 .stroke-B2{stroke:#0D32B2;} - .d2-2661353035 .stroke-B3{stroke:#E3E9FD;} - .d2-2661353035 .stroke-B4{stroke:#E3E9FD;} - .d2-2661353035 .stroke-B5{stroke:#EDF0FD;} - .d2-2661353035 .stroke-B6{stroke:#F7F8FE;} - .d2-2661353035 .stroke-AA2{stroke:#4A6FF3;} - .d2-2661353035 .stroke-AA4{stroke:#EDF0FD;} - .d2-2661353035 .stroke-AA5{stroke:#F7F8FE;} - .d2-2661353035 .stroke-AB4{stroke:#EDF0FD;} - .d2-2661353035 .stroke-AB5{stroke:#F7F8FE;} - .d2-2661353035 .background-color-N1{background-color:#0A0F25;} - .d2-2661353035 .background-color-N2{background-color:#676C7E;} - .d2-2661353035 .background-color-N3{background-color:#9499AB;} - .d2-2661353035 .background-color-N4{background-color:#CFD2DD;} - .d2-2661353035 .background-color-N5{background-color:#DEE1EB;} - .d2-2661353035 .background-color-N6{background-color:#EEF1F8;} - .d2-2661353035 .background-color-N7{background-color:#FFFFFF;} - .d2-2661353035 .background-color-B1{background-color:#0D32B2;} - .d2-2661353035 .background-color-B2{background-color:#0D32B2;} - .d2-2661353035 .background-color-B3{background-color:#E3E9FD;} - .d2-2661353035 .background-color-B4{background-color:#E3E9FD;} - .d2-2661353035 .background-color-B5{background-color:#EDF0FD;} - .d2-2661353035 .background-color-B6{background-color:#F7F8FE;} - .d2-2661353035 .background-color-AA2{background-color:#4A6FF3;} - .d2-2661353035 .background-color-AA4{background-color:#EDF0FD;} - .d2-2661353035 .background-color-AA5{background-color:#F7F8FE;} - .d2-2661353035 .background-color-AB4{background-color:#EDF0FD;} - .d2-2661353035 .background-color-AB5{background-color:#F7F8FE;} - .d2-2661353035 .color-N1{color:#0A0F25;} - .d2-2661353035 .color-N2{color:#676C7E;} - .d2-2661353035 .color-N3{color:#9499AB;} - .d2-2661353035 .color-N4{color:#CFD2DD;} - .d2-2661353035 .color-N5{color:#DEE1EB;} - .d2-2661353035 .color-N6{color:#EEF1F8;} - .d2-2661353035 .color-N7{color:#FFFFFF;} - .d2-2661353035 .color-B1{color:#0D32B2;} - .d2-2661353035 .color-B2{color:#0D32B2;} - .d2-2661353035 .color-B3{color:#E3E9FD;} - .d2-2661353035 .color-B4{color:#E3E9FD;} - .d2-2661353035 .color-B5{color:#EDF0FD;} - .d2-2661353035 .color-B6{color:#F7F8FE;} - .d2-2661353035 .color-AA2{color:#4A6FF3;} - .d2-2661353035 .color-AA4{color:#EDF0FD;} - .d2-2661353035 .color-AA5{color:#F7F8FE;} - .d2-2661353035 .color-AB4{color:#EDF0FD;} - .d2-2661353035 .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 - - -======= .d2-3964001802 .fill-N1{fill:#0A0F25;} .d2-3964001802 .fill-N2{fill:#676C7E;} .d2-3964001802 .fill-N3{fill:#9499AB;} @@ -419,10 +96,9 @@ .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 + .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) 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 48db56be8..ea6517899 100644 --- a/e2etests/testdata/stable/sequence_diagram_real/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_real/elk/sketch.exp.svg @@ -1,26 +1,6 @@ -<<<<<<< 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 - - -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-67562191 .fill-N1{fill:#0A0F25;} - .d2-67562191 .fill-N2{fill:#676C7E;} - .d2-67562191 .fill-N3{fill:#9499AB;} - .d2-67562191 .fill-N4{fill:#CFD2DD;} - .d2-67562191 .fill-N5{fill:#DEE1EB;} - .d2-67562191 .fill-N6{fill:#EEF1F8;} - .d2-67562191 .fill-N7{fill:#FFFFFF;} - .d2-67562191 .fill-B1{fill:#0D32B2;} - .d2-67562191 .fill-B2{fill:#0D32B2;} - .d2-67562191 .fill-B3{fill:#E3E9FD;} - .d2-67562191 .fill-B4{fill:#E3E9FD;} - .d2-67562191 .fill-B5{fill:#EDF0FD;} - .d2-67562191 .fill-B6{fill:#F7F8FE;} - .d2-67562191 .fill-AA2{fill:#4A6FF3;} - .d2-67562191 .fill-AA4{fill:#EDF0FD;} - .d2-67562191 .fill-AA5{fill:#F7F8FE;} - .d2-67562191 .fill-AB4{fill:#EDF0FD;} - .d2-67562191 .fill-AB5{fill:#F7F8FE;} - .d2-67562191 .stroke-N1{stroke:#0A0F25;} - .d2-67562191 .stroke-N2{stroke:#676C7E;} - .d2-67562191 .stroke-N3{stroke:#9499AB;} - .d2-67562191 .stroke-N4{stroke:#CFD2DD;} - .d2-67562191 .stroke-N5{stroke:#DEE1EB;} - .d2-67562191 .stroke-N6{stroke:#EEF1F8;} - .d2-67562191 .stroke-N7{stroke:#FFFFFF;} - .d2-67562191 .stroke-B1{stroke:#0D32B2;} - .d2-67562191 .stroke-B2{stroke:#0D32B2;} - .d2-67562191 .stroke-B3{stroke:#E3E9FD;} - .d2-67562191 .stroke-B4{stroke:#E3E9FD;} - .d2-67562191 .stroke-B5{stroke:#EDF0FD;} - .d2-67562191 .stroke-B6{stroke:#F7F8FE;} - .d2-67562191 .stroke-AA2{stroke:#4A6FF3;} - .d2-67562191 .stroke-AA4{stroke:#EDF0FD;} - .d2-67562191 .stroke-AA5{stroke:#F7F8FE;} - .d2-67562191 .stroke-AB4{stroke:#EDF0FD;} - .d2-67562191 .stroke-AB5{stroke:#F7F8FE;} - .d2-67562191 .background-color-N1{background-color:#0A0F25;} - .d2-67562191 .background-color-N2{background-color:#676C7E;} - .d2-67562191 .background-color-N3{background-color:#9499AB;} - .d2-67562191 .background-color-N4{background-color:#CFD2DD;} - .d2-67562191 .background-color-N5{background-color:#DEE1EB;} - .d2-67562191 .background-color-N6{background-color:#EEF1F8;} - .d2-67562191 .background-color-N7{background-color:#FFFFFF;} - .d2-67562191 .background-color-B1{background-color:#0D32B2;} - .d2-67562191 .background-color-B2{background-color:#0D32B2;} - .d2-67562191 .background-color-B3{background-color:#E3E9FD;} - .d2-67562191 .background-color-B4{background-color:#E3E9FD;} - .d2-67562191 .background-color-B5{background-color:#EDF0FD;} - .d2-67562191 .background-color-B6{background-color:#F7F8FE;} - .d2-67562191 .background-color-AA2{background-color:#4A6FF3;} - .d2-67562191 .background-color-AA4{background-color:#EDF0FD;} - .d2-67562191 .background-color-AA5{background-color:#F7F8FE;} - .d2-67562191 .background-color-AB4{background-color:#EDF0FD;} - .d2-67562191 .background-color-AB5{background-color:#F7F8FE;} - .d2-67562191 .color-N1{color:#0A0F25;} - .d2-67562191 .color-N2{color:#676C7E;} - .d2-67562191 .color-N3{color:#9499AB;} - .d2-67562191 .color-N4{color:#CFD2DD;} - .d2-67562191 .color-N5{color:#DEE1EB;} - .d2-67562191 .color-N6{color:#EEF1F8;} - .d2-67562191 .color-N7{color:#FFFFFF;} - .d2-67562191 .color-B1{color:#0D32B2;} - .d2-67562191 .color-B2{color:#0D32B2;} - .d2-67562191 .color-B3{color:#E3E9FD;} - .d2-67562191 .color-B4{color:#E3E9FD;} - .d2-67562191 .color-B5{color:#EDF0FD;} - .d2-67562191 .color-B6{color:#F7F8FE;} - .d2-67562191 .color-AA2{color:#4A6FF3;} - .d2-67562191 .color-AA4{color:#EDF0FD;} - .d2-67562191 .color-AA5{color:#F7F8FE;} - .d2-67562191 .color-AB4{color:#EDF0FD;} - .d2-67562191 .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 - - -======= - .d2-1149270587 .fill-N1{fill:#0A0F25;} - .d2-1149270587 .fill-N2{fill:#676C7E;} - .d2-1149270587 .fill-N3{fill:#9499AB;} - .d2-1149270587 .fill-N4{fill:#CFD2DD;} - .d2-1149270587 .fill-N5{fill:#DEE1EB;} - .d2-1149270587 .fill-N6{fill:#EEF1F8;} - .d2-1149270587 .fill-N7{fill:#FFFFFF;} - .d2-1149270587 .fill-B1{fill:#0D32B2;} - .d2-1149270587 .fill-B2{fill:#0D32B2;} - .d2-1149270587 .fill-B3{fill:#E3E9FD;} - .d2-1149270587 .fill-B4{fill:#E3E9FD;} - .d2-1149270587 .fill-B5{fill:#EDF0FD;} - .d2-1149270587 .fill-B6{fill:#F7F8FE;} - .d2-1149270587 .fill-AA2{fill:#4A6FF3;} - .d2-1149270587 .fill-AA4{fill:#EDF0FD;} - .d2-1149270587 .fill-AA5{fill:#F7F8FE;} - .d2-1149270587 .fill-AB4{fill:#EDF0FD;} - .d2-1149270587 .fill-AB5{fill:#F7F8FE;} - .d2-1149270587 .stroke-N1{stroke:#0A0F25;} - .d2-1149270587 .stroke-N2{stroke:#676C7E;} - .d2-1149270587 .stroke-N3{stroke:#9499AB;} - .d2-1149270587 .stroke-N4{stroke:#CFD2DD;} - .d2-1149270587 .stroke-N5{stroke:#DEE1EB;} - .d2-1149270587 .stroke-N6{stroke:#EEF1F8;} - .d2-1149270587 .stroke-N7{stroke:#FFFFFF;} - .d2-1149270587 .stroke-B1{stroke:#0D32B2;} - .d2-1149270587 .stroke-B2{stroke:#0D32B2;} - .d2-1149270587 .stroke-B3{stroke:#E3E9FD;} - .d2-1149270587 .stroke-B4{stroke:#E3E9FD;} - .d2-1149270587 .stroke-B5{stroke:#EDF0FD;} - .d2-1149270587 .stroke-B6{stroke:#F7F8FE;} - .d2-1149270587 .stroke-AA2{stroke:#4A6FF3;} - .d2-1149270587 .stroke-AA4{stroke:#EDF0FD;} - .d2-1149270587 .stroke-AA5{stroke:#F7F8FE;} - .d2-1149270587 .stroke-AB4{stroke:#EDF0FD;} - .d2-1149270587 .stroke-AB5{stroke:#F7F8FE;} - .d2-1149270587 .background-color-N1{background-color:#0A0F25;} - .d2-1149270587 .background-color-N2{background-color:#676C7E;} - .d2-1149270587 .background-color-N3{background-color:#9499AB;} - .d2-1149270587 .background-color-N4{background-color:#CFD2DD;} - .d2-1149270587 .background-color-N5{background-color:#DEE1EB;} - .d2-1149270587 .background-color-N6{background-color:#EEF1F8;} - .d2-1149270587 .background-color-N7{background-color:#FFFFFF;} - .d2-1149270587 .background-color-B1{background-color:#0D32B2;} - .d2-1149270587 .background-color-B2{background-color:#0D32B2;} - .d2-1149270587 .background-color-B3{background-color:#E3E9FD;} - .d2-1149270587 .background-color-B4{background-color:#E3E9FD;} - .d2-1149270587 .background-color-B5{background-color:#EDF0FD;} - .d2-1149270587 .background-color-B6{background-color:#F7F8FE;} - .d2-1149270587 .background-color-AA2{background-color:#4A6FF3;} - .d2-1149270587 .background-color-AA4{background-color:#EDF0FD;} - .d2-1149270587 .background-color-AA5{background-color:#F7F8FE;} - .d2-1149270587 .background-color-AB4{background-color:#EDF0FD;} - .d2-1149270587 .background-color-AB5{background-color:#F7F8FE;} - .d2-1149270587 .color-N1{color:#0A0F25;} - .d2-1149270587 .color-N2{color:#676C7E;} - .d2-1149270587 .color-N3{color:#9499AB;} - .d2-1149270587 .color-N4{color:#CFD2DD;} - .d2-1149270587 .color-N5{color:#DEE1EB;} - .d2-1149270587 .color-N6{color:#EEF1F8;} - .d2-1149270587 .color-N7{color:#FFFFFF;} - .d2-1149270587 .color-B1{color:#0D32B2;} - .d2-1149270587 .color-B2{color:#0D32B2;} - .d2-1149270587 .color-B3{color:#E3E9FD;} - .d2-1149270587 .color-B4{color:#E3E9FD;} - .d2-1149270587 .color-B5{color:#EDF0FD;} - .d2-1149270587 .color-B6{color:#F7F8FE;} - .d2-1149270587 .color-AA2{color:#4A6FF3;} - .d2-1149270587 .color-AA4{color:#EDF0FD;} - .d2-1149270587 .color-AA5{color:#F7F8FE;} - .d2-1149270587 .color-AB4{color:#EDF0FD;} - .d2-1149270587 .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 - - ->>>>>>> 33280fed5 (fixed e2e tests) -||||||| parent of cb2f2823c (Fix changes) - .d2-1149270587 .fill-N1{fill:#0A0F25;} - .d2-1149270587 .fill-N2{fill:#676C7E;} - .d2-1149270587 .fill-N3{fill:#9499AB;} - .d2-1149270587 .fill-N4{fill:#CFD2DD;} - .d2-1149270587 .fill-N5{fill:#DEE1EB;} - .d2-1149270587 .fill-N6{fill:#EEF1F8;} - .d2-1149270587 .fill-N7{fill:#FFFFFF;} - .d2-1149270587 .fill-B1{fill:#0D32B2;} - .d2-1149270587 .fill-B2{fill:#0D32B2;} - .d2-1149270587 .fill-B3{fill:#E3E9FD;} - .d2-1149270587 .fill-B4{fill:#E3E9FD;} - .d2-1149270587 .fill-B5{fill:#EDF0FD;} - .d2-1149270587 .fill-B6{fill:#F7F8FE;} - .d2-1149270587 .fill-AA2{fill:#4A6FF3;} - .d2-1149270587 .fill-AA4{fill:#EDF0FD;} - .d2-1149270587 .fill-AA5{fill:#F7F8FE;} - .d2-1149270587 .fill-AB4{fill:#EDF0FD;} - .d2-1149270587 .fill-AB5{fill:#F7F8FE;} - .d2-1149270587 .stroke-N1{stroke:#0A0F25;} - .d2-1149270587 .stroke-N2{stroke:#676C7E;} - .d2-1149270587 .stroke-N3{stroke:#9499AB;} - .d2-1149270587 .stroke-N4{stroke:#CFD2DD;} - .d2-1149270587 .stroke-N5{stroke:#DEE1EB;} - .d2-1149270587 .stroke-N6{stroke:#EEF1F8;} - .d2-1149270587 .stroke-N7{stroke:#FFFFFF;} - .d2-1149270587 .stroke-B1{stroke:#0D32B2;} - .d2-1149270587 .stroke-B2{stroke:#0D32B2;} - .d2-1149270587 .stroke-B3{stroke:#E3E9FD;} - .d2-1149270587 .stroke-B4{stroke:#E3E9FD;} - .d2-1149270587 .stroke-B5{stroke:#EDF0FD;} - .d2-1149270587 .stroke-B6{stroke:#F7F8FE;} - .d2-1149270587 .stroke-AA2{stroke:#4A6FF3;} - .d2-1149270587 .stroke-AA4{stroke:#EDF0FD;} - .d2-1149270587 .stroke-AA5{stroke:#F7F8FE;} - .d2-1149270587 .stroke-AB4{stroke:#EDF0FD;} - .d2-1149270587 .stroke-AB5{stroke:#F7F8FE;} - .d2-1149270587 .background-color-N1{background-color:#0A0F25;} - .d2-1149270587 .background-color-N2{background-color:#676C7E;} - .d2-1149270587 .background-color-N3{background-color:#9499AB;} - .d2-1149270587 .background-color-N4{background-color:#CFD2DD;} - .d2-1149270587 .background-color-N5{background-color:#DEE1EB;} - .d2-1149270587 .background-color-N6{background-color:#EEF1F8;} - .d2-1149270587 .background-color-N7{background-color:#FFFFFF;} - .d2-1149270587 .background-color-B1{background-color:#0D32B2;} - .d2-1149270587 .background-color-B2{background-color:#0D32B2;} - .d2-1149270587 .background-color-B3{background-color:#E3E9FD;} - .d2-1149270587 .background-color-B4{background-color:#E3E9FD;} - .d2-1149270587 .background-color-B5{background-color:#EDF0FD;} - .d2-1149270587 .background-color-B6{background-color:#F7F8FE;} - .d2-1149270587 .background-color-AA2{background-color:#4A6FF3;} - .d2-1149270587 .background-color-AA4{background-color:#EDF0FD;} - .d2-1149270587 .background-color-AA5{background-color:#F7F8FE;} - .d2-1149270587 .background-color-AB4{background-color:#EDF0FD;} - .d2-1149270587 .background-color-AB5{background-color:#F7F8FE;} - .d2-1149270587 .color-N1{color:#0A0F25;} - .d2-1149270587 .color-N2{color:#676C7E;} - .d2-1149270587 .color-N3{color:#9499AB;} - .d2-1149270587 .color-N4{color:#CFD2DD;} - .d2-1149270587 .color-N5{color:#DEE1EB;} - .d2-1149270587 .color-N6{color:#EEF1F8;} - .d2-1149270587 .color-N7{color:#FFFFFF;} - .d2-1149270587 .color-B1{color:#0D32B2;} - .d2-1149270587 .color-B2{color:#0D32B2;} - .d2-1149270587 .color-B3{color:#E3E9FD;} - .d2-1149270587 .color-B4{color:#E3E9FD;} - .d2-1149270587 .color-B5{color:#EDF0FD;} - .d2-1149270587 .color-B6{color:#F7F8FE;} - .d2-1149270587 .color-AA2{color:#4A6FF3;} - .d2-1149270587 .color-AA4{color:#EDF0FD;} - .d2-1149270587 .color-AA5{color:#F7F8FE;} - .d2-1149270587 .color-AB4{color:#EDF0FD;} - .d2-1149270587 .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 - - -======= .d2-2840663315 .fill-N1{fill:#0A0F25;} .d2-2840663315 .fill-N2{fill:#676C7E;} .d2-2840663315 .fill-N3{fill:#9499AB;} @@ -419,10 +96,9 @@ .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 + .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) 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 19ddb13af..77f0a94e7 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,26 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -ab a self edge herebetween actorsto descendantto deeper descendantto parentactor - -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-2513312896 .fill-N1{fill:#0A0F25;} - .d2-2513312896 .fill-N2{fill:#676C7E;} - .d2-2513312896 .fill-N3{fill:#9499AB;} - .d2-2513312896 .fill-N4{fill:#CFD2DD;} - .d2-2513312896 .fill-N5{fill:#DEE1EB;} - .d2-2513312896 .fill-N6{fill:#EEF1F8;} - .d2-2513312896 .fill-N7{fill:#FFFFFF;} - .d2-2513312896 .fill-B1{fill:#0D32B2;} - .d2-2513312896 .fill-B2{fill:#0D32B2;} - .d2-2513312896 .fill-B3{fill:#E3E9FD;} - .d2-2513312896 .fill-B4{fill:#E3E9FD;} - .d2-2513312896 .fill-B5{fill:#EDF0FD;} - .d2-2513312896 .fill-B6{fill:#F7F8FE;} - .d2-2513312896 .fill-AA2{fill:#4A6FF3;} - .d2-2513312896 .fill-AA4{fill:#EDF0FD;} - .d2-2513312896 .fill-AA5{fill:#F7F8FE;} - .d2-2513312896 .fill-AB4{fill:#EDF0FD;} - .d2-2513312896 .fill-AB5{fill:#F7F8FE;} - .d2-2513312896 .stroke-N1{stroke:#0A0F25;} - .d2-2513312896 .stroke-N2{stroke:#676C7E;} - .d2-2513312896 .stroke-N3{stroke:#9499AB;} - .d2-2513312896 .stroke-N4{stroke:#CFD2DD;} - .d2-2513312896 .stroke-N5{stroke:#DEE1EB;} - .d2-2513312896 .stroke-N6{stroke:#EEF1F8;} - .d2-2513312896 .stroke-N7{stroke:#FFFFFF;} - .d2-2513312896 .stroke-B1{stroke:#0D32B2;} - .d2-2513312896 .stroke-B2{stroke:#0D32B2;} - .d2-2513312896 .stroke-B3{stroke:#E3E9FD;} - .d2-2513312896 .stroke-B4{stroke:#E3E9FD;} - .d2-2513312896 .stroke-B5{stroke:#EDF0FD;} - .d2-2513312896 .stroke-B6{stroke:#F7F8FE;} - .d2-2513312896 .stroke-AA2{stroke:#4A6FF3;} - .d2-2513312896 .stroke-AA4{stroke:#EDF0FD;} - .d2-2513312896 .stroke-AA5{stroke:#F7F8FE;} - .d2-2513312896 .stroke-AB4{stroke:#EDF0FD;} - .d2-2513312896 .stroke-AB5{stroke:#F7F8FE;} - .d2-2513312896 .background-color-N1{background-color:#0A0F25;} - .d2-2513312896 .background-color-N2{background-color:#676C7E;} - .d2-2513312896 .background-color-N3{background-color:#9499AB;} - .d2-2513312896 .background-color-N4{background-color:#CFD2DD;} - .d2-2513312896 .background-color-N5{background-color:#DEE1EB;} - .d2-2513312896 .background-color-N6{background-color:#EEF1F8;} - .d2-2513312896 .background-color-N7{background-color:#FFFFFF;} - .d2-2513312896 .background-color-B1{background-color:#0D32B2;} - .d2-2513312896 .background-color-B2{background-color:#0D32B2;} - .d2-2513312896 .background-color-B3{background-color:#E3E9FD;} - .d2-2513312896 .background-color-B4{background-color:#E3E9FD;} - .d2-2513312896 .background-color-B5{background-color:#EDF0FD;} - .d2-2513312896 .background-color-B6{background-color:#F7F8FE;} - .d2-2513312896 .background-color-AA2{background-color:#4A6FF3;} - .d2-2513312896 .background-color-AA4{background-color:#EDF0FD;} - .d2-2513312896 .background-color-AA5{background-color:#F7F8FE;} - .d2-2513312896 .background-color-AB4{background-color:#EDF0FD;} - .d2-2513312896 .background-color-AB5{background-color:#F7F8FE;} - .d2-2513312896 .color-N1{color:#0A0F25;} - .d2-2513312896 .color-N2{color:#676C7E;} - .d2-2513312896 .color-N3{color:#9499AB;} - .d2-2513312896 .color-N4{color:#CFD2DD;} - .d2-2513312896 .color-N5{color:#DEE1EB;} - .d2-2513312896 .color-N6{color:#EEF1F8;} - .d2-2513312896 .color-N7{color:#FFFFFF;} - .d2-2513312896 .color-B1{color:#0D32B2;} - .d2-2513312896 .color-B2{color:#0D32B2;} - .d2-2513312896 .color-B3{color:#E3E9FD;} - .d2-2513312896 .color-B4{color:#E3E9FD;} - .d2-2513312896 .color-B5{color:#EDF0FD;} - .d2-2513312896 .color-B6{color:#F7F8FE;} - .d2-2513312896 .color-AA2{color:#4A6FF3;} - .d2-2513312896 .color-AA4{color:#EDF0FD;} - .d2-2513312896 .color-AA5{color:#F7F8FE;} - .d2-2513312896 .color-AB4{color:#EDF0FD;} - .d2-2513312896 .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-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 - ->>>>>>> 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;} @@ -415,9 +96,8 @@ .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 + .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) 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 19ddb13af..77f0a94e7 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,26 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -ab a self edge herebetween actorsto descendantto deeper descendantto parentactor - -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-2513312896 .fill-N1{fill:#0A0F25;} - .d2-2513312896 .fill-N2{fill:#676C7E;} - .d2-2513312896 .fill-N3{fill:#9499AB;} - .d2-2513312896 .fill-N4{fill:#CFD2DD;} - .d2-2513312896 .fill-N5{fill:#DEE1EB;} - .d2-2513312896 .fill-N6{fill:#EEF1F8;} - .d2-2513312896 .fill-N7{fill:#FFFFFF;} - .d2-2513312896 .fill-B1{fill:#0D32B2;} - .d2-2513312896 .fill-B2{fill:#0D32B2;} - .d2-2513312896 .fill-B3{fill:#E3E9FD;} - .d2-2513312896 .fill-B4{fill:#E3E9FD;} - .d2-2513312896 .fill-B5{fill:#EDF0FD;} - .d2-2513312896 .fill-B6{fill:#F7F8FE;} - .d2-2513312896 .fill-AA2{fill:#4A6FF3;} - .d2-2513312896 .fill-AA4{fill:#EDF0FD;} - .d2-2513312896 .fill-AA5{fill:#F7F8FE;} - .d2-2513312896 .fill-AB4{fill:#EDF0FD;} - .d2-2513312896 .fill-AB5{fill:#F7F8FE;} - .d2-2513312896 .stroke-N1{stroke:#0A0F25;} - .d2-2513312896 .stroke-N2{stroke:#676C7E;} - .d2-2513312896 .stroke-N3{stroke:#9499AB;} - .d2-2513312896 .stroke-N4{stroke:#CFD2DD;} - .d2-2513312896 .stroke-N5{stroke:#DEE1EB;} - .d2-2513312896 .stroke-N6{stroke:#EEF1F8;} - .d2-2513312896 .stroke-N7{stroke:#FFFFFF;} - .d2-2513312896 .stroke-B1{stroke:#0D32B2;} - .d2-2513312896 .stroke-B2{stroke:#0D32B2;} - .d2-2513312896 .stroke-B3{stroke:#E3E9FD;} - .d2-2513312896 .stroke-B4{stroke:#E3E9FD;} - .d2-2513312896 .stroke-B5{stroke:#EDF0FD;} - .d2-2513312896 .stroke-B6{stroke:#F7F8FE;} - .d2-2513312896 .stroke-AA2{stroke:#4A6FF3;} - .d2-2513312896 .stroke-AA4{stroke:#EDF0FD;} - .d2-2513312896 .stroke-AA5{stroke:#F7F8FE;} - .d2-2513312896 .stroke-AB4{stroke:#EDF0FD;} - .d2-2513312896 .stroke-AB5{stroke:#F7F8FE;} - .d2-2513312896 .background-color-N1{background-color:#0A0F25;} - .d2-2513312896 .background-color-N2{background-color:#676C7E;} - .d2-2513312896 .background-color-N3{background-color:#9499AB;} - .d2-2513312896 .background-color-N4{background-color:#CFD2DD;} - .d2-2513312896 .background-color-N5{background-color:#DEE1EB;} - .d2-2513312896 .background-color-N6{background-color:#EEF1F8;} - .d2-2513312896 .background-color-N7{background-color:#FFFFFF;} - .d2-2513312896 .background-color-B1{background-color:#0D32B2;} - .d2-2513312896 .background-color-B2{background-color:#0D32B2;} - .d2-2513312896 .background-color-B3{background-color:#E3E9FD;} - .d2-2513312896 .background-color-B4{background-color:#E3E9FD;} - .d2-2513312896 .background-color-B5{background-color:#EDF0FD;} - .d2-2513312896 .background-color-B6{background-color:#F7F8FE;} - .d2-2513312896 .background-color-AA2{background-color:#4A6FF3;} - .d2-2513312896 .background-color-AA4{background-color:#EDF0FD;} - .d2-2513312896 .background-color-AA5{background-color:#F7F8FE;} - .d2-2513312896 .background-color-AB4{background-color:#EDF0FD;} - .d2-2513312896 .background-color-AB5{background-color:#F7F8FE;} - .d2-2513312896 .color-N1{color:#0A0F25;} - .d2-2513312896 .color-N2{color:#676C7E;} - .d2-2513312896 .color-N3{color:#9499AB;} - .d2-2513312896 .color-N4{color:#CFD2DD;} - .d2-2513312896 .color-N5{color:#DEE1EB;} - .d2-2513312896 .color-N6{color:#EEF1F8;} - .d2-2513312896 .color-N7{color:#FFFFFF;} - .d2-2513312896 .color-B1{color:#0D32B2;} - .d2-2513312896 .color-B2{color:#0D32B2;} - .d2-2513312896 .color-B3{color:#E3E9FD;} - .d2-2513312896 .color-B4{color:#E3E9FD;} - .d2-2513312896 .color-B5{color:#EDF0FD;} - .d2-2513312896 .color-B6{color:#F7F8FE;} - .d2-2513312896 .color-AA2{color:#4A6FF3;} - .d2-2513312896 .color-AA4{color:#EDF0FD;} - .d2-2513312896 .color-AA5{color:#F7F8FE;} - .d2-2513312896 .color-AB4{color:#EDF0FD;} - .d2-2513312896 .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-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 - ->>>>>>> 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;} @@ -415,9 +96,8 @@ .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 + .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) 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 d1cdfbf45..b97843102 100644 --- a/e2etests/testdata/stable/sequence_diagram_simple/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_simple/dagre/sketch.exp.svg @@ -1,26 +1,6 @@ -<<<<<<< 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 - -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-335886273 .fill-N1{fill:#0A0F25;} - .d2-335886273 .fill-N2{fill:#676C7E;} - .d2-335886273 .fill-N3{fill:#9499AB;} - .d2-335886273 .fill-N4{fill:#CFD2DD;} - .d2-335886273 .fill-N5{fill:#DEE1EB;} - .d2-335886273 .fill-N6{fill:#EEF1F8;} - .d2-335886273 .fill-N7{fill:#FFFFFF;} - .d2-335886273 .fill-B1{fill:#0D32B2;} - .d2-335886273 .fill-B2{fill:#0D32B2;} - .d2-335886273 .fill-B3{fill:#E3E9FD;} - .d2-335886273 .fill-B4{fill:#E3E9FD;} - .d2-335886273 .fill-B5{fill:#EDF0FD;} - .d2-335886273 .fill-B6{fill:#F7F8FE;} - .d2-335886273 .fill-AA2{fill:#4A6FF3;} - .d2-335886273 .fill-AA4{fill:#EDF0FD;} - .d2-335886273 .fill-AA5{fill:#F7F8FE;} - .d2-335886273 .fill-AB4{fill:#EDF0FD;} - .d2-335886273 .fill-AB5{fill:#F7F8FE;} - .d2-335886273 .stroke-N1{stroke:#0A0F25;} - .d2-335886273 .stroke-N2{stroke:#676C7E;} - .d2-335886273 .stroke-N3{stroke:#9499AB;} - .d2-335886273 .stroke-N4{stroke:#CFD2DD;} - .d2-335886273 .stroke-N5{stroke:#DEE1EB;} - .d2-335886273 .stroke-N6{stroke:#EEF1F8;} - .d2-335886273 .stroke-N7{stroke:#FFFFFF;} - .d2-335886273 .stroke-B1{stroke:#0D32B2;} - .d2-335886273 .stroke-B2{stroke:#0D32B2;} - .d2-335886273 .stroke-B3{stroke:#E3E9FD;} - .d2-335886273 .stroke-B4{stroke:#E3E9FD;} - .d2-335886273 .stroke-B5{stroke:#EDF0FD;} - .d2-335886273 .stroke-B6{stroke:#F7F8FE;} - .d2-335886273 .stroke-AA2{stroke:#4A6FF3;} - .d2-335886273 .stroke-AA4{stroke:#EDF0FD;} - .d2-335886273 .stroke-AA5{stroke:#F7F8FE;} - .d2-335886273 .stroke-AB4{stroke:#EDF0FD;} - .d2-335886273 .stroke-AB5{stroke:#F7F8FE;} - .d2-335886273 .background-color-N1{background-color:#0A0F25;} - .d2-335886273 .background-color-N2{background-color:#676C7E;} - .d2-335886273 .background-color-N3{background-color:#9499AB;} - .d2-335886273 .background-color-N4{background-color:#CFD2DD;} - .d2-335886273 .background-color-N5{background-color:#DEE1EB;} - .d2-335886273 .background-color-N6{background-color:#EEF1F8;} - .d2-335886273 .background-color-N7{background-color:#FFFFFF;} - .d2-335886273 .background-color-B1{background-color:#0D32B2;} - .d2-335886273 .background-color-B2{background-color:#0D32B2;} - .d2-335886273 .background-color-B3{background-color:#E3E9FD;} - .d2-335886273 .background-color-B4{background-color:#E3E9FD;} - .d2-335886273 .background-color-B5{background-color:#EDF0FD;} - .d2-335886273 .background-color-B6{background-color:#F7F8FE;} - .d2-335886273 .background-color-AA2{background-color:#4A6FF3;} - .d2-335886273 .background-color-AA4{background-color:#EDF0FD;} - .d2-335886273 .background-color-AA5{background-color:#F7F8FE;} - .d2-335886273 .background-color-AB4{background-color:#EDF0FD;} - .d2-335886273 .background-color-AB5{background-color:#F7F8FE;} - .d2-335886273 .color-N1{color:#0A0F25;} - .d2-335886273 .color-N2{color:#676C7E;} - .d2-335886273 .color-N3{color:#9499AB;} - .d2-335886273 .color-N4{color:#CFD2DD;} - .d2-335886273 .color-N5{color:#DEE1EB;} - .d2-335886273 .color-N6{color:#EEF1F8;} - .d2-335886273 .color-N7{color:#FFFFFF;} - .d2-335886273 .color-B1{color:#0D32B2;} - .d2-335886273 .color-B2{color:#0D32B2;} - .d2-335886273 .color-B3{color:#E3E9FD;} - .d2-335886273 .color-B4{color:#E3E9FD;} - .d2-335886273 .color-B5{color:#EDF0FD;} - .d2-335886273 .color-B6{color:#F7F8FE;} - .d2-335886273 .color-AA2{color:#4A6FF3;} - .d2-335886273 .color-AA4{color:#EDF0FD;} - .d2-335886273 .color-AA5{color:#F7F8FE;} - .d2-335886273 .color-AB4{color:#EDF0FD;} - .d2-335886273 .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-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 - ->>>>>>> 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;} @@ -415,9 +96,8 @@ .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 + .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) 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 d1cdfbf45..b97843102 100644 --- a/e2etests/testdata/stable/sequence_diagram_simple/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_simple/elk/sketch.exp.svg @@ -1,26 +1,6 @@ -<<<<<<< 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 - -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-335886273 .fill-N1{fill:#0A0F25;} - .d2-335886273 .fill-N2{fill:#676C7E;} - .d2-335886273 .fill-N3{fill:#9499AB;} - .d2-335886273 .fill-N4{fill:#CFD2DD;} - .d2-335886273 .fill-N5{fill:#DEE1EB;} - .d2-335886273 .fill-N6{fill:#EEF1F8;} - .d2-335886273 .fill-N7{fill:#FFFFFF;} - .d2-335886273 .fill-B1{fill:#0D32B2;} - .d2-335886273 .fill-B2{fill:#0D32B2;} - .d2-335886273 .fill-B3{fill:#E3E9FD;} - .d2-335886273 .fill-B4{fill:#E3E9FD;} - .d2-335886273 .fill-B5{fill:#EDF0FD;} - .d2-335886273 .fill-B6{fill:#F7F8FE;} - .d2-335886273 .fill-AA2{fill:#4A6FF3;} - .d2-335886273 .fill-AA4{fill:#EDF0FD;} - .d2-335886273 .fill-AA5{fill:#F7F8FE;} - .d2-335886273 .fill-AB4{fill:#EDF0FD;} - .d2-335886273 .fill-AB5{fill:#F7F8FE;} - .d2-335886273 .stroke-N1{stroke:#0A0F25;} - .d2-335886273 .stroke-N2{stroke:#676C7E;} - .d2-335886273 .stroke-N3{stroke:#9499AB;} - .d2-335886273 .stroke-N4{stroke:#CFD2DD;} - .d2-335886273 .stroke-N5{stroke:#DEE1EB;} - .d2-335886273 .stroke-N6{stroke:#EEF1F8;} - .d2-335886273 .stroke-N7{stroke:#FFFFFF;} - .d2-335886273 .stroke-B1{stroke:#0D32B2;} - .d2-335886273 .stroke-B2{stroke:#0D32B2;} - .d2-335886273 .stroke-B3{stroke:#E3E9FD;} - .d2-335886273 .stroke-B4{stroke:#E3E9FD;} - .d2-335886273 .stroke-B5{stroke:#EDF0FD;} - .d2-335886273 .stroke-B6{stroke:#F7F8FE;} - .d2-335886273 .stroke-AA2{stroke:#4A6FF3;} - .d2-335886273 .stroke-AA4{stroke:#EDF0FD;} - .d2-335886273 .stroke-AA5{stroke:#F7F8FE;} - .d2-335886273 .stroke-AB4{stroke:#EDF0FD;} - .d2-335886273 .stroke-AB5{stroke:#F7F8FE;} - .d2-335886273 .background-color-N1{background-color:#0A0F25;} - .d2-335886273 .background-color-N2{background-color:#676C7E;} - .d2-335886273 .background-color-N3{background-color:#9499AB;} - .d2-335886273 .background-color-N4{background-color:#CFD2DD;} - .d2-335886273 .background-color-N5{background-color:#DEE1EB;} - .d2-335886273 .background-color-N6{background-color:#EEF1F8;} - .d2-335886273 .background-color-N7{background-color:#FFFFFF;} - .d2-335886273 .background-color-B1{background-color:#0D32B2;} - .d2-335886273 .background-color-B2{background-color:#0D32B2;} - .d2-335886273 .background-color-B3{background-color:#E3E9FD;} - .d2-335886273 .background-color-B4{background-color:#E3E9FD;} - .d2-335886273 .background-color-B5{background-color:#EDF0FD;} - .d2-335886273 .background-color-B6{background-color:#F7F8FE;} - .d2-335886273 .background-color-AA2{background-color:#4A6FF3;} - .d2-335886273 .background-color-AA4{background-color:#EDF0FD;} - .d2-335886273 .background-color-AA5{background-color:#F7F8FE;} - .d2-335886273 .background-color-AB4{background-color:#EDF0FD;} - .d2-335886273 .background-color-AB5{background-color:#F7F8FE;} - .d2-335886273 .color-N1{color:#0A0F25;} - .d2-335886273 .color-N2{color:#676C7E;} - .d2-335886273 .color-N3{color:#9499AB;} - .d2-335886273 .color-N4{color:#CFD2DD;} - .d2-335886273 .color-N5{color:#DEE1EB;} - .d2-335886273 .color-N6{color:#EEF1F8;} - .d2-335886273 .color-N7{color:#FFFFFF;} - .d2-335886273 .color-B1{color:#0D32B2;} - .d2-335886273 .color-B2{color:#0D32B2;} - .d2-335886273 .color-B3{color:#E3E9FD;} - .d2-335886273 .color-B4{color:#E3E9FD;} - .d2-335886273 .color-B5{color:#EDF0FD;} - .d2-335886273 .color-B6{color:#F7F8FE;} - .d2-335886273 .color-AA2{color:#4A6FF3;} - .d2-335886273 .color-AA4{color:#EDF0FD;} - .d2-335886273 .color-AA5{color:#F7F8FE;} - .d2-335886273 .color-AB4{color:#EDF0FD;} - .d2-335886273 .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-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 - ->>>>>>> 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;} @@ -415,9 +96,8 @@ .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 + .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) 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 2a94cfc5c..8bf4d0bb8 100644 --- a/e2etests/testdata/stable/sequence_diagram_span/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_span/dagre/sketch.exp.svg @@ -1,26 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -scoreritemResponseitemessayRubricconceptitemOutcome getItem() itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts) - -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-1754693087 .fill-N1{fill:#0A0F25;} - .d2-1754693087 .fill-N2{fill:#676C7E;} - .d2-1754693087 .fill-N3{fill:#9499AB;} - .d2-1754693087 .fill-N4{fill:#CFD2DD;} - .d2-1754693087 .fill-N5{fill:#DEE1EB;} - .d2-1754693087 .fill-N6{fill:#EEF1F8;} - .d2-1754693087 .fill-N7{fill:#FFFFFF;} - .d2-1754693087 .fill-B1{fill:#0D32B2;} - .d2-1754693087 .fill-B2{fill:#0D32B2;} - .d2-1754693087 .fill-B3{fill:#E3E9FD;} - .d2-1754693087 .fill-B4{fill:#E3E9FD;} - .d2-1754693087 .fill-B5{fill:#EDF0FD;} - .d2-1754693087 .fill-B6{fill:#F7F8FE;} - .d2-1754693087 .fill-AA2{fill:#4A6FF3;} - .d2-1754693087 .fill-AA4{fill:#EDF0FD;} - .d2-1754693087 .fill-AA5{fill:#F7F8FE;} - .d2-1754693087 .fill-AB4{fill:#EDF0FD;} - .d2-1754693087 .fill-AB5{fill:#F7F8FE;} - .d2-1754693087 .stroke-N1{stroke:#0A0F25;} - .d2-1754693087 .stroke-N2{stroke:#676C7E;} - .d2-1754693087 .stroke-N3{stroke:#9499AB;} - .d2-1754693087 .stroke-N4{stroke:#CFD2DD;} - .d2-1754693087 .stroke-N5{stroke:#DEE1EB;} - .d2-1754693087 .stroke-N6{stroke:#EEF1F8;} - .d2-1754693087 .stroke-N7{stroke:#FFFFFF;} - .d2-1754693087 .stroke-B1{stroke:#0D32B2;} - .d2-1754693087 .stroke-B2{stroke:#0D32B2;} - .d2-1754693087 .stroke-B3{stroke:#E3E9FD;} - .d2-1754693087 .stroke-B4{stroke:#E3E9FD;} - .d2-1754693087 .stroke-B5{stroke:#EDF0FD;} - .d2-1754693087 .stroke-B6{stroke:#F7F8FE;} - .d2-1754693087 .stroke-AA2{stroke:#4A6FF3;} - .d2-1754693087 .stroke-AA4{stroke:#EDF0FD;} - .d2-1754693087 .stroke-AA5{stroke:#F7F8FE;} - .d2-1754693087 .stroke-AB4{stroke:#EDF0FD;} - .d2-1754693087 .stroke-AB5{stroke:#F7F8FE;} - .d2-1754693087 .background-color-N1{background-color:#0A0F25;} - .d2-1754693087 .background-color-N2{background-color:#676C7E;} - .d2-1754693087 .background-color-N3{background-color:#9499AB;} - .d2-1754693087 .background-color-N4{background-color:#CFD2DD;} - .d2-1754693087 .background-color-N5{background-color:#DEE1EB;} - .d2-1754693087 .background-color-N6{background-color:#EEF1F8;} - .d2-1754693087 .background-color-N7{background-color:#FFFFFF;} - .d2-1754693087 .background-color-B1{background-color:#0D32B2;} - .d2-1754693087 .background-color-B2{background-color:#0D32B2;} - .d2-1754693087 .background-color-B3{background-color:#E3E9FD;} - .d2-1754693087 .background-color-B4{background-color:#E3E9FD;} - .d2-1754693087 .background-color-B5{background-color:#EDF0FD;} - .d2-1754693087 .background-color-B6{background-color:#F7F8FE;} - .d2-1754693087 .background-color-AA2{background-color:#4A6FF3;} - .d2-1754693087 .background-color-AA4{background-color:#EDF0FD;} - .d2-1754693087 .background-color-AA5{background-color:#F7F8FE;} - .d2-1754693087 .background-color-AB4{background-color:#EDF0FD;} - .d2-1754693087 .background-color-AB5{background-color:#F7F8FE;} - .d2-1754693087 .color-N1{color:#0A0F25;} - .d2-1754693087 .color-N2{color:#676C7E;} - .d2-1754693087 .color-N3{color:#9499AB;} - .d2-1754693087 .color-N4{color:#CFD2DD;} - .d2-1754693087 .color-N5{color:#DEE1EB;} - .d2-1754693087 .color-N6{color:#EEF1F8;} - .d2-1754693087 .color-N7{color:#FFFFFF;} - .d2-1754693087 .color-B1{color:#0D32B2;} - .d2-1754693087 .color-B2{color:#0D32B2;} - .d2-1754693087 .color-B3{color:#E3E9FD;} - .d2-1754693087 .color-B4{color:#E3E9FD;} - .d2-1754693087 .color-B5{color:#EDF0FD;} - .d2-1754693087 .color-B6{color:#F7F8FE;} - .d2-1754693087 .color-AA2{color:#4A6FF3;} - .d2-1754693087 .color-AA4{color:#EDF0FD;} - .d2-1754693087 .color-AA5{color:#F7F8FE;} - .d2-1754693087 .color-AB4{color:#EDF0FD;} - .d2-1754693087 .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-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) - ->>>>>>> 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;} @@ -415,9 +96,8 @@ .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) + .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) 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 2a94cfc5c..8bf4d0bb8 100644 --- a/e2etests/testdata/stable/sequence_diagram_span/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagram_span/elk/sketch.exp.svg @@ -1,26 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -scoreritemResponseitemessayRubricconceptitemOutcome getItem() itemgetRubric()rubricapplyTo(essayResp)match(essayResponse)scorenewgetNormalMinimum()getNormalMaximum()setScore(score)setFeedback(missingConcepts) - -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-1754693087 .fill-N1{fill:#0A0F25;} - .d2-1754693087 .fill-N2{fill:#676C7E;} - .d2-1754693087 .fill-N3{fill:#9499AB;} - .d2-1754693087 .fill-N4{fill:#CFD2DD;} - .d2-1754693087 .fill-N5{fill:#DEE1EB;} - .d2-1754693087 .fill-N6{fill:#EEF1F8;} - .d2-1754693087 .fill-N7{fill:#FFFFFF;} - .d2-1754693087 .fill-B1{fill:#0D32B2;} - .d2-1754693087 .fill-B2{fill:#0D32B2;} - .d2-1754693087 .fill-B3{fill:#E3E9FD;} - .d2-1754693087 .fill-B4{fill:#E3E9FD;} - .d2-1754693087 .fill-B5{fill:#EDF0FD;} - .d2-1754693087 .fill-B6{fill:#F7F8FE;} - .d2-1754693087 .fill-AA2{fill:#4A6FF3;} - .d2-1754693087 .fill-AA4{fill:#EDF0FD;} - .d2-1754693087 .fill-AA5{fill:#F7F8FE;} - .d2-1754693087 .fill-AB4{fill:#EDF0FD;} - .d2-1754693087 .fill-AB5{fill:#F7F8FE;} - .d2-1754693087 .stroke-N1{stroke:#0A0F25;} - .d2-1754693087 .stroke-N2{stroke:#676C7E;} - .d2-1754693087 .stroke-N3{stroke:#9499AB;} - .d2-1754693087 .stroke-N4{stroke:#CFD2DD;} - .d2-1754693087 .stroke-N5{stroke:#DEE1EB;} - .d2-1754693087 .stroke-N6{stroke:#EEF1F8;} - .d2-1754693087 .stroke-N7{stroke:#FFFFFF;} - .d2-1754693087 .stroke-B1{stroke:#0D32B2;} - .d2-1754693087 .stroke-B2{stroke:#0D32B2;} - .d2-1754693087 .stroke-B3{stroke:#E3E9FD;} - .d2-1754693087 .stroke-B4{stroke:#E3E9FD;} - .d2-1754693087 .stroke-B5{stroke:#EDF0FD;} - .d2-1754693087 .stroke-B6{stroke:#F7F8FE;} - .d2-1754693087 .stroke-AA2{stroke:#4A6FF3;} - .d2-1754693087 .stroke-AA4{stroke:#EDF0FD;} - .d2-1754693087 .stroke-AA5{stroke:#F7F8FE;} - .d2-1754693087 .stroke-AB4{stroke:#EDF0FD;} - .d2-1754693087 .stroke-AB5{stroke:#F7F8FE;} - .d2-1754693087 .background-color-N1{background-color:#0A0F25;} - .d2-1754693087 .background-color-N2{background-color:#676C7E;} - .d2-1754693087 .background-color-N3{background-color:#9499AB;} - .d2-1754693087 .background-color-N4{background-color:#CFD2DD;} - .d2-1754693087 .background-color-N5{background-color:#DEE1EB;} - .d2-1754693087 .background-color-N6{background-color:#EEF1F8;} - .d2-1754693087 .background-color-N7{background-color:#FFFFFF;} - .d2-1754693087 .background-color-B1{background-color:#0D32B2;} - .d2-1754693087 .background-color-B2{background-color:#0D32B2;} - .d2-1754693087 .background-color-B3{background-color:#E3E9FD;} - .d2-1754693087 .background-color-B4{background-color:#E3E9FD;} - .d2-1754693087 .background-color-B5{background-color:#EDF0FD;} - .d2-1754693087 .background-color-B6{background-color:#F7F8FE;} - .d2-1754693087 .background-color-AA2{background-color:#4A6FF3;} - .d2-1754693087 .background-color-AA4{background-color:#EDF0FD;} - .d2-1754693087 .background-color-AA5{background-color:#F7F8FE;} - .d2-1754693087 .background-color-AB4{background-color:#EDF0FD;} - .d2-1754693087 .background-color-AB5{background-color:#F7F8FE;} - .d2-1754693087 .color-N1{color:#0A0F25;} - .d2-1754693087 .color-N2{color:#676C7E;} - .d2-1754693087 .color-N3{color:#9499AB;} - .d2-1754693087 .color-N4{color:#CFD2DD;} - .d2-1754693087 .color-N5{color:#DEE1EB;} - .d2-1754693087 .color-N6{color:#EEF1F8;} - .d2-1754693087 .color-N7{color:#FFFFFF;} - .d2-1754693087 .color-B1{color:#0D32B2;} - .d2-1754693087 .color-B2{color:#0D32B2;} - .d2-1754693087 .color-B3{color:#E3E9FD;} - .d2-1754693087 .color-B4{color:#E3E9FD;} - .d2-1754693087 .color-B5{color:#EDF0FD;} - .d2-1754693087 .color-B6{color:#F7F8FE;} - .d2-1754693087 .color-AA2{color:#4A6FF3;} - .d2-1754693087 .color-AA4{color:#EDF0FD;} - .d2-1754693087 .color-AA5{color:#F7F8FE;} - .d2-1754693087 .color-AB4{color:#EDF0FD;} - .d2-1754693087 .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-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) - ->>>>>>> 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;} @@ -415,9 +96,8 @@ .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) + .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) diff --git a/e2etests/testdata/stable/sequence_diagrams/dagre/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagrams/dagre/sketch.exp.svg index e9f1ff5bd..a00774e5f 100644 --- a/e2etests/testdata/stable/sequence_diagrams/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagrams/dagre/sketch.exp.svg @@ -1,26 +1,6 @@ -<<<<<<< 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) - - - - - - -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-4238082430 .fill-N1{fill:#0A0F25;} - .d2-4238082430 .fill-N2{fill:#676C7E;} - .d2-4238082430 .fill-N3{fill:#9499AB;} - .d2-4238082430 .fill-N4{fill:#CFD2DD;} - .d2-4238082430 .fill-N5{fill:#DEE1EB;} - .d2-4238082430 .fill-N6{fill:#EEF1F8;} - .d2-4238082430 .fill-N7{fill:#FFFFFF;} - .d2-4238082430 .fill-B1{fill:#0D32B2;} - .d2-4238082430 .fill-B2{fill:#0D32B2;} - .d2-4238082430 .fill-B3{fill:#E3E9FD;} - .d2-4238082430 .fill-B4{fill:#E3E9FD;} - .d2-4238082430 .fill-B5{fill:#EDF0FD;} - .d2-4238082430 .fill-B6{fill:#F7F8FE;} - .d2-4238082430 .fill-AA2{fill:#4A6FF3;} - .d2-4238082430 .fill-AA4{fill:#EDF0FD;} - .d2-4238082430 .fill-AA5{fill:#F7F8FE;} - .d2-4238082430 .fill-AB4{fill:#EDF0FD;} - .d2-4238082430 .fill-AB5{fill:#F7F8FE;} - .d2-4238082430 .stroke-N1{stroke:#0A0F25;} - .d2-4238082430 .stroke-N2{stroke:#676C7E;} - .d2-4238082430 .stroke-N3{stroke:#9499AB;} - .d2-4238082430 .stroke-N4{stroke:#CFD2DD;} - .d2-4238082430 .stroke-N5{stroke:#DEE1EB;} - .d2-4238082430 .stroke-N6{stroke:#EEF1F8;} - .d2-4238082430 .stroke-N7{stroke:#FFFFFF;} - .d2-4238082430 .stroke-B1{stroke:#0D32B2;} - .d2-4238082430 .stroke-B2{stroke:#0D32B2;} - .d2-4238082430 .stroke-B3{stroke:#E3E9FD;} - .d2-4238082430 .stroke-B4{stroke:#E3E9FD;} - .d2-4238082430 .stroke-B5{stroke:#EDF0FD;} - .d2-4238082430 .stroke-B6{stroke:#F7F8FE;} - .d2-4238082430 .stroke-AA2{stroke:#4A6FF3;} - .d2-4238082430 .stroke-AA4{stroke:#EDF0FD;} - .d2-4238082430 .stroke-AA5{stroke:#F7F8FE;} - .d2-4238082430 .stroke-AB4{stroke:#EDF0FD;} - .d2-4238082430 .stroke-AB5{stroke:#F7F8FE;} - .d2-4238082430 .background-color-N1{background-color:#0A0F25;} - .d2-4238082430 .background-color-N2{background-color:#676C7E;} - .d2-4238082430 .background-color-N3{background-color:#9499AB;} - .d2-4238082430 .background-color-N4{background-color:#CFD2DD;} - .d2-4238082430 .background-color-N5{background-color:#DEE1EB;} - .d2-4238082430 .background-color-N6{background-color:#EEF1F8;} - .d2-4238082430 .background-color-N7{background-color:#FFFFFF;} - .d2-4238082430 .background-color-B1{background-color:#0D32B2;} - .d2-4238082430 .background-color-B2{background-color:#0D32B2;} - .d2-4238082430 .background-color-B3{background-color:#E3E9FD;} - .d2-4238082430 .background-color-B4{background-color:#E3E9FD;} - .d2-4238082430 .background-color-B5{background-color:#EDF0FD;} - .d2-4238082430 .background-color-B6{background-color:#F7F8FE;} - .d2-4238082430 .background-color-AA2{background-color:#4A6FF3;} - .d2-4238082430 .background-color-AA4{background-color:#EDF0FD;} - .d2-4238082430 .background-color-AA5{background-color:#F7F8FE;} - .d2-4238082430 .background-color-AB4{background-color:#EDF0FD;} - .d2-4238082430 .background-color-AB5{background-color:#F7F8FE;} - .d2-4238082430 .color-N1{color:#0A0F25;} - .d2-4238082430 .color-N2{color:#676C7E;} - .d2-4238082430 .color-N3{color:#9499AB;} - .d2-4238082430 .color-N4{color:#CFD2DD;} - .d2-4238082430 .color-N5{color:#DEE1EB;} - .d2-4238082430 .color-N6{color:#EEF1F8;} - .d2-4238082430 .color-N7{color:#FFFFFF;} - .d2-4238082430 .color-B1{color:#0D32B2;} - .d2-4238082430 .color-B2{color:#0D32B2;} - .d2-4238082430 .color-B3{color:#E3E9FD;} - .d2-4238082430 .color-B4{color:#E3E9FD;} - .d2-4238082430 .color-B5{color:#EDF0FD;} - .d2-4238082430 .color-B6{color:#F7F8FE;} - .d2-4238082430 .color-AA2{color:#4A6FF3;} - .d2-4238082430 .color-AA4{color:#EDF0FD;} - .d2-4238082430 .color-AA5{color:#F7F8FE;} - .d2-4238082430 .color-AB4{color:#EDF0FD;} - .d2-4238082430 .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) - - - - - - -======= - .d2-1906448019 .fill-N1{fill:#0A0F25;} - .d2-1906448019 .fill-N2{fill:#676C7E;} - .d2-1906448019 .fill-N3{fill:#9499AB;} - .d2-1906448019 .fill-N4{fill:#CFD2DD;} - .d2-1906448019 .fill-N5{fill:#DEE1EB;} - .d2-1906448019 .fill-N6{fill:#EEF1F8;} - .d2-1906448019 .fill-N7{fill:#FFFFFF;} - .d2-1906448019 .fill-B1{fill:#0D32B2;} - .d2-1906448019 .fill-B2{fill:#0D32B2;} - .d2-1906448019 .fill-B3{fill:#E3E9FD;} - .d2-1906448019 .fill-B4{fill:#E3E9FD;} - .d2-1906448019 .fill-B5{fill:#EDF0FD;} - .d2-1906448019 .fill-B6{fill:#F7F8FE;} - .d2-1906448019 .fill-AA2{fill:#4A6FF3;} - .d2-1906448019 .fill-AA4{fill:#EDF0FD;} - .d2-1906448019 .fill-AA5{fill:#F7F8FE;} - .d2-1906448019 .fill-AB4{fill:#EDF0FD;} - .d2-1906448019 .fill-AB5{fill:#F7F8FE;} - .d2-1906448019 .stroke-N1{stroke:#0A0F25;} - .d2-1906448019 .stroke-N2{stroke:#676C7E;} - .d2-1906448019 .stroke-N3{stroke:#9499AB;} - .d2-1906448019 .stroke-N4{stroke:#CFD2DD;} - .d2-1906448019 .stroke-N5{stroke:#DEE1EB;} - .d2-1906448019 .stroke-N6{stroke:#EEF1F8;} - .d2-1906448019 .stroke-N7{stroke:#FFFFFF;} - .d2-1906448019 .stroke-B1{stroke:#0D32B2;} - .d2-1906448019 .stroke-B2{stroke:#0D32B2;} - .d2-1906448019 .stroke-B3{stroke:#E3E9FD;} - .d2-1906448019 .stroke-B4{stroke:#E3E9FD;} - .d2-1906448019 .stroke-B5{stroke:#EDF0FD;} - .d2-1906448019 .stroke-B6{stroke:#F7F8FE;} - .d2-1906448019 .stroke-AA2{stroke:#4A6FF3;} - .d2-1906448019 .stroke-AA4{stroke:#EDF0FD;} - .d2-1906448019 .stroke-AA5{stroke:#F7F8FE;} - .d2-1906448019 .stroke-AB4{stroke:#EDF0FD;} - .d2-1906448019 .stroke-AB5{stroke:#F7F8FE;} - .d2-1906448019 .background-color-N1{background-color:#0A0F25;} - .d2-1906448019 .background-color-N2{background-color:#676C7E;} - .d2-1906448019 .background-color-N3{background-color:#9499AB;} - .d2-1906448019 .background-color-N4{background-color:#CFD2DD;} - .d2-1906448019 .background-color-N5{background-color:#DEE1EB;} - .d2-1906448019 .background-color-N6{background-color:#EEF1F8;} - .d2-1906448019 .background-color-N7{background-color:#FFFFFF;} - .d2-1906448019 .background-color-B1{background-color:#0D32B2;} - .d2-1906448019 .background-color-B2{background-color:#0D32B2;} - .d2-1906448019 .background-color-B3{background-color:#E3E9FD;} - .d2-1906448019 .background-color-B4{background-color:#E3E9FD;} - .d2-1906448019 .background-color-B5{background-color:#EDF0FD;} - .d2-1906448019 .background-color-B6{background-color:#F7F8FE;} - .d2-1906448019 .background-color-AA2{background-color:#4A6FF3;} - .d2-1906448019 .background-color-AA4{background-color:#EDF0FD;} - .d2-1906448019 .background-color-AA5{background-color:#F7F8FE;} - .d2-1906448019 .background-color-AB4{background-color:#EDF0FD;} - .d2-1906448019 .background-color-AB5{background-color:#F7F8FE;} - .d2-1906448019 .color-N1{color:#0A0F25;} - .d2-1906448019 .color-N2{color:#676C7E;} - .d2-1906448019 .color-N3{color:#9499AB;} - .d2-1906448019 .color-N4{color:#CFD2DD;} - .d2-1906448019 .color-N5{color:#DEE1EB;} - .d2-1906448019 .color-N6{color:#EEF1F8;} - .d2-1906448019 .color-N7{color:#FFFFFF;} - .d2-1906448019 .color-B1{color:#0D32B2;} - .d2-1906448019 .color-B2{color:#0D32B2;} - .d2-1906448019 .color-B3{color:#E3E9FD;} - .d2-1906448019 .color-B4{color:#E3E9FD;} - .d2-1906448019 .color-B5{color:#EDF0FD;} - .d2-1906448019 .color-B6{color:#F7F8FE;} - .d2-1906448019 .color-AA2{color:#4A6FF3;} - .d2-1906448019 .color-AA4{color:#EDF0FD;} - .d2-1906448019 .color-AA5{color:#F7F8FE;} - .d2-1906448019 .color-AB4{color:#EDF0FD;} - .d2-1906448019 .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) - - - - - - ->>>>>>> 33280fed5 (fixed e2e tests) -||||||| parent of cb2f2823c (Fix changes) - .d2-1906448019 .fill-N1{fill:#0A0F25;} - .d2-1906448019 .fill-N2{fill:#676C7E;} - .d2-1906448019 .fill-N3{fill:#9499AB;} - .d2-1906448019 .fill-N4{fill:#CFD2DD;} - .d2-1906448019 .fill-N5{fill:#DEE1EB;} - .d2-1906448019 .fill-N6{fill:#EEF1F8;} - .d2-1906448019 .fill-N7{fill:#FFFFFF;} - .d2-1906448019 .fill-B1{fill:#0D32B2;} - .d2-1906448019 .fill-B2{fill:#0D32B2;} - .d2-1906448019 .fill-B3{fill:#E3E9FD;} - .d2-1906448019 .fill-B4{fill:#E3E9FD;} - .d2-1906448019 .fill-B5{fill:#EDF0FD;} - .d2-1906448019 .fill-B6{fill:#F7F8FE;} - .d2-1906448019 .fill-AA2{fill:#4A6FF3;} - .d2-1906448019 .fill-AA4{fill:#EDF0FD;} - .d2-1906448019 .fill-AA5{fill:#F7F8FE;} - .d2-1906448019 .fill-AB4{fill:#EDF0FD;} - .d2-1906448019 .fill-AB5{fill:#F7F8FE;} - .d2-1906448019 .stroke-N1{stroke:#0A0F25;} - .d2-1906448019 .stroke-N2{stroke:#676C7E;} - .d2-1906448019 .stroke-N3{stroke:#9499AB;} - .d2-1906448019 .stroke-N4{stroke:#CFD2DD;} - .d2-1906448019 .stroke-N5{stroke:#DEE1EB;} - .d2-1906448019 .stroke-N6{stroke:#EEF1F8;} - .d2-1906448019 .stroke-N7{stroke:#FFFFFF;} - .d2-1906448019 .stroke-B1{stroke:#0D32B2;} - .d2-1906448019 .stroke-B2{stroke:#0D32B2;} - .d2-1906448019 .stroke-B3{stroke:#E3E9FD;} - .d2-1906448019 .stroke-B4{stroke:#E3E9FD;} - .d2-1906448019 .stroke-B5{stroke:#EDF0FD;} - .d2-1906448019 .stroke-B6{stroke:#F7F8FE;} - .d2-1906448019 .stroke-AA2{stroke:#4A6FF3;} - .d2-1906448019 .stroke-AA4{stroke:#EDF0FD;} - .d2-1906448019 .stroke-AA5{stroke:#F7F8FE;} - .d2-1906448019 .stroke-AB4{stroke:#EDF0FD;} - .d2-1906448019 .stroke-AB5{stroke:#F7F8FE;} - .d2-1906448019 .background-color-N1{background-color:#0A0F25;} - .d2-1906448019 .background-color-N2{background-color:#676C7E;} - .d2-1906448019 .background-color-N3{background-color:#9499AB;} - .d2-1906448019 .background-color-N4{background-color:#CFD2DD;} - .d2-1906448019 .background-color-N5{background-color:#DEE1EB;} - .d2-1906448019 .background-color-N6{background-color:#EEF1F8;} - .d2-1906448019 .background-color-N7{background-color:#FFFFFF;} - .d2-1906448019 .background-color-B1{background-color:#0D32B2;} - .d2-1906448019 .background-color-B2{background-color:#0D32B2;} - .d2-1906448019 .background-color-B3{background-color:#E3E9FD;} - .d2-1906448019 .background-color-B4{background-color:#E3E9FD;} - .d2-1906448019 .background-color-B5{background-color:#EDF0FD;} - .d2-1906448019 .background-color-B6{background-color:#F7F8FE;} - .d2-1906448019 .background-color-AA2{background-color:#4A6FF3;} - .d2-1906448019 .background-color-AA4{background-color:#EDF0FD;} - .d2-1906448019 .background-color-AA5{background-color:#F7F8FE;} - .d2-1906448019 .background-color-AB4{background-color:#EDF0FD;} - .d2-1906448019 .background-color-AB5{background-color:#F7F8FE;} - .d2-1906448019 .color-N1{color:#0A0F25;} - .d2-1906448019 .color-N2{color:#676C7E;} - .d2-1906448019 .color-N3{color:#9499AB;} - .d2-1906448019 .color-N4{color:#CFD2DD;} - .d2-1906448019 .color-N5{color:#DEE1EB;} - .d2-1906448019 .color-N6{color:#EEF1F8;} - .d2-1906448019 .color-N7{color:#FFFFFF;} - .d2-1906448019 .color-B1{color:#0D32B2;} - .d2-1906448019 .color-B2{color:#0D32B2;} - .d2-1906448019 .color-B3{color:#E3E9FD;} - .d2-1906448019 .color-B4{color:#E3E9FD;} - .d2-1906448019 .color-B5{color:#EDF0FD;} - .d2-1906448019 .color-B6{color:#F7F8FE;} - .d2-1906448019 .color-AA2{color:#4A6FF3;} - .d2-1906448019 .color-AA4{color:#EDF0FD;} - .d2-1906448019 .color-AA5{color:#F7F8FE;} - .d2-1906448019 .color-AB4{color:#EDF0FD;} - .d2-1906448019 .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) - - - - - - -======= .d2-1481716508 .fill-N1{fill:#0A0F25;} .d2-1481716508 .fill-N2{fill:#676C7E;} .d2-1481716508 .fill-N3{fill:#9499AB;} @@ -442,14 +103,13 @@ .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) + .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) diff --git a/e2etests/testdata/stable/sequence_diagrams/elk/sketch.exp.svg b/e2etests/testdata/stable/sequence_diagrams/elk/sketch.exp.svg index 6dd294db6..0509682c6 100644 --- a/e2etests/testdata/stable/sequence_diagrams/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sequence_diagrams/elk/sketch.exp.svg @@ -1,26 +1,6 @@ -<<<<<<< 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) - - - - - - -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-4113947436 .fill-N1{fill:#0A0F25;} - .d2-4113947436 .fill-N2{fill:#676C7E;} - .d2-4113947436 .fill-N3{fill:#9499AB;} - .d2-4113947436 .fill-N4{fill:#CFD2DD;} - .d2-4113947436 .fill-N5{fill:#DEE1EB;} - .d2-4113947436 .fill-N6{fill:#EEF1F8;} - .d2-4113947436 .fill-N7{fill:#FFFFFF;} - .d2-4113947436 .fill-B1{fill:#0D32B2;} - .d2-4113947436 .fill-B2{fill:#0D32B2;} - .d2-4113947436 .fill-B3{fill:#E3E9FD;} - .d2-4113947436 .fill-B4{fill:#E3E9FD;} - .d2-4113947436 .fill-B5{fill:#EDF0FD;} - .d2-4113947436 .fill-B6{fill:#F7F8FE;} - .d2-4113947436 .fill-AA2{fill:#4A6FF3;} - .d2-4113947436 .fill-AA4{fill:#EDF0FD;} - .d2-4113947436 .fill-AA5{fill:#F7F8FE;} - .d2-4113947436 .fill-AB4{fill:#EDF0FD;} - .d2-4113947436 .fill-AB5{fill:#F7F8FE;} - .d2-4113947436 .stroke-N1{stroke:#0A0F25;} - .d2-4113947436 .stroke-N2{stroke:#676C7E;} - .d2-4113947436 .stroke-N3{stroke:#9499AB;} - .d2-4113947436 .stroke-N4{stroke:#CFD2DD;} - .d2-4113947436 .stroke-N5{stroke:#DEE1EB;} - .d2-4113947436 .stroke-N6{stroke:#EEF1F8;} - .d2-4113947436 .stroke-N7{stroke:#FFFFFF;} - .d2-4113947436 .stroke-B1{stroke:#0D32B2;} - .d2-4113947436 .stroke-B2{stroke:#0D32B2;} - .d2-4113947436 .stroke-B3{stroke:#E3E9FD;} - .d2-4113947436 .stroke-B4{stroke:#E3E9FD;} - .d2-4113947436 .stroke-B5{stroke:#EDF0FD;} - .d2-4113947436 .stroke-B6{stroke:#F7F8FE;} - .d2-4113947436 .stroke-AA2{stroke:#4A6FF3;} - .d2-4113947436 .stroke-AA4{stroke:#EDF0FD;} - .d2-4113947436 .stroke-AA5{stroke:#F7F8FE;} - .d2-4113947436 .stroke-AB4{stroke:#EDF0FD;} - .d2-4113947436 .stroke-AB5{stroke:#F7F8FE;} - .d2-4113947436 .background-color-N1{background-color:#0A0F25;} - .d2-4113947436 .background-color-N2{background-color:#676C7E;} - .d2-4113947436 .background-color-N3{background-color:#9499AB;} - .d2-4113947436 .background-color-N4{background-color:#CFD2DD;} - .d2-4113947436 .background-color-N5{background-color:#DEE1EB;} - .d2-4113947436 .background-color-N6{background-color:#EEF1F8;} - .d2-4113947436 .background-color-N7{background-color:#FFFFFF;} - .d2-4113947436 .background-color-B1{background-color:#0D32B2;} - .d2-4113947436 .background-color-B2{background-color:#0D32B2;} - .d2-4113947436 .background-color-B3{background-color:#E3E9FD;} - .d2-4113947436 .background-color-B4{background-color:#E3E9FD;} - .d2-4113947436 .background-color-B5{background-color:#EDF0FD;} - .d2-4113947436 .background-color-B6{background-color:#F7F8FE;} - .d2-4113947436 .background-color-AA2{background-color:#4A6FF3;} - .d2-4113947436 .background-color-AA4{background-color:#EDF0FD;} - .d2-4113947436 .background-color-AA5{background-color:#F7F8FE;} - .d2-4113947436 .background-color-AB4{background-color:#EDF0FD;} - .d2-4113947436 .background-color-AB5{background-color:#F7F8FE;} - .d2-4113947436 .color-N1{color:#0A0F25;} - .d2-4113947436 .color-N2{color:#676C7E;} - .d2-4113947436 .color-N3{color:#9499AB;} - .d2-4113947436 .color-N4{color:#CFD2DD;} - .d2-4113947436 .color-N5{color:#DEE1EB;} - .d2-4113947436 .color-N6{color:#EEF1F8;} - .d2-4113947436 .color-N7{color:#FFFFFF;} - .d2-4113947436 .color-B1{color:#0D32B2;} - .d2-4113947436 .color-B2{color:#0D32B2;} - .d2-4113947436 .color-B3{color:#E3E9FD;} - .d2-4113947436 .color-B4{color:#E3E9FD;} - .d2-4113947436 .color-B5{color:#EDF0FD;} - .d2-4113947436 .color-B6{color:#F7F8FE;} - .d2-4113947436 .color-AA2{color:#4A6FF3;} - .d2-4113947436 .color-AA4{color:#EDF0FD;} - .d2-4113947436 .color-AA5{color:#F7F8FE;} - .d2-4113947436 .color-AB4{color:#EDF0FD;} - .d2-4113947436 .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) - - - - - - -======= - .d2-3492243630 .fill-N1{fill:#0A0F25;} - .d2-3492243630 .fill-N2{fill:#676C7E;} - .d2-3492243630 .fill-N3{fill:#9499AB;} - .d2-3492243630 .fill-N4{fill:#CFD2DD;} - .d2-3492243630 .fill-N5{fill:#DEE1EB;} - .d2-3492243630 .fill-N6{fill:#EEF1F8;} - .d2-3492243630 .fill-N7{fill:#FFFFFF;} - .d2-3492243630 .fill-B1{fill:#0D32B2;} - .d2-3492243630 .fill-B2{fill:#0D32B2;} - .d2-3492243630 .fill-B3{fill:#E3E9FD;} - .d2-3492243630 .fill-B4{fill:#E3E9FD;} - .d2-3492243630 .fill-B5{fill:#EDF0FD;} - .d2-3492243630 .fill-B6{fill:#F7F8FE;} - .d2-3492243630 .fill-AA2{fill:#4A6FF3;} - .d2-3492243630 .fill-AA4{fill:#EDF0FD;} - .d2-3492243630 .fill-AA5{fill:#F7F8FE;} - .d2-3492243630 .fill-AB4{fill:#EDF0FD;} - .d2-3492243630 .fill-AB5{fill:#F7F8FE;} - .d2-3492243630 .stroke-N1{stroke:#0A0F25;} - .d2-3492243630 .stroke-N2{stroke:#676C7E;} - .d2-3492243630 .stroke-N3{stroke:#9499AB;} - .d2-3492243630 .stroke-N4{stroke:#CFD2DD;} - .d2-3492243630 .stroke-N5{stroke:#DEE1EB;} - .d2-3492243630 .stroke-N6{stroke:#EEF1F8;} - .d2-3492243630 .stroke-N7{stroke:#FFFFFF;} - .d2-3492243630 .stroke-B1{stroke:#0D32B2;} - .d2-3492243630 .stroke-B2{stroke:#0D32B2;} - .d2-3492243630 .stroke-B3{stroke:#E3E9FD;} - .d2-3492243630 .stroke-B4{stroke:#E3E9FD;} - .d2-3492243630 .stroke-B5{stroke:#EDF0FD;} - .d2-3492243630 .stroke-B6{stroke:#F7F8FE;} - .d2-3492243630 .stroke-AA2{stroke:#4A6FF3;} - .d2-3492243630 .stroke-AA4{stroke:#EDF0FD;} - .d2-3492243630 .stroke-AA5{stroke:#F7F8FE;} - .d2-3492243630 .stroke-AB4{stroke:#EDF0FD;} - .d2-3492243630 .stroke-AB5{stroke:#F7F8FE;} - .d2-3492243630 .background-color-N1{background-color:#0A0F25;} - .d2-3492243630 .background-color-N2{background-color:#676C7E;} - .d2-3492243630 .background-color-N3{background-color:#9499AB;} - .d2-3492243630 .background-color-N4{background-color:#CFD2DD;} - .d2-3492243630 .background-color-N5{background-color:#DEE1EB;} - .d2-3492243630 .background-color-N6{background-color:#EEF1F8;} - .d2-3492243630 .background-color-N7{background-color:#FFFFFF;} - .d2-3492243630 .background-color-B1{background-color:#0D32B2;} - .d2-3492243630 .background-color-B2{background-color:#0D32B2;} - .d2-3492243630 .background-color-B3{background-color:#E3E9FD;} - .d2-3492243630 .background-color-B4{background-color:#E3E9FD;} - .d2-3492243630 .background-color-B5{background-color:#EDF0FD;} - .d2-3492243630 .background-color-B6{background-color:#F7F8FE;} - .d2-3492243630 .background-color-AA2{background-color:#4A6FF3;} - .d2-3492243630 .background-color-AA4{background-color:#EDF0FD;} - .d2-3492243630 .background-color-AA5{background-color:#F7F8FE;} - .d2-3492243630 .background-color-AB4{background-color:#EDF0FD;} - .d2-3492243630 .background-color-AB5{background-color:#F7F8FE;} - .d2-3492243630 .color-N1{color:#0A0F25;} - .d2-3492243630 .color-N2{color:#676C7E;} - .d2-3492243630 .color-N3{color:#9499AB;} - .d2-3492243630 .color-N4{color:#CFD2DD;} - .d2-3492243630 .color-N5{color:#DEE1EB;} - .d2-3492243630 .color-N6{color:#EEF1F8;} - .d2-3492243630 .color-N7{color:#FFFFFF;} - .d2-3492243630 .color-B1{color:#0D32B2;} - .d2-3492243630 .color-B2{color:#0D32B2;} - .d2-3492243630 .color-B3{color:#E3E9FD;} - .d2-3492243630 .color-B4{color:#E3E9FD;} - .d2-3492243630 .color-B5{color:#EDF0FD;} - .d2-3492243630 .color-B6{color:#F7F8FE;} - .d2-3492243630 .color-AA2{color:#4A6FF3;} - .d2-3492243630 .color-AA4{color:#EDF0FD;} - .d2-3492243630 .color-AA5{color:#F7F8FE;} - .d2-3492243630 .color-AB4{color:#EDF0FD;} - .d2-3492243630 .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) - - - - - - ->>>>>>> 33280fed5 (fixed e2e tests) -||||||| parent of cb2f2823c (Fix changes) - .d2-3492243630 .fill-N1{fill:#0A0F25;} - .d2-3492243630 .fill-N2{fill:#676C7E;} - .d2-3492243630 .fill-N3{fill:#9499AB;} - .d2-3492243630 .fill-N4{fill:#CFD2DD;} - .d2-3492243630 .fill-N5{fill:#DEE1EB;} - .d2-3492243630 .fill-N6{fill:#EEF1F8;} - .d2-3492243630 .fill-N7{fill:#FFFFFF;} - .d2-3492243630 .fill-B1{fill:#0D32B2;} - .d2-3492243630 .fill-B2{fill:#0D32B2;} - .d2-3492243630 .fill-B3{fill:#E3E9FD;} - .d2-3492243630 .fill-B4{fill:#E3E9FD;} - .d2-3492243630 .fill-B5{fill:#EDF0FD;} - .d2-3492243630 .fill-B6{fill:#F7F8FE;} - .d2-3492243630 .fill-AA2{fill:#4A6FF3;} - .d2-3492243630 .fill-AA4{fill:#EDF0FD;} - .d2-3492243630 .fill-AA5{fill:#F7F8FE;} - .d2-3492243630 .fill-AB4{fill:#EDF0FD;} - .d2-3492243630 .fill-AB5{fill:#F7F8FE;} - .d2-3492243630 .stroke-N1{stroke:#0A0F25;} - .d2-3492243630 .stroke-N2{stroke:#676C7E;} - .d2-3492243630 .stroke-N3{stroke:#9499AB;} - .d2-3492243630 .stroke-N4{stroke:#CFD2DD;} - .d2-3492243630 .stroke-N5{stroke:#DEE1EB;} - .d2-3492243630 .stroke-N6{stroke:#EEF1F8;} - .d2-3492243630 .stroke-N7{stroke:#FFFFFF;} - .d2-3492243630 .stroke-B1{stroke:#0D32B2;} - .d2-3492243630 .stroke-B2{stroke:#0D32B2;} - .d2-3492243630 .stroke-B3{stroke:#E3E9FD;} - .d2-3492243630 .stroke-B4{stroke:#E3E9FD;} - .d2-3492243630 .stroke-B5{stroke:#EDF0FD;} - .d2-3492243630 .stroke-B6{stroke:#F7F8FE;} - .d2-3492243630 .stroke-AA2{stroke:#4A6FF3;} - .d2-3492243630 .stroke-AA4{stroke:#EDF0FD;} - .d2-3492243630 .stroke-AA5{stroke:#F7F8FE;} - .d2-3492243630 .stroke-AB4{stroke:#EDF0FD;} - .d2-3492243630 .stroke-AB5{stroke:#F7F8FE;} - .d2-3492243630 .background-color-N1{background-color:#0A0F25;} - .d2-3492243630 .background-color-N2{background-color:#676C7E;} - .d2-3492243630 .background-color-N3{background-color:#9499AB;} - .d2-3492243630 .background-color-N4{background-color:#CFD2DD;} - .d2-3492243630 .background-color-N5{background-color:#DEE1EB;} - .d2-3492243630 .background-color-N6{background-color:#EEF1F8;} - .d2-3492243630 .background-color-N7{background-color:#FFFFFF;} - .d2-3492243630 .background-color-B1{background-color:#0D32B2;} - .d2-3492243630 .background-color-B2{background-color:#0D32B2;} - .d2-3492243630 .background-color-B3{background-color:#E3E9FD;} - .d2-3492243630 .background-color-B4{background-color:#E3E9FD;} - .d2-3492243630 .background-color-B5{background-color:#EDF0FD;} - .d2-3492243630 .background-color-B6{background-color:#F7F8FE;} - .d2-3492243630 .background-color-AA2{background-color:#4A6FF3;} - .d2-3492243630 .background-color-AA4{background-color:#EDF0FD;} - .d2-3492243630 .background-color-AA5{background-color:#F7F8FE;} - .d2-3492243630 .background-color-AB4{background-color:#EDF0FD;} - .d2-3492243630 .background-color-AB5{background-color:#F7F8FE;} - .d2-3492243630 .color-N1{color:#0A0F25;} - .d2-3492243630 .color-N2{color:#676C7E;} - .d2-3492243630 .color-N3{color:#9499AB;} - .d2-3492243630 .color-N4{color:#CFD2DD;} - .d2-3492243630 .color-N5{color:#DEE1EB;} - .d2-3492243630 .color-N6{color:#EEF1F8;} - .d2-3492243630 .color-N7{color:#FFFFFF;} - .d2-3492243630 .color-B1{color:#0D32B2;} - .d2-3492243630 .color-B2{color:#0D32B2;} - .d2-3492243630 .color-B3{color:#E3E9FD;} - .d2-3492243630 .color-B4{color:#E3E9FD;} - .d2-3492243630 .color-B5{color:#EDF0FD;} - .d2-3492243630 .color-B6{color:#F7F8FE;} - .d2-3492243630 .color-AA2{color:#4A6FF3;} - .d2-3492243630 .color-AA4{color:#EDF0FD;} - .d2-3492243630 .color-AA5{color:#F7F8FE;} - .d2-3492243630 .color-AB4{color:#EDF0FD;} - .d2-3492243630 .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) - - - - - - -======= .d2-4197222062 .fill-N1{fill:#0A0F25;} .d2-4197222062 .fill-N2{fill:#676C7E;} .d2-4197222062 .fill-N3{fill:#9499AB;} @@ -442,14 +103,13 @@ .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) + .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) 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 bf79042d8..bd8833bfe 100644 --- a/e2etests/testdata/stable/simple_grid_edges/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/simple_grid_edges/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -npm i -g@forge/cliSet up anAtlassian siteView the helloworld appforgetunnelforgeloginforgecreateforgedeployforgeinstallHot reloadchanges?Step 1Step 2Step 3Step 4forgedeploy⬤ Forge CLI⬤ Required⬤ Optional YesNo -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-29674933 .fill-N1{fill:#0A0F25;} - .d2-29674933 .fill-N2{fill:#676C7E;} - .d2-29674933 .fill-N3{fill:#9499AB;} - .d2-29674933 .fill-N4{fill:#CFD2DD;} - .d2-29674933 .fill-N5{fill:#DEE1EB;} - .d2-29674933 .fill-N6{fill:#EEF1F8;} - .d2-29674933 .fill-N7{fill:#FFFFFF;} - .d2-29674933 .fill-B1{fill:#0D32B2;} - .d2-29674933 .fill-B2{fill:#0D32B2;} - .d2-29674933 .fill-B3{fill:#E3E9FD;} - .d2-29674933 .fill-B4{fill:#E3E9FD;} - .d2-29674933 .fill-B5{fill:#EDF0FD;} - .d2-29674933 .fill-B6{fill:#F7F8FE;} - .d2-29674933 .fill-AA2{fill:#4A6FF3;} - .d2-29674933 .fill-AA4{fill:#EDF0FD;} - .d2-29674933 .fill-AA5{fill:#F7F8FE;} - .d2-29674933 .fill-AB4{fill:#EDF0FD;} - .d2-29674933 .fill-AB5{fill:#F7F8FE;} - .d2-29674933 .stroke-N1{stroke:#0A0F25;} - .d2-29674933 .stroke-N2{stroke:#676C7E;} - .d2-29674933 .stroke-N3{stroke:#9499AB;} - .d2-29674933 .stroke-N4{stroke:#CFD2DD;} - .d2-29674933 .stroke-N5{stroke:#DEE1EB;} - .d2-29674933 .stroke-N6{stroke:#EEF1F8;} - .d2-29674933 .stroke-N7{stroke:#FFFFFF;} - .d2-29674933 .stroke-B1{stroke:#0D32B2;} - .d2-29674933 .stroke-B2{stroke:#0D32B2;} - .d2-29674933 .stroke-B3{stroke:#E3E9FD;} - .d2-29674933 .stroke-B4{stroke:#E3E9FD;} - .d2-29674933 .stroke-B5{stroke:#EDF0FD;} - .d2-29674933 .stroke-B6{stroke:#F7F8FE;} - .d2-29674933 .stroke-AA2{stroke:#4A6FF3;} - .d2-29674933 .stroke-AA4{stroke:#EDF0FD;} - .d2-29674933 .stroke-AA5{stroke:#F7F8FE;} - .d2-29674933 .stroke-AB4{stroke:#EDF0FD;} - .d2-29674933 .stroke-AB5{stroke:#F7F8FE;} - .d2-29674933 .background-color-N1{background-color:#0A0F25;} - .d2-29674933 .background-color-N2{background-color:#676C7E;} - .d2-29674933 .background-color-N3{background-color:#9499AB;} - .d2-29674933 .background-color-N4{background-color:#CFD2DD;} - .d2-29674933 .background-color-N5{background-color:#DEE1EB;} - .d2-29674933 .background-color-N6{background-color:#EEF1F8;} - .d2-29674933 .background-color-N7{background-color:#FFFFFF;} - .d2-29674933 .background-color-B1{background-color:#0D32B2;} - .d2-29674933 .background-color-B2{background-color:#0D32B2;} - .d2-29674933 .background-color-B3{background-color:#E3E9FD;} - .d2-29674933 .background-color-B4{background-color:#E3E9FD;} - .d2-29674933 .background-color-B5{background-color:#EDF0FD;} - .d2-29674933 .background-color-B6{background-color:#F7F8FE;} - .d2-29674933 .background-color-AA2{background-color:#4A6FF3;} - .d2-29674933 .background-color-AA4{background-color:#EDF0FD;} - .d2-29674933 .background-color-AA5{background-color:#F7F8FE;} - .d2-29674933 .background-color-AB4{background-color:#EDF0FD;} - .d2-29674933 .background-color-AB5{background-color:#F7F8FE;} - .d2-29674933 .color-N1{color:#0A0F25;} - .d2-29674933 .color-N2{color:#676C7E;} - .d2-29674933 .color-N3{color:#9499AB;} - .d2-29674933 .color-N4{color:#CFD2DD;} - .d2-29674933 .color-N5{color:#DEE1EB;} - .d2-29674933 .color-N6{color:#EEF1F8;} - .d2-29674933 .color-N7{color:#FFFFFF;} - .d2-29674933 .color-B1{color:#0D32B2;} - .d2-29674933 .color-B2{color:#0D32B2;} - .d2-29674933 .color-B3{color:#E3E9FD;} - .d2-29674933 .color-B4{color:#E3E9FD;} - .d2-29674933 .color-B5{color:#EDF0FD;} - .d2-29674933 .color-B6{color:#F7F8FE;} - .d2-29674933 .color-AA2{color:#4A6FF3;} - .d2-29674933 .color-AA4{color:#EDF0FD;} - .d2-29674933 .color-AA5{color:#F7F8FE;} - .d2-29674933 .color-AB4{color:#EDF0FD;} - .d2-29674933 .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}]]>npm i -g@forge/cliSet up anAtlassian siteView the helloworld appforgetunnelforgeloginforgecreateforgedeployforgeinstallHot reloadchanges?Step 1Step 2Step 3Step 4forgedeploy⬤ Forge CLI⬤ Required⬤ Optional YesNo -======= .d2-2134875159 .fill-N1{fill:#0A0F25;} .d2-2134875159 .fill-N2{fill:#676C7E;} .d2-2134875159 .fill-N3{fill:#9499AB;} @@ -266,8 +103,7 @@ .d2-2134875159 .color-AA4{color:#EDF0FD;} .d2-2134875159 .color-AA5{color:#F7F8FE;} .d2-2134875159 .color-AB4{color:#EDF0FD;} - .d2-2134875159 .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}]]>npm i -g@forge/cliSet up anAtlassian siteView the helloworld appforgetunnelforgeloginforgecreateforgedeployforgeinstallHot reloadchanges?Step 1Step 2Step 3Step 4forgedeploy⬤ Forge CLI⬤ Required⬤ Optional YesNo ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-2134875159 .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}]]>npm i -g@forge/cliSet up anAtlassian siteView the helloworld appforgetunnelforgeloginforgecreateforgedeployforgeinstallHot reloadchanges?Step 1Step 2Step 3Step 4forgedeploy⬤ Forge CLI⬤ Required⬤ Optional YesNo diff --git a/e2etests/testdata/stable/simple_grid_edges/elk/sketch.exp.svg b/e2etests/testdata/stable/simple_grid_edges/elk/sketch.exp.svg index bf79042d8..bd8833bfe 100644 --- a/e2etests/testdata/stable/simple_grid_edges/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/simple_grid_edges/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -npm i -g@forge/cliSet up anAtlassian siteView the helloworld appforgetunnelforgeloginforgecreateforgedeployforgeinstallHot reloadchanges?Step 1Step 2Step 3Step 4forgedeploy⬤ Forge CLI⬤ Required⬤ Optional YesNo -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-29674933 .fill-N1{fill:#0A0F25;} - .d2-29674933 .fill-N2{fill:#676C7E;} - .d2-29674933 .fill-N3{fill:#9499AB;} - .d2-29674933 .fill-N4{fill:#CFD2DD;} - .d2-29674933 .fill-N5{fill:#DEE1EB;} - .d2-29674933 .fill-N6{fill:#EEF1F8;} - .d2-29674933 .fill-N7{fill:#FFFFFF;} - .d2-29674933 .fill-B1{fill:#0D32B2;} - .d2-29674933 .fill-B2{fill:#0D32B2;} - .d2-29674933 .fill-B3{fill:#E3E9FD;} - .d2-29674933 .fill-B4{fill:#E3E9FD;} - .d2-29674933 .fill-B5{fill:#EDF0FD;} - .d2-29674933 .fill-B6{fill:#F7F8FE;} - .d2-29674933 .fill-AA2{fill:#4A6FF3;} - .d2-29674933 .fill-AA4{fill:#EDF0FD;} - .d2-29674933 .fill-AA5{fill:#F7F8FE;} - .d2-29674933 .fill-AB4{fill:#EDF0FD;} - .d2-29674933 .fill-AB5{fill:#F7F8FE;} - .d2-29674933 .stroke-N1{stroke:#0A0F25;} - .d2-29674933 .stroke-N2{stroke:#676C7E;} - .d2-29674933 .stroke-N3{stroke:#9499AB;} - .d2-29674933 .stroke-N4{stroke:#CFD2DD;} - .d2-29674933 .stroke-N5{stroke:#DEE1EB;} - .d2-29674933 .stroke-N6{stroke:#EEF1F8;} - .d2-29674933 .stroke-N7{stroke:#FFFFFF;} - .d2-29674933 .stroke-B1{stroke:#0D32B2;} - .d2-29674933 .stroke-B2{stroke:#0D32B2;} - .d2-29674933 .stroke-B3{stroke:#E3E9FD;} - .d2-29674933 .stroke-B4{stroke:#E3E9FD;} - .d2-29674933 .stroke-B5{stroke:#EDF0FD;} - .d2-29674933 .stroke-B6{stroke:#F7F8FE;} - .d2-29674933 .stroke-AA2{stroke:#4A6FF3;} - .d2-29674933 .stroke-AA4{stroke:#EDF0FD;} - .d2-29674933 .stroke-AA5{stroke:#F7F8FE;} - .d2-29674933 .stroke-AB4{stroke:#EDF0FD;} - .d2-29674933 .stroke-AB5{stroke:#F7F8FE;} - .d2-29674933 .background-color-N1{background-color:#0A0F25;} - .d2-29674933 .background-color-N2{background-color:#676C7E;} - .d2-29674933 .background-color-N3{background-color:#9499AB;} - .d2-29674933 .background-color-N4{background-color:#CFD2DD;} - .d2-29674933 .background-color-N5{background-color:#DEE1EB;} - .d2-29674933 .background-color-N6{background-color:#EEF1F8;} - .d2-29674933 .background-color-N7{background-color:#FFFFFF;} - .d2-29674933 .background-color-B1{background-color:#0D32B2;} - .d2-29674933 .background-color-B2{background-color:#0D32B2;} - .d2-29674933 .background-color-B3{background-color:#E3E9FD;} - .d2-29674933 .background-color-B4{background-color:#E3E9FD;} - .d2-29674933 .background-color-B5{background-color:#EDF0FD;} - .d2-29674933 .background-color-B6{background-color:#F7F8FE;} - .d2-29674933 .background-color-AA2{background-color:#4A6FF3;} - .d2-29674933 .background-color-AA4{background-color:#EDF0FD;} - .d2-29674933 .background-color-AA5{background-color:#F7F8FE;} - .d2-29674933 .background-color-AB4{background-color:#EDF0FD;} - .d2-29674933 .background-color-AB5{background-color:#F7F8FE;} - .d2-29674933 .color-N1{color:#0A0F25;} - .d2-29674933 .color-N2{color:#676C7E;} - .d2-29674933 .color-N3{color:#9499AB;} - .d2-29674933 .color-N4{color:#CFD2DD;} - .d2-29674933 .color-N5{color:#DEE1EB;} - .d2-29674933 .color-N6{color:#EEF1F8;} - .d2-29674933 .color-N7{color:#FFFFFF;} - .d2-29674933 .color-B1{color:#0D32B2;} - .d2-29674933 .color-B2{color:#0D32B2;} - .d2-29674933 .color-B3{color:#E3E9FD;} - .d2-29674933 .color-B4{color:#E3E9FD;} - .d2-29674933 .color-B5{color:#EDF0FD;} - .d2-29674933 .color-B6{color:#F7F8FE;} - .d2-29674933 .color-AA2{color:#4A6FF3;} - .d2-29674933 .color-AA4{color:#EDF0FD;} - .d2-29674933 .color-AA5{color:#F7F8FE;} - .d2-29674933 .color-AB4{color:#EDF0FD;} - .d2-29674933 .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}]]>npm i -g@forge/cliSet up anAtlassian siteView the helloworld appforgetunnelforgeloginforgecreateforgedeployforgeinstallHot reloadchanges?Step 1Step 2Step 3Step 4forgedeploy⬤ Forge CLI⬤ Required⬤ Optional YesNo -======= .d2-2134875159 .fill-N1{fill:#0A0F25;} .d2-2134875159 .fill-N2{fill:#676C7E;} .d2-2134875159 .fill-N3{fill:#9499AB;} @@ -266,8 +103,7 @@ .d2-2134875159 .color-AA4{color:#EDF0FD;} .d2-2134875159 .color-AA5{color:#F7F8FE;} .d2-2134875159 .color-AB4{color:#EDF0FD;} - .d2-2134875159 .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}]]>npm i -g@forge/cliSet up anAtlassian siteView the helloworld appforgetunnelforgeloginforgecreateforgedeployforgeinstallHot reloadchanges?Step 1Step 2Step 3Step 4forgedeploy⬤ Forge CLI⬤ Required⬤ Optional YesNo ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-2134875159 .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}]]>npm i -g@forge/cliSet up anAtlassian siteView the helloworld appforgetunnelforgeloginforgecreateforgedeployforgeinstallHot reloadchanges?Step 1Step 2Step 3Step 4forgedeploy⬤ Forge CLI⬤ Required⬤ Optional YesNo diff --git a/e2etests/testdata/stable/sql_table_row_connections/dagre/sketch.exp.svg b/e2etests/testdata/stable/sql_table_row_connections/dagre/sketch.exp.svg index 42cdab8a0..807e7e3df 100644 --- a/e2etests/testdata/stable/sql_table_row_connections/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sql_table_row_connections/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -aidintPKbidintPKa_1intFKa_2intFK -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-87880443 .fill-N1{fill:#0A0F25;} - .d2-87880443 .fill-N2{fill:#676C7E;} - .d2-87880443 .fill-N3{fill:#9499AB;} - .d2-87880443 .fill-N4{fill:#CFD2DD;} - .d2-87880443 .fill-N5{fill:#DEE1EB;} - .d2-87880443 .fill-N6{fill:#EEF1F8;} - .d2-87880443 .fill-N7{fill:#FFFFFF;} - .d2-87880443 .fill-B1{fill:#0D32B2;} - .d2-87880443 .fill-B2{fill:#0D32B2;} - .d2-87880443 .fill-B3{fill:#E3E9FD;} - .d2-87880443 .fill-B4{fill:#E3E9FD;} - .d2-87880443 .fill-B5{fill:#EDF0FD;} - .d2-87880443 .fill-B6{fill:#F7F8FE;} - .d2-87880443 .fill-AA2{fill:#4A6FF3;} - .d2-87880443 .fill-AA4{fill:#EDF0FD;} - .d2-87880443 .fill-AA5{fill:#F7F8FE;} - .d2-87880443 .fill-AB4{fill:#EDF0FD;} - .d2-87880443 .fill-AB5{fill:#F7F8FE;} - .d2-87880443 .stroke-N1{stroke:#0A0F25;} - .d2-87880443 .stroke-N2{stroke:#676C7E;} - .d2-87880443 .stroke-N3{stroke:#9499AB;} - .d2-87880443 .stroke-N4{stroke:#CFD2DD;} - .d2-87880443 .stroke-N5{stroke:#DEE1EB;} - .d2-87880443 .stroke-N6{stroke:#EEF1F8;} - .d2-87880443 .stroke-N7{stroke:#FFFFFF;} - .d2-87880443 .stroke-B1{stroke:#0D32B2;} - .d2-87880443 .stroke-B2{stroke:#0D32B2;} - .d2-87880443 .stroke-B3{stroke:#E3E9FD;} - .d2-87880443 .stroke-B4{stroke:#E3E9FD;} - .d2-87880443 .stroke-B5{stroke:#EDF0FD;} - .d2-87880443 .stroke-B6{stroke:#F7F8FE;} - .d2-87880443 .stroke-AA2{stroke:#4A6FF3;} - .d2-87880443 .stroke-AA4{stroke:#EDF0FD;} - .d2-87880443 .stroke-AA5{stroke:#F7F8FE;} - .d2-87880443 .stroke-AB4{stroke:#EDF0FD;} - .d2-87880443 .stroke-AB5{stroke:#F7F8FE;} - .d2-87880443 .background-color-N1{background-color:#0A0F25;} - .d2-87880443 .background-color-N2{background-color:#676C7E;} - .d2-87880443 .background-color-N3{background-color:#9499AB;} - .d2-87880443 .background-color-N4{background-color:#CFD2DD;} - .d2-87880443 .background-color-N5{background-color:#DEE1EB;} - .d2-87880443 .background-color-N6{background-color:#EEF1F8;} - .d2-87880443 .background-color-N7{background-color:#FFFFFF;} - .d2-87880443 .background-color-B1{background-color:#0D32B2;} - .d2-87880443 .background-color-B2{background-color:#0D32B2;} - .d2-87880443 .background-color-B3{background-color:#E3E9FD;} - .d2-87880443 .background-color-B4{background-color:#E3E9FD;} - .d2-87880443 .background-color-B5{background-color:#EDF0FD;} - .d2-87880443 .background-color-B6{background-color:#F7F8FE;} - .d2-87880443 .background-color-AA2{background-color:#4A6FF3;} - .d2-87880443 .background-color-AA4{background-color:#EDF0FD;} - .d2-87880443 .background-color-AA5{background-color:#F7F8FE;} - .d2-87880443 .background-color-AB4{background-color:#EDF0FD;} - .d2-87880443 .background-color-AB5{background-color:#F7F8FE;} - .d2-87880443 .color-N1{color:#0A0F25;} - .d2-87880443 .color-N2{color:#676C7E;} - .d2-87880443 .color-N3{color:#9499AB;} - .d2-87880443 .color-N4{color:#CFD2DD;} - .d2-87880443 .color-N5{color:#DEE1EB;} - .d2-87880443 .color-N6{color:#EEF1F8;} - .d2-87880443 .color-N7{color:#FFFFFF;} - .d2-87880443 .color-B1{color:#0D32B2;} - .d2-87880443 .color-B2{color:#0D32B2;} - .d2-87880443 .color-B3{color:#E3E9FD;} - .d2-87880443 .color-B4{color:#E3E9FD;} - .d2-87880443 .color-B5{color:#EDF0FD;} - .d2-87880443 .color-B6{color:#F7F8FE;} - .d2-87880443 .color-AA2{color:#4A6FF3;} - .d2-87880443 .color-AA4{color:#EDF0FD;} - .d2-87880443 .color-AA5{color:#F7F8FE;} - .d2-87880443 .color-AB4{color:#EDF0FD;} - .d2-87880443 .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}]]>aidintPKbidintPKa_1intFKa_2intFK -======= .d2-3621457819 .fill-N1{fill:#0A0F25;} .d2-3621457819 .fill-N2{fill:#676C7E;} .d2-3621457819 .fill-N3{fill:#9499AB;} @@ -252,8 +89,7 @@ .d2-3621457819 .color-AA4{color:#EDF0FD;} .d2-3621457819 .color-AA5{color:#F7F8FE;} .d2-3621457819 .color-AB4{color:#EDF0FD;} - .d2-3621457819 .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}]]>aidintPKbidintPKa_1intFKa_2intFK ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-3621457819 .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}]]>aidintPKbidintPKa_1intFKa_2intFK \ No newline at end of file diff --git a/e2etests/testdata/stable/sql_table_row_connections/elk/sketch.exp.svg b/e2etests/testdata/stable/sql_table_row_connections/elk/sketch.exp.svg index 6a7305c88..93a8a9f56 100644 --- a/e2etests/testdata/stable/sql_table_row_connections/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sql_table_row_connections/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -aidintPKbidintPKa_1intFKa_2intFK -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-1777601262 .fill-N1{fill:#0A0F25;} - .d2-1777601262 .fill-N2{fill:#676C7E;} - .d2-1777601262 .fill-N3{fill:#9499AB;} - .d2-1777601262 .fill-N4{fill:#CFD2DD;} - .d2-1777601262 .fill-N5{fill:#DEE1EB;} - .d2-1777601262 .fill-N6{fill:#EEF1F8;} - .d2-1777601262 .fill-N7{fill:#FFFFFF;} - .d2-1777601262 .fill-B1{fill:#0D32B2;} - .d2-1777601262 .fill-B2{fill:#0D32B2;} - .d2-1777601262 .fill-B3{fill:#E3E9FD;} - .d2-1777601262 .fill-B4{fill:#E3E9FD;} - .d2-1777601262 .fill-B5{fill:#EDF0FD;} - .d2-1777601262 .fill-B6{fill:#F7F8FE;} - .d2-1777601262 .fill-AA2{fill:#4A6FF3;} - .d2-1777601262 .fill-AA4{fill:#EDF0FD;} - .d2-1777601262 .fill-AA5{fill:#F7F8FE;} - .d2-1777601262 .fill-AB4{fill:#EDF0FD;} - .d2-1777601262 .fill-AB5{fill:#F7F8FE;} - .d2-1777601262 .stroke-N1{stroke:#0A0F25;} - .d2-1777601262 .stroke-N2{stroke:#676C7E;} - .d2-1777601262 .stroke-N3{stroke:#9499AB;} - .d2-1777601262 .stroke-N4{stroke:#CFD2DD;} - .d2-1777601262 .stroke-N5{stroke:#DEE1EB;} - .d2-1777601262 .stroke-N6{stroke:#EEF1F8;} - .d2-1777601262 .stroke-N7{stroke:#FFFFFF;} - .d2-1777601262 .stroke-B1{stroke:#0D32B2;} - .d2-1777601262 .stroke-B2{stroke:#0D32B2;} - .d2-1777601262 .stroke-B3{stroke:#E3E9FD;} - .d2-1777601262 .stroke-B4{stroke:#E3E9FD;} - .d2-1777601262 .stroke-B5{stroke:#EDF0FD;} - .d2-1777601262 .stroke-B6{stroke:#F7F8FE;} - .d2-1777601262 .stroke-AA2{stroke:#4A6FF3;} - .d2-1777601262 .stroke-AA4{stroke:#EDF0FD;} - .d2-1777601262 .stroke-AA5{stroke:#F7F8FE;} - .d2-1777601262 .stroke-AB4{stroke:#EDF0FD;} - .d2-1777601262 .stroke-AB5{stroke:#F7F8FE;} - .d2-1777601262 .background-color-N1{background-color:#0A0F25;} - .d2-1777601262 .background-color-N2{background-color:#676C7E;} - .d2-1777601262 .background-color-N3{background-color:#9499AB;} - .d2-1777601262 .background-color-N4{background-color:#CFD2DD;} - .d2-1777601262 .background-color-N5{background-color:#DEE1EB;} - .d2-1777601262 .background-color-N6{background-color:#EEF1F8;} - .d2-1777601262 .background-color-N7{background-color:#FFFFFF;} - .d2-1777601262 .background-color-B1{background-color:#0D32B2;} - .d2-1777601262 .background-color-B2{background-color:#0D32B2;} - .d2-1777601262 .background-color-B3{background-color:#E3E9FD;} - .d2-1777601262 .background-color-B4{background-color:#E3E9FD;} - .d2-1777601262 .background-color-B5{background-color:#EDF0FD;} - .d2-1777601262 .background-color-B6{background-color:#F7F8FE;} - .d2-1777601262 .background-color-AA2{background-color:#4A6FF3;} - .d2-1777601262 .background-color-AA4{background-color:#EDF0FD;} - .d2-1777601262 .background-color-AA5{background-color:#F7F8FE;} - .d2-1777601262 .background-color-AB4{background-color:#EDF0FD;} - .d2-1777601262 .background-color-AB5{background-color:#F7F8FE;} - .d2-1777601262 .color-N1{color:#0A0F25;} - .d2-1777601262 .color-N2{color:#676C7E;} - .d2-1777601262 .color-N3{color:#9499AB;} - .d2-1777601262 .color-N4{color:#CFD2DD;} - .d2-1777601262 .color-N5{color:#DEE1EB;} - .d2-1777601262 .color-N6{color:#EEF1F8;} - .d2-1777601262 .color-N7{color:#FFFFFF;} - .d2-1777601262 .color-B1{color:#0D32B2;} - .d2-1777601262 .color-B2{color:#0D32B2;} - .d2-1777601262 .color-B3{color:#E3E9FD;} - .d2-1777601262 .color-B4{color:#E3E9FD;} - .d2-1777601262 .color-B5{color:#EDF0FD;} - .d2-1777601262 .color-B6{color:#F7F8FE;} - .d2-1777601262 .color-AA2{color:#4A6FF3;} - .d2-1777601262 .color-AA4{color:#EDF0FD;} - .d2-1777601262 .color-AA5{color:#F7F8FE;} - .d2-1777601262 .color-AB4{color:#EDF0FD;} - .d2-1777601262 .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}]]>aidintPKbidintPKa_1intFKa_2intFK -======= .d2-242784462 .fill-N1{fill:#0A0F25;} .d2-242784462 .fill-N2{fill:#676C7E;} .d2-242784462 .fill-N3{fill:#9499AB;} @@ -252,8 +89,7 @@ .d2-242784462 .color-AA4{color:#EDF0FD;} .d2-242784462 .color-AA5{color:#F7F8FE;} .d2-242784462 .color-AB4{color:#EDF0FD;} - .d2-242784462 .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}]]>aidintPKbidintPKa_1intFKa_2intFK ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-242784462 .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}]]>aidintPKbidintPKa_1intFKa_2intFK \ No newline at end of file diff --git a/e2etests/testdata/stable/sql_table_tooltip_animated/dagre/sketch.exp.svg b/e2etests/testdata/stable/sql_table_tooltip_animated/dagre/sketch.exp.svg index 0d077d58c..b0fe7ee1e 100644 --- a/e2etests/testdata/stable/sql_table_tooltip_animated/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sql_table_tooltip_animated/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -xyPKabFK I like turtles -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-3096218097 .fill-N1{fill:#0A0F25;} - .d2-3096218097 .fill-N2{fill:#676C7E;} - .d2-3096218097 .fill-N3{fill:#9499AB;} - .d2-3096218097 .fill-N4{fill:#CFD2DD;} - .d2-3096218097 .fill-N5{fill:#DEE1EB;} - .d2-3096218097 .fill-N6{fill:#EEF1F8;} - .d2-3096218097 .fill-N7{fill:#FFFFFF;} - .d2-3096218097 .fill-B1{fill:#0D32B2;} - .d2-3096218097 .fill-B2{fill:#0D32B2;} - .d2-3096218097 .fill-B3{fill:#E3E9FD;} - .d2-3096218097 .fill-B4{fill:#E3E9FD;} - .d2-3096218097 .fill-B5{fill:#EDF0FD;} - .d2-3096218097 .fill-B6{fill:#F7F8FE;} - .d2-3096218097 .fill-AA2{fill:#4A6FF3;} - .d2-3096218097 .fill-AA4{fill:#EDF0FD;} - .d2-3096218097 .fill-AA5{fill:#F7F8FE;} - .d2-3096218097 .fill-AB4{fill:#EDF0FD;} - .d2-3096218097 .fill-AB5{fill:#F7F8FE;} - .d2-3096218097 .stroke-N1{stroke:#0A0F25;} - .d2-3096218097 .stroke-N2{stroke:#676C7E;} - .d2-3096218097 .stroke-N3{stroke:#9499AB;} - .d2-3096218097 .stroke-N4{stroke:#CFD2DD;} - .d2-3096218097 .stroke-N5{stroke:#DEE1EB;} - .d2-3096218097 .stroke-N6{stroke:#EEF1F8;} - .d2-3096218097 .stroke-N7{stroke:#FFFFFF;} - .d2-3096218097 .stroke-B1{stroke:#0D32B2;} - .d2-3096218097 .stroke-B2{stroke:#0D32B2;} - .d2-3096218097 .stroke-B3{stroke:#E3E9FD;} - .d2-3096218097 .stroke-B4{stroke:#E3E9FD;} - .d2-3096218097 .stroke-B5{stroke:#EDF0FD;} - .d2-3096218097 .stroke-B6{stroke:#F7F8FE;} - .d2-3096218097 .stroke-AA2{stroke:#4A6FF3;} - .d2-3096218097 .stroke-AA4{stroke:#EDF0FD;} - .d2-3096218097 .stroke-AA5{stroke:#F7F8FE;} - .d2-3096218097 .stroke-AB4{stroke:#EDF0FD;} - .d2-3096218097 .stroke-AB5{stroke:#F7F8FE;} - .d2-3096218097 .background-color-N1{background-color:#0A0F25;} - .d2-3096218097 .background-color-N2{background-color:#676C7E;} - .d2-3096218097 .background-color-N3{background-color:#9499AB;} - .d2-3096218097 .background-color-N4{background-color:#CFD2DD;} - .d2-3096218097 .background-color-N5{background-color:#DEE1EB;} - .d2-3096218097 .background-color-N6{background-color:#EEF1F8;} - .d2-3096218097 .background-color-N7{background-color:#FFFFFF;} - .d2-3096218097 .background-color-B1{background-color:#0D32B2;} - .d2-3096218097 .background-color-B2{background-color:#0D32B2;} - .d2-3096218097 .background-color-B3{background-color:#E3E9FD;} - .d2-3096218097 .background-color-B4{background-color:#E3E9FD;} - .d2-3096218097 .background-color-B5{background-color:#EDF0FD;} - .d2-3096218097 .background-color-B6{background-color:#F7F8FE;} - .d2-3096218097 .background-color-AA2{background-color:#4A6FF3;} - .d2-3096218097 .background-color-AA4{background-color:#EDF0FD;} - .d2-3096218097 .background-color-AA5{background-color:#F7F8FE;} - .d2-3096218097 .background-color-AB4{background-color:#EDF0FD;} - .d2-3096218097 .background-color-AB5{background-color:#F7F8FE;} - .d2-3096218097 .color-N1{color:#0A0F25;} - .d2-3096218097 .color-N2{color:#676C7E;} - .d2-3096218097 .color-N3{color:#9499AB;} - .d2-3096218097 .color-N4{color:#CFD2DD;} - .d2-3096218097 .color-N5{color:#DEE1EB;} - .d2-3096218097 .color-N6{color:#EEF1F8;} - .d2-3096218097 .color-N7{color:#FFFFFF;} - .d2-3096218097 .color-B1{color:#0D32B2;} - .d2-3096218097 .color-B2{color:#0D32B2;} - .d2-3096218097 .color-B3{color:#E3E9FD;} - .d2-3096218097 .color-B4{color:#E3E9FD;} - .d2-3096218097 .color-B5{color:#EDF0FD;} - .d2-3096218097 .color-B6{color:#F7F8FE;} - .d2-3096218097 .color-AA2{color:#4A6FF3;} - .d2-3096218097 .color-AA4{color:#EDF0FD;} - .d2-3096218097 .color-AA5{color:#F7F8FE;} - .d2-3096218097 .color-AB4{color:#EDF0FD;} - .d2-3096218097 .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}]]>xyPKabFK I like turtles -======= .d2-2656350679 .fill-N1{fill:#0A0F25;} .d2-2656350679 .fill-N2{fill:#676C7E;} .d2-2656350679 .fill-N3{fill:#9499AB;} @@ -261,8 +98,7 @@ .d2-2656350679 .color-AA4{color:#EDF0FD;} .d2-2656350679 .color-AA5{color:#F7F8FE;} .d2-2656350679 .color-AB4{color:#EDF0FD;} - .d2-2656350679 .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}]]>xyPKabFK I like turtles ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-2656350679 .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}]]>xyPKabFK I like turtles diff --git a/e2etests/testdata/stable/sql_table_tooltip_animated/elk/sketch.exp.svg b/e2etests/testdata/stable/sql_table_tooltip_animated/elk/sketch.exp.svg index b82bede34..4dd6cc6db 100644 --- a/e2etests/testdata/stable/sql_table_tooltip_animated/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sql_table_tooltip_animated/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -xyPKabFK I like turtles -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-3579465052 .fill-N1{fill:#0A0F25;} - .d2-3579465052 .fill-N2{fill:#676C7E;} - .d2-3579465052 .fill-N3{fill:#9499AB;} - .d2-3579465052 .fill-N4{fill:#CFD2DD;} - .d2-3579465052 .fill-N5{fill:#DEE1EB;} - .d2-3579465052 .fill-N6{fill:#EEF1F8;} - .d2-3579465052 .fill-N7{fill:#FFFFFF;} - .d2-3579465052 .fill-B1{fill:#0D32B2;} - .d2-3579465052 .fill-B2{fill:#0D32B2;} - .d2-3579465052 .fill-B3{fill:#E3E9FD;} - .d2-3579465052 .fill-B4{fill:#E3E9FD;} - .d2-3579465052 .fill-B5{fill:#EDF0FD;} - .d2-3579465052 .fill-B6{fill:#F7F8FE;} - .d2-3579465052 .fill-AA2{fill:#4A6FF3;} - .d2-3579465052 .fill-AA4{fill:#EDF0FD;} - .d2-3579465052 .fill-AA5{fill:#F7F8FE;} - .d2-3579465052 .fill-AB4{fill:#EDF0FD;} - .d2-3579465052 .fill-AB5{fill:#F7F8FE;} - .d2-3579465052 .stroke-N1{stroke:#0A0F25;} - .d2-3579465052 .stroke-N2{stroke:#676C7E;} - .d2-3579465052 .stroke-N3{stroke:#9499AB;} - .d2-3579465052 .stroke-N4{stroke:#CFD2DD;} - .d2-3579465052 .stroke-N5{stroke:#DEE1EB;} - .d2-3579465052 .stroke-N6{stroke:#EEF1F8;} - .d2-3579465052 .stroke-N7{stroke:#FFFFFF;} - .d2-3579465052 .stroke-B1{stroke:#0D32B2;} - .d2-3579465052 .stroke-B2{stroke:#0D32B2;} - .d2-3579465052 .stroke-B3{stroke:#E3E9FD;} - .d2-3579465052 .stroke-B4{stroke:#E3E9FD;} - .d2-3579465052 .stroke-B5{stroke:#EDF0FD;} - .d2-3579465052 .stroke-B6{stroke:#F7F8FE;} - .d2-3579465052 .stroke-AA2{stroke:#4A6FF3;} - .d2-3579465052 .stroke-AA4{stroke:#EDF0FD;} - .d2-3579465052 .stroke-AA5{stroke:#F7F8FE;} - .d2-3579465052 .stroke-AB4{stroke:#EDF0FD;} - .d2-3579465052 .stroke-AB5{stroke:#F7F8FE;} - .d2-3579465052 .background-color-N1{background-color:#0A0F25;} - .d2-3579465052 .background-color-N2{background-color:#676C7E;} - .d2-3579465052 .background-color-N3{background-color:#9499AB;} - .d2-3579465052 .background-color-N4{background-color:#CFD2DD;} - .d2-3579465052 .background-color-N5{background-color:#DEE1EB;} - .d2-3579465052 .background-color-N6{background-color:#EEF1F8;} - .d2-3579465052 .background-color-N7{background-color:#FFFFFF;} - .d2-3579465052 .background-color-B1{background-color:#0D32B2;} - .d2-3579465052 .background-color-B2{background-color:#0D32B2;} - .d2-3579465052 .background-color-B3{background-color:#E3E9FD;} - .d2-3579465052 .background-color-B4{background-color:#E3E9FD;} - .d2-3579465052 .background-color-B5{background-color:#EDF0FD;} - .d2-3579465052 .background-color-B6{background-color:#F7F8FE;} - .d2-3579465052 .background-color-AA2{background-color:#4A6FF3;} - .d2-3579465052 .background-color-AA4{background-color:#EDF0FD;} - .d2-3579465052 .background-color-AA5{background-color:#F7F8FE;} - .d2-3579465052 .background-color-AB4{background-color:#EDF0FD;} - .d2-3579465052 .background-color-AB5{background-color:#F7F8FE;} - .d2-3579465052 .color-N1{color:#0A0F25;} - .d2-3579465052 .color-N2{color:#676C7E;} - .d2-3579465052 .color-N3{color:#9499AB;} - .d2-3579465052 .color-N4{color:#CFD2DD;} - .d2-3579465052 .color-N5{color:#DEE1EB;} - .d2-3579465052 .color-N6{color:#EEF1F8;} - .d2-3579465052 .color-N7{color:#FFFFFF;} - .d2-3579465052 .color-B1{color:#0D32B2;} - .d2-3579465052 .color-B2{color:#0D32B2;} - .d2-3579465052 .color-B3{color:#E3E9FD;} - .d2-3579465052 .color-B4{color:#E3E9FD;} - .d2-3579465052 .color-B5{color:#EDF0FD;} - .d2-3579465052 .color-B6{color:#F7F8FE;} - .d2-3579465052 .color-AA2{color:#4A6FF3;} - .d2-3579465052 .color-AA4{color:#EDF0FD;} - .d2-3579465052 .color-AA5{color:#F7F8FE;} - .d2-3579465052 .color-AB4{color:#EDF0FD;} - .d2-3579465052 .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}]]>xyPKabFK I like turtles -======= .d2-3338527134 .fill-N1{fill:#0A0F25;} .d2-3338527134 .fill-N2{fill:#676C7E;} .d2-3338527134 .fill-N3{fill:#9499AB;} @@ -261,8 +98,7 @@ .d2-3338527134 .color-AA4{color:#EDF0FD;} .d2-3338527134 .color-AA5{color:#F7F8FE;} .d2-3338527134 .color-AB4{color:#EDF0FD;} - .d2-3338527134 .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}]]>xyPKabFK I like turtles ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-3338527134 .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}]]>xyPKabFK I like turtles diff --git a/e2etests/testdata/stable/sql_tables/dagre/sketch.exp.svg b/e2etests/testdata/stable/sql_tables/dagre/sketch.exp.svg index d13f2f849..798a96af4 100644 --- a/e2etests/testdata/stable/sql_tables/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/sql_tables/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -usersidintPKnamestringemailstringpasswordstringlast_logindatetimeproductsidintPKpricedecimalskustringnamestringordersidintPKuser_idintFKproduct_idintFKshipmentsidintPKorder_idintFKtracking_numberstringstatusstring -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-1770468726 .fill-N1{fill:#0A0F25;} - .d2-1770468726 .fill-N2{fill:#676C7E;} - .d2-1770468726 .fill-N3{fill:#9499AB;} - .d2-1770468726 .fill-N4{fill:#CFD2DD;} - .d2-1770468726 .fill-N5{fill:#DEE1EB;} - .d2-1770468726 .fill-N6{fill:#EEF1F8;} - .d2-1770468726 .fill-N7{fill:#FFFFFF;} - .d2-1770468726 .fill-B1{fill:#0D32B2;} - .d2-1770468726 .fill-B2{fill:#0D32B2;} - .d2-1770468726 .fill-B3{fill:#E3E9FD;} - .d2-1770468726 .fill-B4{fill:#E3E9FD;} - .d2-1770468726 .fill-B5{fill:#EDF0FD;} - .d2-1770468726 .fill-B6{fill:#F7F8FE;} - .d2-1770468726 .fill-AA2{fill:#4A6FF3;} - .d2-1770468726 .fill-AA4{fill:#EDF0FD;} - .d2-1770468726 .fill-AA5{fill:#F7F8FE;} - .d2-1770468726 .fill-AB4{fill:#EDF0FD;} - .d2-1770468726 .fill-AB5{fill:#F7F8FE;} - .d2-1770468726 .stroke-N1{stroke:#0A0F25;} - .d2-1770468726 .stroke-N2{stroke:#676C7E;} - .d2-1770468726 .stroke-N3{stroke:#9499AB;} - .d2-1770468726 .stroke-N4{stroke:#CFD2DD;} - .d2-1770468726 .stroke-N5{stroke:#DEE1EB;} - .d2-1770468726 .stroke-N6{stroke:#EEF1F8;} - .d2-1770468726 .stroke-N7{stroke:#FFFFFF;} - .d2-1770468726 .stroke-B1{stroke:#0D32B2;} - .d2-1770468726 .stroke-B2{stroke:#0D32B2;} - .d2-1770468726 .stroke-B3{stroke:#E3E9FD;} - .d2-1770468726 .stroke-B4{stroke:#E3E9FD;} - .d2-1770468726 .stroke-B5{stroke:#EDF0FD;} - .d2-1770468726 .stroke-B6{stroke:#F7F8FE;} - .d2-1770468726 .stroke-AA2{stroke:#4A6FF3;} - .d2-1770468726 .stroke-AA4{stroke:#EDF0FD;} - .d2-1770468726 .stroke-AA5{stroke:#F7F8FE;} - .d2-1770468726 .stroke-AB4{stroke:#EDF0FD;} - .d2-1770468726 .stroke-AB5{stroke:#F7F8FE;} - .d2-1770468726 .background-color-N1{background-color:#0A0F25;} - .d2-1770468726 .background-color-N2{background-color:#676C7E;} - .d2-1770468726 .background-color-N3{background-color:#9499AB;} - .d2-1770468726 .background-color-N4{background-color:#CFD2DD;} - .d2-1770468726 .background-color-N5{background-color:#DEE1EB;} - .d2-1770468726 .background-color-N6{background-color:#EEF1F8;} - .d2-1770468726 .background-color-N7{background-color:#FFFFFF;} - .d2-1770468726 .background-color-B1{background-color:#0D32B2;} - .d2-1770468726 .background-color-B2{background-color:#0D32B2;} - .d2-1770468726 .background-color-B3{background-color:#E3E9FD;} - .d2-1770468726 .background-color-B4{background-color:#E3E9FD;} - .d2-1770468726 .background-color-B5{background-color:#EDF0FD;} - .d2-1770468726 .background-color-B6{background-color:#F7F8FE;} - .d2-1770468726 .background-color-AA2{background-color:#4A6FF3;} - .d2-1770468726 .background-color-AA4{background-color:#EDF0FD;} - .d2-1770468726 .background-color-AA5{background-color:#F7F8FE;} - .d2-1770468726 .background-color-AB4{background-color:#EDF0FD;} - .d2-1770468726 .background-color-AB5{background-color:#F7F8FE;} - .d2-1770468726 .color-N1{color:#0A0F25;} - .d2-1770468726 .color-N2{color:#676C7E;} - .d2-1770468726 .color-N3{color:#9499AB;} - .d2-1770468726 .color-N4{color:#CFD2DD;} - .d2-1770468726 .color-N5{color:#DEE1EB;} - .d2-1770468726 .color-N6{color:#EEF1F8;} - .d2-1770468726 .color-N7{color:#FFFFFF;} - .d2-1770468726 .color-B1{color:#0D32B2;} - .d2-1770468726 .color-B2{color:#0D32B2;} - .d2-1770468726 .color-B3{color:#E3E9FD;} - .d2-1770468726 .color-B4{color:#E3E9FD;} - .d2-1770468726 .color-B5{color:#EDF0FD;} - .d2-1770468726 .color-B6{color:#F7F8FE;} - .d2-1770468726 .color-AA2{color:#4A6FF3;} - .d2-1770468726 .color-AA4{color:#EDF0FD;} - .d2-1770468726 .color-AA5{color:#F7F8FE;} - .d2-1770468726 .color-AB4{color:#EDF0FD;} - .d2-1770468726 .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}]]>usersidintPKnamestringemailstringpasswordstringlast_logindatetimeproductsidintPKpricedecimalskustringnamestringordersidintPKuser_idintFKproduct_idintFKshipmentsidintPKorder_idintFKtracking_numberstringstatusstring -======= .d2-2963560652 .fill-N1{fill:#0A0F25;} .d2-2963560652 .fill-N2{fill:#676C7E;} .d2-2963560652 .fill-N3{fill:#9499AB;} @@ -252,8 +89,7 @@ .d2-2963560652 .color-AA4{color:#EDF0FD;} .d2-2963560652 .color-AA5{color:#F7F8FE;} .d2-2963560652 .color-AB4{color:#EDF0FD;} - .d2-2963560652 .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}]]>usersidintPKnamestringemailstringpasswordstringlast_logindatetimeproductsidintPKpricedecimalskustringnamestringordersidintPKuser_idintFKproduct_idintFKshipmentsidintPKorder_idintFKtracking_numberstringstatusstring ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-2963560652 .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}]]>usersidintPKnamestringemailstringpasswordstringlast_logindatetimeproductsidintPKpricedecimalskustringnamestringordersidintPKuser_idintFKproduct_idintFKshipmentsidintPKorder_idintFKtracking_numberstringstatusstring \ No newline at end of file diff --git a/e2etests/testdata/stable/sql_tables/elk/sketch.exp.svg b/e2etests/testdata/stable/sql_tables/elk/sketch.exp.svg index dd5ee4316..3d4b0ea65 100644 --- a/e2etests/testdata/stable/sql_tables/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/sql_tables/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -usersidintPKnamestringemailstringpasswordstringlast_logindatetimeproductsidintPKpricedecimalskustringnamestringordersidintPKuser_idintFKproduct_idintFKshipmentsidintPKorder_idintFKtracking_numberstringstatusstring -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-2764772137 .fill-N1{fill:#0A0F25;} - .d2-2764772137 .fill-N2{fill:#676C7E;} - .d2-2764772137 .fill-N3{fill:#9499AB;} - .d2-2764772137 .fill-N4{fill:#CFD2DD;} - .d2-2764772137 .fill-N5{fill:#DEE1EB;} - .d2-2764772137 .fill-N6{fill:#EEF1F8;} - .d2-2764772137 .fill-N7{fill:#FFFFFF;} - .d2-2764772137 .fill-B1{fill:#0D32B2;} - .d2-2764772137 .fill-B2{fill:#0D32B2;} - .d2-2764772137 .fill-B3{fill:#E3E9FD;} - .d2-2764772137 .fill-B4{fill:#E3E9FD;} - .d2-2764772137 .fill-B5{fill:#EDF0FD;} - .d2-2764772137 .fill-B6{fill:#F7F8FE;} - .d2-2764772137 .fill-AA2{fill:#4A6FF3;} - .d2-2764772137 .fill-AA4{fill:#EDF0FD;} - .d2-2764772137 .fill-AA5{fill:#F7F8FE;} - .d2-2764772137 .fill-AB4{fill:#EDF0FD;} - .d2-2764772137 .fill-AB5{fill:#F7F8FE;} - .d2-2764772137 .stroke-N1{stroke:#0A0F25;} - .d2-2764772137 .stroke-N2{stroke:#676C7E;} - .d2-2764772137 .stroke-N3{stroke:#9499AB;} - .d2-2764772137 .stroke-N4{stroke:#CFD2DD;} - .d2-2764772137 .stroke-N5{stroke:#DEE1EB;} - .d2-2764772137 .stroke-N6{stroke:#EEF1F8;} - .d2-2764772137 .stroke-N7{stroke:#FFFFFF;} - .d2-2764772137 .stroke-B1{stroke:#0D32B2;} - .d2-2764772137 .stroke-B2{stroke:#0D32B2;} - .d2-2764772137 .stroke-B3{stroke:#E3E9FD;} - .d2-2764772137 .stroke-B4{stroke:#E3E9FD;} - .d2-2764772137 .stroke-B5{stroke:#EDF0FD;} - .d2-2764772137 .stroke-B6{stroke:#F7F8FE;} - .d2-2764772137 .stroke-AA2{stroke:#4A6FF3;} - .d2-2764772137 .stroke-AA4{stroke:#EDF0FD;} - .d2-2764772137 .stroke-AA5{stroke:#F7F8FE;} - .d2-2764772137 .stroke-AB4{stroke:#EDF0FD;} - .d2-2764772137 .stroke-AB5{stroke:#F7F8FE;} - .d2-2764772137 .background-color-N1{background-color:#0A0F25;} - .d2-2764772137 .background-color-N2{background-color:#676C7E;} - .d2-2764772137 .background-color-N3{background-color:#9499AB;} - .d2-2764772137 .background-color-N4{background-color:#CFD2DD;} - .d2-2764772137 .background-color-N5{background-color:#DEE1EB;} - .d2-2764772137 .background-color-N6{background-color:#EEF1F8;} - .d2-2764772137 .background-color-N7{background-color:#FFFFFF;} - .d2-2764772137 .background-color-B1{background-color:#0D32B2;} - .d2-2764772137 .background-color-B2{background-color:#0D32B2;} - .d2-2764772137 .background-color-B3{background-color:#E3E9FD;} - .d2-2764772137 .background-color-B4{background-color:#E3E9FD;} - .d2-2764772137 .background-color-B5{background-color:#EDF0FD;} - .d2-2764772137 .background-color-B6{background-color:#F7F8FE;} - .d2-2764772137 .background-color-AA2{background-color:#4A6FF3;} - .d2-2764772137 .background-color-AA4{background-color:#EDF0FD;} - .d2-2764772137 .background-color-AA5{background-color:#F7F8FE;} - .d2-2764772137 .background-color-AB4{background-color:#EDF0FD;} - .d2-2764772137 .background-color-AB5{background-color:#F7F8FE;} - .d2-2764772137 .color-N1{color:#0A0F25;} - .d2-2764772137 .color-N2{color:#676C7E;} - .d2-2764772137 .color-N3{color:#9499AB;} - .d2-2764772137 .color-N4{color:#CFD2DD;} - .d2-2764772137 .color-N5{color:#DEE1EB;} - .d2-2764772137 .color-N6{color:#EEF1F8;} - .d2-2764772137 .color-N7{color:#FFFFFF;} - .d2-2764772137 .color-B1{color:#0D32B2;} - .d2-2764772137 .color-B2{color:#0D32B2;} - .d2-2764772137 .color-B3{color:#E3E9FD;} - .d2-2764772137 .color-B4{color:#E3E9FD;} - .d2-2764772137 .color-B5{color:#EDF0FD;} - .d2-2764772137 .color-B6{color:#F7F8FE;} - .d2-2764772137 .color-AA2{color:#4A6FF3;} - .d2-2764772137 .color-AA4{color:#EDF0FD;} - .d2-2764772137 .color-AA5{color:#F7F8FE;} - .d2-2764772137 .color-AB4{color:#EDF0FD;} - .d2-2764772137 .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}]]>usersidintPKnamestringemailstringpasswordstringlast_logindatetimeproductsidintPKpricedecimalskustringnamestringordersidintPKuser_idintFKproduct_idintFKshipmentsidintPKorder_idintFKtracking_numberstringstatusstring -======= .d2-2987290171 .fill-N1{fill:#0A0F25;} .d2-2987290171 .fill-N2{fill:#676C7E;} .d2-2987290171 .fill-N3{fill:#9499AB;} @@ -252,8 +89,7 @@ .d2-2987290171 .color-AA4{color:#EDF0FD;} .d2-2987290171 .color-AA5{color:#F7F8FE;} .d2-2987290171 .color-AB4{color:#EDF0FD;} - .d2-2987290171 .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}]]>usersidintPKnamestringemailstringpasswordstringlast_logindatetimeproductsidintPKpricedecimalskustringnamestringordersidintPKuser_idintFKproduct_idintFKshipmentsidintPKorder_idintFKtracking_numberstringstatusstring ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-2987290171 .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}]]>usersidintPKnamestringemailstringpasswordstringlast_logindatetimeproductsidintPKpricedecimalskustringnamestringordersidintPKuser_idintFKproduct_idintFKshipmentsidintPKorder_idintFKtracking_numberstringstatusstring \ No newline at end of file diff --git a/e2etests/testdata/stable/square_3d/dagre/sketch.exp.svg b/e2etests/testdata/stable/square_3d/dagre/sketch.exp.svg index 63cd3e2a4..423274bb2 100644 --- a/e2etests/testdata/stable/square_3d/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/square_3d/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -acbl1l2c1l2c3l2c2l3c1l3c2l4bacacbabcc1c2c3abc -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-1367388716 .fill-N1{fill:#0A0F25;} - .d2-1367388716 .fill-N2{fill:#676C7E;} - .d2-1367388716 .fill-N3{fill:#9499AB;} - .d2-1367388716 .fill-N4{fill:#CFD2DD;} - .d2-1367388716 .fill-N5{fill:#DEE1EB;} - .d2-1367388716 .fill-N6{fill:#EEF1F8;} - .d2-1367388716 .fill-N7{fill:#FFFFFF;} - .d2-1367388716 .fill-B1{fill:#0D32B2;} - .d2-1367388716 .fill-B2{fill:#0D32B2;} - .d2-1367388716 .fill-B3{fill:#E3E9FD;} - .d2-1367388716 .fill-B4{fill:#E3E9FD;} - .d2-1367388716 .fill-B5{fill:#EDF0FD;} - .d2-1367388716 .fill-B6{fill:#F7F8FE;} - .d2-1367388716 .fill-AA2{fill:#4A6FF3;} - .d2-1367388716 .fill-AA4{fill:#EDF0FD;} - .d2-1367388716 .fill-AA5{fill:#F7F8FE;} - .d2-1367388716 .fill-AB4{fill:#EDF0FD;} - .d2-1367388716 .fill-AB5{fill:#F7F8FE;} - .d2-1367388716 .stroke-N1{stroke:#0A0F25;} - .d2-1367388716 .stroke-N2{stroke:#676C7E;} - .d2-1367388716 .stroke-N3{stroke:#9499AB;} - .d2-1367388716 .stroke-N4{stroke:#CFD2DD;} - .d2-1367388716 .stroke-N5{stroke:#DEE1EB;} - .d2-1367388716 .stroke-N6{stroke:#EEF1F8;} - .d2-1367388716 .stroke-N7{stroke:#FFFFFF;} - .d2-1367388716 .stroke-B1{stroke:#0D32B2;} - .d2-1367388716 .stroke-B2{stroke:#0D32B2;} - .d2-1367388716 .stroke-B3{stroke:#E3E9FD;} - .d2-1367388716 .stroke-B4{stroke:#E3E9FD;} - .d2-1367388716 .stroke-B5{stroke:#EDF0FD;} - .d2-1367388716 .stroke-B6{stroke:#F7F8FE;} - .d2-1367388716 .stroke-AA2{stroke:#4A6FF3;} - .d2-1367388716 .stroke-AA4{stroke:#EDF0FD;} - .d2-1367388716 .stroke-AA5{stroke:#F7F8FE;} - .d2-1367388716 .stroke-AB4{stroke:#EDF0FD;} - .d2-1367388716 .stroke-AB5{stroke:#F7F8FE;} - .d2-1367388716 .background-color-N1{background-color:#0A0F25;} - .d2-1367388716 .background-color-N2{background-color:#676C7E;} - .d2-1367388716 .background-color-N3{background-color:#9499AB;} - .d2-1367388716 .background-color-N4{background-color:#CFD2DD;} - .d2-1367388716 .background-color-N5{background-color:#DEE1EB;} - .d2-1367388716 .background-color-N6{background-color:#EEF1F8;} - .d2-1367388716 .background-color-N7{background-color:#FFFFFF;} - .d2-1367388716 .background-color-B1{background-color:#0D32B2;} - .d2-1367388716 .background-color-B2{background-color:#0D32B2;} - .d2-1367388716 .background-color-B3{background-color:#E3E9FD;} - .d2-1367388716 .background-color-B4{background-color:#E3E9FD;} - .d2-1367388716 .background-color-B5{background-color:#EDF0FD;} - .d2-1367388716 .background-color-B6{background-color:#F7F8FE;} - .d2-1367388716 .background-color-AA2{background-color:#4A6FF3;} - .d2-1367388716 .background-color-AA4{background-color:#EDF0FD;} - .d2-1367388716 .background-color-AA5{background-color:#F7F8FE;} - .d2-1367388716 .background-color-AB4{background-color:#EDF0FD;} - .d2-1367388716 .background-color-AB5{background-color:#F7F8FE;} - .d2-1367388716 .color-N1{color:#0A0F25;} - .d2-1367388716 .color-N2{color:#676C7E;} - .d2-1367388716 .color-N3{color:#9499AB;} - .d2-1367388716 .color-N4{color:#CFD2DD;} - .d2-1367388716 .color-N5{color:#DEE1EB;} - .d2-1367388716 .color-N6{color:#EEF1F8;} - .d2-1367388716 .color-N7{color:#FFFFFF;} - .d2-1367388716 .color-B1{color:#0D32B2;} - .d2-1367388716 .color-B2{color:#0D32B2;} - .d2-1367388716 .color-B3{color:#E3E9FD;} - .d2-1367388716 .color-B4{color:#E3E9FD;} - .d2-1367388716 .color-B5{color:#EDF0FD;} - .d2-1367388716 .color-B6{color:#F7F8FE;} - .d2-1367388716 .color-AA2{color:#4A6FF3;} - .d2-1367388716 .color-AA4{color:#EDF0FD;} - .d2-1367388716 .color-AA5{color:#F7F8FE;} - .d2-1367388716 .color-AB4{color:#EDF0FD;} - .d2-1367388716 .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}]]>acbl1l2c1l2c3l2c2l3c1l3c2l4bacacbabcc1c2c3abc -======= .d2-121937204 .fill-N1{fill:#0A0F25;} .d2-121937204 .fill-N2{fill:#676C7E;} .d2-121937204 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-121937204 .color-AA4{color:#EDF0FD;} .d2-121937204 .color-AA5{color:#F7F8FE;} .d2-121937204 .color-AB4{color:#EDF0FD;} - .d2-121937204 .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}]]>acbl1l2c1l2c3l2c2l3c1l3c2l4bacacbabcc1c2c3abc ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-121937204 .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}]]>acbl1l2c1l2c3l2c2l3c1l3c2l4bacacbabcc1c2c3abc diff --git a/e2etests/testdata/stable/straight_hierarchy_container/elk/sketch.exp.svg b/e2etests/testdata/stable/straight_hierarchy_container/elk/sketch.exp.svg index c34762593..ab92dd531 100644 --- a/e2etests/testdata/stable/straight_hierarchy_container/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/straight_hierarchy_container/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -acbl1l2c1l2c3l2c2l3c1l3c2l4bacacbabcc1c2c3abc -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-2088457274 .fill-N1{fill:#0A0F25;} - .d2-2088457274 .fill-N2{fill:#676C7E;} - .d2-2088457274 .fill-N3{fill:#9499AB;} - .d2-2088457274 .fill-N4{fill:#CFD2DD;} - .d2-2088457274 .fill-N5{fill:#DEE1EB;} - .d2-2088457274 .fill-N6{fill:#EEF1F8;} - .d2-2088457274 .fill-N7{fill:#FFFFFF;} - .d2-2088457274 .fill-B1{fill:#0D32B2;} - .d2-2088457274 .fill-B2{fill:#0D32B2;} - .d2-2088457274 .fill-B3{fill:#E3E9FD;} - .d2-2088457274 .fill-B4{fill:#E3E9FD;} - .d2-2088457274 .fill-B5{fill:#EDF0FD;} - .d2-2088457274 .fill-B6{fill:#F7F8FE;} - .d2-2088457274 .fill-AA2{fill:#4A6FF3;} - .d2-2088457274 .fill-AA4{fill:#EDF0FD;} - .d2-2088457274 .fill-AA5{fill:#F7F8FE;} - .d2-2088457274 .fill-AB4{fill:#EDF0FD;} - .d2-2088457274 .fill-AB5{fill:#F7F8FE;} - .d2-2088457274 .stroke-N1{stroke:#0A0F25;} - .d2-2088457274 .stroke-N2{stroke:#676C7E;} - .d2-2088457274 .stroke-N3{stroke:#9499AB;} - .d2-2088457274 .stroke-N4{stroke:#CFD2DD;} - .d2-2088457274 .stroke-N5{stroke:#DEE1EB;} - .d2-2088457274 .stroke-N6{stroke:#EEF1F8;} - .d2-2088457274 .stroke-N7{stroke:#FFFFFF;} - .d2-2088457274 .stroke-B1{stroke:#0D32B2;} - .d2-2088457274 .stroke-B2{stroke:#0D32B2;} - .d2-2088457274 .stroke-B3{stroke:#E3E9FD;} - .d2-2088457274 .stroke-B4{stroke:#E3E9FD;} - .d2-2088457274 .stroke-B5{stroke:#EDF0FD;} - .d2-2088457274 .stroke-B6{stroke:#F7F8FE;} - .d2-2088457274 .stroke-AA2{stroke:#4A6FF3;} - .d2-2088457274 .stroke-AA4{stroke:#EDF0FD;} - .d2-2088457274 .stroke-AA5{stroke:#F7F8FE;} - .d2-2088457274 .stroke-AB4{stroke:#EDF0FD;} - .d2-2088457274 .stroke-AB5{stroke:#F7F8FE;} - .d2-2088457274 .background-color-N1{background-color:#0A0F25;} - .d2-2088457274 .background-color-N2{background-color:#676C7E;} - .d2-2088457274 .background-color-N3{background-color:#9499AB;} - .d2-2088457274 .background-color-N4{background-color:#CFD2DD;} - .d2-2088457274 .background-color-N5{background-color:#DEE1EB;} - .d2-2088457274 .background-color-N6{background-color:#EEF1F8;} - .d2-2088457274 .background-color-N7{background-color:#FFFFFF;} - .d2-2088457274 .background-color-B1{background-color:#0D32B2;} - .d2-2088457274 .background-color-B2{background-color:#0D32B2;} - .d2-2088457274 .background-color-B3{background-color:#E3E9FD;} - .d2-2088457274 .background-color-B4{background-color:#E3E9FD;} - .d2-2088457274 .background-color-B5{background-color:#EDF0FD;} - .d2-2088457274 .background-color-B6{background-color:#F7F8FE;} - .d2-2088457274 .background-color-AA2{background-color:#4A6FF3;} - .d2-2088457274 .background-color-AA4{background-color:#EDF0FD;} - .d2-2088457274 .background-color-AA5{background-color:#F7F8FE;} - .d2-2088457274 .background-color-AB4{background-color:#EDF0FD;} - .d2-2088457274 .background-color-AB5{background-color:#F7F8FE;} - .d2-2088457274 .color-N1{color:#0A0F25;} - .d2-2088457274 .color-N2{color:#676C7E;} - .d2-2088457274 .color-N3{color:#9499AB;} - .d2-2088457274 .color-N4{color:#CFD2DD;} - .d2-2088457274 .color-N5{color:#DEE1EB;} - .d2-2088457274 .color-N6{color:#EEF1F8;} - .d2-2088457274 .color-N7{color:#FFFFFF;} - .d2-2088457274 .color-B1{color:#0D32B2;} - .d2-2088457274 .color-B2{color:#0D32B2;} - .d2-2088457274 .color-B3{color:#E3E9FD;} - .d2-2088457274 .color-B4{color:#E3E9FD;} - .d2-2088457274 .color-B5{color:#EDF0FD;} - .d2-2088457274 .color-B6{color:#F7F8FE;} - .d2-2088457274 .color-AA2{color:#4A6FF3;} - .d2-2088457274 .color-AA4{color:#EDF0FD;} - .d2-2088457274 .color-AA5{color:#F7F8FE;} - .d2-2088457274 .color-AB4{color:#EDF0FD;} - .d2-2088457274 .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}]]>acbl1l2c1l2c3l2c2l3c1l3c2l4bacacbabcc1c2c3abc -======= .d2-3895104826 .fill-N1{fill:#0A0F25;} .d2-3895104826 .fill-N2{fill:#676C7E;} .d2-3895104826 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-3895104826 .color-AA4{color:#EDF0FD;} .d2-3895104826 .color-AA5{color:#F7F8FE;} .d2-3895104826 .color-AB4{color:#EDF0FD;} - .d2-3895104826 .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}]]>acbl1l2c1l2c3l2c2l3c1l3c2l4bacacbabcc1c2c3abc ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-3895104826 .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}]]>acbl1l2c1l2c3l2c2l3c1l3c2l4bacacbabcc1c2c3abc diff --git a/e2etests/testdata/stable/stylish/dagre/sketch.exp.svg b/e2etests/testdata/stable/stylish/dagre/sketch.exp.svg index e951af2e1..90b6943d3 100644 --- a/e2etests/testdata/stable/stylish/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/stylish/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -ABCD defaulttriangle -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-857282650 .fill-N1{fill:#0A0F25;} - .d2-857282650 .fill-N2{fill:#676C7E;} - .d2-857282650 .fill-N3{fill:#9499AB;} - .d2-857282650 .fill-N4{fill:#CFD2DD;} - .d2-857282650 .fill-N5{fill:#DEE1EB;} - .d2-857282650 .fill-N6{fill:#EEF1F8;} - .d2-857282650 .fill-N7{fill:#FFFFFF;} - .d2-857282650 .fill-B1{fill:#0D32B2;} - .d2-857282650 .fill-B2{fill:#0D32B2;} - .d2-857282650 .fill-B3{fill:#E3E9FD;} - .d2-857282650 .fill-B4{fill:#E3E9FD;} - .d2-857282650 .fill-B5{fill:#EDF0FD;} - .d2-857282650 .fill-B6{fill:#F7F8FE;} - .d2-857282650 .fill-AA2{fill:#4A6FF3;} - .d2-857282650 .fill-AA4{fill:#EDF0FD;} - .d2-857282650 .fill-AA5{fill:#F7F8FE;} - .d2-857282650 .fill-AB4{fill:#EDF0FD;} - .d2-857282650 .fill-AB5{fill:#F7F8FE;} - .d2-857282650 .stroke-N1{stroke:#0A0F25;} - .d2-857282650 .stroke-N2{stroke:#676C7E;} - .d2-857282650 .stroke-N3{stroke:#9499AB;} - .d2-857282650 .stroke-N4{stroke:#CFD2DD;} - .d2-857282650 .stroke-N5{stroke:#DEE1EB;} - .d2-857282650 .stroke-N6{stroke:#EEF1F8;} - .d2-857282650 .stroke-N7{stroke:#FFFFFF;} - .d2-857282650 .stroke-B1{stroke:#0D32B2;} - .d2-857282650 .stroke-B2{stroke:#0D32B2;} - .d2-857282650 .stroke-B3{stroke:#E3E9FD;} - .d2-857282650 .stroke-B4{stroke:#E3E9FD;} - .d2-857282650 .stroke-B5{stroke:#EDF0FD;} - .d2-857282650 .stroke-B6{stroke:#F7F8FE;} - .d2-857282650 .stroke-AA2{stroke:#4A6FF3;} - .d2-857282650 .stroke-AA4{stroke:#EDF0FD;} - .d2-857282650 .stroke-AA5{stroke:#F7F8FE;} - .d2-857282650 .stroke-AB4{stroke:#EDF0FD;} - .d2-857282650 .stroke-AB5{stroke:#F7F8FE;} - .d2-857282650 .background-color-N1{background-color:#0A0F25;} - .d2-857282650 .background-color-N2{background-color:#676C7E;} - .d2-857282650 .background-color-N3{background-color:#9499AB;} - .d2-857282650 .background-color-N4{background-color:#CFD2DD;} - .d2-857282650 .background-color-N5{background-color:#DEE1EB;} - .d2-857282650 .background-color-N6{background-color:#EEF1F8;} - .d2-857282650 .background-color-N7{background-color:#FFFFFF;} - .d2-857282650 .background-color-B1{background-color:#0D32B2;} - .d2-857282650 .background-color-B2{background-color:#0D32B2;} - .d2-857282650 .background-color-B3{background-color:#E3E9FD;} - .d2-857282650 .background-color-B4{background-color:#E3E9FD;} - .d2-857282650 .background-color-B5{background-color:#EDF0FD;} - .d2-857282650 .background-color-B6{background-color:#F7F8FE;} - .d2-857282650 .background-color-AA2{background-color:#4A6FF3;} - .d2-857282650 .background-color-AA4{background-color:#EDF0FD;} - .d2-857282650 .background-color-AA5{background-color:#F7F8FE;} - .d2-857282650 .background-color-AB4{background-color:#EDF0FD;} - .d2-857282650 .background-color-AB5{background-color:#F7F8FE;} - .d2-857282650 .color-N1{color:#0A0F25;} - .d2-857282650 .color-N2{color:#676C7E;} - .d2-857282650 .color-N3{color:#9499AB;} - .d2-857282650 .color-N4{color:#CFD2DD;} - .d2-857282650 .color-N5{color:#DEE1EB;} - .d2-857282650 .color-N6{color:#EEF1F8;} - .d2-857282650 .color-N7{color:#FFFFFF;} - .d2-857282650 .color-B1{color:#0D32B2;} - .d2-857282650 .color-B2{color:#0D32B2;} - .d2-857282650 .color-B3{color:#E3E9FD;} - .d2-857282650 .color-B4{color:#E3E9FD;} - .d2-857282650 .color-B5{color:#EDF0FD;} - .d2-857282650 .color-B6{color:#F7F8FE;} - .d2-857282650 .color-AA2{color:#4A6FF3;} - .d2-857282650 .color-AA4{color:#EDF0FD;} - .d2-857282650 .color-AA5{color:#F7F8FE;} - .d2-857282650 .color-AB4{color:#EDF0FD;} - .d2-857282650 .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 defaulttriangle -======= .d2-4052114486 .fill-N1{fill:#0A0F25;} .d2-4052114486 .fill-N2{fill:#676C7E;} .d2-4052114486 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-4052114486 .color-AA4{color:#EDF0FD;} .d2-4052114486 .color-AA5{color:#F7F8FE;} .d2-4052114486 .color-AB4{color:#EDF0FD;} - .d2-4052114486 .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 defaulttriangle ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-4052114486 .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 defaulttriangle diff --git a/e2etests/testdata/stable/unfilled_triangle/elk/sketch.exp.svg b/e2etests/testdata/stable/unfilled_triangle/elk/sketch.exp.svg index a185d0283..29586b3e7 100644 --- a/e2etests/testdata/stable/unfilled_triangle/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/unfilled_triangle/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -ABCD defaulttriangle -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-3330864888 .fill-N1{fill:#0A0F25;} - .d2-3330864888 .fill-N2{fill:#676C7E;} - .d2-3330864888 .fill-N3{fill:#9499AB;} - .d2-3330864888 .fill-N4{fill:#CFD2DD;} - .d2-3330864888 .fill-N5{fill:#DEE1EB;} - .d2-3330864888 .fill-N6{fill:#EEF1F8;} - .d2-3330864888 .fill-N7{fill:#FFFFFF;} - .d2-3330864888 .fill-B1{fill:#0D32B2;} - .d2-3330864888 .fill-B2{fill:#0D32B2;} - .d2-3330864888 .fill-B3{fill:#E3E9FD;} - .d2-3330864888 .fill-B4{fill:#E3E9FD;} - .d2-3330864888 .fill-B5{fill:#EDF0FD;} - .d2-3330864888 .fill-B6{fill:#F7F8FE;} - .d2-3330864888 .fill-AA2{fill:#4A6FF3;} - .d2-3330864888 .fill-AA4{fill:#EDF0FD;} - .d2-3330864888 .fill-AA5{fill:#F7F8FE;} - .d2-3330864888 .fill-AB4{fill:#EDF0FD;} - .d2-3330864888 .fill-AB5{fill:#F7F8FE;} - .d2-3330864888 .stroke-N1{stroke:#0A0F25;} - .d2-3330864888 .stroke-N2{stroke:#676C7E;} - .d2-3330864888 .stroke-N3{stroke:#9499AB;} - .d2-3330864888 .stroke-N4{stroke:#CFD2DD;} - .d2-3330864888 .stroke-N5{stroke:#DEE1EB;} - .d2-3330864888 .stroke-N6{stroke:#EEF1F8;} - .d2-3330864888 .stroke-N7{stroke:#FFFFFF;} - .d2-3330864888 .stroke-B1{stroke:#0D32B2;} - .d2-3330864888 .stroke-B2{stroke:#0D32B2;} - .d2-3330864888 .stroke-B3{stroke:#E3E9FD;} - .d2-3330864888 .stroke-B4{stroke:#E3E9FD;} - .d2-3330864888 .stroke-B5{stroke:#EDF0FD;} - .d2-3330864888 .stroke-B6{stroke:#F7F8FE;} - .d2-3330864888 .stroke-AA2{stroke:#4A6FF3;} - .d2-3330864888 .stroke-AA4{stroke:#EDF0FD;} - .d2-3330864888 .stroke-AA5{stroke:#F7F8FE;} - .d2-3330864888 .stroke-AB4{stroke:#EDF0FD;} - .d2-3330864888 .stroke-AB5{stroke:#F7F8FE;} - .d2-3330864888 .background-color-N1{background-color:#0A0F25;} - .d2-3330864888 .background-color-N2{background-color:#676C7E;} - .d2-3330864888 .background-color-N3{background-color:#9499AB;} - .d2-3330864888 .background-color-N4{background-color:#CFD2DD;} - .d2-3330864888 .background-color-N5{background-color:#DEE1EB;} - .d2-3330864888 .background-color-N6{background-color:#EEF1F8;} - .d2-3330864888 .background-color-N7{background-color:#FFFFFF;} - .d2-3330864888 .background-color-B1{background-color:#0D32B2;} - .d2-3330864888 .background-color-B2{background-color:#0D32B2;} - .d2-3330864888 .background-color-B3{background-color:#E3E9FD;} - .d2-3330864888 .background-color-B4{background-color:#E3E9FD;} - .d2-3330864888 .background-color-B5{background-color:#EDF0FD;} - .d2-3330864888 .background-color-B6{background-color:#F7F8FE;} - .d2-3330864888 .background-color-AA2{background-color:#4A6FF3;} - .d2-3330864888 .background-color-AA4{background-color:#EDF0FD;} - .d2-3330864888 .background-color-AA5{background-color:#F7F8FE;} - .d2-3330864888 .background-color-AB4{background-color:#EDF0FD;} - .d2-3330864888 .background-color-AB5{background-color:#F7F8FE;} - .d2-3330864888 .color-N1{color:#0A0F25;} - .d2-3330864888 .color-N2{color:#676C7E;} - .d2-3330864888 .color-N3{color:#9499AB;} - .d2-3330864888 .color-N4{color:#CFD2DD;} - .d2-3330864888 .color-N5{color:#DEE1EB;} - .d2-3330864888 .color-N6{color:#EEF1F8;} - .d2-3330864888 .color-N7{color:#FFFFFF;} - .d2-3330864888 .color-B1{color:#0D32B2;} - .d2-3330864888 .color-B2{color:#0D32B2;} - .d2-3330864888 .color-B3{color:#E3E9FD;} - .d2-3330864888 .color-B4{color:#E3E9FD;} - .d2-3330864888 .color-B5{color:#EDF0FD;} - .d2-3330864888 .color-B6{color:#F7F8FE;} - .d2-3330864888 .color-AA2{color:#4A6FF3;} - .d2-3330864888 .color-AA4{color:#EDF0FD;} - .d2-3330864888 .color-AA5{color:#F7F8FE;} - .d2-3330864888 .color-AB4{color:#EDF0FD;} - .d2-3330864888 .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 defaulttriangle -======= .d2-3550117164 .fill-N1{fill:#0A0F25;} .d2-3550117164 .fill-N2{fill:#676C7E;} .d2-3550117164 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-3550117164 .color-AA4{color:#EDF0FD;} .d2-3550117164 .color-AA5{color:#F7F8FE;} .d2-3550117164 .color-AB4{color:#EDF0FD;} - .d2-3550117164 .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 defaulttriangle ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-3550117164 .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 defaulttriangle diff --git a/e2etests/testdata/stable/unnamed_only_height/dagre/sketch.exp.svg b/e2etests/testdata/stable/unnamed_only_height/dagre/sketch.exp.svg index 3e246b084..50ed7dd6f 100644 --- a/e2etests/testdata/stable/unnamed_only_height/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/unnamed_only_height/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD --numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetime:= 5 -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-4206423234 .fill-N1{fill:#0A0F25;} - .d2-4206423234 .fill-N2{fill:#676C7E;} - .d2-4206423234 .fill-N3{fill:#9499AB;} - .d2-4206423234 .fill-N4{fill:#CFD2DD;} - .d2-4206423234 .fill-N5{fill:#DEE1EB;} - .d2-4206423234 .fill-N6{fill:#EEF1F8;} - .d2-4206423234 .fill-N7{fill:#FFFFFF;} - .d2-4206423234 .fill-B1{fill:#0D32B2;} - .d2-4206423234 .fill-B2{fill:#0D32B2;} - .d2-4206423234 .fill-B3{fill:#E3E9FD;} - .d2-4206423234 .fill-B4{fill:#E3E9FD;} - .d2-4206423234 .fill-B5{fill:#EDF0FD;} - .d2-4206423234 .fill-B6{fill:#F7F8FE;} - .d2-4206423234 .fill-AA2{fill:#4A6FF3;} - .d2-4206423234 .fill-AA4{fill:#EDF0FD;} - .d2-4206423234 .fill-AA5{fill:#F7F8FE;} - .d2-4206423234 .fill-AB4{fill:#EDF0FD;} - .d2-4206423234 .fill-AB5{fill:#F7F8FE;} - .d2-4206423234 .stroke-N1{stroke:#0A0F25;} - .d2-4206423234 .stroke-N2{stroke:#676C7E;} - .d2-4206423234 .stroke-N3{stroke:#9499AB;} - .d2-4206423234 .stroke-N4{stroke:#CFD2DD;} - .d2-4206423234 .stroke-N5{stroke:#DEE1EB;} - .d2-4206423234 .stroke-N6{stroke:#EEF1F8;} - .d2-4206423234 .stroke-N7{stroke:#FFFFFF;} - .d2-4206423234 .stroke-B1{stroke:#0D32B2;} - .d2-4206423234 .stroke-B2{stroke:#0D32B2;} - .d2-4206423234 .stroke-B3{stroke:#E3E9FD;} - .d2-4206423234 .stroke-B4{stroke:#E3E9FD;} - .d2-4206423234 .stroke-B5{stroke:#EDF0FD;} - .d2-4206423234 .stroke-B6{stroke:#F7F8FE;} - .d2-4206423234 .stroke-AA2{stroke:#4A6FF3;} - .d2-4206423234 .stroke-AA4{stroke:#EDF0FD;} - .d2-4206423234 .stroke-AA5{stroke:#F7F8FE;} - .d2-4206423234 .stroke-AB4{stroke:#EDF0FD;} - .d2-4206423234 .stroke-AB5{stroke:#F7F8FE;} - .d2-4206423234 .background-color-N1{background-color:#0A0F25;} - .d2-4206423234 .background-color-N2{background-color:#676C7E;} - .d2-4206423234 .background-color-N3{background-color:#9499AB;} - .d2-4206423234 .background-color-N4{background-color:#CFD2DD;} - .d2-4206423234 .background-color-N5{background-color:#DEE1EB;} - .d2-4206423234 .background-color-N6{background-color:#EEF1F8;} - .d2-4206423234 .background-color-N7{background-color:#FFFFFF;} - .d2-4206423234 .background-color-B1{background-color:#0D32B2;} - .d2-4206423234 .background-color-B2{background-color:#0D32B2;} - .d2-4206423234 .background-color-B3{background-color:#E3E9FD;} - .d2-4206423234 .background-color-B4{background-color:#E3E9FD;} - .d2-4206423234 .background-color-B5{background-color:#EDF0FD;} - .d2-4206423234 .background-color-B6{background-color:#F7F8FE;} - .d2-4206423234 .background-color-AA2{background-color:#4A6FF3;} - .d2-4206423234 .background-color-AA4{background-color:#EDF0FD;} - .d2-4206423234 .background-color-AA5{background-color:#F7F8FE;} - .d2-4206423234 .background-color-AB4{background-color:#EDF0FD;} - .d2-4206423234 .background-color-AB5{background-color:#F7F8FE;} - .d2-4206423234 .color-N1{color:#0A0F25;} - .d2-4206423234 .color-N2{color:#676C7E;} - .d2-4206423234 .color-N3{color:#9499AB;} - .d2-4206423234 .color-N4{color:#CFD2DD;} - .d2-4206423234 .color-N5{color:#DEE1EB;} - .d2-4206423234 .color-N6{color:#EEF1F8;} - .d2-4206423234 .color-N7{color:#FFFFFF;} - .d2-4206423234 .color-B1{color:#0D32B2;} - .d2-4206423234 .color-B2{color:#0D32B2;} - .d2-4206423234 .color-B3{color:#E3E9FD;} - .d2-4206423234 .color-B4{color:#E3E9FD;} - .d2-4206423234 .color-B5{color:#EDF0FD;} - .d2-4206423234 .color-B6{color:#F7F8FE;} - .d2-4206423234 .color-AA2{color:#4A6FF3;} - .d2-4206423234 .color-AA4{color:#EDF0FD;} - .d2-4206423234 .color-AA5{color:#F7F8FE;} - .d2-4206423234 .color-AB4{color:#EDF0FD;} - .d2-4206423234 .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}]]>-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetime:= 5 -======= .d2-3318758314 .fill-N1{fill:#0A0F25;} .d2-3318758314 .fill-N2{fill:#676C7E;} .d2-3318758314 .fill-N3{fill:#9499AB;} @@ -266,22 +103,11 @@ .d2-3318758314 .color-AA4{color:#EDF0FD;} .d2-3318758314 .color-AA5{color:#F7F8FE;} .d2-3318758314 .color-AB4{color:#EDF0FD;} - .d2-3318758314 .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}]]>-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetime:= 5 ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-3318758314 .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}]]>-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetime:= 5 := a + 7 -<<<<<<< HEAD fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b) -||||||| parent of 33280fed5 (fixed e2e tests) -fmt.Printf("%d", b)a := 5 -b := a + 7 -fmt.Printf("%d", b) -======= -fmt.Printf("%d", b)a := 5 -b := a + 7 -fmt.Printf("%d", b) ->>>>>>> 33280fed5 (fixed e2e tests) +fmt.Printf("%d", b) \ No newline at end of file diff --git a/e2etests/testdata/stable/unnamed_only_height/elk/sketch.exp.svg b/e2etests/testdata/stable/unnamed_only_height/elk/sketch.exp.svg index 7991e7dee..576a2c076 100644 --- a/e2etests/testdata/stable/unnamed_only_height/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/unnamed_only_height/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD --numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetime:= 5 -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-197062209 .fill-N1{fill:#0A0F25;} - .d2-197062209 .fill-N2{fill:#676C7E;} - .d2-197062209 .fill-N3{fill:#9499AB;} - .d2-197062209 .fill-N4{fill:#CFD2DD;} - .d2-197062209 .fill-N5{fill:#DEE1EB;} - .d2-197062209 .fill-N6{fill:#EEF1F8;} - .d2-197062209 .fill-N7{fill:#FFFFFF;} - .d2-197062209 .fill-B1{fill:#0D32B2;} - .d2-197062209 .fill-B2{fill:#0D32B2;} - .d2-197062209 .fill-B3{fill:#E3E9FD;} - .d2-197062209 .fill-B4{fill:#E3E9FD;} - .d2-197062209 .fill-B5{fill:#EDF0FD;} - .d2-197062209 .fill-B6{fill:#F7F8FE;} - .d2-197062209 .fill-AA2{fill:#4A6FF3;} - .d2-197062209 .fill-AA4{fill:#EDF0FD;} - .d2-197062209 .fill-AA5{fill:#F7F8FE;} - .d2-197062209 .fill-AB4{fill:#EDF0FD;} - .d2-197062209 .fill-AB5{fill:#F7F8FE;} - .d2-197062209 .stroke-N1{stroke:#0A0F25;} - .d2-197062209 .stroke-N2{stroke:#676C7E;} - .d2-197062209 .stroke-N3{stroke:#9499AB;} - .d2-197062209 .stroke-N4{stroke:#CFD2DD;} - .d2-197062209 .stroke-N5{stroke:#DEE1EB;} - .d2-197062209 .stroke-N6{stroke:#EEF1F8;} - .d2-197062209 .stroke-N7{stroke:#FFFFFF;} - .d2-197062209 .stroke-B1{stroke:#0D32B2;} - .d2-197062209 .stroke-B2{stroke:#0D32B2;} - .d2-197062209 .stroke-B3{stroke:#E3E9FD;} - .d2-197062209 .stroke-B4{stroke:#E3E9FD;} - .d2-197062209 .stroke-B5{stroke:#EDF0FD;} - .d2-197062209 .stroke-B6{stroke:#F7F8FE;} - .d2-197062209 .stroke-AA2{stroke:#4A6FF3;} - .d2-197062209 .stroke-AA4{stroke:#EDF0FD;} - .d2-197062209 .stroke-AA5{stroke:#F7F8FE;} - .d2-197062209 .stroke-AB4{stroke:#EDF0FD;} - .d2-197062209 .stroke-AB5{stroke:#F7F8FE;} - .d2-197062209 .background-color-N1{background-color:#0A0F25;} - .d2-197062209 .background-color-N2{background-color:#676C7E;} - .d2-197062209 .background-color-N3{background-color:#9499AB;} - .d2-197062209 .background-color-N4{background-color:#CFD2DD;} - .d2-197062209 .background-color-N5{background-color:#DEE1EB;} - .d2-197062209 .background-color-N6{background-color:#EEF1F8;} - .d2-197062209 .background-color-N7{background-color:#FFFFFF;} - .d2-197062209 .background-color-B1{background-color:#0D32B2;} - .d2-197062209 .background-color-B2{background-color:#0D32B2;} - .d2-197062209 .background-color-B3{background-color:#E3E9FD;} - .d2-197062209 .background-color-B4{background-color:#E3E9FD;} - .d2-197062209 .background-color-B5{background-color:#EDF0FD;} - .d2-197062209 .background-color-B6{background-color:#F7F8FE;} - .d2-197062209 .background-color-AA2{background-color:#4A6FF3;} - .d2-197062209 .background-color-AA4{background-color:#EDF0FD;} - .d2-197062209 .background-color-AA5{background-color:#F7F8FE;} - .d2-197062209 .background-color-AB4{background-color:#EDF0FD;} - .d2-197062209 .background-color-AB5{background-color:#F7F8FE;} - .d2-197062209 .color-N1{color:#0A0F25;} - .d2-197062209 .color-N2{color:#676C7E;} - .d2-197062209 .color-N3{color:#9499AB;} - .d2-197062209 .color-N4{color:#CFD2DD;} - .d2-197062209 .color-N5{color:#DEE1EB;} - .d2-197062209 .color-N6{color:#EEF1F8;} - .d2-197062209 .color-N7{color:#FFFFFF;} - .d2-197062209 .color-B1{color:#0D32B2;} - .d2-197062209 .color-B2{color:#0D32B2;} - .d2-197062209 .color-B3{color:#E3E9FD;} - .d2-197062209 .color-B4{color:#E3E9FD;} - .d2-197062209 .color-B5{color:#EDF0FD;} - .d2-197062209 .color-B6{color:#F7F8FE;} - .d2-197062209 .color-AA2{color:#4A6FF3;} - .d2-197062209 .color-AA4{color:#EDF0FD;} - .d2-197062209 .color-AA5{color:#F7F8FE;} - .d2-197062209 .color-AB4{color:#EDF0FD;} - .d2-197062209 .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}]]>-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetime:= 5 -======= .d2-2399361065 .fill-N1{fill:#0A0F25;} .d2-2399361065 .fill-N2{fill:#676C7E;} .d2-2399361065 .fill-N3{fill:#9499AB;} @@ -266,22 +103,11 @@ .d2-2399361065 .color-AA4{color:#EDF0FD;} .d2-2399361065 .color-AA5{color:#F7F8FE;} .d2-2399361065 .color-AB4{color:#EDF0FD;} - .d2-2399361065 .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}]]>-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetime:= 5 ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-2399361065 .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}]]>-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetime:= 5 := a + 7 -<<<<<<< HEAD fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b) -||||||| parent of 33280fed5 (fixed e2e tests) -fmt.Printf("%d", b)a := 5 -b := a + 7 -fmt.Printf("%d", b) -======= -fmt.Printf("%d", b)a := 5 -b := a + 7 -fmt.Printf("%d", b) ->>>>>>> 33280fed5 (fixed e2e tests) +fmt.Printf("%d", b) \ No newline at end of file diff --git a/e2etests/testdata/stable/unnamed_only_width/dagre/sketch.exp.svg b/e2etests/testdata/stable/unnamed_only_width/dagre/sketch.exp.svg index befd450dc..0a712566a 100644 --- a/e2etests/testdata/stable/unnamed_only_width/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/unnamed_only_width/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD --numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetime:= 5 -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-2056966260 .fill-N1{fill:#0A0F25;} - .d2-2056966260 .fill-N2{fill:#676C7E;} - .d2-2056966260 .fill-N3{fill:#9499AB;} - .d2-2056966260 .fill-N4{fill:#CFD2DD;} - .d2-2056966260 .fill-N5{fill:#DEE1EB;} - .d2-2056966260 .fill-N6{fill:#EEF1F8;} - .d2-2056966260 .fill-N7{fill:#FFFFFF;} - .d2-2056966260 .fill-B1{fill:#0D32B2;} - .d2-2056966260 .fill-B2{fill:#0D32B2;} - .d2-2056966260 .fill-B3{fill:#E3E9FD;} - .d2-2056966260 .fill-B4{fill:#E3E9FD;} - .d2-2056966260 .fill-B5{fill:#EDF0FD;} - .d2-2056966260 .fill-B6{fill:#F7F8FE;} - .d2-2056966260 .fill-AA2{fill:#4A6FF3;} - .d2-2056966260 .fill-AA4{fill:#EDF0FD;} - .d2-2056966260 .fill-AA5{fill:#F7F8FE;} - .d2-2056966260 .fill-AB4{fill:#EDF0FD;} - .d2-2056966260 .fill-AB5{fill:#F7F8FE;} - .d2-2056966260 .stroke-N1{stroke:#0A0F25;} - .d2-2056966260 .stroke-N2{stroke:#676C7E;} - .d2-2056966260 .stroke-N3{stroke:#9499AB;} - .d2-2056966260 .stroke-N4{stroke:#CFD2DD;} - .d2-2056966260 .stroke-N5{stroke:#DEE1EB;} - .d2-2056966260 .stroke-N6{stroke:#EEF1F8;} - .d2-2056966260 .stroke-N7{stroke:#FFFFFF;} - .d2-2056966260 .stroke-B1{stroke:#0D32B2;} - .d2-2056966260 .stroke-B2{stroke:#0D32B2;} - .d2-2056966260 .stroke-B3{stroke:#E3E9FD;} - .d2-2056966260 .stroke-B4{stroke:#E3E9FD;} - .d2-2056966260 .stroke-B5{stroke:#EDF0FD;} - .d2-2056966260 .stroke-B6{stroke:#F7F8FE;} - .d2-2056966260 .stroke-AA2{stroke:#4A6FF3;} - .d2-2056966260 .stroke-AA4{stroke:#EDF0FD;} - .d2-2056966260 .stroke-AA5{stroke:#F7F8FE;} - .d2-2056966260 .stroke-AB4{stroke:#EDF0FD;} - .d2-2056966260 .stroke-AB5{stroke:#F7F8FE;} - .d2-2056966260 .background-color-N1{background-color:#0A0F25;} - .d2-2056966260 .background-color-N2{background-color:#676C7E;} - .d2-2056966260 .background-color-N3{background-color:#9499AB;} - .d2-2056966260 .background-color-N4{background-color:#CFD2DD;} - .d2-2056966260 .background-color-N5{background-color:#DEE1EB;} - .d2-2056966260 .background-color-N6{background-color:#EEF1F8;} - .d2-2056966260 .background-color-N7{background-color:#FFFFFF;} - .d2-2056966260 .background-color-B1{background-color:#0D32B2;} - .d2-2056966260 .background-color-B2{background-color:#0D32B2;} - .d2-2056966260 .background-color-B3{background-color:#E3E9FD;} - .d2-2056966260 .background-color-B4{background-color:#E3E9FD;} - .d2-2056966260 .background-color-B5{background-color:#EDF0FD;} - .d2-2056966260 .background-color-B6{background-color:#F7F8FE;} - .d2-2056966260 .background-color-AA2{background-color:#4A6FF3;} - .d2-2056966260 .background-color-AA4{background-color:#EDF0FD;} - .d2-2056966260 .background-color-AA5{background-color:#F7F8FE;} - .d2-2056966260 .background-color-AB4{background-color:#EDF0FD;} - .d2-2056966260 .background-color-AB5{background-color:#F7F8FE;} - .d2-2056966260 .color-N1{color:#0A0F25;} - .d2-2056966260 .color-N2{color:#676C7E;} - .d2-2056966260 .color-N3{color:#9499AB;} - .d2-2056966260 .color-N4{color:#CFD2DD;} - .d2-2056966260 .color-N5{color:#DEE1EB;} - .d2-2056966260 .color-N6{color:#EEF1F8;} - .d2-2056966260 .color-N7{color:#FFFFFF;} - .d2-2056966260 .color-B1{color:#0D32B2;} - .d2-2056966260 .color-B2{color:#0D32B2;} - .d2-2056966260 .color-B3{color:#E3E9FD;} - .d2-2056966260 .color-B4{color:#E3E9FD;} - .d2-2056966260 .color-B5{color:#EDF0FD;} - .d2-2056966260 .color-B6{color:#F7F8FE;} - .d2-2056966260 .color-AA2{color:#4A6FF3;} - .d2-2056966260 .color-AA4{color:#EDF0FD;} - .d2-2056966260 .color-AA5{color:#F7F8FE;} - .d2-2056966260 .color-AB4{color:#EDF0FD;} - .d2-2056966260 .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}]]>-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetime:= 5 -======= .d2-2832257792 .fill-N1{fill:#0A0F25;} .d2-2832257792 .fill-N2{fill:#676C7E;} .d2-2832257792 .fill-N3{fill:#9499AB;} @@ -266,22 +103,11 @@ .d2-2832257792 .color-AA4{color:#EDF0FD;} .d2-2832257792 .color-AA5{color:#F7F8FE;} .d2-2832257792 .color-AB4{color:#EDF0FD;} - .d2-2832257792 .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}]]>-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetime:= 5 ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-2832257792 .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}]]>-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetime:= 5 := a + 7 -<<<<<<< HEAD fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b) -||||||| parent of 33280fed5 (fixed e2e tests) -fmt.Printf("%d", b)a := 5 -b := a + 7 -fmt.Printf("%d", b) -======= -fmt.Printf("%d", b)a := 5 -b := a + 7 -fmt.Printf("%d", b) ->>>>>>> 33280fed5 (fixed e2e tests) +fmt.Printf("%d", b) \ No newline at end of file diff --git a/e2etests/testdata/stable/unnamed_only_width/elk/sketch.exp.svg b/e2etests/testdata/stable/unnamed_only_width/elk/sketch.exp.svg index 5ab66f7f5..98a075be7 100644 --- a/e2etests/testdata/stable/unnamed_only_width/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/unnamed_only_width/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD --numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetime:= 5 -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-933844085 .fill-N1{fill:#0A0F25;} - .d2-933844085 .fill-N2{fill:#676C7E;} - .d2-933844085 .fill-N3{fill:#9499AB;} - .d2-933844085 .fill-N4{fill:#CFD2DD;} - .d2-933844085 .fill-N5{fill:#DEE1EB;} - .d2-933844085 .fill-N6{fill:#EEF1F8;} - .d2-933844085 .fill-N7{fill:#FFFFFF;} - .d2-933844085 .fill-B1{fill:#0D32B2;} - .d2-933844085 .fill-B2{fill:#0D32B2;} - .d2-933844085 .fill-B3{fill:#E3E9FD;} - .d2-933844085 .fill-B4{fill:#E3E9FD;} - .d2-933844085 .fill-B5{fill:#EDF0FD;} - .d2-933844085 .fill-B6{fill:#F7F8FE;} - .d2-933844085 .fill-AA2{fill:#4A6FF3;} - .d2-933844085 .fill-AA4{fill:#EDF0FD;} - .d2-933844085 .fill-AA5{fill:#F7F8FE;} - .d2-933844085 .fill-AB4{fill:#EDF0FD;} - .d2-933844085 .fill-AB5{fill:#F7F8FE;} - .d2-933844085 .stroke-N1{stroke:#0A0F25;} - .d2-933844085 .stroke-N2{stroke:#676C7E;} - .d2-933844085 .stroke-N3{stroke:#9499AB;} - .d2-933844085 .stroke-N4{stroke:#CFD2DD;} - .d2-933844085 .stroke-N5{stroke:#DEE1EB;} - .d2-933844085 .stroke-N6{stroke:#EEF1F8;} - .d2-933844085 .stroke-N7{stroke:#FFFFFF;} - .d2-933844085 .stroke-B1{stroke:#0D32B2;} - .d2-933844085 .stroke-B2{stroke:#0D32B2;} - .d2-933844085 .stroke-B3{stroke:#E3E9FD;} - .d2-933844085 .stroke-B4{stroke:#E3E9FD;} - .d2-933844085 .stroke-B5{stroke:#EDF0FD;} - .d2-933844085 .stroke-B6{stroke:#F7F8FE;} - .d2-933844085 .stroke-AA2{stroke:#4A6FF3;} - .d2-933844085 .stroke-AA4{stroke:#EDF0FD;} - .d2-933844085 .stroke-AA5{stroke:#F7F8FE;} - .d2-933844085 .stroke-AB4{stroke:#EDF0FD;} - .d2-933844085 .stroke-AB5{stroke:#F7F8FE;} - .d2-933844085 .background-color-N1{background-color:#0A0F25;} - .d2-933844085 .background-color-N2{background-color:#676C7E;} - .d2-933844085 .background-color-N3{background-color:#9499AB;} - .d2-933844085 .background-color-N4{background-color:#CFD2DD;} - .d2-933844085 .background-color-N5{background-color:#DEE1EB;} - .d2-933844085 .background-color-N6{background-color:#EEF1F8;} - .d2-933844085 .background-color-N7{background-color:#FFFFFF;} - .d2-933844085 .background-color-B1{background-color:#0D32B2;} - .d2-933844085 .background-color-B2{background-color:#0D32B2;} - .d2-933844085 .background-color-B3{background-color:#E3E9FD;} - .d2-933844085 .background-color-B4{background-color:#E3E9FD;} - .d2-933844085 .background-color-B5{background-color:#EDF0FD;} - .d2-933844085 .background-color-B6{background-color:#F7F8FE;} - .d2-933844085 .background-color-AA2{background-color:#4A6FF3;} - .d2-933844085 .background-color-AA4{background-color:#EDF0FD;} - .d2-933844085 .background-color-AA5{background-color:#F7F8FE;} - .d2-933844085 .background-color-AB4{background-color:#EDF0FD;} - .d2-933844085 .background-color-AB5{background-color:#F7F8FE;} - .d2-933844085 .color-N1{color:#0A0F25;} - .d2-933844085 .color-N2{color:#676C7E;} - .d2-933844085 .color-N3{color:#9499AB;} - .d2-933844085 .color-N4{color:#CFD2DD;} - .d2-933844085 .color-N5{color:#DEE1EB;} - .d2-933844085 .color-N6{color:#EEF1F8;} - .d2-933844085 .color-N7{color:#FFFFFF;} - .d2-933844085 .color-B1{color:#0D32B2;} - .d2-933844085 .color-B2{color:#0D32B2;} - .d2-933844085 .color-B3{color:#E3E9FD;} - .d2-933844085 .color-B4{color:#E3E9FD;} - .d2-933844085 .color-B5{color:#EDF0FD;} - .d2-933844085 .color-B6{color:#F7F8FE;} - .d2-933844085 .color-AA2{color:#4A6FF3;} - .d2-933844085 .color-AA4{color:#EDF0FD;} - .d2-933844085 .color-AA5{color:#F7F8FE;} - .d2-933844085 .color-AB4{color:#EDF0FD;} - .d2-933844085 .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}]]>-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetime:= 5 -======= .d2-1437779293 .fill-N1{fill:#0A0F25;} .d2-1437779293 .fill-N2{fill:#676C7E;} .d2-1437779293 .fill-N3{fill:#9499AB;} @@ -266,22 +103,11 @@ .d2-1437779293 .color-AA4{color:#EDF0FD;} .d2-1437779293 .color-AA5{color:#F7F8FE;} .d2-1437779293 .color-AB4{color:#EDF0FD;} - .d2-1437779293 .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}]]>-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetime:= 5 ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-1437779293 .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}]]>-numint-timeoutint-pid+getStatus()Enum+getJobs()Job[]+setTimeout(seconds int)voididintnamestringemailstringpasswordstringlast_logindatetime:= 5 := a + 7 -<<<<<<< HEAD fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b) -||||||| parent of 33280fed5 (fixed e2e tests) -fmt.Printf("%d", b)a := 5 -b := a + 7 -fmt.Printf("%d", b) -======= -fmt.Printf("%d", b)a := 5 -b := a + 7 -fmt.Printf("%d", b) ->>>>>>> 33280fed5 (fixed e2e tests) +fmt.Printf("%d", b) \ No newline at end of file diff --git a/e2etests/testdata/stable/us_map/dagre/sketch.exp.svg b/e2etests/testdata/stable/us_map/dagre/sketch.exp.svg index c1a5ebf63..da2c5a548 100644 --- a/e2etests/testdata/stable/us_map/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/us_map/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -ALFLGAMSTNAKAZCANVNMUTARLAMOOKTXORCOKSNEWYCTMANYRIDEMDNJPANCSCHIIDMTWAILINIAMIKYWIOHMNSDVAWVMENHVTND -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-1802566061 .fill-N1{fill:#0A0F25;} - .d2-1802566061 .fill-N2{fill:#676C7E;} - .d2-1802566061 .fill-N3{fill:#9499AB;} - .d2-1802566061 .fill-N4{fill:#CFD2DD;} - .d2-1802566061 .fill-N5{fill:#DEE1EB;} - .d2-1802566061 .fill-N6{fill:#EEF1F8;} - .d2-1802566061 .fill-N7{fill:#FFFFFF;} - .d2-1802566061 .fill-B1{fill:#0D32B2;} - .d2-1802566061 .fill-B2{fill:#0D32B2;} - .d2-1802566061 .fill-B3{fill:#E3E9FD;} - .d2-1802566061 .fill-B4{fill:#E3E9FD;} - .d2-1802566061 .fill-B5{fill:#EDF0FD;} - .d2-1802566061 .fill-B6{fill:#F7F8FE;} - .d2-1802566061 .fill-AA2{fill:#4A6FF3;} - .d2-1802566061 .fill-AA4{fill:#EDF0FD;} - .d2-1802566061 .fill-AA5{fill:#F7F8FE;} - .d2-1802566061 .fill-AB4{fill:#EDF0FD;} - .d2-1802566061 .fill-AB5{fill:#F7F8FE;} - .d2-1802566061 .stroke-N1{stroke:#0A0F25;} - .d2-1802566061 .stroke-N2{stroke:#676C7E;} - .d2-1802566061 .stroke-N3{stroke:#9499AB;} - .d2-1802566061 .stroke-N4{stroke:#CFD2DD;} - .d2-1802566061 .stroke-N5{stroke:#DEE1EB;} - .d2-1802566061 .stroke-N6{stroke:#EEF1F8;} - .d2-1802566061 .stroke-N7{stroke:#FFFFFF;} - .d2-1802566061 .stroke-B1{stroke:#0D32B2;} - .d2-1802566061 .stroke-B2{stroke:#0D32B2;} - .d2-1802566061 .stroke-B3{stroke:#E3E9FD;} - .d2-1802566061 .stroke-B4{stroke:#E3E9FD;} - .d2-1802566061 .stroke-B5{stroke:#EDF0FD;} - .d2-1802566061 .stroke-B6{stroke:#F7F8FE;} - .d2-1802566061 .stroke-AA2{stroke:#4A6FF3;} - .d2-1802566061 .stroke-AA4{stroke:#EDF0FD;} - .d2-1802566061 .stroke-AA5{stroke:#F7F8FE;} - .d2-1802566061 .stroke-AB4{stroke:#EDF0FD;} - .d2-1802566061 .stroke-AB5{stroke:#F7F8FE;} - .d2-1802566061 .background-color-N1{background-color:#0A0F25;} - .d2-1802566061 .background-color-N2{background-color:#676C7E;} - .d2-1802566061 .background-color-N3{background-color:#9499AB;} - .d2-1802566061 .background-color-N4{background-color:#CFD2DD;} - .d2-1802566061 .background-color-N5{background-color:#DEE1EB;} - .d2-1802566061 .background-color-N6{background-color:#EEF1F8;} - .d2-1802566061 .background-color-N7{background-color:#FFFFFF;} - .d2-1802566061 .background-color-B1{background-color:#0D32B2;} - .d2-1802566061 .background-color-B2{background-color:#0D32B2;} - .d2-1802566061 .background-color-B3{background-color:#E3E9FD;} - .d2-1802566061 .background-color-B4{background-color:#E3E9FD;} - .d2-1802566061 .background-color-B5{background-color:#EDF0FD;} - .d2-1802566061 .background-color-B6{background-color:#F7F8FE;} - .d2-1802566061 .background-color-AA2{background-color:#4A6FF3;} - .d2-1802566061 .background-color-AA4{background-color:#EDF0FD;} - .d2-1802566061 .background-color-AA5{background-color:#F7F8FE;} - .d2-1802566061 .background-color-AB4{background-color:#EDF0FD;} - .d2-1802566061 .background-color-AB5{background-color:#F7F8FE;} - .d2-1802566061 .color-N1{color:#0A0F25;} - .d2-1802566061 .color-N2{color:#676C7E;} - .d2-1802566061 .color-N3{color:#9499AB;} - .d2-1802566061 .color-N4{color:#CFD2DD;} - .d2-1802566061 .color-N5{color:#DEE1EB;} - .d2-1802566061 .color-N6{color:#EEF1F8;} - .d2-1802566061 .color-N7{color:#FFFFFF;} - .d2-1802566061 .color-B1{color:#0D32B2;} - .d2-1802566061 .color-B2{color:#0D32B2;} - .d2-1802566061 .color-B3{color:#E3E9FD;} - .d2-1802566061 .color-B4{color:#E3E9FD;} - .d2-1802566061 .color-B5{color:#EDF0FD;} - .d2-1802566061 .color-B6{color:#F7F8FE;} - .d2-1802566061 .color-AA2{color:#4A6FF3;} - .d2-1802566061 .color-AA4{color:#EDF0FD;} - .d2-1802566061 .color-AA5{color:#F7F8FE;} - .d2-1802566061 .color-AB4{color:#EDF0FD;} - .d2-1802566061 .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}]]>ALFLGAMSTNAKAZCANVNMUTARLAMOOKTXORCOKSNEWYCTMANYRIDEMDNJPANCSCHIIDMTWAILINIAMIKYWIOHMNSDVAWVMENHVTND -======= .d2-254941333 .fill-N1{fill:#0A0F25;} .d2-254941333 .fill-N2{fill:#676C7E;} .d2-254941333 .fill-N3{fill:#9499AB;} @@ -252,8 +89,7 @@ .d2-254941333 .color-AA4{color:#EDF0FD;} .d2-254941333 .color-AA5{color:#F7F8FE;} .d2-254941333 .color-AB4{color:#EDF0FD;} - .d2-254941333 .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}]]>ALFLGAMSTNAKAZCANVNMUTARLAMOOKTXORCOKSNEWYCTMANYRIDEMDNJPANCSCHIIDMTWAILINIAMIKYWIOHMNSDVAWVMENHVTND ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-254941333 .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}]]>ALFLGAMSTNAKAZCANVNMUTARLAMOOKTXORCOKSNEWYCTMANYRIDEMDNJPANCSCHIIDMTWAILINIAMIKYWIOHMNSDVAWVMENHVTND diff --git a/e2etests/testdata/stable/us_map/elk/sketch.exp.svg b/e2etests/testdata/stable/us_map/elk/sketch.exp.svg index d654ecd5b..41b0ded60 100644 --- a/e2etests/testdata/stable/us_map/elk/sketch.exp.svg +++ b/e2etests/testdata/stable/us_map/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -ALFLGAMSTNAKAZCANVNMUTARLAMOOKTXORCOKSNEWYCTMANYRIDEMDNJPANCSCHIIDMTWAILINIAMIKYWIOHMNSDVAWVMENHVTND -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-1796634463 .fill-N1{fill:#0A0F25;} - .d2-1796634463 .fill-N2{fill:#676C7E;} - .d2-1796634463 .fill-N3{fill:#9499AB;} - .d2-1796634463 .fill-N4{fill:#CFD2DD;} - .d2-1796634463 .fill-N5{fill:#DEE1EB;} - .d2-1796634463 .fill-N6{fill:#EEF1F8;} - .d2-1796634463 .fill-N7{fill:#FFFFFF;} - .d2-1796634463 .fill-B1{fill:#0D32B2;} - .d2-1796634463 .fill-B2{fill:#0D32B2;} - .d2-1796634463 .fill-B3{fill:#E3E9FD;} - .d2-1796634463 .fill-B4{fill:#E3E9FD;} - .d2-1796634463 .fill-B5{fill:#EDF0FD;} - .d2-1796634463 .fill-B6{fill:#F7F8FE;} - .d2-1796634463 .fill-AA2{fill:#4A6FF3;} - .d2-1796634463 .fill-AA4{fill:#EDF0FD;} - .d2-1796634463 .fill-AA5{fill:#F7F8FE;} - .d2-1796634463 .fill-AB4{fill:#EDF0FD;} - .d2-1796634463 .fill-AB5{fill:#F7F8FE;} - .d2-1796634463 .stroke-N1{stroke:#0A0F25;} - .d2-1796634463 .stroke-N2{stroke:#676C7E;} - .d2-1796634463 .stroke-N3{stroke:#9499AB;} - .d2-1796634463 .stroke-N4{stroke:#CFD2DD;} - .d2-1796634463 .stroke-N5{stroke:#DEE1EB;} - .d2-1796634463 .stroke-N6{stroke:#EEF1F8;} - .d2-1796634463 .stroke-N7{stroke:#FFFFFF;} - .d2-1796634463 .stroke-B1{stroke:#0D32B2;} - .d2-1796634463 .stroke-B2{stroke:#0D32B2;} - .d2-1796634463 .stroke-B3{stroke:#E3E9FD;} - .d2-1796634463 .stroke-B4{stroke:#E3E9FD;} - .d2-1796634463 .stroke-B5{stroke:#EDF0FD;} - .d2-1796634463 .stroke-B6{stroke:#F7F8FE;} - .d2-1796634463 .stroke-AA2{stroke:#4A6FF3;} - .d2-1796634463 .stroke-AA4{stroke:#EDF0FD;} - .d2-1796634463 .stroke-AA5{stroke:#F7F8FE;} - .d2-1796634463 .stroke-AB4{stroke:#EDF0FD;} - .d2-1796634463 .stroke-AB5{stroke:#F7F8FE;} - .d2-1796634463 .background-color-N1{background-color:#0A0F25;} - .d2-1796634463 .background-color-N2{background-color:#676C7E;} - .d2-1796634463 .background-color-N3{background-color:#9499AB;} - .d2-1796634463 .background-color-N4{background-color:#CFD2DD;} - .d2-1796634463 .background-color-N5{background-color:#DEE1EB;} - .d2-1796634463 .background-color-N6{background-color:#EEF1F8;} - .d2-1796634463 .background-color-N7{background-color:#FFFFFF;} - .d2-1796634463 .background-color-B1{background-color:#0D32B2;} - .d2-1796634463 .background-color-B2{background-color:#0D32B2;} - .d2-1796634463 .background-color-B3{background-color:#E3E9FD;} - .d2-1796634463 .background-color-B4{background-color:#E3E9FD;} - .d2-1796634463 .background-color-B5{background-color:#EDF0FD;} - .d2-1796634463 .background-color-B6{background-color:#F7F8FE;} - .d2-1796634463 .background-color-AA2{background-color:#4A6FF3;} - .d2-1796634463 .background-color-AA4{background-color:#EDF0FD;} - .d2-1796634463 .background-color-AA5{background-color:#F7F8FE;} - .d2-1796634463 .background-color-AB4{background-color:#EDF0FD;} - .d2-1796634463 .background-color-AB5{background-color:#F7F8FE;} - .d2-1796634463 .color-N1{color:#0A0F25;} - .d2-1796634463 .color-N2{color:#676C7E;} - .d2-1796634463 .color-N3{color:#9499AB;} - .d2-1796634463 .color-N4{color:#CFD2DD;} - .d2-1796634463 .color-N5{color:#DEE1EB;} - .d2-1796634463 .color-N6{color:#EEF1F8;} - .d2-1796634463 .color-N7{color:#FFFFFF;} - .d2-1796634463 .color-B1{color:#0D32B2;} - .d2-1796634463 .color-B2{color:#0D32B2;} - .d2-1796634463 .color-B3{color:#E3E9FD;} - .d2-1796634463 .color-B4{color:#E3E9FD;} - .d2-1796634463 .color-B5{color:#EDF0FD;} - .d2-1796634463 .color-B6{color:#F7F8FE;} - .d2-1796634463 .color-AA2{color:#4A6FF3;} - .d2-1796634463 .color-AA4{color:#EDF0FD;} - .d2-1796634463 .color-AA5{color:#F7F8FE;} - .d2-1796634463 .color-AB4{color:#EDF0FD;} - .d2-1796634463 .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}]]>ALFLGAMSTNAKAZCANVNMUTARLAMOOKTXORCOKSNEWYCTMANYRIDEMDNJPANCSCHIIDMTWAILINIAMIKYWIOHMNSDVAWVMENHVTND -======= .d2-4163663719 .fill-N1{fill:#0A0F25;} .d2-4163663719 .fill-N2{fill:#676C7E;} .d2-4163663719 .fill-N3{fill:#9499AB;} @@ -252,8 +89,7 @@ .d2-4163663719 .color-AA4{color:#EDF0FD;} .d2-4163663719 .color-AA5{color:#F7F8FE;} .d2-4163663719 .color-AB4{color:#EDF0FD;} - .d2-4163663719 .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}]]>ALFLGAMSTNAKAZCANVNMUTARLAMOOKTXORCOKSNEWYCTMANYRIDEMDNJPANCSCHIIDMTWAILINIAMIKYWIOHMNSDVAWVMENHVTND ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-4163663719 .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}]]>ALFLGAMSTNAKAZCANVNMUTARLAMOOKTXORCOKSNEWYCTMANYRIDEMDNJPANCSCHIIDMTWAILINIAMIKYWIOHMNSDVAWVMENHVTND diff --git a/e2etests/testdata/themes/dark_terrastruct_flagship/dagre/sketch.exp.svg b/e2etests/testdata/themes/dark_terrastruct_flagship/dagre/sketch.exp.svg index 2812db1b8..602ef7542 100644 --- a/e2etests/testdata/themes/dark_terrastruct_flagship/dagre/sketch.exp.svg +++ b/e2etests/testdata/themes/dark_terrastruct_flagship/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -Big fontabca -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-1917458193 .fill-N1{fill:#0A0F25;} - .d2-1917458193 .fill-N2{fill:#676C7E;} - .d2-1917458193 .fill-N3{fill:#9499AB;} - .d2-1917458193 .fill-N4{fill:#CFD2DD;} - .d2-1917458193 .fill-N5{fill:#DEE1EB;} - .d2-1917458193 .fill-N6{fill:#EEF1F8;} - .d2-1917458193 .fill-N7{fill:#FFFFFF;} - .d2-1917458193 .fill-B1{fill:#0D32B2;} - .d2-1917458193 .fill-B2{fill:#0D32B2;} - .d2-1917458193 .fill-B3{fill:#E3E9FD;} - .d2-1917458193 .fill-B4{fill:#E3E9FD;} - .d2-1917458193 .fill-B5{fill:#EDF0FD;} - .d2-1917458193 .fill-B6{fill:#F7F8FE;} - .d2-1917458193 .fill-AA2{fill:#4A6FF3;} - .d2-1917458193 .fill-AA4{fill:#EDF0FD;} - .d2-1917458193 .fill-AA5{fill:#F7F8FE;} - .d2-1917458193 .fill-AB4{fill:#EDF0FD;} - .d2-1917458193 .fill-AB5{fill:#F7F8FE;} - .d2-1917458193 .stroke-N1{stroke:#0A0F25;} - .d2-1917458193 .stroke-N2{stroke:#676C7E;} - .d2-1917458193 .stroke-N3{stroke:#9499AB;} - .d2-1917458193 .stroke-N4{stroke:#CFD2DD;} - .d2-1917458193 .stroke-N5{stroke:#DEE1EB;} - .d2-1917458193 .stroke-N6{stroke:#EEF1F8;} - .d2-1917458193 .stroke-N7{stroke:#FFFFFF;} - .d2-1917458193 .stroke-B1{stroke:#0D32B2;} - .d2-1917458193 .stroke-B2{stroke:#0D32B2;} - .d2-1917458193 .stroke-B3{stroke:#E3E9FD;} - .d2-1917458193 .stroke-B4{stroke:#E3E9FD;} - .d2-1917458193 .stroke-B5{stroke:#EDF0FD;} - .d2-1917458193 .stroke-B6{stroke:#F7F8FE;} - .d2-1917458193 .stroke-AA2{stroke:#4A6FF3;} - .d2-1917458193 .stroke-AA4{stroke:#EDF0FD;} - .d2-1917458193 .stroke-AA5{stroke:#F7F8FE;} - .d2-1917458193 .stroke-AB4{stroke:#EDF0FD;} - .d2-1917458193 .stroke-AB5{stroke:#F7F8FE;} - .d2-1917458193 .background-color-N1{background-color:#0A0F25;} - .d2-1917458193 .background-color-N2{background-color:#676C7E;} - .d2-1917458193 .background-color-N3{background-color:#9499AB;} - .d2-1917458193 .background-color-N4{background-color:#CFD2DD;} - .d2-1917458193 .background-color-N5{background-color:#DEE1EB;} - .d2-1917458193 .background-color-N6{background-color:#EEF1F8;} - .d2-1917458193 .background-color-N7{background-color:#FFFFFF;} - .d2-1917458193 .background-color-B1{background-color:#0D32B2;} - .d2-1917458193 .background-color-B2{background-color:#0D32B2;} - .d2-1917458193 .background-color-B3{background-color:#E3E9FD;} - .d2-1917458193 .background-color-B4{background-color:#E3E9FD;} - .d2-1917458193 .background-color-B5{background-color:#EDF0FD;} - .d2-1917458193 .background-color-B6{background-color:#F7F8FE;} - .d2-1917458193 .background-color-AA2{background-color:#4A6FF3;} - .d2-1917458193 .background-color-AA4{background-color:#EDF0FD;} - .d2-1917458193 .background-color-AA5{background-color:#F7F8FE;} - .d2-1917458193 .background-color-AB4{background-color:#EDF0FD;} - .d2-1917458193 .background-color-AB5{background-color:#F7F8FE;} - .d2-1917458193 .color-N1{color:#0A0F25;} - .d2-1917458193 .color-N2{color:#676C7E;} - .d2-1917458193 .color-N3{color:#9499AB;} - .d2-1917458193 .color-N4{color:#CFD2DD;} - .d2-1917458193 .color-N5{color:#DEE1EB;} - .d2-1917458193 .color-N6{color:#EEF1F8;} - .d2-1917458193 .color-N7{color:#FFFFFF;} - .d2-1917458193 .color-B1{color:#0D32B2;} - .d2-1917458193 .color-B2{color:#0D32B2;} - .d2-1917458193 .color-B3{color:#E3E9FD;} - .d2-1917458193 .color-B4{color:#E3E9FD;} - .d2-1917458193 .color-B5{color:#EDF0FD;} - .d2-1917458193 .color-B6{color:#F7F8FE;} - .d2-1917458193 .color-AA2{color:#4A6FF3;} - .d2-1917458193 .color-AA4{color:#EDF0FD;} - .d2-1917458193 .color-AA5{color:#F7F8FE;} - .d2-1917458193 .color-AB4{color:#EDF0FD;} - .d2-1917458193 .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}]]>Big fontabca -======= .d2-3860827657 .fill-N1{fill:#0A0F25;} .d2-3860827657 .fill-N2{fill:#676C7E;} .d2-3860827657 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-3860827657 .color-AA4{color:#EDF0FD;} .d2-3860827657 .color-AA5{color:#F7F8FE;} .d2-3860827657 .color-AB4{color:#EDF0FD;} - .d2-3860827657 .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}]]>Big fontabca ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-3860827657 .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}]]>Big fontabca diff --git a/e2etests/testdata/todo/container_icon_label/elk/sketch.exp.svg b/e2etests/testdata/todo/container_icon_label/elk/sketch.exp.svg index eddf4258e..31af65931 100644 --- a/e2etests/testdata/todo/container_icon_label/elk/sketch.exp.svg +++ b/e2etests/testdata/todo/container_icon_label/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -Big fontabca -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-1959422453 .fill-N1{fill:#0A0F25;} - .d2-1959422453 .fill-N2{fill:#676C7E;} - .d2-1959422453 .fill-N3{fill:#9499AB;} - .d2-1959422453 .fill-N4{fill:#CFD2DD;} - .d2-1959422453 .fill-N5{fill:#DEE1EB;} - .d2-1959422453 .fill-N6{fill:#EEF1F8;} - .d2-1959422453 .fill-N7{fill:#FFFFFF;} - .d2-1959422453 .fill-B1{fill:#0D32B2;} - .d2-1959422453 .fill-B2{fill:#0D32B2;} - .d2-1959422453 .fill-B3{fill:#E3E9FD;} - .d2-1959422453 .fill-B4{fill:#E3E9FD;} - .d2-1959422453 .fill-B5{fill:#EDF0FD;} - .d2-1959422453 .fill-B6{fill:#F7F8FE;} - .d2-1959422453 .fill-AA2{fill:#4A6FF3;} - .d2-1959422453 .fill-AA4{fill:#EDF0FD;} - .d2-1959422453 .fill-AA5{fill:#F7F8FE;} - .d2-1959422453 .fill-AB4{fill:#EDF0FD;} - .d2-1959422453 .fill-AB5{fill:#F7F8FE;} - .d2-1959422453 .stroke-N1{stroke:#0A0F25;} - .d2-1959422453 .stroke-N2{stroke:#676C7E;} - .d2-1959422453 .stroke-N3{stroke:#9499AB;} - .d2-1959422453 .stroke-N4{stroke:#CFD2DD;} - .d2-1959422453 .stroke-N5{stroke:#DEE1EB;} - .d2-1959422453 .stroke-N6{stroke:#EEF1F8;} - .d2-1959422453 .stroke-N7{stroke:#FFFFFF;} - .d2-1959422453 .stroke-B1{stroke:#0D32B2;} - .d2-1959422453 .stroke-B2{stroke:#0D32B2;} - .d2-1959422453 .stroke-B3{stroke:#E3E9FD;} - .d2-1959422453 .stroke-B4{stroke:#E3E9FD;} - .d2-1959422453 .stroke-B5{stroke:#EDF0FD;} - .d2-1959422453 .stroke-B6{stroke:#F7F8FE;} - .d2-1959422453 .stroke-AA2{stroke:#4A6FF3;} - .d2-1959422453 .stroke-AA4{stroke:#EDF0FD;} - .d2-1959422453 .stroke-AA5{stroke:#F7F8FE;} - .d2-1959422453 .stroke-AB4{stroke:#EDF0FD;} - .d2-1959422453 .stroke-AB5{stroke:#F7F8FE;} - .d2-1959422453 .background-color-N1{background-color:#0A0F25;} - .d2-1959422453 .background-color-N2{background-color:#676C7E;} - .d2-1959422453 .background-color-N3{background-color:#9499AB;} - .d2-1959422453 .background-color-N4{background-color:#CFD2DD;} - .d2-1959422453 .background-color-N5{background-color:#DEE1EB;} - .d2-1959422453 .background-color-N6{background-color:#EEF1F8;} - .d2-1959422453 .background-color-N7{background-color:#FFFFFF;} - .d2-1959422453 .background-color-B1{background-color:#0D32B2;} - .d2-1959422453 .background-color-B2{background-color:#0D32B2;} - .d2-1959422453 .background-color-B3{background-color:#E3E9FD;} - .d2-1959422453 .background-color-B4{background-color:#E3E9FD;} - .d2-1959422453 .background-color-B5{background-color:#EDF0FD;} - .d2-1959422453 .background-color-B6{background-color:#F7F8FE;} - .d2-1959422453 .background-color-AA2{background-color:#4A6FF3;} - .d2-1959422453 .background-color-AA4{background-color:#EDF0FD;} - .d2-1959422453 .background-color-AA5{background-color:#F7F8FE;} - .d2-1959422453 .background-color-AB4{background-color:#EDF0FD;} - .d2-1959422453 .background-color-AB5{background-color:#F7F8FE;} - .d2-1959422453 .color-N1{color:#0A0F25;} - .d2-1959422453 .color-N2{color:#676C7E;} - .d2-1959422453 .color-N3{color:#9499AB;} - .d2-1959422453 .color-N4{color:#CFD2DD;} - .d2-1959422453 .color-N5{color:#DEE1EB;} - .d2-1959422453 .color-N6{color:#EEF1F8;} - .d2-1959422453 .color-N7{color:#FFFFFF;} - .d2-1959422453 .color-B1{color:#0D32B2;} - .d2-1959422453 .color-B2{color:#0D32B2;} - .d2-1959422453 .color-B3{color:#E3E9FD;} - .d2-1959422453 .color-B4{color:#E3E9FD;} - .d2-1959422453 .color-B5{color:#EDF0FD;} - .d2-1959422453 .color-B6{color:#F7F8FE;} - .d2-1959422453 .color-AA2{color:#4A6FF3;} - .d2-1959422453 .color-AA4{color:#EDF0FD;} - .d2-1959422453 .color-AA5{color:#F7F8FE;} - .d2-1959422453 .color-AB4{color:#EDF0FD;} - .d2-1959422453 .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}]]>Big fontabca -======= .d2-1986136645 .fill-N1{fill:#0A0F25;} .d2-1986136645 .fill-N2{fill:#676C7E;} .d2-1986136645 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-1986136645 .color-AA4{color:#EDF0FD;} .d2-1986136645 .color-AA5{color:#F7F8FE;} .d2-1986136645 .color-AB4{color:#EDF0FD;} - .d2-1986136645 .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}]]>Big fontabca ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-1986136645 .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}]]>Big fontabca diff --git a/e2etests/testdata/todo/container_label_edge_adjustment/dagre/sketch.exp.svg b/e2etests/testdata/todo/container_label_edge_adjustment/dagre/sketch.exp.svg index 70cc36339..3edc474fa 100644 --- a/e2etests/testdata/todo/container_label_edge_adjustment/dagre/sketch.exp.svg +++ b/e2etests/testdata/todo/container_label_edge_adjustment/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -aa container labeldefgc -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-2683099636 .fill-N1{fill:#0A0F25;} - .d2-2683099636 .fill-N2{fill:#676C7E;} - .d2-2683099636 .fill-N3{fill:#9499AB;} - .d2-2683099636 .fill-N4{fill:#CFD2DD;} - .d2-2683099636 .fill-N5{fill:#DEE1EB;} - .d2-2683099636 .fill-N6{fill:#EEF1F8;} - .d2-2683099636 .fill-N7{fill:#FFFFFF;} - .d2-2683099636 .fill-B1{fill:#0D32B2;} - .d2-2683099636 .fill-B2{fill:#0D32B2;} - .d2-2683099636 .fill-B3{fill:#E3E9FD;} - .d2-2683099636 .fill-B4{fill:#E3E9FD;} - .d2-2683099636 .fill-B5{fill:#EDF0FD;} - .d2-2683099636 .fill-B6{fill:#F7F8FE;} - .d2-2683099636 .fill-AA2{fill:#4A6FF3;} - .d2-2683099636 .fill-AA4{fill:#EDF0FD;} - .d2-2683099636 .fill-AA5{fill:#F7F8FE;} - .d2-2683099636 .fill-AB4{fill:#EDF0FD;} - .d2-2683099636 .fill-AB5{fill:#F7F8FE;} - .d2-2683099636 .stroke-N1{stroke:#0A0F25;} - .d2-2683099636 .stroke-N2{stroke:#676C7E;} - .d2-2683099636 .stroke-N3{stroke:#9499AB;} - .d2-2683099636 .stroke-N4{stroke:#CFD2DD;} - .d2-2683099636 .stroke-N5{stroke:#DEE1EB;} - .d2-2683099636 .stroke-N6{stroke:#EEF1F8;} - .d2-2683099636 .stroke-N7{stroke:#FFFFFF;} - .d2-2683099636 .stroke-B1{stroke:#0D32B2;} - .d2-2683099636 .stroke-B2{stroke:#0D32B2;} - .d2-2683099636 .stroke-B3{stroke:#E3E9FD;} - .d2-2683099636 .stroke-B4{stroke:#E3E9FD;} - .d2-2683099636 .stroke-B5{stroke:#EDF0FD;} - .d2-2683099636 .stroke-B6{stroke:#F7F8FE;} - .d2-2683099636 .stroke-AA2{stroke:#4A6FF3;} - .d2-2683099636 .stroke-AA4{stroke:#EDF0FD;} - .d2-2683099636 .stroke-AA5{stroke:#F7F8FE;} - .d2-2683099636 .stroke-AB4{stroke:#EDF0FD;} - .d2-2683099636 .stroke-AB5{stroke:#F7F8FE;} - .d2-2683099636 .background-color-N1{background-color:#0A0F25;} - .d2-2683099636 .background-color-N2{background-color:#676C7E;} - .d2-2683099636 .background-color-N3{background-color:#9499AB;} - .d2-2683099636 .background-color-N4{background-color:#CFD2DD;} - .d2-2683099636 .background-color-N5{background-color:#DEE1EB;} - .d2-2683099636 .background-color-N6{background-color:#EEF1F8;} - .d2-2683099636 .background-color-N7{background-color:#FFFFFF;} - .d2-2683099636 .background-color-B1{background-color:#0D32B2;} - .d2-2683099636 .background-color-B2{background-color:#0D32B2;} - .d2-2683099636 .background-color-B3{background-color:#E3E9FD;} - .d2-2683099636 .background-color-B4{background-color:#E3E9FD;} - .d2-2683099636 .background-color-B5{background-color:#EDF0FD;} - .d2-2683099636 .background-color-B6{background-color:#F7F8FE;} - .d2-2683099636 .background-color-AA2{background-color:#4A6FF3;} - .d2-2683099636 .background-color-AA4{background-color:#EDF0FD;} - .d2-2683099636 .background-color-AA5{background-color:#F7F8FE;} - .d2-2683099636 .background-color-AB4{background-color:#EDF0FD;} - .d2-2683099636 .background-color-AB5{background-color:#F7F8FE;} - .d2-2683099636 .color-N1{color:#0A0F25;} - .d2-2683099636 .color-N2{color:#676C7E;} - .d2-2683099636 .color-N3{color:#9499AB;} - .d2-2683099636 .color-N4{color:#CFD2DD;} - .d2-2683099636 .color-N5{color:#DEE1EB;} - .d2-2683099636 .color-N6{color:#EEF1F8;} - .d2-2683099636 .color-N7{color:#FFFFFF;} - .d2-2683099636 .color-B1{color:#0D32B2;} - .d2-2683099636 .color-B2{color:#0D32B2;} - .d2-2683099636 .color-B3{color:#E3E9FD;} - .d2-2683099636 .color-B4{color:#E3E9FD;} - .d2-2683099636 .color-B5{color:#EDF0FD;} - .d2-2683099636 .color-B6{color:#F7F8FE;} - .d2-2683099636 .color-AA2{color:#4A6FF3;} - .d2-2683099636 .color-AA4{color:#EDF0FD;} - .d2-2683099636 .color-AA5{color:#F7F8FE;} - .d2-2683099636 .color-AB4{color:#EDF0FD;} - .d2-2683099636 .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}]]>aa container labeldefgc -======= .d2-3473197450 .fill-N1{fill:#0A0F25;} .d2-3473197450 .fill-N2{fill:#676C7E;} .d2-3473197450 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-3473197450 .color-AA4{color:#EDF0FD;} .d2-3473197450 .color-AA5{color:#F7F8FE;} .d2-3473197450 .color-AB4{color:#EDF0FD;} - .d2-3473197450 .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}]]>aa container labeldefgc ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-3473197450 .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}]]>aa container labeldefgc diff --git a/e2etests/testdata/todo/container_label_edge_adjustment/elk/sketch.exp.svg b/e2etests/testdata/todo/container_label_edge_adjustment/elk/sketch.exp.svg index 12f5a913c..2c86c753c 100644 --- a/e2etests/testdata/todo/container_label_edge_adjustment/elk/sketch.exp.svg +++ b/e2etests/testdata/todo/container_label_edge_adjustment/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -aa container labeldefgc -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-1911948766 .fill-N1{fill:#0A0F25;} - .d2-1911948766 .fill-N2{fill:#676C7E;} - .d2-1911948766 .fill-N3{fill:#9499AB;} - .d2-1911948766 .fill-N4{fill:#CFD2DD;} - .d2-1911948766 .fill-N5{fill:#DEE1EB;} - .d2-1911948766 .fill-N6{fill:#EEF1F8;} - .d2-1911948766 .fill-N7{fill:#FFFFFF;} - .d2-1911948766 .fill-B1{fill:#0D32B2;} - .d2-1911948766 .fill-B2{fill:#0D32B2;} - .d2-1911948766 .fill-B3{fill:#E3E9FD;} - .d2-1911948766 .fill-B4{fill:#E3E9FD;} - .d2-1911948766 .fill-B5{fill:#EDF0FD;} - .d2-1911948766 .fill-B6{fill:#F7F8FE;} - .d2-1911948766 .fill-AA2{fill:#4A6FF3;} - .d2-1911948766 .fill-AA4{fill:#EDF0FD;} - .d2-1911948766 .fill-AA5{fill:#F7F8FE;} - .d2-1911948766 .fill-AB4{fill:#EDF0FD;} - .d2-1911948766 .fill-AB5{fill:#F7F8FE;} - .d2-1911948766 .stroke-N1{stroke:#0A0F25;} - .d2-1911948766 .stroke-N2{stroke:#676C7E;} - .d2-1911948766 .stroke-N3{stroke:#9499AB;} - .d2-1911948766 .stroke-N4{stroke:#CFD2DD;} - .d2-1911948766 .stroke-N5{stroke:#DEE1EB;} - .d2-1911948766 .stroke-N6{stroke:#EEF1F8;} - .d2-1911948766 .stroke-N7{stroke:#FFFFFF;} - .d2-1911948766 .stroke-B1{stroke:#0D32B2;} - .d2-1911948766 .stroke-B2{stroke:#0D32B2;} - .d2-1911948766 .stroke-B3{stroke:#E3E9FD;} - .d2-1911948766 .stroke-B4{stroke:#E3E9FD;} - .d2-1911948766 .stroke-B5{stroke:#EDF0FD;} - .d2-1911948766 .stroke-B6{stroke:#F7F8FE;} - .d2-1911948766 .stroke-AA2{stroke:#4A6FF3;} - .d2-1911948766 .stroke-AA4{stroke:#EDF0FD;} - .d2-1911948766 .stroke-AA5{stroke:#F7F8FE;} - .d2-1911948766 .stroke-AB4{stroke:#EDF0FD;} - .d2-1911948766 .stroke-AB5{stroke:#F7F8FE;} - .d2-1911948766 .background-color-N1{background-color:#0A0F25;} - .d2-1911948766 .background-color-N2{background-color:#676C7E;} - .d2-1911948766 .background-color-N3{background-color:#9499AB;} - .d2-1911948766 .background-color-N4{background-color:#CFD2DD;} - .d2-1911948766 .background-color-N5{background-color:#DEE1EB;} - .d2-1911948766 .background-color-N6{background-color:#EEF1F8;} - .d2-1911948766 .background-color-N7{background-color:#FFFFFF;} - .d2-1911948766 .background-color-B1{background-color:#0D32B2;} - .d2-1911948766 .background-color-B2{background-color:#0D32B2;} - .d2-1911948766 .background-color-B3{background-color:#E3E9FD;} - .d2-1911948766 .background-color-B4{background-color:#E3E9FD;} - .d2-1911948766 .background-color-B5{background-color:#EDF0FD;} - .d2-1911948766 .background-color-B6{background-color:#F7F8FE;} - .d2-1911948766 .background-color-AA2{background-color:#4A6FF3;} - .d2-1911948766 .background-color-AA4{background-color:#EDF0FD;} - .d2-1911948766 .background-color-AA5{background-color:#F7F8FE;} - .d2-1911948766 .background-color-AB4{background-color:#EDF0FD;} - .d2-1911948766 .background-color-AB5{background-color:#F7F8FE;} - .d2-1911948766 .color-N1{color:#0A0F25;} - .d2-1911948766 .color-N2{color:#676C7E;} - .d2-1911948766 .color-N3{color:#9499AB;} - .d2-1911948766 .color-N4{color:#CFD2DD;} - .d2-1911948766 .color-N5{color:#DEE1EB;} - .d2-1911948766 .color-N6{color:#EEF1F8;} - .d2-1911948766 .color-N7{color:#FFFFFF;} - .d2-1911948766 .color-B1{color:#0D32B2;} - .d2-1911948766 .color-B2{color:#0D32B2;} - .d2-1911948766 .color-B3{color:#E3E9FD;} - .d2-1911948766 .color-B4{color:#E3E9FD;} - .d2-1911948766 .color-B5{color:#EDF0FD;} - .d2-1911948766 .color-B6{color:#F7F8FE;} - .d2-1911948766 .color-AA2{color:#4A6FF3;} - .d2-1911948766 .color-AA4{color:#EDF0FD;} - .d2-1911948766 .color-AA5{color:#F7F8FE;} - .d2-1911948766 .color-AB4{color:#EDF0FD;} - .d2-1911948766 .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}]]>aa container labeldefgc -======= .d2-3817031852 .fill-N1{fill:#0A0F25;} .d2-3817031852 .fill-N2{fill:#676C7E;} .d2-3817031852 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-3817031852 .color-AA4{color:#EDF0FD;} .d2-3817031852 .color-AA5{color:#F7F8FE;} .d2-3817031852 .color-AB4{color:#EDF0FD;} - .d2-3817031852 .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}]]>aa container labeldefgc ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-3817031852 .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}]]>aa container labeldefgc diff --git a/e2etests/testdata/todo/container_label_edge_adjustment2/dagre/sketch.exp.svg b/e2etests/testdata/todo/container_label_edge_adjustment2/dagre/sketch.exp.svg index b7b40162f..6ba72de40 100644 --- a/e2etests/testdata/todo/container_label_edge_adjustment2/dagre/sketch.exp.svg +++ b/e2etests/testdata/todo/container_label_edge_adjustment2/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -xbarz foo -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-3520681588 .fill-N1{fill:#0A0F25;} - .d2-3520681588 .fill-N2{fill:#676C7E;} - .d2-3520681588 .fill-N3{fill:#9499AB;} - .d2-3520681588 .fill-N4{fill:#CFD2DD;} - .d2-3520681588 .fill-N5{fill:#DEE1EB;} - .d2-3520681588 .fill-N6{fill:#EEF1F8;} - .d2-3520681588 .fill-N7{fill:#FFFFFF;} - .d2-3520681588 .fill-B1{fill:#0D32B2;} - .d2-3520681588 .fill-B2{fill:#0D32B2;} - .d2-3520681588 .fill-B3{fill:#E3E9FD;} - .d2-3520681588 .fill-B4{fill:#E3E9FD;} - .d2-3520681588 .fill-B5{fill:#EDF0FD;} - .d2-3520681588 .fill-B6{fill:#F7F8FE;} - .d2-3520681588 .fill-AA2{fill:#4A6FF3;} - .d2-3520681588 .fill-AA4{fill:#EDF0FD;} - .d2-3520681588 .fill-AA5{fill:#F7F8FE;} - .d2-3520681588 .fill-AB4{fill:#EDF0FD;} - .d2-3520681588 .fill-AB5{fill:#F7F8FE;} - .d2-3520681588 .stroke-N1{stroke:#0A0F25;} - .d2-3520681588 .stroke-N2{stroke:#676C7E;} - .d2-3520681588 .stroke-N3{stroke:#9499AB;} - .d2-3520681588 .stroke-N4{stroke:#CFD2DD;} - .d2-3520681588 .stroke-N5{stroke:#DEE1EB;} - .d2-3520681588 .stroke-N6{stroke:#EEF1F8;} - .d2-3520681588 .stroke-N7{stroke:#FFFFFF;} - .d2-3520681588 .stroke-B1{stroke:#0D32B2;} - .d2-3520681588 .stroke-B2{stroke:#0D32B2;} - .d2-3520681588 .stroke-B3{stroke:#E3E9FD;} - .d2-3520681588 .stroke-B4{stroke:#E3E9FD;} - .d2-3520681588 .stroke-B5{stroke:#EDF0FD;} - .d2-3520681588 .stroke-B6{stroke:#F7F8FE;} - .d2-3520681588 .stroke-AA2{stroke:#4A6FF3;} - .d2-3520681588 .stroke-AA4{stroke:#EDF0FD;} - .d2-3520681588 .stroke-AA5{stroke:#F7F8FE;} - .d2-3520681588 .stroke-AB4{stroke:#EDF0FD;} - .d2-3520681588 .stroke-AB5{stroke:#F7F8FE;} - .d2-3520681588 .background-color-N1{background-color:#0A0F25;} - .d2-3520681588 .background-color-N2{background-color:#676C7E;} - .d2-3520681588 .background-color-N3{background-color:#9499AB;} - .d2-3520681588 .background-color-N4{background-color:#CFD2DD;} - .d2-3520681588 .background-color-N5{background-color:#DEE1EB;} - .d2-3520681588 .background-color-N6{background-color:#EEF1F8;} - .d2-3520681588 .background-color-N7{background-color:#FFFFFF;} - .d2-3520681588 .background-color-B1{background-color:#0D32B2;} - .d2-3520681588 .background-color-B2{background-color:#0D32B2;} - .d2-3520681588 .background-color-B3{background-color:#E3E9FD;} - .d2-3520681588 .background-color-B4{background-color:#E3E9FD;} - .d2-3520681588 .background-color-B5{background-color:#EDF0FD;} - .d2-3520681588 .background-color-B6{background-color:#F7F8FE;} - .d2-3520681588 .background-color-AA2{background-color:#4A6FF3;} - .d2-3520681588 .background-color-AA4{background-color:#EDF0FD;} - .d2-3520681588 .background-color-AA5{background-color:#F7F8FE;} - .d2-3520681588 .background-color-AB4{background-color:#EDF0FD;} - .d2-3520681588 .background-color-AB5{background-color:#F7F8FE;} - .d2-3520681588 .color-N1{color:#0A0F25;} - .d2-3520681588 .color-N2{color:#676C7E;} - .d2-3520681588 .color-N3{color:#9499AB;} - .d2-3520681588 .color-N4{color:#CFD2DD;} - .d2-3520681588 .color-N5{color:#DEE1EB;} - .d2-3520681588 .color-N6{color:#EEF1F8;} - .d2-3520681588 .color-N7{color:#FFFFFF;} - .d2-3520681588 .color-B1{color:#0D32B2;} - .d2-3520681588 .color-B2{color:#0D32B2;} - .d2-3520681588 .color-B3{color:#E3E9FD;} - .d2-3520681588 .color-B4{color:#E3E9FD;} - .d2-3520681588 .color-B5{color:#EDF0FD;} - .d2-3520681588 .color-B6{color:#F7F8FE;} - .d2-3520681588 .color-AA2{color:#4A6FF3;} - .d2-3520681588 .color-AA4{color:#EDF0FD;} - .d2-3520681588 .color-AA5{color:#F7F8FE;} - .d2-3520681588 .color-AB4{color:#EDF0FD;} - .d2-3520681588 .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}]]>xbarz foo -======= .d2-1381119694 .fill-N1{fill:#0A0F25;} .d2-1381119694 .fill-N2{fill:#676C7E;} .d2-1381119694 .fill-N3{fill:#9499AB;} @@ -266,8 +103,7 @@ .d2-1381119694 .color-AA4{color:#EDF0FD;} .d2-1381119694 .color-AA5{color:#F7F8FE;} .d2-1381119694 .color-AB4{color:#EDF0FD;} - .d2-1381119694 .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}]]>xbarz foo ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-1381119694 .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}]]>xbarz foo diff --git a/e2etests/testdata/todo/container_label_edge_adjustment2/elk/sketch.exp.svg b/e2etests/testdata/todo/container_label_edge_adjustment2/elk/sketch.exp.svg index a7b4159f5..478047bd9 100644 --- a/e2etests/testdata/todo/container_label_edge_adjustment2/elk/sketch.exp.svg +++ b/e2etests/testdata/todo/container_label_edge_adjustment2/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -xbarz foo -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-2150775247 .fill-N1{fill:#0A0F25;} - .d2-2150775247 .fill-N2{fill:#676C7E;} - .d2-2150775247 .fill-N3{fill:#9499AB;} - .d2-2150775247 .fill-N4{fill:#CFD2DD;} - .d2-2150775247 .fill-N5{fill:#DEE1EB;} - .d2-2150775247 .fill-N6{fill:#EEF1F8;} - .d2-2150775247 .fill-N7{fill:#FFFFFF;} - .d2-2150775247 .fill-B1{fill:#0D32B2;} - .d2-2150775247 .fill-B2{fill:#0D32B2;} - .d2-2150775247 .fill-B3{fill:#E3E9FD;} - .d2-2150775247 .fill-B4{fill:#E3E9FD;} - .d2-2150775247 .fill-B5{fill:#EDF0FD;} - .d2-2150775247 .fill-B6{fill:#F7F8FE;} - .d2-2150775247 .fill-AA2{fill:#4A6FF3;} - .d2-2150775247 .fill-AA4{fill:#EDF0FD;} - .d2-2150775247 .fill-AA5{fill:#F7F8FE;} - .d2-2150775247 .fill-AB4{fill:#EDF0FD;} - .d2-2150775247 .fill-AB5{fill:#F7F8FE;} - .d2-2150775247 .stroke-N1{stroke:#0A0F25;} - .d2-2150775247 .stroke-N2{stroke:#676C7E;} - .d2-2150775247 .stroke-N3{stroke:#9499AB;} - .d2-2150775247 .stroke-N4{stroke:#CFD2DD;} - .d2-2150775247 .stroke-N5{stroke:#DEE1EB;} - .d2-2150775247 .stroke-N6{stroke:#EEF1F8;} - .d2-2150775247 .stroke-N7{stroke:#FFFFFF;} - .d2-2150775247 .stroke-B1{stroke:#0D32B2;} - .d2-2150775247 .stroke-B2{stroke:#0D32B2;} - .d2-2150775247 .stroke-B3{stroke:#E3E9FD;} - .d2-2150775247 .stroke-B4{stroke:#E3E9FD;} - .d2-2150775247 .stroke-B5{stroke:#EDF0FD;} - .d2-2150775247 .stroke-B6{stroke:#F7F8FE;} - .d2-2150775247 .stroke-AA2{stroke:#4A6FF3;} - .d2-2150775247 .stroke-AA4{stroke:#EDF0FD;} - .d2-2150775247 .stroke-AA5{stroke:#F7F8FE;} - .d2-2150775247 .stroke-AB4{stroke:#EDF0FD;} - .d2-2150775247 .stroke-AB5{stroke:#F7F8FE;} - .d2-2150775247 .background-color-N1{background-color:#0A0F25;} - .d2-2150775247 .background-color-N2{background-color:#676C7E;} - .d2-2150775247 .background-color-N3{background-color:#9499AB;} - .d2-2150775247 .background-color-N4{background-color:#CFD2DD;} - .d2-2150775247 .background-color-N5{background-color:#DEE1EB;} - .d2-2150775247 .background-color-N6{background-color:#EEF1F8;} - .d2-2150775247 .background-color-N7{background-color:#FFFFFF;} - .d2-2150775247 .background-color-B1{background-color:#0D32B2;} - .d2-2150775247 .background-color-B2{background-color:#0D32B2;} - .d2-2150775247 .background-color-B3{background-color:#E3E9FD;} - .d2-2150775247 .background-color-B4{background-color:#E3E9FD;} - .d2-2150775247 .background-color-B5{background-color:#EDF0FD;} - .d2-2150775247 .background-color-B6{background-color:#F7F8FE;} - .d2-2150775247 .background-color-AA2{background-color:#4A6FF3;} - .d2-2150775247 .background-color-AA4{background-color:#EDF0FD;} - .d2-2150775247 .background-color-AA5{background-color:#F7F8FE;} - .d2-2150775247 .background-color-AB4{background-color:#EDF0FD;} - .d2-2150775247 .background-color-AB5{background-color:#F7F8FE;} - .d2-2150775247 .color-N1{color:#0A0F25;} - .d2-2150775247 .color-N2{color:#676C7E;} - .d2-2150775247 .color-N3{color:#9499AB;} - .d2-2150775247 .color-N4{color:#CFD2DD;} - .d2-2150775247 .color-N5{color:#DEE1EB;} - .d2-2150775247 .color-N6{color:#EEF1F8;} - .d2-2150775247 .color-N7{color:#FFFFFF;} - .d2-2150775247 .color-B1{color:#0D32B2;} - .d2-2150775247 .color-B2{color:#0D32B2;} - .d2-2150775247 .color-B3{color:#E3E9FD;} - .d2-2150775247 .color-B4{color:#E3E9FD;} - .d2-2150775247 .color-B5{color:#EDF0FD;} - .d2-2150775247 .color-B6{color:#F7F8FE;} - .d2-2150775247 .color-AA2{color:#4A6FF3;} - .d2-2150775247 .color-AA4{color:#EDF0FD;} - .d2-2150775247 .color-AA5{color:#F7F8FE;} - .d2-2150775247 .color-AB4{color:#EDF0FD;} - .d2-2150775247 .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}]]>xbarz foo -======= .d2-34935397 .fill-N1{fill:#0A0F25;} .d2-34935397 .fill-N2{fill:#676C7E;} .d2-34935397 .fill-N3{fill:#9499AB;} @@ -266,8 +103,7 @@ .d2-34935397 .color-AA4{color:#EDF0FD;} .d2-34935397 .color-AA5{color:#F7F8FE;} .d2-34935397 .color-AB4{color:#EDF0FD;} - .d2-34935397 .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}]]>xbarz foo ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-34935397 .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}]]>xbarz foo diff --git a/e2etests/testdata/todo/dagre_container_md_label_panic/dagre/sketch.exp.svg b/e2etests/testdata/todo/dagre_container_md_label_panic/dagre/sketch.exp.svg index 2d0f35395..42abe9cae 100644 --- a/e2etests/testdata/todo/dagre_container_md_label_panic/dagre/sketch.exp.svg +++ b/e2etests/testdata/todo/dagre_container_md_label_panic/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -bacthis is a message groupand this is a nested message groupwhat about more nestingyoyo - -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-325604788 .fill-N1{fill:#0A0F25;} - .d2-325604788 .fill-N2{fill:#676C7E;} - .d2-325604788 .fill-N3{fill:#9499AB;} - .d2-325604788 .fill-N4{fill:#CFD2DD;} - .d2-325604788 .fill-N5{fill:#DEE1EB;} - .d2-325604788 .fill-N6{fill:#EEF1F8;} - .d2-325604788 .fill-N7{fill:#FFFFFF;} - .d2-325604788 .fill-B1{fill:#0D32B2;} - .d2-325604788 .fill-B2{fill:#0D32B2;} - .d2-325604788 .fill-B3{fill:#E3E9FD;} - .d2-325604788 .fill-B4{fill:#E3E9FD;} - .d2-325604788 .fill-B5{fill:#EDF0FD;} - .d2-325604788 .fill-B6{fill:#F7F8FE;} - .d2-325604788 .fill-AA2{fill:#4A6FF3;} - .d2-325604788 .fill-AA4{fill:#EDF0FD;} - .d2-325604788 .fill-AA5{fill:#F7F8FE;} - .d2-325604788 .fill-AB4{fill:#EDF0FD;} - .d2-325604788 .fill-AB5{fill:#F7F8FE;} - .d2-325604788 .stroke-N1{stroke:#0A0F25;} - .d2-325604788 .stroke-N2{stroke:#676C7E;} - .d2-325604788 .stroke-N3{stroke:#9499AB;} - .d2-325604788 .stroke-N4{stroke:#CFD2DD;} - .d2-325604788 .stroke-N5{stroke:#DEE1EB;} - .d2-325604788 .stroke-N6{stroke:#EEF1F8;} - .d2-325604788 .stroke-N7{stroke:#FFFFFF;} - .d2-325604788 .stroke-B1{stroke:#0D32B2;} - .d2-325604788 .stroke-B2{stroke:#0D32B2;} - .d2-325604788 .stroke-B3{stroke:#E3E9FD;} - .d2-325604788 .stroke-B4{stroke:#E3E9FD;} - .d2-325604788 .stroke-B5{stroke:#EDF0FD;} - .d2-325604788 .stroke-B6{stroke:#F7F8FE;} - .d2-325604788 .stroke-AA2{stroke:#4A6FF3;} - .d2-325604788 .stroke-AA4{stroke:#EDF0FD;} - .d2-325604788 .stroke-AA5{stroke:#F7F8FE;} - .d2-325604788 .stroke-AB4{stroke:#EDF0FD;} - .d2-325604788 .stroke-AB5{stroke:#F7F8FE;} - .d2-325604788 .background-color-N1{background-color:#0A0F25;} - .d2-325604788 .background-color-N2{background-color:#676C7E;} - .d2-325604788 .background-color-N3{background-color:#9499AB;} - .d2-325604788 .background-color-N4{background-color:#CFD2DD;} - .d2-325604788 .background-color-N5{background-color:#DEE1EB;} - .d2-325604788 .background-color-N6{background-color:#EEF1F8;} - .d2-325604788 .background-color-N7{background-color:#FFFFFF;} - .d2-325604788 .background-color-B1{background-color:#0D32B2;} - .d2-325604788 .background-color-B2{background-color:#0D32B2;} - .d2-325604788 .background-color-B3{background-color:#E3E9FD;} - .d2-325604788 .background-color-B4{background-color:#E3E9FD;} - .d2-325604788 .background-color-B5{background-color:#EDF0FD;} - .d2-325604788 .background-color-B6{background-color:#F7F8FE;} - .d2-325604788 .background-color-AA2{background-color:#4A6FF3;} - .d2-325604788 .background-color-AA4{background-color:#EDF0FD;} - .d2-325604788 .background-color-AA5{background-color:#F7F8FE;} - .d2-325604788 .background-color-AB4{background-color:#EDF0FD;} - .d2-325604788 .background-color-AB5{background-color:#F7F8FE;} - .d2-325604788 .color-N1{color:#0A0F25;} - .d2-325604788 .color-N2{color:#676C7E;} - .d2-325604788 .color-N3{color:#9499AB;} - .d2-325604788 .color-N4{color:#CFD2DD;} - .d2-325604788 .color-N5{color:#DEE1EB;} - .d2-325604788 .color-N6{color:#EEF1F8;} - .d2-325604788 .color-N7{color:#FFFFFF;} - .d2-325604788 .color-B1{color:#0D32B2;} - .d2-325604788 .color-B2{color:#0D32B2;} - .d2-325604788 .color-B3{color:#E3E9FD;} - .d2-325604788 .color-B4{color:#E3E9FD;} - .d2-325604788 .color-B5{color:#EDF0FD;} - .d2-325604788 .color-B6{color:#F7F8FE;} - .d2-325604788 .color-AA2{color:#4A6FF3;} - .d2-325604788 .color-AA4{color:#EDF0FD;} - .d2-325604788 .color-AA5{color:#F7F8FE;} - .d2-325604788 .color-AB4{color:#EDF0FD;} - .d2-325604788 .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-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 - ->>>>>>> 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;} @@ -408,9 +89,8 @@ .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 + .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) 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 e899790be..437c59720 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,26 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -bacthis is a message groupand this is a nested message groupwhat about more nestingyoyo - -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-325604788 .fill-N1{fill:#0A0F25;} - .d2-325604788 .fill-N2{fill:#676C7E;} - .d2-325604788 .fill-N3{fill:#9499AB;} - .d2-325604788 .fill-N4{fill:#CFD2DD;} - .d2-325604788 .fill-N5{fill:#DEE1EB;} - .d2-325604788 .fill-N6{fill:#EEF1F8;} - .d2-325604788 .fill-N7{fill:#FFFFFF;} - .d2-325604788 .fill-B1{fill:#0D32B2;} - .d2-325604788 .fill-B2{fill:#0D32B2;} - .d2-325604788 .fill-B3{fill:#E3E9FD;} - .d2-325604788 .fill-B4{fill:#E3E9FD;} - .d2-325604788 .fill-B5{fill:#EDF0FD;} - .d2-325604788 .fill-B6{fill:#F7F8FE;} - .d2-325604788 .fill-AA2{fill:#4A6FF3;} - .d2-325604788 .fill-AA4{fill:#EDF0FD;} - .d2-325604788 .fill-AA5{fill:#F7F8FE;} - .d2-325604788 .fill-AB4{fill:#EDF0FD;} - .d2-325604788 .fill-AB5{fill:#F7F8FE;} - .d2-325604788 .stroke-N1{stroke:#0A0F25;} - .d2-325604788 .stroke-N2{stroke:#676C7E;} - .d2-325604788 .stroke-N3{stroke:#9499AB;} - .d2-325604788 .stroke-N4{stroke:#CFD2DD;} - .d2-325604788 .stroke-N5{stroke:#DEE1EB;} - .d2-325604788 .stroke-N6{stroke:#EEF1F8;} - .d2-325604788 .stroke-N7{stroke:#FFFFFF;} - .d2-325604788 .stroke-B1{stroke:#0D32B2;} - .d2-325604788 .stroke-B2{stroke:#0D32B2;} - .d2-325604788 .stroke-B3{stroke:#E3E9FD;} - .d2-325604788 .stroke-B4{stroke:#E3E9FD;} - .d2-325604788 .stroke-B5{stroke:#EDF0FD;} - .d2-325604788 .stroke-B6{stroke:#F7F8FE;} - .d2-325604788 .stroke-AA2{stroke:#4A6FF3;} - .d2-325604788 .stroke-AA4{stroke:#EDF0FD;} - .d2-325604788 .stroke-AA5{stroke:#F7F8FE;} - .d2-325604788 .stroke-AB4{stroke:#EDF0FD;} - .d2-325604788 .stroke-AB5{stroke:#F7F8FE;} - .d2-325604788 .background-color-N1{background-color:#0A0F25;} - .d2-325604788 .background-color-N2{background-color:#676C7E;} - .d2-325604788 .background-color-N3{background-color:#9499AB;} - .d2-325604788 .background-color-N4{background-color:#CFD2DD;} - .d2-325604788 .background-color-N5{background-color:#DEE1EB;} - .d2-325604788 .background-color-N6{background-color:#EEF1F8;} - .d2-325604788 .background-color-N7{background-color:#FFFFFF;} - .d2-325604788 .background-color-B1{background-color:#0D32B2;} - .d2-325604788 .background-color-B2{background-color:#0D32B2;} - .d2-325604788 .background-color-B3{background-color:#E3E9FD;} - .d2-325604788 .background-color-B4{background-color:#E3E9FD;} - .d2-325604788 .background-color-B5{background-color:#EDF0FD;} - .d2-325604788 .background-color-B6{background-color:#F7F8FE;} - .d2-325604788 .background-color-AA2{background-color:#4A6FF3;} - .d2-325604788 .background-color-AA4{background-color:#EDF0FD;} - .d2-325604788 .background-color-AA5{background-color:#F7F8FE;} - .d2-325604788 .background-color-AB4{background-color:#EDF0FD;} - .d2-325604788 .background-color-AB5{background-color:#F7F8FE;} - .d2-325604788 .color-N1{color:#0A0F25;} - .d2-325604788 .color-N2{color:#676C7E;} - .d2-325604788 .color-N3{color:#9499AB;} - .d2-325604788 .color-N4{color:#CFD2DD;} - .d2-325604788 .color-N5{color:#DEE1EB;} - .d2-325604788 .color-N6{color:#EEF1F8;} - .d2-325604788 .color-N7{color:#FFFFFF;} - .d2-325604788 .color-B1{color:#0D32B2;} - .d2-325604788 .color-B2{color:#0D32B2;} - .d2-325604788 .color-B3{color:#E3E9FD;} - .d2-325604788 .color-B4{color:#E3E9FD;} - .d2-325604788 .color-B5{color:#EDF0FD;} - .d2-325604788 .color-B6{color:#F7F8FE;} - .d2-325604788 .color-AA2{color:#4A6FF3;} - .d2-325604788 .color-AA4{color:#EDF0FD;} - .d2-325604788 .color-AA5{color:#F7F8FE;} - .d2-325604788 .color-AB4{color:#EDF0FD;} - .d2-325604788 .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-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 - ->>>>>>> 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;} @@ -408,9 +89,8 @@ .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 + .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) 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 93f3a2643..31bd210de 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,26 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -Office chatterAliceBobbyawkward small talkicebreaker attemptunfortunate outcome uhm, hioh, hellowhat did you have for lunch?that's personal - - -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-510866931 .fill-N1{fill:#0A0F25;} - .d2-510866931 .fill-N2{fill:#676C7E;} - .d2-510866931 .fill-N3{fill:#9499AB;} - .d2-510866931 .fill-N4{fill:#CFD2DD;} - .d2-510866931 .fill-N5{fill:#DEE1EB;} - .d2-510866931 .fill-N6{fill:#EEF1F8;} - .d2-510866931 .fill-N7{fill:#FFFFFF;} - .d2-510866931 .fill-B1{fill:#0D32B2;} - .d2-510866931 .fill-B2{fill:#0D32B2;} - .d2-510866931 .fill-B3{fill:#E3E9FD;} - .d2-510866931 .fill-B4{fill:#E3E9FD;} - .d2-510866931 .fill-B5{fill:#EDF0FD;} - .d2-510866931 .fill-B6{fill:#F7F8FE;} - .d2-510866931 .fill-AA2{fill:#4A6FF3;} - .d2-510866931 .fill-AA4{fill:#EDF0FD;} - .d2-510866931 .fill-AA5{fill:#F7F8FE;} - .d2-510866931 .fill-AB4{fill:#EDF0FD;} - .d2-510866931 .fill-AB5{fill:#F7F8FE;} - .d2-510866931 .stroke-N1{stroke:#0A0F25;} - .d2-510866931 .stroke-N2{stroke:#676C7E;} - .d2-510866931 .stroke-N3{stroke:#9499AB;} - .d2-510866931 .stroke-N4{stroke:#CFD2DD;} - .d2-510866931 .stroke-N5{stroke:#DEE1EB;} - .d2-510866931 .stroke-N6{stroke:#EEF1F8;} - .d2-510866931 .stroke-N7{stroke:#FFFFFF;} - .d2-510866931 .stroke-B1{stroke:#0D32B2;} - .d2-510866931 .stroke-B2{stroke:#0D32B2;} - .d2-510866931 .stroke-B3{stroke:#E3E9FD;} - .d2-510866931 .stroke-B4{stroke:#E3E9FD;} - .d2-510866931 .stroke-B5{stroke:#EDF0FD;} - .d2-510866931 .stroke-B6{stroke:#F7F8FE;} - .d2-510866931 .stroke-AA2{stroke:#4A6FF3;} - .d2-510866931 .stroke-AA4{stroke:#EDF0FD;} - .d2-510866931 .stroke-AA5{stroke:#F7F8FE;} - .d2-510866931 .stroke-AB4{stroke:#EDF0FD;} - .d2-510866931 .stroke-AB5{stroke:#F7F8FE;} - .d2-510866931 .background-color-N1{background-color:#0A0F25;} - .d2-510866931 .background-color-N2{background-color:#676C7E;} - .d2-510866931 .background-color-N3{background-color:#9499AB;} - .d2-510866931 .background-color-N4{background-color:#CFD2DD;} - .d2-510866931 .background-color-N5{background-color:#DEE1EB;} - .d2-510866931 .background-color-N6{background-color:#EEF1F8;} - .d2-510866931 .background-color-N7{background-color:#FFFFFF;} - .d2-510866931 .background-color-B1{background-color:#0D32B2;} - .d2-510866931 .background-color-B2{background-color:#0D32B2;} - .d2-510866931 .background-color-B3{background-color:#E3E9FD;} - .d2-510866931 .background-color-B4{background-color:#E3E9FD;} - .d2-510866931 .background-color-B5{background-color:#EDF0FD;} - .d2-510866931 .background-color-B6{background-color:#F7F8FE;} - .d2-510866931 .background-color-AA2{background-color:#4A6FF3;} - .d2-510866931 .background-color-AA4{background-color:#EDF0FD;} - .d2-510866931 .background-color-AA5{background-color:#F7F8FE;} - .d2-510866931 .background-color-AB4{background-color:#EDF0FD;} - .d2-510866931 .background-color-AB5{background-color:#F7F8FE;} - .d2-510866931 .color-N1{color:#0A0F25;} - .d2-510866931 .color-N2{color:#676C7E;} - .d2-510866931 .color-N3{color:#9499AB;} - .d2-510866931 .color-N4{color:#CFD2DD;} - .d2-510866931 .color-N5{color:#DEE1EB;} - .d2-510866931 .color-N6{color:#EEF1F8;} - .d2-510866931 .color-N7{color:#FFFFFF;} - .d2-510866931 .color-B1{color:#0D32B2;} - .d2-510866931 .color-B2{color:#0D32B2;} - .d2-510866931 .color-B3{color:#E3E9FD;} - .d2-510866931 .color-B4{color:#E3E9FD;} - .d2-510866931 .color-B5{color:#EDF0FD;} - .d2-510866931 .color-B6{color:#F7F8FE;} - .d2-510866931 .color-AA2{color:#4A6FF3;} - .d2-510866931 .color-AA4{color:#EDF0FD;} - .d2-510866931 .color-AA5{color:#F7F8FE;} - .d2-510866931 .color-AB4{color:#EDF0FD;} - .d2-510866931 .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 - - -======= - .d2-519121422 .fill-N1{fill:#0A0F25;} - .d2-519121422 .fill-N2{fill:#676C7E;} - .d2-519121422 .fill-N3{fill:#9499AB;} - .d2-519121422 .fill-N4{fill:#CFD2DD;} - .d2-519121422 .fill-N5{fill:#DEE1EB;} - .d2-519121422 .fill-N6{fill:#EEF1F8;} - .d2-519121422 .fill-N7{fill:#FFFFFF;} - .d2-519121422 .fill-B1{fill:#0D32B2;} - .d2-519121422 .fill-B2{fill:#0D32B2;} - .d2-519121422 .fill-B3{fill:#E3E9FD;} - .d2-519121422 .fill-B4{fill:#E3E9FD;} - .d2-519121422 .fill-B5{fill:#EDF0FD;} - .d2-519121422 .fill-B6{fill:#F7F8FE;} - .d2-519121422 .fill-AA2{fill:#4A6FF3;} - .d2-519121422 .fill-AA4{fill:#EDF0FD;} - .d2-519121422 .fill-AA5{fill:#F7F8FE;} - .d2-519121422 .fill-AB4{fill:#EDF0FD;} - .d2-519121422 .fill-AB5{fill:#F7F8FE;} - .d2-519121422 .stroke-N1{stroke:#0A0F25;} - .d2-519121422 .stroke-N2{stroke:#676C7E;} - .d2-519121422 .stroke-N3{stroke:#9499AB;} - .d2-519121422 .stroke-N4{stroke:#CFD2DD;} - .d2-519121422 .stroke-N5{stroke:#DEE1EB;} - .d2-519121422 .stroke-N6{stroke:#EEF1F8;} - .d2-519121422 .stroke-N7{stroke:#FFFFFF;} - .d2-519121422 .stroke-B1{stroke:#0D32B2;} - .d2-519121422 .stroke-B2{stroke:#0D32B2;} - .d2-519121422 .stroke-B3{stroke:#E3E9FD;} - .d2-519121422 .stroke-B4{stroke:#E3E9FD;} - .d2-519121422 .stroke-B5{stroke:#EDF0FD;} - .d2-519121422 .stroke-B6{stroke:#F7F8FE;} - .d2-519121422 .stroke-AA2{stroke:#4A6FF3;} - .d2-519121422 .stroke-AA4{stroke:#EDF0FD;} - .d2-519121422 .stroke-AA5{stroke:#F7F8FE;} - .d2-519121422 .stroke-AB4{stroke:#EDF0FD;} - .d2-519121422 .stroke-AB5{stroke:#F7F8FE;} - .d2-519121422 .background-color-N1{background-color:#0A0F25;} - .d2-519121422 .background-color-N2{background-color:#676C7E;} - .d2-519121422 .background-color-N3{background-color:#9499AB;} - .d2-519121422 .background-color-N4{background-color:#CFD2DD;} - .d2-519121422 .background-color-N5{background-color:#DEE1EB;} - .d2-519121422 .background-color-N6{background-color:#EEF1F8;} - .d2-519121422 .background-color-N7{background-color:#FFFFFF;} - .d2-519121422 .background-color-B1{background-color:#0D32B2;} - .d2-519121422 .background-color-B2{background-color:#0D32B2;} - .d2-519121422 .background-color-B3{background-color:#E3E9FD;} - .d2-519121422 .background-color-B4{background-color:#E3E9FD;} - .d2-519121422 .background-color-B5{background-color:#EDF0FD;} - .d2-519121422 .background-color-B6{background-color:#F7F8FE;} - .d2-519121422 .background-color-AA2{background-color:#4A6FF3;} - .d2-519121422 .background-color-AA4{background-color:#EDF0FD;} - .d2-519121422 .background-color-AA5{background-color:#F7F8FE;} - .d2-519121422 .background-color-AB4{background-color:#EDF0FD;} - .d2-519121422 .background-color-AB5{background-color:#F7F8FE;} - .d2-519121422 .color-N1{color:#0A0F25;} - .d2-519121422 .color-N2{color:#676C7E;} - .d2-519121422 .color-N3{color:#9499AB;} - .d2-519121422 .color-N4{color:#CFD2DD;} - .d2-519121422 .color-N5{color:#DEE1EB;} - .d2-519121422 .color-N6{color:#EEF1F8;} - .d2-519121422 .color-N7{color:#FFFFFF;} - .d2-519121422 .color-B1{color:#0D32B2;} - .d2-519121422 .color-B2{color:#0D32B2;} - .d2-519121422 .color-B3{color:#E3E9FD;} - .d2-519121422 .color-B4{color:#E3E9FD;} - .d2-519121422 .color-B5{color:#EDF0FD;} - .d2-519121422 .color-B6{color:#F7F8FE;} - .d2-519121422 .color-AA2{color:#4A6FF3;} - .d2-519121422 .color-AA4{color:#EDF0FD;} - .d2-519121422 .color-AA5{color:#F7F8FE;} - .d2-519121422 .color-AB4{color:#EDF0FD;} - .d2-519121422 .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 - - ->>>>>>> 33280fed5 (fixed e2e tests) -||||||| parent of cb2f2823c (Fix changes) - .d2-519121422 .fill-N1{fill:#0A0F25;} - .d2-519121422 .fill-N2{fill:#676C7E;} - .d2-519121422 .fill-N3{fill:#9499AB;} - .d2-519121422 .fill-N4{fill:#CFD2DD;} - .d2-519121422 .fill-N5{fill:#DEE1EB;} - .d2-519121422 .fill-N6{fill:#EEF1F8;} - .d2-519121422 .fill-N7{fill:#FFFFFF;} - .d2-519121422 .fill-B1{fill:#0D32B2;} - .d2-519121422 .fill-B2{fill:#0D32B2;} - .d2-519121422 .fill-B3{fill:#E3E9FD;} - .d2-519121422 .fill-B4{fill:#E3E9FD;} - .d2-519121422 .fill-B5{fill:#EDF0FD;} - .d2-519121422 .fill-B6{fill:#F7F8FE;} - .d2-519121422 .fill-AA2{fill:#4A6FF3;} - .d2-519121422 .fill-AA4{fill:#EDF0FD;} - .d2-519121422 .fill-AA5{fill:#F7F8FE;} - .d2-519121422 .fill-AB4{fill:#EDF0FD;} - .d2-519121422 .fill-AB5{fill:#F7F8FE;} - .d2-519121422 .stroke-N1{stroke:#0A0F25;} - .d2-519121422 .stroke-N2{stroke:#676C7E;} - .d2-519121422 .stroke-N3{stroke:#9499AB;} - .d2-519121422 .stroke-N4{stroke:#CFD2DD;} - .d2-519121422 .stroke-N5{stroke:#DEE1EB;} - .d2-519121422 .stroke-N6{stroke:#EEF1F8;} - .d2-519121422 .stroke-N7{stroke:#FFFFFF;} - .d2-519121422 .stroke-B1{stroke:#0D32B2;} - .d2-519121422 .stroke-B2{stroke:#0D32B2;} - .d2-519121422 .stroke-B3{stroke:#E3E9FD;} - .d2-519121422 .stroke-B4{stroke:#E3E9FD;} - .d2-519121422 .stroke-B5{stroke:#EDF0FD;} - .d2-519121422 .stroke-B6{stroke:#F7F8FE;} - .d2-519121422 .stroke-AA2{stroke:#4A6FF3;} - .d2-519121422 .stroke-AA4{stroke:#EDF0FD;} - .d2-519121422 .stroke-AA5{stroke:#F7F8FE;} - .d2-519121422 .stroke-AB4{stroke:#EDF0FD;} - .d2-519121422 .stroke-AB5{stroke:#F7F8FE;} - .d2-519121422 .background-color-N1{background-color:#0A0F25;} - .d2-519121422 .background-color-N2{background-color:#676C7E;} - .d2-519121422 .background-color-N3{background-color:#9499AB;} - .d2-519121422 .background-color-N4{background-color:#CFD2DD;} - .d2-519121422 .background-color-N5{background-color:#DEE1EB;} - .d2-519121422 .background-color-N6{background-color:#EEF1F8;} - .d2-519121422 .background-color-N7{background-color:#FFFFFF;} - .d2-519121422 .background-color-B1{background-color:#0D32B2;} - .d2-519121422 .background-color-B2{background-color:#0D32B2;} - .d2-519121422 .background-color-B3{background-color:#E3E9FD;} - .d2-519121422 .background-color-B4{background-color:#E3E9FD;} - .d2-519121422 .background-color-B5{background-color:#EDF0FD;} - .d2-519121422 .background-color-B6{background-color:#F7F8FE;} - .d2-519121422 .background-color-AA2{background-color:#4A6FF3;} - .d2-519121422 .background-color-AA4{background-color:#EDF0FD;} - .d2-519121422 .background-color-AA5{background-color:#F7F8FE;} - .d2-519121422 .background-color-AB4{background-color:#EDF0FD;} - .d2-519121422 .background-color-AB5{background-color:#F7F8FE;} - .d2-519121422 .color-N1{color:#0A0F25;} - .d2-519121422 .color-N2{color:#676C7E;} - .d2-519121422 .color-N3{color:#9499AB;} - .d2-519121422 .color-N4{color:#CFD2DD;} - .d2-519121422 .color-N5{color:#DEE1EB;} - .d2-519121422 .color-N6{color:#EEF1F8;} - .d2-519121422 .color-N7{color:#FFFFFF;} - .d2-519121422 .color-B1{color:#0D32B2;} - .d2-519121422 .color-B2{color:#0D32B2;} - .d2-519121422 .color-B3{color:#E3E9FD;} - .d2-519121422 .color-B4{color:#E3E9FD;} - .d2-519121422 .color-B5{color:#EDF0FD;} - .d2-519121422 .color-B6{color:#F7F8FE;} - .d2-519121422 .color-AA2{color:#4A6FF3;} - .d2-519121422 .color-AA4{color:#EDF0FD;} - .d2-519121422 .color-AA5{color:#F7F8FE;} - .d2-519121422 .color-AB4{color:#EDF0FD;} - .d2-519121422 .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 - - -======= .d2-2918752435 .fill-N1{fill:#0A0F25;} .d2-2918752435 .fill-N2{fill:#676C7E;} .d2-2918752435 .fill-N3{fill:#9499AB;} @@ -419,10 +96,9 @@ .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 + .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) 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 0493e7a00..2df7f27ff 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,26 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -Office chatterAliceBobbyawkward small talkicebreaker attemptunfortunate outcome uhm, hioh, hellowhat did you have for lunch?that's personal - - -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-1426270487 .fill-N1{fill:#0A0F25;} - .d2-1426270487 .fill-N2{fill:#676C7E;} - .d2-1426270487 .fill-N3{fill:#9499AB;} - .d2-1426270487 .fill-N4{fill:#CFD2DD;} - .d2-1426270487 .fill-N5{fill:#DEE1EB;} - .d2-1426270487 .fill-N6{fill:#EEF1F8;} - .d2-1426270487 .fill-N7{fill:#FFFFFF;} - .d2-1426270487 .fill-B1{fill:#0D32B2;} - .d2-1426270487 .fill-B2{fill:#0D32B2;} - .d2-1426270487 .fill-B3{fill:#E3E9FD;} - .d2-1426270487 .fill-B4{fill:#E3E9FD;} - .d2-1426270487 .fill-B5{fill:#EDF0FD;} - .d2-1426270487 .fill-B6{fill:#F7F8FE;} - .d2-1426270487 .fill-AA2{fill:#4A6FF3;} - .d2-1426270487 .fill-AA4{fill:#EDF0FD;} - .d2-1426270487 .fill-AA5{fill:#F7F8FE;} - .d2-1426270487 .fill-AB4{fill:#EDF0FD;} - .d2-1426270487 .fill-AB5{fill:#F7F8FE;} - .d2-1426270487 .stroke-N1{stroke:#0A0F25;} - .d2-1426270487 .stroke-N2{stroke:#676C7E;} - .d2-1426270487 .stroke-N3{stroke:#9499AB;} - .d2-1426270487 .stroke-N4{stroke:#CFD2DD;} - .d2-1426270487 .stroke-N5{stroke:#DEE1EB;} - .d2-1426270487 .stroke-N6{stroke:#EEF1F8;} - .d2-1426270487 .stroke-N7{stroke:#FFFFFF;} - .d2-1426270487 .stroke-B1{stroke:#0D32B2;} - .d2-1426270487 .stroke-B2{stroke:#0D32B2;} - .d2-1426270487 .stroke-B3{stroke:#E3E9FD;} - .d2-1426270487 .stroke-B4{stroke:#E3E9FD;} - .d2-1426270487 .stroke-B5{stroke:#EDF0FD;} - .d2-1426270487 .stroke-B6{stroke:#F7F8FE;} - .d2-1426270487 .stroke-AA2{stroke:#4A6FF3;} - .d2-1426270487 .stroke-AA4{stroke:#EDF0FD;} - .d2-1426270487 .stroke-AA5{stroke:#F7F8FE;} - .d2-1426270487 .stroke-AB4{stroke:#EDF0FD;} - .d2-1426270487 .stroke-AB5{stroke:#F7F8FE;} - .d2-1426270487 .background-color-N1{background-color:#0A0F25;} - .d2-1426270487 .background-color-N2{background-color:#676C7E;} - .d2-1426270487 .background-color-N3{background-color:#9499AB;} - .d2-1426270487 .background-color-N4{background-color:#CFD2DD;} - .d2-1426270487 .background-color-N5{background-color:#DEE1EB;} - .d2-1426270487 .background-color-N6{background-color:#EEF1F8;} - .d2-1426270487 .background-color-N7{background-color:#FFFFFF;} - .d2-1426270487 .background-color-B1{background-color:#0D32B2;} - .d2-1426270487 .background-color-B2{background-color:#0D32B2;} - .d2-1426270487 .background-color-B3{background-color:#E3E9FD;} - .d2-1426270487 .background-color-B4{background-color:#E3E9FD;} - .d2-1426270487 .background-color-B5{background-color:#EDF0FD;} - .d2-1426270487 .background-color-B6{background-color:#F7F8FE;} - .d2-1426270487 .background-color-AA2{background-color:#4A6FF3;} - .d2-1426270487 .background-color-AA4{background-color:#EDF0FD;} - .d2-1426270487 .background-color-AA5{background-color:#F7F8FE;} - .d2-1426270487 .background-color-AB4{background-color:#EDF0FD;} - .d2-1426270487 .background-color-AB5{background-color:#F7F8FE;} - .d2-1426270487 .color-N1{color:#0A0F25;} - .d2-1426270487 .color-N2{color:#676C7E;} - .d2-1426270487 .color-N3{color:#9499AB;} - .d2-1426270487 .color-N4{color:#CFD2DD;} - .d2-1426270487 .color-N5{color:#DEE1EB;} - .d2-1426270487 .color-N6{color:#EEF1F8;} - .d2-1426270487 .color-N7{color:#FFFFFF;} - .d2-1426270487 .color-B1{color:#0D32B2;} - .d2-1426270487 .color-B2{color:#0D32B2;} - .d2-1426270487 .color-B3{color:#E3E9FD;} - .d2-1426270487 .color-B4{color:#E3E9FD;} - .d2-1426270487 .color-B5{color:#EDF0FD;} - .d2-1426270487 .color-B6{color:#F7F8FE;} - .d2-1426270487 .color-AA2{color:#4A6FF3;} - .d2-1426270487 .color-AA4{color:#EDF0FD;} - .d2-1426270487 .color-AA5{color:#F7F8FE;} - .d2-1426270487 .color-AB4{color:#EDF0FD;} - .d2-1426270487 .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 - - -======= - .d2-75863825 .fill-N1{fill:#0A0F25;} - .d2-75863825 .fill-N2{fill:#676C7E;} - .d2-75863825 .fill-N3{fill:#9499AB;} - .d2-75863825 .fill-N4{fill:#CFD2DD;} - .d2-75863825 .fill-N5{fill:#DEE1EB;} - .d2-75863825 .fill-N6{fill:#EEF1F8;} - .d2-75863825 .fill-N7{fill:#FFFFFF;} - .d2-75863825 .fill-B1{fill:#0D32B2;} - .d2-75863825 .fill-B2{fill:#0D32B2;} - .d2-75863825 .fill-B3{fill:#E3E9FD;} - .d2-75863825 .fill-B4{fill:#E3E9FD;} - .d2-75863825 .fill-B5{fill:#EDF0FD;} - .d2-75863825 .fill-B6{fill:#F7F8FE;} - .d2-75863825 .fill-AA2{fill:#4A6FF3;} - .d2-75863825 .fill-AA4{fill:#EDF0FD;} - .d2-75863825 .fill-AA5{fill:#F7F8FE;} - .d2-75863825 .fill-AB4{fill:#EDF0FD;} - .d2-75863825 .fill-AB5{fill:#F7F8FE;} - .d2-75863825 .stroke-N1{stroke:#0A0F25;} - .d2-75863825 .stroke-N2{stroke:#676C7E;} - .d2-75863825 .stroke-N3{stroke:#9499AB;} - .d2-75863825 .stroke-N4{stroke:#CFD2DD;} - .d2-75863825 .stroke-N5{stroke:#DEE1EB;} - .d2-75863825 .stroke-N6{stroke:#EEF1F8;} - .d2-75863825 .stroke-N7{stroke:#FFFFFF;} - .d2-75863825 .stroke-B1{stroke:#0D32B2;} - .d2-75863825 .stroke-B2{stroke:#0D32B2;} - .d2-75863825 .stroke-B3{stroke:#E3E9FD;} - .d2-75863825 .stroke-B4{stroke:#E3E9FD;} - .d2-75863825 .stroke-B5{stroke:#EDF0FD;} - .d2-75863825 .stroke-B6{stroke:#F7F8FE;} - .d2-75863825 .stroke-AA2{stroke:#4A6FF3;} - .d2-75863825 .stroke-AA4{stroke:#EDF0FD;} - .d2-75863825 .stroke-AA5{stroke:#F7F8FE;} - .d2-75863825 .stroke-AB4{stroke:#EDF0FD;} - .d2-75863825 .stroke-AB5{stroke:#F7F8FE;} - .d2-75863825 .background-color-N1{background-color:#0A0F25;} - .d2-75863825 .background-color-N2{background-color:#676C7E;} - .d2-75863825 .background-color-N3{background-color:#9499AB;} - .d2-75863825 .background-color-N4{background-color:#CFD2DD;} - .d2-75863825 .background-color-N5{background-color:#DEE1EB;} - .d2-75863825 .background-color-N6{background-color:#EEF1F8;} - .d2-75863825 .background-color-N7{background-color:#FFFFFF;} - .d2-75863825 .background-color-B1{background-color:#0D32B2;} - .d2-75863825 .background-color-B2{background-color:#0D32B2;} - .d2-75863825 .background-color-B3{background-color:#E3E9FD;} - .d2-75863825 .background-color-B4{background-color:#E3E9FD;} - .d2-75863825 .background-color-B5{background-color:#EDF0FD;} - .d2-75863825 .background-color-B6{background-color:#F7F8FE;} - .d2-75863825 .background-color-AA2{background-color:#4A6FF3;} - .d2-75863825 .background-color-AA4{background-color:#EDF0FD;} - .d2-75863825 .background-color-AA5{background-color:#F7F8FE;} - .d2-75863825 .background-color-AB4{background-color:#EDF0FD;} - .d2-75863825 .background-color-AB5{background-color:#F7F8FE;} - .d2-75863825 .color-N1{color:#0A0F25;} - .d2-75863825 .color-N2{color:#676C7E;} - .d2-75863825 .color-N3{color:#9499AB;} - .d2-75863825 .color-N4{color:#CFD2DD;} - .d2-75863825 .color-N5{color:#DEE1EB;} - .d2-75863825 .color-N6{color:#EEF1F8;} - .d2-75863825 .color-N7{color:#FFFFFF;} - .d2-75863825 .color-B1{color:#0D32B2;} - .d2-75863825 .color-B2{color:#0D32B2;} - .d2-75863825 .color-B3{color:#E3E9FD;} - .d2-75863825 .color-B4{color:#E3E9FD;} - .d2-75863825 .color-B5{color:#EDF0FD;} - .d2-75863825 .color-B6{color:#F7F8FE;} - .d2-75863825 .color-AA2{color:#4A6FF3;} - .d2-75863825 .color-AA4{color:#EDF0FD;} - .d2-75863825 .color-AA5{color:#F7F8FE;} - .d2-75863825 .color-AB4{color:#EDF0FD;} - .d2-75863825 .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 - - ->>>>>>> 33280fed5 (fixed e2e tests) -||||||| parent of cb2f2823c (Fix changes) - .d2-75863825 .fill-N1{fill:#0A0F25;} - .d2-75863825 .fill-N2{fill:#676C7E;} - .d2-75863825 .fill-N3{fill:#9499AB;} - .d2-75863825 .fill-N4{fill:#CFD2DD;} - .d2-75863825 .fill-N5{fill:#DEE1EB;} - .d2-75863825 .fill-N6{fill:#EEF1F8;} - .d2-75863825 .fill-N7{fill:#FFFFFF;} - .d2-75863825 .fill-B1{fill:#0D32B2;} - .d2-75863825 .fill-B2{fill:#0D32B2;} - .d2-75863825 .fill-B3{fill:#E3E9FD;} - .d2-75863825 .fill-B4{fill:#E3E9FD;} - .d2-75863825 .fill-B5{fill:#EDF0FD;} - .d2-75863825 .fill-B6{fill:#F7F8FE;} - .d2-75863825 .fill-AA2{fill:#4A6FF3;} - .d2-75863825 .fill-AA4{fill:#EDF0FD;} - .d2-75863825 .fill-AA5{fill:#F7F8FE;} - .d2-75863825 .fill-AB4{fill:#EDF0FD;} - .d2-75863825 .fill-AB5{fill:#F7F8FE;} - .d2-75863825 .stroke-N1{stroke:#0A0F25;} - .d2-75863825 .stroke-N2{stroke:#676C7E;} - .d2-75863825 .stroke-N3{stroke:#9499AB;} - .d2-75863825 .stroke-N4{stroke:#CFD2DD;} - .d2-75863825 .stroke-N5{stroke:#DEE1EB;} - .d2-75863825 .stroke-N6{stroke:#EEF1F8;} - .d2-75863825 .stroke-N7{stroke:#FFFFFF;} - .d2-75863825 .stroke-B1{stroke:#0D32B2;} - .d2-75863825 .stroke-B2{stroke:#0D32B2;} - .d2-75863825 .stroke-B3{stroke:#E3E9FD;} - .d2-75863825 .stroke-B4{stroke:#E3E9FD;} - .d2-75863825 .stroke-B5{stroke:#EDF0FD;} - .d2-75863825 .stroke-B6{stroke:#F7F8FE;} - .d2-75863825 .stroke-AA2{stroke:#4A6FF3;} - .d2-75863825 .stroke-AA4{stroke:#EDF0FD;} - .d2-75863825 .stroke-AA5{stroke:#F7F8FE;} - .d2-75863825 .stroke-AB4{stroke:#EDF0FD;} - .d2-75863825 .stroke-AB5{stroke:#F7F8FE;} - .d2-75863825 .background-color-N1{background-color:#0A0F25;} - .d2-75863825 .background-color-N2{background-color:#676C7E;} - .d2-75863825 .background-color-N3{background-color:#9499AB;} - .d2-75863825 .background-color-N4{background-color:#CFD2DD;} - .d2-75863825 .background-color-N5{background-color:#DEE1EB;} - .d2-75863825 .background-color-N6{background-color:#EEF1F8;} - .d2-75863825 .background-color-N7{background-color:#FFFFFF;} - .d2-75863825 .background-color-B1{background-color:#0D32B2;} - .d2-75863825 .background-color-B2{background-color:#0D32B2;} - .d2-75863825 .background-color-B3{background-color:#E3E9FD;} - .d2-75863825 .background-color-B4{background-color:#E3E9FD;} - .d2-75863825 .background-color-B5{background-color:#EDF0FD;} - .d2-75863825 .background-color-B6{background-color:#F7F8FE;} - .d2-75863825 .background-color-AA2{background-color:#4A6FF3;} - .d2-75863825 .background-color-AA4{background-color:#EDF0FD;} - .d2-75863825 .background-color-AA5{background-color:#F7F8FE;} - .d2-75863825 .background-color-AB4{background-color:#EDF0FD;} - .d2-75863825 .background-color-AB5{background-color:#F7F8FE;} - .d2-75863825 .color-N1{color:#0A0F25;} - .d2-75863825 .color-N2{color:#676C7E;} - .d2-75863825 .color-N3{color:#9499AB;} - .d2-75863825 .color-N4{color:#CFD2DD;} - .d2-75863825 .color-N5{color:#DEE1EB;} - .d2-75863825 .color-N6{color:#EEF1F8;} - .d2-75863825 .color-N7{color:#FFFFFF;} - .d2-75863825 .color-B1{color:#0D32B2;} - .d2-75863825 .color-B2{color:#0D32B2;} - .d2-75863825 .color-B3{color:#E3E9FD;} - .d2-75863825 .color-B4{color:#E3E9FD;} - .d2-75863825 .color-B5{color:#EDF0FD;} - .d2-75863825 .color-B6{color:#F7F8FE;} - .d2-75863825 .color-AA2{color:#4A6FF3;} - .d2-75863825 .color-AA4{color:#EDF0FD;} - .d2-75863825 .color-AA5{color:#F7F8FE;} - .d2-75863825 .color-AB4{color:#EDF0FD;} - .d2-75863825 .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 - - -======= .d2-3429413863 .fill-N1{fill:#0A0F25;} .d2-3429413863 .fill-N2{fill:#676C7E;} .d2-3429413863 .fill-N3{fill:#9499AB;} @@ -419,10 +96,9 @@ .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 + .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) 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 32c1936d8..90ef46d93 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,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -abcdefgx -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-2972989750 .fill-N1{fill:#0A0F25;} - .d2-2972989750 .fill-N2{fill:#676C7E;} - .d2-2972989750 .fill-N3{fill:#9499AB;} - .d2-2972989750 .fill-N4{fill:#CFD2DD;} - .d2-2972989750 .fill-N5{fill:#DEE1EB;} - .d2-2972989750 .fill-N6{fill:#EEF1F8;} - .d2-2972989750 .fill-N7{fill:#FFFFFF;} - .d2-2972989750 .fill-B1{fill:#0D32B2;} - .d2-2972989750 .fill-B2{fill:#0D32B2;} - .d2-2972989750 .fill-B3{fill:#E3E9FD;} - .d2-2972989750 .fill-B4{fill:#E3E9FD;} - .d2-2972989750 .fill-B5{fill:#EDF0FD;} - .d2-2972989750 .fill-B6{fill:#F7F8FE;} - .d2-2972989750 .fill-AA2{fill:#4A6FF3;} - .d2-2972989750 .fill-AA4{fill:#EDF0FD;} - .d2-2972989750 .fill-AA5{fill:#F7F8FE;} - .d2-2972989750 .fill-AB4{fill:#EDF0FD;} - .d2-2972989750 .fill-AB5{fill:#F7F8FE;} - .d2-2972989750 .stroke-N1{stroke:#0A0F25;} - .d2-2972989750 .stroke-N2{stroke:#676C7E;} - .d2-2972989750 .stroke-N3{stroke:#9499AB;} - .d2-2972989750 .stroke-N4{stroke:#CFD2DD;} - .d2-2972989750 .stroke-N5{stroke:#DEE1EB;} - .d2-2972989750 .stroke-N6{stroke:#EEF1F8;} - .d2-2972989750 .stroke-N7{stroke:#FFFFFF;} - .d2-2972989750 .stroke-B1{stroke:#0D32B2;} - .d2-2972989750 .stroke-B2{stroke:#0D32B2;} - .d2-2972989750 .stroke-B3{stroke:#E3E9FD;} - .d2-2972989750 .stroke-B4{stroke:#E3E9FD;} - .d2-2972989750 .stroke-B5{stroke:#EDF0FD;} - .d2-2972989750 .stroke-B6{stroke:#F7F8FE;} - .d2-2972989750 .stroke-AA2{stroke:#4A6FF3;} - .d2-2972989750 .stroke-AA4{stroke:#EDF0FD;} - .d2-2972989750 .stroke-AA5{stroke:#F7F8FE;} - .d2-2972989750 .stroke-AB4{stroke:#EDF0FD;} - .d2-2972989750 .stroke-AB5{stroke:#F7F8FE;} - .d2-2972989750 .background-color-N1{background-color:#0A0F25;} - .d2-2972989750 .background-color-N2{background-color:#676C7E;} - .d2-2972989750 .background-color-N3{background-color:#9499AB;} - .d2-2972989750 .background-color-N4{background-color:#CFD2DD;} - .d2-2972989750 .background-color-N5{background-color:#DEE1EB;} - .d2-2972989750 .background-color-N6{background-color:#EEF1F8;} - .d2-2972989750 .background-color-N7{background-color:#FFFFFF;} - .d2-2972989750 .background-color-B1{background-color:#0D32B2;} - .d2-2972989750 .background-color-B2{background-color:#0D32B2;} - .d2-2972989750 .background-color-B3{background-color:#E3E9FD;} - .d2-2972989750 .background-color-B4{background-color:#E3E9FD;} - .d2-2972989750 .background-color-B5{background-color:#EDF0FD;} - .d2-2972989750 .background-color-B6{background-color:#F7F8FE;} - .d2-2972989750 .background-color-AA2{background-color:#4A6FF3;} - .d2-2972989750 .background-color-AA4{background-color:#EDF0FD;} - .d2-2972989750 .background-color-AA5{background-color:#F7F8FE;} - .d2-2972989750 .background-color-AB4{background-color:#EDF0FD;} - .d2-2972989750 .background-color-AB5{background-color:#F7F8FE;} - .d2-2972989750 .color-N1{color:#0A0F25;} - .d2-2972989750 .color-N2{color:#676C7E;} - .d2-2972989750 .color-N3{color:#9499AB;} - .d2-2972989750 .color-N4{color:#CFD2DD;} - .d2-2972989750 .color-N5{color:#DEE1EB;} - .d2-2972989750 .color-N6{color:#EEF1F8;} - .d2-2972989750 .color-N7{color:#FFFFFF;} - .d2-2972989750 .color-B1{color:#0D32B2;} - .d2-2972989750 .color-B2{color:#0D32B2;} - .d2-2972989750 .color-B3{color:#E3E9FD;} - .d2-2972989750 .color-B4{color:#E3E9FD;} - .d2-2972989750 .color-B5{color:#EDF0FD;} - .d2-2972989750 .color-B6{color:#F7F8FE;} - .d2-2972989750 .color-AA2{color:#4A6FF3;} - .d2-2972989750 .color-AA4{color:#EDF0FD;} - .d2-2972989750 .color-AA5{color:#F7F8FE;} - .d2-2972989750 .color-AB4{color:#EDF0FD;} - .d2-2972989750 .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}]]>abcdefgx -======= .d2-2370007998 .fill-N1{fill:#0A0F25;} .d2-2370007998 .fill-N2{fill:#676C7E;} .d2-2370007998 .fill-N3{fill:#9499AB;} @@ -254,8 +95,7 @@ .d2-2370007998 .color-AA4{color:#EDF0FD;} .d2-2370007998 .color-AA5{color:#F7F8FE;} .d2-2370007998 .color-AB4{color:#EDF0FD;} - .d2-2370007998 .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}]]>abcdefgx ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-2370007998 .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}]]>abcdefgx diff --git a/e2etests/testdata/txtar/bidirectional-connection-animation/elk/sketch.exp.svg b/e2etests/testdata/txtar/bidirectional-connection-animation/elk/sketch.exp.svg index f7ea60eb7..e19fc59e2 100644 --- a/e2etests/testdata/txtar/bidirectional-connection-animation/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/bidirectional-connection-animation/elk/sketch.exp.svg @@ -1,16 +1,4 @@ -<<<<<<< HEAD -<<<<<<< HEAD -abcdefgx -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-2574831872 .fill-N1{fill:#0A0F25;} - .d2-2574831872 .fill-N2{fill:#676C7E;} - .d2-2574831872 .fill-N3{fill:#9499AB;} - .d2-2574831872 .fill-N4{fill:#CFD2DD;} - .d2-2574831872 .fill-N5{fill:#DEE1EB;} - .d2-2574831872 .fill-N6{fill:#EEF1F8;} - .d2-2574831872 .fill-N7{fill:#FFFFFF;} - .d2-2574831872 .fill-B1{fill:#0D32B2;} - .d2-2574831872 .fill-B2{fill:#0D32B2;} - .d2-2574831872 .fill-B3{fill:#E3E9FD;} - .d2-2574831872 .fill-B4{fill:#E3E9FD;} - .d2-2574831872 .fill-B5{fill:#EDF0FD;} - .d2-2574831872 .fill-B6{fill:#F7F8FE;} - .d2-2574831872 .fill-AA2{fill:#4A6FF3;} - .d2-2574831872 .fill-AA4{fill:#EDF0FD;} - .d2-2574831872 .fill-AA5{fill:#F7F8FE;} - .d2-2574831872 .fill-AB4{fill:#EDF0FD;} - .d2-2574831872 .fill-AB5{fill:#F7F8FE;} - .d2-2574831872 .stroke-N1{stroke:#0A0F25;} - .d2-2574831872 .stroke-N2{stroke:#676C7E;} - .d2-2574831872 .stroke-N3{stroke:#9499AB;} - .d2-2574831872 .stroke-N4{stroke:#CFD2DD;} - .d2-2574831872 .stroke-N5{stroke:#DEE1EB;} - .d2-2574831872 .stroke-N6{stroke:#EEF1F8;} - .d2-2574831872 .stroke-N7{stroke:#FFFFFF;} - .d2-2574831872 .stroke-B1{stroke:#0D32B2;} - .d2-2574831872 .stroke-B2{stroke:#0D32B2;} - .d2-2574831872 .stroke-B3{stroke:#E3E9FD;} - .d2-2574831872 .stroke-B4{stroke:#E3E9FD;} - .d2-2574831872 .stroke-B5{stroke:#EDF0FD;} - .d2-2574831872 .stroke-B6{stroke:#F7F8FE;} - .d2-2574831872 .stroke-AA2{stroke:#4A6FF3;} - .d2-2574831872 .stroke-AA4{stroke:#EDF0FD;} - .d2-2574831872 .stroke-AA5{stroke:#F7F8FE;} - .d2-2574831872 .stroke-AB4{stroke:#EDF0FD;} - .d2-2574831872 .stroke-AB5{stroke:#F7F8FE;} - .d2-2574831872 .background-color-N1{background-color:#0A0F25;} - .d2-2574831872 .background-color-N2{background-color:#676C7E;} - .d2-2574831872 .background-color-N3{background-color:#9499AB;} - .d2-2574831872 .background-color-N4{background-color:#CFD2DD;} - .d2-2574831872 .background-color-N5{background-color:#DEE1EB;} - .d2-2574831872 .background-color-N6{background-color:#EEF1F8;} - .d2-2574831872 .background-color-N7{background-color:#FFFFFF;} - .d2-2574831872 .background-color-B1{background-color:#0D32B2;} - .d2-2574831872 .background-color-B2{background-color:#0D32B2;} - .d2-2574831872 .background-color-B3{background-color:#E3E9FD;} - .d2-2574831872 .background-color-B4{background-color:#E3E9FD;} - .d2-2574831872 .background-color-B5{background-color:#EDF0FD;} - .d2-2574831872 .background-color-B6{background-color:#F7F8FE;} - .d2-2574831872 .background-color-AA2{background-color:#4A6FF3;} - .d2-2574831872 .background-color-AA4{background-color:#EDF0FD;} - .d2-2574831872 .background-color-AA5{background-color:#F7F8FE;} - .d2-2574831872 .background-color-AB4{background-color:#EDF0FD;} - .d2-2574831872 .background-color-AB5{background-color:#F7F8FE;} - .d2-2574831872 .color-N1{color:#0A0F25;} - .d2-2574831872 .color-N2{color:#676C7E;} - .d2-2574831872 .color-N3{color:#9499AB;} - .d2-2574831872 .color-N4{color:#CFD2DD;} - .d2-2574831872 .color-N5{color:#DEE1EB;} - .d2-2574831872 .color-N6{color:#EEF1F8;} - .d2-2574831872 .color-N7{color:#FFFFFF;} - .d2-2574831872 .color-B1{color:#0D32B2;} - .d2-2574831872 .color-B2{color:#0D32B2;} - .d2-2574831872 .color-B3{color:#E3E9FD;} - .d2-2574831872 .color-B4{color:#E3E9FD;} - .d2-2574831872 .color-B5{color:#EDF0FD;} - .d2-2574831872 .color-B6{color:#F7F8FE;} - .d2-2574831872 .color-AA2{color:#4A6FF3;} - .d2-2574831872 .color-AA4{color:#EDF0FD;} - .d2-2574831872 .color-AA5{color:#F7F8FE;} - .d2-2574831872 .color-AB4{color:#EDF0FD;} - .d2-2574831872 .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}]]>abcdefgx -======= .d2-2806731084 .fill-N1{fill:#0A0F25;} .d2-2806731084 .fill-N2{fill:#676C7E;} .d2-2806731084 .fill-N3{fill:#9499AB;} @@ -254,8 +95,7 @@ .d2-2806731084 .color-AA4{color:#EDF0FD;} .d2-2806731084 .color-AA5{color:#F7F8FE;} .d2-2806731084 .color-AB4{color:#EDF0FD;} - .d2-2806731084 .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}]]>abcdefgx ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-2806731084 .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}]]>abcdefgx diff --git a/e2etests/testdata/txtar/connection-style-fill/dagre/sketch.exp.svg b/e2etests/testdata/txtar/connection-style-fill/dagre/sketch.exp.svg index 34cac6847..d43b8e823 100644 --- a/e2etests/testdata/txtar/connection-style-fill/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/connection-style-fill/dagre/sketch.exp.svg @@ -1,16 +1,6 @@ -<<<<<<< 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;} @@ -253,8 +96,7 @@ .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) + .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. 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 34cac6847..d43b8e823 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,6 @@ -<<<<<<< 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;} @@ -253,8 +96,7 @@ .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) + .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. diff --git a/e2etests/testdata/txtar/connection-underline/dagre/sketch.exp.svg b/e2etests/testdata/txtar/connection-underline/dagre/sketch.exp.svg index 3c1f73b69..df28d0a6b 100644 --- a/e2etests/testdata/txtar/connection-underline/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/connection-underline/dagre/sketch.exp.svg @@ -1,16 +1,4 @@ -<<<<<<< HEAD -<<<<<<< HEAD -ab hi -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-2775395534 .fill-N1{fill:#0A0F25;} - .d2-2775395534 .fill-N2{fill:#676C7E;} - .d2-2775395534 .fill-N3{fill:#9499AB;} - .d2-2775395534 .fill-N4{fill:#CFD2DD;} - .d2-2775395534 .fill-N5{fill:#DEE1EB;} - .d2-2775395534 .fill-N6{fill:#EEF1F8;} - .d2-2775395534 .fill-N7{fill:#FFFFFF;} - .d2-2775395534 .fill-B1{fill:#0D32B2;} - .d2-2775395534 .fill-B2{fill:#0D32B2;} - .d2-2775395534 .fill-B3{fill:#E3E9FD;} - .d2-2775395534 .fill-B4{fill:#E3E9FD;} - .d2-2775395534 .fill-B5{fill:#EDF0FD;} - .d2-2775395534 .fill-B6{fill:#F7F8FE;} - .d2-2775395534 .fill-AA2{fill:#4A6FF3;} - .d2-2775395534 .fill-AA4{fill:#EDF0FD;} - .d2-2775395534 .fill-AA5{fill:#F7F8FE;} - .d2-2775395534 .fill-AB4{fill:#EDF0FD;} - .d2-2775395534 .fill-AB5{fill:#F7F8FE;} - .d2-2775395534 .stroke-N1{stroke:#0A0F25;} - .d2-2775395534 .stroke-N2{stroke:#676C7E;} - .d2-2775395534 .stroke-N3{stroke:#9499AB;} - .d2-2775395534 .stroke-N4{stroke:#CFD2DD;} - .d2-2775395534 .stroke-N5{stroke:#DEE1EB;} - .d2-2775395534 .stroke-N6{stroke:#EEF1F8;} - .d2-2775395534 .stroke-N7{stroke:#FFFFFF;} - .d2-2775395534 .stroke-B1{stroke:#0D32B2;} - .d2-2775395534 .stroke-B2{stroke:#0D32B2;} - .d2-2775395534 .stroke-B3{stroke:#E3E9FD;} - .d2-2775395534 .stroke-B4{stroke:#E3E9FD;} - .d2-2775395534 .stroke-B5{stroke:#EDF0FD;} - .d2-2775395534 .stroke-B6{stroke:#F7F8FE;} - .d2-2775395534 .stroke-AA2{stroke:#4A6FF3;} - .d2-2775395534 .stroke-AA4{stroke:#EDF0FD;} - .d2-2775395534 .stroke-AA5{stroke:#F7F8FE;} - .d2-2775395534 .stroke-AB4{stroke:#EDF0FD;} - .d2-2775395534 .stroke-AB5{stroke:#F7F8FE;} - .d2-2775395534 .background-color-N1{background-color:#0A0F25;} - .d2-2775395534 .background-color-N2{background-color:#676C7E;} - .d2-2775395534 .background-color-N3{background-color:#9499AB;} - .d2-2775395534 .background-color-N4{background-color:#CFD2DD;} - .d2-2775395534 .background-color-N5{background-color:#DEE1EB;} - .d2-2775395534 .background-color-N6{background-color:#EEF1F8;} - .d2-2775395534 .background-color-N7{background-color:#FFFFFF;} - .d2-2775395534 .background-color-B1{background-color:#0D32B2;} - .d2-2775395534 .background-color-B2{background-color:#0D32B2;} - .d2-2775395534 .background-color-B3{background-color:#E3E9FD;} - .d2-2775395534 .background-color-B4{background-color:#E3E9FD;} - .d2-2775395534 .background-color-B5{background-color:#EDF0FD;} - .d2-2775395534 .background-color-B6{background-color:#F7F8FE;} - .d2-2775395534 .background-color-AA2{background-color:#4A6FF3;} - .d2-2775395534 .background-color-AA4{background-color:#EDF0FD;} - .d2-2775395534 .background-color-AA5{background-color:#F7F8FE;} - .d2-2775395534 .background-color-AB4{background-color:#EDF0FD;} - .d2-2775395534 .background-color-AB5{background-color:#F7F8FE;} - .d2-2775395534 .color-N1{color:#0A0F25;} - .d2-2775395534 .color-N2{color:#676C7E;} - .d2-2775395534 .color-N3{color:#9499AB;} - .d2-2775395534 .color-N4{color:#CFD2DD;} - .d2-2775395534 .color-N5{color:#DEE1EB;} - .d2-2775395534 .color-N6{color:#EEF1F8;} - .d2-2775395534 .color-N7{color:#FFFFFF;} - .d2-2775395534 .color-B1{color:#0D32B2;} - .d2-2775395534 .color-B2{color:#0D32B2;} - .d2-2775395534 .color-B3{color:#E3E9FD;} - .d2-2775395534 .color-B4{color:#E3E9FD;} - .d2-2775395534 .color-B5{color:#EDF0FD;} - .d2-2775395534 .color-B6{color:#F7F8FE;} - .d2-2775395534 .color-AA2{color:#4A6FF3;} - .d2-2775395534 .color-AA4{color:#EDF0FD;} - .d2-2775395534 .color-AA5{color:#F7F8FE;} - .d2-2775395534 .color-AB4{color:#EDF0FD;} - .d2-2775395534 .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 hi -======= .d2-3212913988 .fill-N1{fill:#0A0F25;} .d2-3212913988 .fill-N2{fill:#676C7E;} .d2-3212913988 .fill-N3{fill:#9499AB;} @@ -258,8 +99,7 @@ .d2-3212913988 .color-AA4{color:#EDF0FD;} .d2-3212913988 .color-AA5{color:#F7F8FE;} .d2-3212913988 .color-AB4{color:#EDF0FD;} - .d2-3212913988 .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 hi ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-3212913988 .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 hi diff --git a/e2etests/testdata/txtar/connection-underline/elk/sketch.exp.svg b/e2etests/testdata/txtar/connection-underline/elk/sketch.exp.svg index cef28107f..cc408dd20 100644 --- a/e2etests/testdata/txtar/connection-underline/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/connection-underline/elk/sketch.exp.svg @@ -1,16 +1,4 @@ -<<<<<<< HEAD -<<<<<<< HEAD -ab hi -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-2761765795 .fill-N1{fill:#0A0F25;} - .d2-2761765795 .fill-N2{fill:#676C7E;} - .d2-2761765795 .fill-N3{fill:#9499AB;} - .d2-2761765795 .fill-N4{fill:#CFD2DD;} - .d2-2761765795 .fill-N5{fill:#DEE1EB;} - .d2-2761765795 .fill-N6{fill:#EEF1F8;} - .d2-2761765795 .fill-N7{fill:#FFFFFF;} - .d2-2761765795 .fill-B1{fill:#0D32B2;} - .d2-2761765795 .fill-B2{fill:#0D32B2;} - .d2-2761765795 .fill-B3{fill:#E3E9FD;} - .d2-2761765795 .fill-B4{fill:#E3E9FD;} - .d2-2761765795 .fill-B5{fill:#EDF0FD;} - .d2-2761765795 .fill-B6{fill:#F7F8FE;} - .d2-2761765795 .fill-AA2{fill:#4A6FF3;} - .d2-2761765795 .fill-AA4{fill:#EDF0FD;} - .d2-2761765795 .fill-AA5{fill:#F7F8FE;} - .d2-2761765795 .fill-AB4{fill:#EDF0FD;} - .d2-2761765795 .fill-AB5{fill:#F7F8FE;} - .d2-2761765795 .stroke-N1{stroke:#0A0F25;} - .d2-2761765795 .stroke-N2{stroke:#676C7E;} - .d2-2761765795 .stroke-N3{stroke:#9499AB;} - .d2-2761765795 .stroke-N4{stroke:#CFD2DD;} - .d2-2761765795 .stroke-N5{stroke:#DEE1EB;} - .d2-2761765795 .stroke-N6{stroke:#EEF1F8;} - .d2-2761765795 .stroke-N7{stroke:#FFFFFF;} - .d2-2761765795 .stroke-B1{stroke:#0D32B2;} - .d2-2761765795 .stroke-B2{stroke:#0D32B2;} - .d2-2761765795 .stroke-B3{stroke:#E3E9FD;} - .d2-2761765795 .stroke-B4{stroke:#E3E9FD;} - .d2-2761765795 .stroke-B5{stroke:#EDF0FD;} - .d2-2761765795 .stroke-B6{stroke:#F7F8FE;} - .d2-2761765795 .stroke-AA2{stroke:#4A6FF3;} - .d2-2761765795 .stroke-AA4{stroke:#EDF0FD;} - .d2-2761765795 .stroke-AA5{stroke:#F7F8FE;} - .d2-2761765795 .stroke-AB4{stroke:#EDF0FD;} - .d2-2761765795 .stroke-AB5{stroke:#F7F8FE;} - .d2-2761765795 .background-color-N1{background-color:#0A0F25;} - .d2-2761765795 .background-color-N2{background-color:#676C7E;} - .d2-2761765795 .background-color-N3{background-color:#9499AB;} - .d2-2761765795 .background-color-N4{background-color:#CFD2DD;} - .d2-2761765795 .background-color-N5{background-color:#DEE1EB;} - .d2-2761765795 .background-color-N6{background-color:#EEF1F8;} - .d2-2761765795 .background-color-N7{background-color:#FFFFFF;} - .d2-2761765795 .background-color-B1{background-color:#0D32B2;} - .d2-2761765795 .background-color-B2{background-color:#0D32B2;} - .d2-2761765795 .background-color-B3{background-color:#E3E9FD;} - .d2-2761765795 .background-color-B4{background-color:#E3E9FD;} - .d2-2761765795 .background-color-B5{background-color:#EDF0FD;} - .d2-2761765795 .background-color-B6{background-color:#F7F8FE;} - .d2-2761765795 .background-color-AA2{background-color:#4A6FF3;} - .d2-2761765795 .background-color-AA4{background-color:#EDF0FD;} - .d2-2761765795 .background-color-AA5{background-color:#F7F8FE;} - .d2-2761765795 .background-color-AB4{background-color:#EDF0FD;} - .d2-2761765795 .background-color-AB5{background-color:#F7F8FE;} - .d2-2761765795 .color-N1{color:#0A0F25;} - .d2-2761765795 .color-N2{color:#676C7E;} - .d2-2761765795 .color-N3{color:#9499AB;} - .d2-2761765795 .color-N4{color:#CFD2DD;} - .d2-2761765795 .color-N5{color:#DEE1EB;} - .d2-2761765795 .color-N6{color:#EEF1F8;} - .d2-2761765795 .color-N7{color:#FFFFFF;} - .d2-2761765795 .color-B1{color:#0D32B2;} - .d2-2761765795 .color-B2{color:#0D32B2;} - .d2-2761765795 .color-B3{color:#E3E9FD;} - .d2-2761765795 .color-B4{color:#E3E9FD;} - .d2-2761765795 .color-B5{color:#EDF0FD;} - .d2-2761765795 .color-B6{color:#F7F8FE;} - .d2-2761765795 .color-AA2{color:#4A6FF3;} - .d2-2761765795 .color-AA4{color:#EDF0FD;} - .d2-2761765795 .color-AA5{color:#F7F8FE;} - .d2-2761765795 .color-AB4{color:#EDF0FD;} - .d2-2761765795 .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 hi -======= .d2-3118103693 .fill-N1{fill:#0A0F25;} .d2-3118103693 .fill-N2{fill:#676C7E;} .d2-3118103693 .fill-N3{fill:#9499AB;} @@ -258,8 +99,7 @@ .d2-3118103693 .color-AA4{color:#EDF0FD;} .d2-3118103693 .color-AA5{color:#F7F8FE;} .d2-3118103693 .color-AB4{color:#EDF0FD;} - .d2-3118103693 .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 hi ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-3118103693 .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 hi diff --git a/e2etests/testdata/txtar/extended-ascii/dagre/sketch.exp.svg b/e2etests/testdata/txtar/extended-ascii/dagre/sketch.exp.svg index 5d626b5ae..a95d2feff 100644 --- a/e2etests/testdata/txtar/extended-ascii/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/extended-ascii/dagre/sketch.exp.svg @@ -1,16 +1,6 @@ -<<<<<<< HEAD - + .d2-4189426944 .fill-N1{fill:#0A0F25;} + .d2-4189426944 .fill-N2{fill:#676C7E;} + .d2-4189426944 .fill-N3{fill:#9499AB;} + .d2-4189426944 .fill-N4{fill:#CFD2DD;} + .d2-4189426944 .fill-N5{fill:#DEE1EB;} + .d2-4189426944 .fill-N6{fill:#EEF1F8;} + .d2-4189426944 .fill-N7{fill:#FFFFFF;} + .d2-4189426944 .fill-B1{fill:#0D32B2;} + .d2-4189426944 .fill-B2{fill:#0D32B2;} + .d2-4189426944 .fill-B3{fill:#E3E9FD;} + .d2-4189426944 .fill-B4{fill:#E3E9FD;} + .d2-4189426944 .fill-B5{fill:#EDF0FD;} + .d2-4189426944 .fill-B6{fill:#F7F8FE;} + .d2-4189426944 .fill-AA2{fill:#4A6FF3;} + .d2-4189426944 .fill-AA4{fill:#EDF0FD;} + .d2-4189426944 .fill-AA5{fill:#F7F8FE;} + .d2-4189426944 .fill-AB4{fill:#EDF0FD;} + .d2-4189426944 .fill-AB5{fill:#F7F8FE;} + .d2-4189426944 .stroke-N1{stroke:#0A0F25;} + .d2-4189426944 .stroke-N2{stroke:#676C7E;} + .d2-4189426944 .stroke-N3{stroke:#9499AB;} + .d2-4189426944 .stroke-N4{stroke:#CFD2DD;} + .d2-4189426944 .stroke-N5{stroke:#DEE1EB;} + .d2-4189426944 .stroke-N6{stroke:#EEF1F8;} + .d2-4189426944 .stroke-N7{stroke:#FFFFFF;} + .d2-4189426944 .stroke-B1{stroke:#0D32B2;} + .d2-4189426944 .stroke-B2{stroke:#0D32B2;} + .d2-4189426944 .stroke-B3{stroke:#E3E9FD;} + .d2-4189426944 .stroke-B4{stroke:#E3E9FD;} + .d2-4189426944 .stroke-B5{stroke:#EDF0FD;} + .d2-4189426944 .stroke-B6{stroke:#F7F8FE;} + .d2-4189426944 .stroke-AA2{stroke:#4A6FF3;} + .d2-4189426944 .stroke-AA4{stroke:#EDF0FD;} + .d2-4189426944 .stroke-AA5{stroke:#F7F8FE;} + .d2-4189426944 .stroke-AB4{stroke:#EDF0FD;} + .d2-4189426944 .stroke-AB5{stroke:#F7F8FE;} + .d2-4189426944 .background-color-N1{background-color:#0A0F25;} + .d2-4189426944 .background-color-N2{background-color:#676C7E;} + .d2-4189426944 .background-color-N3{background-color:#9499AB;} + .d2-4189426944 .background-color-N4{background-color:#CFD2DD;} + .d2-4189426944 .background-color-N5{background-color:#DEE1EB;} + .d2-4189426944 .background-color-N6{background-color:#EEF1F8;} + .d2-4189426944 .background-color-N7{background-color:#FFFFFF;} + .d2-4189426944 .background-color-B1{background-color:#0D32B2;} + .d2-4189426944 .background-color-B2{background-color:#0D32B2;} + .d2-4189426944 .background-color-B3{background-color:#E3E9FD;} + .d2-4189426944 .background-color-B4{background-color:#E3E9FD;} + .d2-4189426944 .background-color-B5{background-color:#EDF0FD;} + .d2-4189426944 .background-color-B6{background-color:#F7F8FE;} + .d2-4189426944 .background-color-AA2{background-color:#4A6FF3;} + .d2-4189426944 .background-color-AA4{background-color:#EDF0FD;} + .d2-4189426944 .background-color-AA5{background-color:#F7F8FE;} + .d2-4189426944 .background-color-AB4{background-color:#EDF0FD;} + .d2-4189426944 .background-color-AB5{background-color:#F7F8FE;} + .d2-4189426944 .color-N1{color:#0A0F25;} + .d2-4189426944 .color-N2{color:#676C7E;} + .d2-4189426944 .color-N3{color:#9499AB;} + .d2-4189426944 .color-N4{color:#CFD2DD;} + .d2-4189426944 .color-N5{color:#DEE1EB;} + .d2-4189426944 .color-N6{color:#EEF1F8;} + .d2-4189426944 .color-N7{color:#FFFFFF;} + .d2-4189426944 .color-B1{color:#0D32B2;} + .d2-4189426944 .color-B2{color:#0D32B2;} + .d2-4189426944 .color-B3{color:#E3E9FD;} + .d2-4189426944 .color-B4{color:#E3E9FD;} + .d2-4189426944 .color-B5{color:#EDF0FD;} + .d2-4189426944 .color-B6{color:#F7F8FE;} + .d2-4189426944 .color-AA2{color:#4A6FF3;} + .d2-4189426944 .color-AA4{color:#EDF0FD;} + .d2-4189426944 .color-AA5{color:#F7F8FE;} + .d2-4189426944 .color-AB4{color:#EDF0FD;} + .d2-4189426944 .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}]]> @@ -118,7 +118,7 @@ -gradientcolors +gradientcolors diff --git a/e2etests/testdata/txtar/gradient/elk/board.exp.json b/e2etests/testdata/txtar/gradient/elk/board.exp.json index 7803d98f0..3ae1cd391 100644 --- a/e2etests/testdata/txtar/gradient/elk/board.exp.json +++ b/e2etests/testdata/txtar/gradient/elk/board.exp.json @@ -110,6 +110,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 65, diff --git a/e2etests/testdata/txtar/gradient/elk/sketch.exp.svg b/e2etests/testdata/txtar/gradient/elk/sketch.exp.svg index 69988ed5f..90261a4aa 100644 --- a/e2etests/testdata/txtar/gradient/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/gradient/elk/sketch.exp.svg @@ -1,9 +1,9 @@ - + .d2-1687835247 .fill-N1{fill:#0A0F25;} + .d2-1687835247 .fill-N2{fill:#676C7E;} + .d2-1687835247 .fill-N3{fill:#9499AB;} + .d2-1687835247 .fill-N4{fill:#CFD2DD;} + .d2-1687835247 .fill-N5{fill:#DEE1EB;} + .d2-1687835247 .fill-N6{fill:#EEF1F8;} + .d2-1687835247 .fill-N7{fill:#FFFFFF;} + .d2-1687835247 .fill-B1{fill:#0D32B2;} + .d2-1687835247 .fill-B2{fill:#0D32B2;} + .d2-1687835247 .fill-B3{fill:#E3E9FD;} + .d2-1687835247 .fill-B4{fill:#E3E9FD;} + .d2-1687835247 .fill-B5{fill:#EDF0FD;} + .d2-1687835247 .fill-B6{fill:#F7F8FE;} + .d2-1687835247 .fill-AA2{fill:#4A6FF3;} + .d2-1687835247 .fill-AA4{fill:#EDF0FD;} + .d2-1687835247 .fill-AA5{fill:#F7F8FE;} + .d2-1687835247 .fill-AB4{fill:#EDF0FD;} + .d2-1687835247 .fill-AB5{fill:#F7F8FE;} + .d2-1687835247 .stroke-N1{stroke:#0A0F25;} + .d2-1687835247 .stroke-N2{stroke:#676C7E;} + .d2-1687835247 .stroke-N3{stroke:#9499AB;} + .d2-1687835247 .stroke-N4{stroke:#CFD2DD;} + .d2-1687835247 .stroke-N5{stroke:#DEE1EB;} + .d2-1687835247 .stroke-N6{stroke:#EEF1F8;} + .d2-1687835247 .stroke-N7{stroke:#FFFFFF;} + .d2-1687835247 .stroke-B1{stroke:#0D32B2;} + .d2-1687835247 .stroke-B2{stroke:#0D32B2;} + .d2-1687835247 .stroke-B3{stroke:#E3E9FD;} + .d2-1687835247 .stroke-B4{stroke:#E3E9FD;} + .d2-1687835247 .stroke-B5{stroke:#EDF0FD;} + .d2-1687835247 .stroke-B6{stroke:#F7F8FE;} + .d2-1687835247 .stroke-AA2{stroke:#4A6FF3;} + .d2-1687835247 .stroke-AA4{stroke:#EDF0FD;} + .d2-1687835247 .stroke-AA5{stroke:#F7F8FE;} + .d2-1687835247 .stroke-AB4{stroke:#EDF0FD;} + .d2-1687835247 .stroke-AB5{stroke:#F7F8FE;} + .d2-1687835247 .background-color-N1{background-color:#0A0F25;} + .d2-1687835247 .background-color-N2{background-color:#676C7E;} + .d2-1687835247 .background-color-N3{background-color:#9499AB;} + .d2-1687835247 .background-color-N4{background-color:#CFD2DD;} + .d2-1687835247 .background-color-N5{background-color:#DEE1EB;} + .d2-1687835247 .background-color-N6{background-color:#EEF1F8;} + .d2-1687835247 .background-color-N7{background-color:#FFFFFF;} + .d2-1687835247 .background-color-B1{background-color:#0D32B2;} + .d2-1687835247 .background-color-B2{background-color:#0D32B2;} + .d2-1687835247 .background-color-B3{background-color:#E3E9FD;} + .d2-1687835247 .background-color-B4{background-color:#E3E9FD;} + .d2-1687835247 .background-color-B5{background-color:#EDF0FD;} + .d2-1687835247 .background-color-B6{background-color:#F7F8FE;} + .d2-1687835247 .background-color-AA2{background-color:#4A6FF3;} + .d2-1687835247 .background-color-AA4{background-color:#EDF0FD;} + .d2-1687835247 .background-color-AA5{background-color:#F7F8FE;} + .d2-1687835247 .background-color-AB4{background-color:#EDF0FD;} + .d2-1687835247 .background-color-AB5{background-color:#F7F8FE;} + .d2-1687835247 .color-N1{color:#0A0F25;} + .d2-1687835247 .color-N2{color:#676C7E;} + .d2-1687835247 .color-N3{color:#9499AB;} + .d2-1687835247 .color-N4{color:#CFD2DD;} + .d2-1687835247 .color-N5{color:#DEE1EB;} + .d2-1687835247 .color-N6{color:#EEF1F8;} + .d2-1687835247 .color-N7{color:#FFFFFF;} + .d2-1687835247 .color-B1{color:#0D32B2;} + .d2-1687835247 .color-B2{color:#0D32B2;} + .d2-1687835247 .color-B3{color:#E3E9FD;} + .d2-1687835247 .color-B4{color:#E3E9FD;} + .d2-1687835247 .color-B5{color:#EDF0FD;} + .d2-1687835247 .color-B6{color:#F7F8FE;} + .d2-1687835247 .color-AA2{color:#4A6FF3;} + .d2-1687835247 .color-AA4{color:#EDF0FD;} + .d2-1687835247 .color-AA5{color:#F7F8FE;} + .d2-1687835247 .color-AB4{color:#EDF0FD;} + .d2-1687835247 .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}]]> @@ -118,7 +118,7 @@ -gradientcolors +gradientcolors 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 f5aa57468..c3aa72ef3 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 test +}]]>abc test -d +d \ No newline at end of file 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 71ca5fe92..446ab3708 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 test +}]]>abc test -d +d \ No newline at end of file diff --git a/e2etests/testdata/txtar/md-tables/dagre/board.exp.json b/e2etests/testdata/txtar/md-tables/dagre/board.exp.json index c93eefc67..d14f1def6 100644 --- a/e2etests/testdata/txtar/md-tables/dagre/board.exp.json +++ b/e2etests/testdata/txtar/md-tables/dagre/board.exp.json @@ -592,6 +592,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 340.5, @@ -639,6 +640,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 340.5, @@ -698,6 +700,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 756.5, @@ -745,6 +748,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 756.5, @@ -792,6 +796,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 756.5, @@ -839,6 +844,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 756.5, @@ -886,6 +892,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 756.5, diff --git a/e2etests/testdata/txtar/md-tables/dagre/sketch.exp.svg b/e2etests/testdata/txtar/md-tables/dagre/sketch.exp.svg index 72c7bd136..2779ab076 100644 --- a/e2etests/testdata/txtar/md-tables/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/md-tables/dagre/sketch.exp.svg @@ -1,13 +1,13 @@ -
@@ -1148,7 +1148,7 @@
-
Triggers MonitorsAggregatesAffectsImpactsInformsAssigns +
Triggers MonitorsAggregatesAffectsImpactsInformsAssigns diff --git a/e2etests/testdata/txtar/md-tables/elk/board.exp.json b/e2etests/testdata/txtar/md-tables/elk/board.exp.json index 150eee838..72774c892 100644 --- a/e2etests/testdata/txtar/md-tables/elk/board.exp.json +++ b/e2etests/testdata/txtar/md-tables/elk/board.exp.json @@ -592,6 +592,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 183.5, @@ -630,6 +631,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 183.5, @@ -668,6 +670,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 794, @@ -706,6 +709,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 786.5, @@ -744,6 +748,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 794, @@ -782,6 +787,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 794, @@ -820,6 +826,7 @@ "labelHeight": 21, "labelPosition": "INSIDE_MIDDLE_CENTER", "labelPercentage": 0, + "link": "", "route": [ { "x": 794, diff --git a/e2etests/testdata/txtar/md-tables/elk/sketch.exp.svg b/e2etests/testdata/txtar/md-tables/elk/sketch.exp.svg index d63ebdc30..15987e110 100644 --- a/e2etests/testdata/txtar/md-tables/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/md-tables/elk/sketch.exp.svg @@ -1,13 +1,13 @@ -
@@ -1148,7 +1148,7 @@
-
Triggers MonitorsAggregatesAffectsImpactsInformsAssigns +
Triggers MonitorsAggregatesAffectsImpactsInformsAssigns 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 149b69488..bbd54ca60 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,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -Homedog1dog3 -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-3641643904 .fill-N1{fill:#0A0F25;} - .d2-3641643904 .fill-N2{fill:#676C7E;} - .d2-3641643904 .fill-N3{fill:#9499AB;} - .d2-3641643904 .fill-N4{fill:#CFD2DD;} - .d2-3641643904 .fill-N5{fill:#DEE1EB;} - .d2-3641643904 .fill-N6{fill:#EEF1F8;} - .d2-3641643904 .fill-N7{fill:#FFFFFF;} - .d2-3641643904 .fill-B1{fill:#0D32B2;} - .d2-3641643904 .fill-B2{fill:#0D32B2;} - .d2-3641643904 .fill-B3{fill:#E3E9FD;} - .d2-3641643904 .fill-B4{fill:#E3E9FD;} - .d2-3641643904 .fill-B5{fill:#EDF0FD;} - .d2-3641643904 .fill-B6{fill:#F7F8FE;} - .d2-3641643904 .fill-AA2{fill:#4A6FF3;} - .d2-3641643904 .fill-AA4{fill:#EDF0FD;} - .d2-3641643904 .fill-AA5{fill:#F7F8FE;} - .d2-3641643904 .fill-AB4{fill:#EDF0FD;} - .d2-3641643904 .fill-AB5{fill:#F7F8FE;} - .d2-3641643904 .stroke-N1{stroke:#0A0F25;} - .d2-3641643904 .stroke-N2{stroke:#676C7E;} - .d2-3641643904 .stroke-N3{stroke:#9499AB;} - .d2-3641643904 .stroke-N4{stroke:#CFD2DD;} - .d2-3641643904 .stroke-N5{stroke:#DEE1EB;} - .d2-3641643904 .stroke-N6{stroke:#EEF1F8;} - .d2-3641643904 .stroke-N7{stroke:#FFFFFF;} - .d2-3641643904 .stroke-B1{stroke:#0D32B2;} - .d2-3641643904 .stroke-B2{stroke:#0D32B2;} - .d2-3641643904 .stroke-B3{stroke:#E3E9FD;} - .d2-3641643904 .stroke-B4{stroke:#E3E9FD;} - .d2-3641643904 .stroke-B5{stroke:#EDF0FD;} - .d2-3641643904 .stroke-B6{stroke:#F7F8FE;} - .d2-3641643904 .stroke-AA2{stroke:#4A6FF3;} - .d2-3641643904 .stroke-AA4{stroke:#EDF0FD;} - .d2-3641643904 .stroke-AA5{stroke:#F7F8FE;} - .d2-3641643904 .stroke-AB4{stroke:#EDF0FD;} - .d2-3641643904 .stroke-AB5{stroke:#F7F8FE;} - .d2-3641643904 .background-color-N1{background-color:#0A0F25;} - .d2-3641643904 .background-color-N2{background-color:#676C7E;} - .d2-3641643904 .background-color-N3{background-color:#9499AB;} - .d2-3641643904 .background-color-N4{background-color:#CFD2DD;} - .d2-3641643904 .background-color-N5{background-color:#DEE1EB;} - .d2-3641643904 .background-color-N6{background-color:#EEF1F8;} - .d2-3641643904 .background-color-N7{background-color:#FFFFFF;} - .d2-3641643904 .background-color-B1{background-color:#0D32B2;} - .d2-3641643904 .background-color-B2{background-color:#0D32B2;} - .d2-3641643904 .background-color-B3{background-color:#E3E9FD;} - .d2-3641643904 .background-color-B4{background-color:#E3E9FD;} - .d2-3641643904 .background-color-B5{background-color:#EDF0FD;} - .d2-3641643904 .background-color-B6{background-color:#F7F8FE;} - .d2-3641643904 .background-color-AA2{background-color:#4A6FF3;} - .d2-3641643904 .background-color-AA4{background-color:#EDF0FD;} - .d2-3641643904 .background-color-AA5{background-color:#F7F8FE;} - .d2-3641643904 .background-color-AB4{background-color:#EDF0FD;} - .d2-3641643904 .background-color-AB5{background-color:#F7F8FE;} - .d2-3641643904 .color-N1{color:#0A0F25;} - .d2-3641643904 .color-N2{color:#676C7E;} - .d2-3641643904 .color-N3{color:#9499AB;} - .d2-3641643904 .color-N4{color:#CFD2DD;} - .d2-3641643904 .color-N5{color:#DEE1EB;} - .d2-3641643904 .color-N6{color:#EEF1F8;} - .d2-3641643904 .color-N7{color:#FFFFFF;} - .d2-3641643904 .color-B1{color:#0D32B2;} - .d2-3641643904 .color-B2{color:#0D32B2;} - .d2-3641643904 .color-B3{color:#E3E9FD;} - .d2-3641643904 .color-B4{color:#E3E9FD;} - .d2-3641643904 .color-B5{color:#EDF0FD;} - .d2-3641643904 .color-B6{color:#F7F8FE;} - .d2-3641643904 .color-AA2{color:#4A6FF3;} - .d2-3641643904 .color-AA4{color:#EDF0FD;} - .d2-3641643904 .color-AA5{color:#F7F8FE;} - .d2-3641643904 .color-AB4{color:#EDF0FD;} - .d2-3641643904 .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}]]>Homedog1dog3 -======= .d2-2731028706 .fill-N1{fill:#0A0F25;} .d2-2731028706 .fill-N2{fill:#676C7E;} .d2-2731028706 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-2731028706 .color-AA4{color:#EDF0FD;} .d2-2731028706 .color-AA5{color:#F7F8FE;} .d2-2731028706 .color-AB4{color:#EDF0FD;} - .d2-2731028706 .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}]]>Homedog1dog3 ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-2731028706 .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}]]>Homedog1dog3 diff --git a/e2etests/testdata/txtar/nested-spread-substitutions-regression/elk/sketch.exp.svg b/e2etests/testdata/txtar/nested-spread-substitutions-regression/elk/sketch.exp.svg index 251b078dd..b5a4a7e81 100644 --- a/e2etests/testdata/txtar/nested-spread-substitutions-regression/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/nested-spread-substitutions-regression/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -Homedog1dog3 -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-3794321604 .fill-N1{fill:#0A0F25;} - .d2-3794321604 .fill-N2{fill:#676C7E;} - .d2-3794321604 .fill-N3{fill:#9499AB;} - .d2-3794321604 .fill-N4{fill:#CFD2DD;} - .d2-3794321604 .fill-N5{fill:#DEE1EB;} - .d2-3794321604 .fill-N6{fill:#EEF1F8;} - .d2-3794321604 .fill-N7{fill:#FFFFFF;} - .d2-3794321604 .fill-B1{fill:#0D32B2;} - .d2-3794321604 .fill-B2{fill:#0D32B2;} - .d2-3794321604 .fill-B3{fill:#E3E9FD;} - .d2-3794321604 .fill-B4{fill:#E3E9FD;} - .d2-3794321604 .fill-B5{fill:#EDF0FD;} - .d2-3794321604 .fill-B6{fill:#F7F8FE;} - .d2-3794321604 .fill-AA2{fill:#4A6FF3;} - .d2-3794321604 .fill-AA4{fill:#EDF0FD;} - .d2-3794321604 .fill-AA5{fill:#F7F8FE;} - .d2-3794321604 .fill-AB4{fill:#EDF0FD;} - .d2-3794321604 .fill-AB5{fill:#F7F8FE;} - .d2-3794321604 .stroke-N1{stroke:#0A0F25;} - .d2-3794321604 .stroke-N2{stroke:#676C7E;} - .d2-3794321604 .stroke-N3{stroke:#9499AB;} - .d2-3794321604 .stroke-N4{stroke:#CFD2DD;} - .d2-3794321604 .stroke-N5{stroke:#DEE1EB;} - .d2-3794321604 .stroke-N6{stroke:#EEF1F8;} - .d2-3794321604 .stroke-N7{stroke:#FFFFFF;} - .d2-3794321604 .stroke-B1{stroke:#0D32B2;} - .d2-3794321604 .stroke-B2{stroke:#0D32B2;} - .d2-3794321604 .stroke-B3{stroke:#E3E9FD;} - .d2-3794321604 .stroke-B4{stroke:#E3E9FD;} - .d2-3794321604 .stroke-B5{stroke:#EDF0FD;} - .d2-3794321604 .stroke-B6{stroke:#F7F8FE;} - .d2-3794321604 .stroke-AA2{stroke:#4A6FF3;} - .d2-3794321604 .stroke-AA4{stroke:#EDF0FD;} - .d2-3794321604 .stroke-AA5{stroke:#F7F8FE;} - .d2-3794321604 .stroke-AB4{stroke:#EDF0FD;} - .d2-3794321604 .stroke-AB5{stroke:#F7F8FE;} - .d2-3794321604 .background-color-N1{background-color:#0A0F25;} - .d2-3794321604 .background-color-N2{background-color:#676C7E;} - .d2-3794321604 .background-color-N3{background-color:#9499AB;} - .d2-3794321604 .background-color-N4{background-color:#CFD2DD;} - .d2-3794321604 .background-color-N5{background-color:#DEE1EB;} - .d2-3794321604 .background-color-N6{background-color:#EEF1F8;} - .d2-3794321604 .background-color-N7{background-color:#FFFFFF;} - .d2-3794321604 .background-color-B1{background-color:#0D32B2;} - .d2-3794321604 .background-color-B2{background-color:#0D32B2;} - .d2-3794321604 .background-color-B3{background-color:#E3E9FD;} - .d2-3794321604 .background-color-B4{background-color:#E3E9FD;} - .d2-3794321604 .background-color-B5{background-color:#EDF0FD;} - .d2-3794321604 .background-color-B6{background-color:#F7F8FE;} - .d2-3794321604 .background-color-AA2{background-color:#4A6FF3;} - .d2-3794321604 .background-color-AA4{background-color:#EDF0FD;} - .d2-3794321604 .background-color-AA5{background-color:#F7F8FE;} - .d2-3794321604 .background-color-AB4{background-color:#EDF0FD;} - .d2-3794321604 .background-color-AB5{background-color:#F7F8FE;} - .d2-3794321604 .color-N1{color:#0A0F25;} - .d2-3794321604 .color-N2{color:#676C7E;} - .d2-3794321604 .color-N3{color:#9499AB;} - .d2-3794321604 .color-N4{color:#CFD2DD;} - .d2-3794321604 .color-N5{color:#DEE1EB;} - .d2-3794321604 .color-N6{color:#EEF1F8;} - .d2-3794321604 .color-N7{color:#FFFFFF;} - .d2-3794321604 .color-B1{color:#0D32B2;} - .d2-3794321604 .color-B2{color:#0D32B2;} - .d2-3794321604 .color-B3{color:#E3E9FD;} - .d2-3794321604 .color-B4{color:#E3E9FD;} - .d2-3794321604 .color-B5{color:#EDF0FD;} - .d2-3794321604 .color-B6{color:#F7F8FE;} - .d2-3794321604 .color-AA2{color:#4A6FF3;} - .d2-3794321604 .color-AA4{color:#EDF0FD;} - .d2-3794321604 .color-AA5{color:#F7F8FE;} - .d2-3794321604 .color-AB4{color:#EDF0FD;} - .d2-3794321604 .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}]]>Homedog1dog3 -======= .d2-765102746 .fill-N1{fill:#0A0F25;} .d2-765102746 .fill-N2{fill:#676C7E;} .d2-765102746 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-765102746 .color-AA4{color:#EDF0FD;} .d2-765102746 .color-AA5{color:#F7F8FE;} .d2-765102746 .color-AB4{color:#EDF0FD;} - .d2-765102746 .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}]]>Homedog1dog3 ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-765102746 .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}]]>Homedog1dog3 diff --git a/e2etests/testdata/txtar/opacity-zero-route/dagre/sketch.exp.svg b/e2etests/testdata/txtar/opacity-zero-route/dagre/sketch.exp.svg index 77d520af7..9a661c44a 100644 --- a/e2etests/testdata/txtar/opacity-zero-route/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/opacity-zero-route/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -gridoutd -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-1723842539 .fill-N1{fill:#0A0F25;} - .d2-1723842539 .fill-N2{fill:#676C7E;} - .d2-1723842539 .fill-N3{fill:#9499AB;} - .d2-1723842539 .fill-N4{fill:#CFD2DD;} - .d2-1723842539 .fill-N5{fill:#DEE1EB;} - .d2-1723842539 .fill-N6{fill:#EEF1F8;} - .d2-1723842539 .fill-N7{fill:#FFFFFF;} - .d2-1723842539 .fill-B1{fill:#0D32B2;} - .d2-1723842539 .fill-B2{fill:#0D32B2;} - .d2-1723842539 .fill-B3{fill:#E3E9FD;} - .d2-1723842539 .fill-B4{fill:#E3E9FD;} - .d2-1723842539 .fill-B5{fill:#EDF0FD;} - .d2-1723842539 .fill-B6{fill:#F7F8FE;} - .d2-1723842539 .fill-AA2{fill:#4A6FF3;} - .d2-1723842539 .fill-AA4{fill:#EDF0FD;} - .d2-1723842539 .fill-AA5{fill:#F7F8FE;} - .d2-1723842539 .fill-AB4{fill:#EDF0FD;} - .d2-1723842539 .fill-AB5{fill:#F7F8FE;} - .d2-1723842539 .stroke-N1{stroke:#0A0F25;} - .d2-1723842539 .stroke-N2{stroke:#676C7E;} - .d2-1723842539 .stroke-N3{stroke:#9499AB;} - .d2-1723842539 .stroke-N4{stroke:#CFD2DD;} - .d2-1723842539 .stroke-N5{stroke:#DEE1EB;} - .d2-1723842539 .stroke-N6{stroke:#EEF1F8;} - .d2-1723842539 .stroke-N7{stroke:#FFFFFF;} - .d2-1723842539 .stroke-B1{stroke:#0D32B2;} - .d2-1723842539 .stroke-B2{stroke:#0D32B2;} - .d2-1723842539 .stroke-B3{stroke:#E3E9FD;} - .d2-1723842539 .stroke-B4{stroke:#E3E9FD;} - .d2-1723842539 .stroke-B5{stroke:#EDF0FD;} - .d2-1723842539 .stroke-B6{stroke:#F7F8FE;} - .d2-1723842539 .stroke-AA2{stroke:#4A6FF3;} - .d2-1723842539 .stroke-AA4{stroke:#EDF0FD;} - .d2-1723842539 .stroke-AA5{stroke:#F7F8FE;} - .d2-1723842539 .stroke-AB4{stroke:#EDF0FD;} - .d2-1723842539 .stroke-AB5{stroke:#F7F8FE;} - .d2-1723842539 .background-color-N1{background-color:#0A0F25;} - .d2-1723842539 .background-color-N2{background-color:#676C7E;} - .d2-1723842539 .background-color-N3{background-color:#9499AB;} - .d2-1723842539 .background-color-N4{background-color:#CFD2DD;} - .d2-1723842539 .background-color-N5{background-color:#DEE1EB;} - .d2-1723842539 .background-color-N6{background-color:#EEF1F8;} - .d2-1723842539 .background-color-N7{background-color:#FFFFFF;} - .d2-1723842539 .background-color-B1{background-color:#0D32B2;} - .d2-1723842539 .background-color-B2{background-color:#0D32B2;} - .d2-1723842539 .background-color-B3{background-color:#E3E9FD;} - .d2-1723842539 .background-color-B4{background-color:#E3E9FD;} - .d2-1723842539 .background-color-B5{background-color:#EDF0FD;} - .d2-1723842539 .background-color-B6{background-color:#F7F8FE;} - .d2-1723842539 .background-color-AA2{background-color:#4A6FF3;} - .d2-1723842539 .background-color-AA4{background-color:#EDF0FD;} - .d2-1723842539 .background-color-AA5{background-color:#F7F8FE;} - .d2-1723842539 .background-color-AB4{background-color:#EDF0FD;} - .d2-1723842539 .background-color-AB5{background-color:#F7F8FE;} - .d2-1723842539 .color-N1{color:#0A0F25;} - .d2-1723842539 .color-N2{color:#676C7E;} - .d2-1723842539 .color-N3{color:#9499AB;} - .d2-1723842539 .color-N4{color:#CFD2DD;} - .d2-1723842539 .color-N5{color:#DEE1EB;} - .d2-1723842539 .color-N6{color:#EEF1F8;} - .d2-1723842539 .color-N7{color:#FFFFFF;} - .d2-1723842539 .color-B1{color:#0D32B2;} - .d2-1723842539 .color-B2{color:#0D32B2;} - .d2-1723842539 .color-B3{color:#E3E9FD;} - .d2-1723842539 .color-B4{color:#E3E9FD;} - .d2-1723842539 .color-B5{color:#EDF0FD;} - .d2-1723842539 .color-B6{color:#F7F8FE;} - .d2-1723842539 .color-AA2{color:#4A6FF3;} - .d2-1723842539 .color-AA4{color:#EDF0FD;} - .d2-1723842539 .color-AA5{color:#F7F8FE;} - .d2-1723842539 .color-AB4{color:#EDF0FD;} - .d2-1723842539 .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}]]>gridoutd -======= .d2-279508969 .fill-N1{fill:#0A0F25;} .d2-279508969 .fill-N2{fill:#676C7E;} .d2-279508969 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-279508969 .color-AA4{color:#EDF0FD;} .d2-279508969 .color-AA5{color:#F7F8FE;} .d2-279508969 .color-AB4{color:#EDF0FD;} - .d2-279508969 .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}]]>gridoutd ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-279508969 .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}]]>gridoutd diff --git a/e2etests/testdata/txtar/opacity-zero-route/elk/sketch.exp.svg b/e2etests/testdata/txtar/opacity-zero-route/elk/sketch.exp.svg index 9d0e182cf..ef67823be 100644 --- a/e2etests/testdata/txtar/opacity-zero-route/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/opacity-zero-route/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -gridoutd -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-2998709085 .fill-N1{fill:#0A0F25;} - .d2-2998709085 .fill-N2{fill:#676C7E;} - .d2-2998709085 .fill-N3{fill:#9499AB;} - .d2-2998709085 .fill-N4{fill:#CFD2DD;} - .d2-2998709085 .fill-N5{fill:#DEE1EB;} - .d2-2998709085 .fill-N6{fill:#EEF1F8;} - .d2-2998709085 .fill-N7{fill:#FFFFFF;} - .d2-2998709085 .fill-B1{fill:#0D32B2;} - .d2-2998709085 .fill-B2{fill:#0D32B2;} - .d2-2998709085 .fill-B3{fill:#E3E9FD;} - .d2-2998709085 .fill-B4{fill:#E3E9FD;} - .d2-2998709085 .fill-B5{fill:#EDF0FD;} - .d2-2998709085 .fill-B6{fill:#F7F8FE;} - .d2-2998709085 .fill-AA2{fill:#4A6FF3;} - .d2-2998709085 .fill-AA4{fill:#EDF0FD;} - .d2-2998709085 .fill-AA5{fill:#F7F8FE;} - .d2-2998709085 .fill-AB4{fill:#EDF0FD;} - .d2-2998709085 .fill-AB5{fill:#F7F8FE;} - .d2-2998709085 .stroke-N1{stroke:#0A0F25;} - .d2-2998709085 .stroke-N2{stroke:#676C7E;} - .d2-2998709085 .stroke-N3{stroke:#9499AB;} - .d2-2998709085 .stroke-N4{stroke:#CFD2DD;} - .d2-2998709085 .stroke-N5{stroke:#DEE1EB;} - .d2-2998709085 .stroke-N6{stroke:#EEF1F8;} - .d2-2998709085 .stroke-N7{stroke:#FFFFFF;} - .d2-2998709085 .stroke-B1{stroke:#0D32B2;} - .d2-2998709085 .stroke-B2{stroke:#0D32B2;} - .d2-2998709085 .stroke-B3{stroke:#E3E9FD;} - .d2-2998709085 .stroke-B4{stroke:#E3E9FD;} - .d2-2998709085 .stroke-B5{stroke:#EDF0FD;} - .d2-2998709085 .stroke-B6{stroke:#F7F8FE;} - .d2-2998709085 .stroke-AA2{stroke:#4A6FF3;} - .d2-2998709085 .stroke-AA4{stroke:#EDF0FD;} - .d2-2998709085 .stroke-AA5{stroke:#F7F8FE;} - .d2-2998709085 .stroke-AB4{stroke:#EDF0FD;} - .d2-2998709085 .stroke-AB5{stroke:#F7F8FE;} - .d2-2998709085 .background-color-N1{background-color:#0A0F25;} - .d2-2998709085 .background-color-N2{background-color:#676C7E;} - .d2-2998709085 .background-color-N3{background-color:#9499AB;} - .d2-2998709085 .background-color-N4{background-color:#CFD2DD;} - .d2-2998709085 .background-color-N5{background-color:#DEE1EB;} - .d2-2998709085 .background-color-N6{background-color:#EEF1F8;} - .d2-2998709085 .background-color-N7{background-color:#FFFFFF;} - .d2-2998709085 .background-color-B1{background-color:#0D32B2;} - .d2-2998709085 .background-color-B2{background-color:#0D32B2;} - .d2-2998709085 .background-color-B3{background-color:#E3E9FD;} - .d2-2998709085 .background-color-B4{background-color:#E3E9FD;} - .d2-2998709085 .background-color-B5{background-color:#EDF0FD;} - .d2-2998709085 .background-color-B6{background-color:#F7F8FE;} - .d2-2998709085 .background-color-AA2{background-color:#4A6FF3;} - .d2-2998709085 .background-color-AA4{background-color:#EDF0FD;} - .d2-2998709085 .background-color-AA5{background-color:#F7F8FE;} - .d2-2998709085 .background-color-AB4{background-color:#EDF0FD;} - .d2-2998709085 .background-color-AB5{background-color:#F7F8FE;} - .d2-2998709085 .color-N1{color:#0A0F25;} - .d2-2998709085 .color-N2{color:#676C7E;} - .d2-2998709085 .color-N3{color:#9499AB;} - .d2-2998709085 .color-N4{color:#CFD2DD;} - .d2-2998709085 .color-N5{color:#DEE1EB;} - .d2-2998709085 .color-N6{color:#EEF1F8;} - .d2-2998709085 .color-N7{color:#FFFFFF;} - .d2-2998709085 .color-B1{color:#0D32B2;} - .d2-2998709085 .color-B2{color:#0D32B2;} - .d2-2998709085 .color-B3{color:#E3E9FD;} - .d2-2998709085 .color-B4{color:#E3E9FD;} - .d2-2998709085 .color-B5{color:#EDF0FD;} - .d2-2998709085 .color-B6{color:#F7F8FE;} - .d2-2998709085 .color-AA2{color:#4A6FF3;} - .d2-2998709085 .color-AA4{color:#EDF0FD;} - .d2-2998709085 .color-AA5{color:#F7F8FE;} - .d2-2998709085 .color-AB4{color:#EDF0FD;} - .d2-2998709085 .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}]]>gridoutd -======= .d2-2939247815 .fill-N1{fill:#0A0F25;} .d2-2939247815 .fill-N2{fill:#676C7E;} .d2-2939247815 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-2939247815 .color-AA4{color:#EDF0FD;} .d2-2939247815 .color-AA5{color:#F7F8FE;} .d2-2939247815 .color-AB4{color:#EDF0FD;} - .d2-2939247815 .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}]]>gridoutd ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-2939247815 .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}]]>gridoutd diff --git a/e2etests/testdata/txtar/sequence-bounding-box/dagre/sketch.exp.svg b/e2etests/testdata/txtar/sequence-bounding-box/dagre/sketch.exp.svg index 940c25779..7a7bc5864 100644 --- a/e2etests/testdata/txtar/sequence-bounding-box/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/sequence-bounding-box/dagre/sketch.exp.svg @@ -1,16 +1,6 @@ -<<<<<<< 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;} @@ -253,8 +96,7 @@ .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) + .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 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 7008e7be3..dd9f1f46a 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,6 @@ -<<<<<<< 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;} @@ -253,8 +96,7 @@ .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) + .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 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 22748e20e..01e79e7cc 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,6 @@ -<<<<<<< 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;} @@ -253,8 +96,7 @@ .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) + .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 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 9850420f0..ebd9108dc 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,6 @@ -<<<<<<< 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;} @@ -253,8 +96,7 @@ .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) + .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 diff --git a/e2etests/testdata/txtar/sequence-fontsize/dagre/sketch.exp.svg b/e2etests/testdata/txtar/sequence-fontsize/dagre/sketch.exp.svg index 6bc6018f9..1c96d6d0b 100644 --- a/e2etests/testdata/txtar/sequence-fontsize/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/sequence-fontsize/dagre/sketch.exp.svg @@ -1,16 +1,6 @@ -<<<<<<< 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;} @@ -253,8 +96,7 @@ .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) + .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 diff --git a/e2etests/testdata/txtar/sequence-fontsize/elk/sketch.exp.svg b/e2etests/testdata/txtar/sequence-fontsize/elk/sketch.exp.svg index 6bc6018f9..1c96d6d0b 100644 --- a/e2etests/testdata/txtar/sequence-fontsize/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/sequence-fontsize/elk/sketch.exp.svg @@ -1,16 +1,6 @@ -<<<<<<< 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;} @@ -253,8 +96,7 @@ .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) + .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 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 0d533cce6..76cacfad7 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,6 @@ -<<<<<<< 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;} @@ -253,8 +96,7 @@ .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) + .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 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 0d533cce6..76cacfad7 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,6 @@ -<<<<<<< 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;} @@ -253,8 +96,7 @@ .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) + .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 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 65d496133..9be2dad78 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,6 @@ -<<<<<<< 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;} @@ -253,8 +96,7 @@ .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) + .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 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 65d496133..9be2dad78 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,6 @@ -<<<<<<< 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;} @@ -253,8 +96,7 @@ .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) + .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 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 6b00204d5..1086a9921 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,6 @@ -<<<<<<< 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;} @@ -253,8 +96,7 @@ .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) + .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 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 6b00204d5..1086a9921 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,6 @@ -<<<<<<< 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;} @@ -253,8 +96,7 @@ .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) + .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 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 ba9a0ae59..46e1064fd 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,16 +1,4 @@ -<<<<<<< HEAD -<<<<<<< HEAD -my_tableshapestringiconstringwidthintheightintx + .d2-679924710 .fill-N1{fill:#0A0F25;} + .d2-679924710 .fill-N2{fill:#676C7E;} + .d2-679924710 .fill-N3{fill:#9499AB;} + .d2-679924710 .fill-N4{fill:#CFD2DD;} + .d2-679924710 .fill-N5{fill:#DEE1EB;} + .d2-679924710 .fill-N6{fill:#EEF1F8;} + .d2-679924710 .fill-N7{fill:#FFFFFF;} + .d2-679924710 .fill-B1{fill:#0D32B2;} + .d2-679924710 .fill-B2{fill:#0D32B2;} + .d2-679924710 .fill-B3{fill:#E3E9FD;} + .d2-679924710 .fill-B4{fill:#E3E9FD;} + .d2-679924710 .fill-B5{fill:#EDF0FD;} + .d2-679924710 .fill-B6{fill:#F7F8FE;} + .d2-679924710 .fill-AA2{fill:#4A6FF3;} + .d2-679924710 .fill-AA4{fill:#EDF0FD;} + .d2-679924710 .fill-AA5{fill:#F7F8FE;} + .d2-679924710 .fill-AB4{fill:#EDF0FD;} + .d2-679924710 .fill-AB5{fill:#F7F8FE;} + .d2-679924710 .stroke-N1{stroke:#0A0F25;} + .d2-679924710 .stroke-N2{stroke:#676C7E;} + .d2-679924710 .stroke-N3{stroke:#9499AB;} + .d2-679924710 .stroke-N4{stroke:#CFD2DD;} + .d2-679924710 .stroke-N5{stroke:#DEE1EB;} + .d2-679924710 .stroke-N6{stroke:#EEF1F8;} + .d2-679924710 .stroke-N7{stroke:#FFFFFF;} + .d2-679924710 .stroke-B1{stroke:#0D32B2;} + .d2-679924710 .stroke-B2{stroke:#0D32B2;} + .d2-679924710 .stroke-B3{stroke:#E3E9FD;} + .d2-679924710 .stroke-B4{stroke:#E3E9FD;} + .d2-679924710 .stroke-B5{stroke:#EDF0FD;} + .d2-679924710 .stroke-B6{stroke:#F7F8FE;} + .d2-679924710 .stroke-AA2{stroke:#4A6FF3;} + .d2-679924710 .stroke-AA4{stroke:#EDF0FD;} + .d2-679924710 .stroke-AA5{stroke:#F7F8FE;} + .d2-679924710 .stroke-AB4{stroke:#EDF0FD;} + .d2-679924710 .stroke-AB5{stroke:#F7F8FE;} + .d2-679924710 .background-color-N1{background-color:#0A0F25;} + .d2-679924710 .background-color-N2{background-color:#676C7E;} + .d2-679924710 .background-color-N3{background-color:#9499AB;} + .d2-679924710 .background-color-N4{background-color:#CFD2DD;} + .d2-679924710 .background-color-N5{background-color:#DEE1EB;} + .d2-679924710 .background-color-N6{background-color:#EEF1F8;} + .d2-679924710 .background-color-N7{background-color:#FFFFFF;} + .d2-679924710 .background-color-B1{background-color:#0D32B2;} + .d2-679924710 .background-color-B2{background-color:#0D32B2;} + .d2-679924710 .background-color-B3{background-color:#E3E9FD;} + .d2-679924710 .background-color-B4{background-color:#E3E9FD;} + .d2-679924710 .background-color-B5{background-color:#EDF0FD;} + .d2-679924710 .background-color-B6{background-color:#F7F8FE;} + .d2-679924710 .background-color-AA2{background-color:#4A6FF3;} + .d2-679924710 .background-color-AA4{background-color:#EDF0FD;} + .d2-679924710 .background-color-AA5{background-color:#F7F8FE;} + .d2-679924710 .background-color-AB4{background-color:#EDF0FD;} + .d2-679924710 .background-color-AB5{background-color:#F7F8FE;} + .d2-679924710 .color-N1{color:#0A0F25;} + .d2-679924710 .color-N2{color:#676C7E;} + .d2-679924710 .color-N3{color:#9499AB;} + .d2-679924710 .color-N4{color:#CFD2DD;} + .d2-679924710 .color-N5{color:#DEE1EB;} + .d2-679924710 .color-N6{color:#EEF1F8;} + .d2-679924710 .color-N7{color:#FFFFFF;} + .d2-679924710 .color-B1{color:#0D32B2;} + .d2-679924710 .color-B2{color:#0D32B2;} + .d2-679924710 .color-B3{color:#E3E9FD;} + .d2-679924710 .color-B4{color:#E3E9FD;} + .d2-679924710 .color-B5{color:#EDF0FD;} + .d2-679924710 .color-B6{color:#F7F8FE;} + .d2-679924710 .color-AA2{color:#4A6FF3;} + .d2-679924710 .color-AA4{color:#EDF0FD;} + .d2-679924710 .color-AA5{color:#F7F8FE;} + .d2-679924710 .color-AB4{color:#EDF0FD;} + .d2-679924710 .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}]]>my_tableshapestringiconstringwidthintheightintx \ No newline at end of file diff --git a/e2etests/testdata/txtar/sql-table-reserved/elk/board.exp.json b/e2etests/testdata/txtar/sql-table-reserved/elk/board.exp.json index c53ead7f7..bf1c0e98f 100644 --- a/e2etests/testdata/txtar/sql-table-reserved/elk/board.exp.json +++ b/e2etests/testdata/txtar/sql-table-reserved/elk/board.exp.json @@ -237,6 +237,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 38.5, diff --git a/e2etests/testdata/txtar/sql-table-reserved/elk/sketch.exp.svg b/e2etests/testdata/txtar/sql-table-reserved/elk/sketch.exp.svg index 1f6898cdd..8e78d76bb 100644 --- a/e2etests/testdata/txtar/sql-table-reserved/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/sql-table-reserved/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -my_tableshapestringiconstringwidthintheightintx + .d2-468816344 .fill-N1{fill:#0A0F25;} + .d2-468816344 .fill-N2{fill:#676C7E;} + .d2-468816344 .fill-N3{fill:#9499AB;} + .d2-468816344 .fill-N4{fill:#CFD2DD;} + .d2-468816344 .fill-N5{fill:#DEE1EB;} + .d2-468816344 .fill-N6{fill:#EEF1F8;} + .d2-468816344 .fill-N7{fill:#FFFFFF;} + .d2-468816344 .fill-B1{fill:#0D32B2;} + .d2-468816344 .fill-B2{fill:#0D32B2;} + .d2-468816344 .fill-B3{fill:#E3E9FD;} + .d2-468816344 .fill-B4{fill:#E3E9FD;} + .d2-468816344 .fill-B5{fill:#EDF0FD;} + .d2-468816344 .fill-B6{fill:#F7F8FE;} + .d2-468816344 .fill-AA2{fill:#4A6FF3;} + .d2-468816344 .fill-AA4{fill:#EDF0FD;} + .d2-468816344 .fill-AA5{fill:#F7F8FE;} + .d2-468816344 .fill-AB4{fill:#EDF0FD;} + .d2-468816344 .fill-AB5{fill:#F7F8FE;} + .d2-468816344 .stroke-N1{stroke:#0A0F25;} + .d2-468816344 .stroke-N2{stroke:#676C7E;} + .d2-468816344 .stroke-N3{stroke:#9499AB;} + .d2-468816344 .stroke-N4{stroke:#CFD2DD;} + .d2-468816344 .stroke-N5{stroke:#DEE1EB;} + .d2-468816344 .stroke-N6{stroke:#EEF1F8;} + .d2-468816344 .stroke-N7{stroke:#FFFFFF;} + .d2-468816344 .stroke-B1{stroke:#0D32B2;} + .d2-468816344 .stroke-B2{stroke:#0D32B2;} + .d2-468816344 .stroke-B3{stroke:#E3E9FD;} + .d2-468816344 .stroke-B4{stroke:#E3E9FD;} + .d2-468816344 .stroke-B5{stroke:#EDF0FD;} + .d2-468816344 .stroke-B6{stroke:#F7F8FE;} + .d2-468816344 .stroke-AA2{stroke:#4A6FF3;} + .d2-468816344 .stroke-AA4{stroke:#EDF0FD;} + .d2-468816344 .stroke-AA5{stroke:#F7F8FE;} + .d2-468816344 .stroke-AB4{stroke:#EDF0FD;} + .d2-468816344 .stroke-AB5{stroke:#F7F8FE;} + .d2-468816344 .background-color-N1{background-color:#0A0F25;} + .d2-468816344 .background-color-N2{background-color:#676C7E;} + .d2-468816344 .background-color-N3{background-color:#9499AB;} + .d2-468816344 .background-color-N4{background-color:#CFD2DD;} + .d2-468816344 .background-color-N5{background-color:#DEE1EB;} + .d2-468816344 .background-color-N6{background-color:#EEF1F8;} + .d2-468816344 .background-color-N7{background-color:#FFFFFF;} + .d2-468816344 .background-color-B1{background-color:#0D32B2;} + .d2-468816344 .background-color-B2{background-color:#0D32B2;} + .d2-468816344 .background-color-B3{background-color:#E3E9FD;} + .d2-468816344 .background-color-B4{background-color:#E3E9FD;} + .d2-468816344 .background-color-B5{background-color:#EDF0FD;} + .d2-468816344 .background-color-B6{background-color:#F7F8FE;} + .d2-468816344 .background-color-AA2{background-color:#4A6FF3;} + .d2-468816344 .background-color-AA4{background-color:#EDF0FD;} + .d2-468816344 .background-color-AA5{background-color:#F7F8FE;} + .d2-468816344 .background-color-AB4{background-color:#EDF0FD;} + .d2-468816344 .background-color-AB5{background-color:#F7F8FE;} + .d2-468816344 .color-N1{color:#0A0F25;} + .d2-468816344 .color-N2{color:#676C7E;} + .d2-468816344 .color-N3{color:#9499AB;} + .d2-468816344 .color-N4{color:#CFD2DD;} + .d2-468816344 .color-N5{color:#DEE1EB;} + .d2-468816344 .color-N6{color:#EEF1F8;} + .d2-468816344 .color-N7{color:#FFFFFF;} + .d2-468816344 .color-B1{color:#0D32B2;} + .d2-468816344 .color-B2{color:#0D32B2;} + .d2-468816344 .color-B3{color:#E3E9FD;} + .d2-468816344 .color-B4{color:#E3E9FD;} + .d2-468816344 .color-B5{color:#EDF0FD;} + .d2-468816344 .color-B6{color:#F7F8FE;} + .d2-468816344 .color-AA2{color:#4A6FF3;} + .d2-468816344 .color-AA4{color:#EDF0FD;} + .d2-468816344 .color-AA5{color:#F7F8FE;} + .d2-468816344 .color-AB4{color:#EDF0FD;} + .d2-468816344 .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}]]>my_tableshapestringiconstringwidthintheightintx \ No newline at end of file diff --git a/e2etests/testdata/txtar/theme-overrides/dagre/sketch.exp.svg b/e2etests/testdata/txtar/theme-overrides/dagre/sketch.exp.svg index 93020f020..8f35e9099 100644 --- a/e2etests/testdata/txtar/theme-overrides/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/theme-overrides/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -logsUserNetworkAPI ServercostumesidintPKsillinessintmonsterintlast_updatedtimestampmonstersidintPKmoviestringweightintlast_updatedtimestampCell TowerData ProcessorOnline PortalsatellitestransmitterStorageUI phone logsMake callpersistdisplay access -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-64011612 .fill-N1{fill:#2E2E2E;} - .d2-64011612 .fill-N2{fill:#2E2E2E;} - .d2-64011612 .fill-N3{fill:#595959;} - .d2-64011612 .fill-N4{fill:#858585;} - .d2-64011612 .fill-N5{fill:#B1B1B1;} - .d2-64011612 .fill-N6{fill:#DCDCDC;} - .d2-64011612 .fill-N7{fill:#DCDCDC;} - .d2-64011612 .fill-B1{fill:#2E7D32;} - .d2-64011612 .fill-B2{fill:#66BB6A;} - .d2-64011612 .fill-B3{fill:#A5D6A7;} - .d2-64011612 .fill-B4{fill:#C5E1A5;} - .d2-64011612 .fill-B5{fill:#E6EE9C;} - .d2-64011612 .fill-B6{fill:#FFF59D;} - .d2-64011612 .fill-AA2{fill:#0D47A1;} - .d2-64011612 .fill-AA4{fill:#42A5F5;} - .d2-64011612 .fill-AA5{fill:#90CAF9;} - .d2-64011612 .fill-AB4{fill:#F44336;} - .d2-64011612 .fill-AB5{fill:#FFCDD2;} - .d2-64011612 .stroke-N1{stroke:#2E2E2E;} - .d2-64011612 .stroke-N2{stroke:#2E2E2E;} - .d2-64011612 .stroke-N3{stroke:#595959;} - .d2-64011612 .stroke-N4{stroke:#858585;} - .d2-64011612 .stroke-N5{stroke:#B1B1B1;} - .d2-64011612 .stroke-N6{stroke:#DCDCDC;} - .d2-64011612 .stroke-N7{stroke:#DCDCDC;} - .d2-64011612 .stroke-B1{stroke:#2E7D32;} - .d2-64011612 .stroke-B2{stroke:#66BB6A;} - .d2-64011612 .stroke-B3{stroke:#A5D6A7;} - .d2-64011612 .stroke-B4{stroke:#C5E1A5;} - .d2-64011612 .stroke-B5{stroke:#E6EE9C;} - .d2-64011612 .stroke-B6{stroke:#FFF59D;} - .d2-64011612 .stroke-AA2{stroke:#0D47A1;} - .d2-64011612 .stroke-AA4{stroke:#42A5F5;} - .d2-64011612 .stroke-AA5{stroke:#90CAF9;} - .d2-64011612 .stroke-AB4{stroke:#F44336;} - .d2-64011612 .stroke-AB5{stroke:#FFCDD2;} - .d2-64011612 .background-color-N1{background-color:#2E2E2E;} - .d2-64011612 .background-color-N2{background-color:#2E2E2E;} - .d2-64011612 .background-color-N3{background-color:#595959;} - .d2-64011612 .background-color-N4{background-color:#858585;} - .d2-64011612 .background-color-N5{background-color:#B1B1B1;} - .d2-64011612 .background-color-N6{background-color:#DCDCDC;} - .d2-64011612 .background-color-N7{background-color:#DCDCDC;} - .d2-64011612 .background-color-B1{background-color:#2E7D32;} - .d2-64011612 .background-color-B2{background-color:#66BB6A;} - .d2-64011612 .background-color-B3{background-color:#A5D6A7;} - .d2-64011612 .background-color-B4{background-color:#C5E1A5;} - .d2-64011612 .background-color-B5{background-color:#E6EE9C;} - .d2-64011612 .background-color-B6{background-color:#FFF59D;} - .d2-64011612 .background-color-AA2{background-color:#0D47A1;} - .d2-64011612 .background-color-AA4{background-color:#42A5F5;} - .d2-64011612 .background-color-AA5{background-color:#90CAF9;} - .d2-64011612 .background-color-AB4{background-color:#F44336;} - .d2-64011612 .background-color-AB5{background-color:#FFCDD2;} - .d2-64011612 .color-N1{color:#2E2E2E;} - .d2-64011612 .color-N2{color:#2E2E2E;} - .d2-64011612 .color-N3{color:#595959;} - .d2-64011612 .color-N4{color:#858585;} - .d2-64011612 .color-N5{color:#B1B1B1;} - .d2-64011612 .color-N6{color:#DCDCDC;} - .d2-64011612 .color-N7{color:#DCDCDC;} - .d2-64011612 .color-B1{color:#2E7D32;} - .d2-64011612 .color-B2{color:#66BB6A;} - .d2-64011612 .color-B3{color:#A5D6A7;} - .d2-64011612 .color-B4{color:#C5E1A5;} - .d2-64011612 .color-B5{color:#E6EE9C;} - .d2-64011612 .color-B6{color:#FFF59D;} - .d2-64011612 .color-AA2{color:#0D47A1;} - .d2-64011612 .color-AA4{color:#42A5F5;} - .d2-64011612 .color-AA5{color:#90CAF9;} - .d2-64011612 .color-AB4{color:#F44336;} - .d2-64011612 .color-AB5{color:#FFCDD2;}.appendix text.text{fill:#2E2E2E}.md{--color-fg-default:#2E2E2E;--color-fg-muted:#2E2E2E;--color-fg-subtle:#595959;--color-canvas-default:#DCDCDC;--color-canvas-subtle:#DCDCDC;--color-border-default:#2E7D32;--color-border-muted:#66BB6A;--color-neutral-muted:#DCDCDC;--color-accent-fg:#66BB6A;--color-accent-emphasis:#66BB6A;--color-attention-subtle:#2E2E2E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.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-darker);mix-blend-mode:lighten}.sketch-overlay-AA4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AA5{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AB4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AB5{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N3{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N6{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N7{fill:url(#streaks-normal);mix-blend-mode:color-burn}.light-code{display: block}.dark-code{display: none}]]>logsUserNetworkAPI ServercostumesidintPKsillinessintmonsterintlast_updatedtimestampmonstersidintPKmoviestringweightintlast_updatedtimestampCell TowerData ProcessorOnline PortalsatellitestransmitterStorageUI phone logsMake callpersistdisplay access -======= .d2-3500999268 .fill-N1{fill:#2E2E2E;} .d2-3500999268 .fill-N2{fill:#2E2E2E;} .d2-3500999268 .fill-N3{fill:#595959;} @@ -266,8 +103,7 @@ .d2-3500999268 .color-AA4{color:#42A5F5;} .d2-3500999268 .color-AA5{color:#90CAF9;} .d2-3500999268 .color-AB4{color:#F44336;} - .d2-3500999268 .color-AB5{color:#FFCDD2;}.appendix text.text{fill:#2E2E2E}.md{--color-fg-default:#2E2E2E;--color-fg-muted:#2E2E2E;--color-fg-subtle:#595959;--color-canvas-default:#DCDCDC;--color-canvas-subtle:#DCDCDC;--color-border-default:#2E7D32;--color-border-muted:#66BB6A;--color-neutral-muted:#DCDCDC;--color-accent-fg:#66BB6A;--color-accent-emphasis:#66BB6A;--color-attention-subtle:#2E2E2E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.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-darker);mix-blend-mode:lighten}.sketch-overlay-AA4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AA5{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AB4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AB5{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N3{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N6{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N7{fill:url(#streaks-normal);mix-blend-mode:color-burn}.light-code{display: block}.dark-code{display: none}]]>logsUserNetworkAPI ServercostumesidintPKsillinessintmonsterintlast_updatedtimestampmonstersidintPKmoviestringweightintlast_updatedtimestampCell TowerData ProcessorOnline PortalsatellitestransmitterStorageUI phone logsMake callpersistdisplay access ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-3500999268 .color-AB5{color:#FFCDD2;}.appendix text.text{fill:#2E2E2E}.md{--color-fg-default:#2E2E2E;--color-fg-muted:#2E2E2E;--color-fg-subtle:#595959;--color-canvas-default:#DCDCDC;--color-canvas-subtle:#DCDCDC;--color-border-default:#2E7D32;--color-border-muted:#66BB6A;--color-neutral-muted:#DCDCDC;--color-accent-fg:#66BB6A;--color-accent-emphasis:#66BB6A;--color-attention-subtle:#2E2E2E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.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-darker);mix-blend-mode:lighten}.sketch-overlay-AA4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AA5{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AB4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AB5{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N3{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N6{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N7{fill:url(#streaks-normal);mix-blend-mode:color-burn}.light-code{display: block}.dark-code{display: none}]]>logsUserNetworkAPI ServercostumesidintPKsillinessintmonsterintlast_updatedtimestampmonstersidintPKmoviestringweightintlast_updatedtimestampCell TowerData ProcessorOnline PortalsatellitestransmitterStorageUI phone logsMake callpersistdisplay access diff --git a/e2etests/testdata/txtar/theme-overrides/elk/sketch.exp.svg b/e2etests/testdata/txtar/theme-overrides/elk/sketch.exp.svg index 4aa55b789..582bf40f1 100644 --- a/e2etests/testdata/txtar/theme-overrides/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/theme-overrides/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -logsUserNetworkAPI ServercostumesidintPKsillinessintmonsterintlast_updatedtimestampmonstersidintPKmoviestringweightintlast_updatedtimestampCell TowerData ProcessorOnline PortalsatellitestransmitterStorageUI phone logsMake callpersistdisplay access -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-230079697 .fill-N1{fill:#2E2E2E;} - .d2-230079697 .fill-N2{fill:#2E2E2E;} - .d2-230079697 .fill-N3{fill:#595959;} - .d2-230079697 .fill-N4{fill:#858585;} - .d2-230079697 .fill-N5{fill:#B1B1B1;} - .d2-230079697 .fill-N6{fill:#DCDCDC;} - .d2-230079697 .fill-N7{fill:#DCDCDC;} - .d2-230079697 .fill-B1{fill:#2E7D32;} - .d2-230079697 .fill-B2{fill:#66BB6A;} - .d2-230079697 .fill-B3{fill:#A5D6A7;} - .d2-230079697 .fill-B4{fill:#C5E1A5;} - .d2-230079697 .fill-B5{fill:#E6EE9C;} - .d2-230079697 .fill-B6{fill:#FFF59D;} - .d2-230079697 .fill-AA2{fill:#0D47A1;} - .d2-230079697 .fill-AA4{fill:#42A5F5;} - .d2-230079697 .fill-AA5{fill:#90CAF9;} - .d2-230079697 .fill-AB4{fill:#F44336;} - .d2-230079697 .fill-AB5{fill:#FFCDD2;} - .d2-230079697 .stroke-N1{stroke:#2E2E2E;} - .d2-230079697 .stroke-N2{stroke:#2E2E2E;} - .d2-230079697 .stroke-N3{stroke:#595959;} - .d2-230079697 .stroke-N4{stroke:#858585;} - .d2-230079697 .stroke-N5{stroke:#B1B1B1;} - .d2-230079697 .stroke-N6{stroke:#DCDCDC;} - .d2-230079697 .stroke-N7{stroke:#DCDCDC;} - .d2-230079697 .stroke-B1{stroke:#2E7D32;} - .d2-230079697 .stroke-B2{stroke:#66BB6A;} - .d2-230079697 .stroke-B3{stroke:#A5D6A7;} - .d2-230079697 .stroke-B4{stroke:#C5E1A5;} - .d2-230079697 .stroke-B5{stroke:#E6EE9C;} - .d2-230079697 .stroke-B6{stroke:#FFF59D;} - .d2-230079697 .stroke-AA2{stroke:#0D47A1;} - .d2-230079697 .stroke-AA4{stroke:#42A5F5;} - .d2-230079697 .stroke-AA5{stroke:#90CAF9;} - .d2-230079697 .stroke-AB4{stroke:#F44336;} - .d2-230079697 .stroke-AB5{stroke:#FFCDD2;} - .d2-230079697 .background-color-N1{background-color:#2E2E2E;} - .d2-230079697 .background-color-N2{background-color:#2E2E2E;} - .d2-230079697 .background-color-N3{background-color:#595959;} - .d2-230079697 .background-color-N4{background-color:#858585;} - .d2-230079697 .background-color-N5{background-color:#B1B1B1;} - .d2-230079697 .background-color-N6{background-color:#DCDCDC;} - .d2-230079697 .background-color-N7{background-color:#DCDCDC;} - .d2-230079697 .background-color-B1{background-color:#2E7D32;} - .d2-230079697 .background-color-B2{background-color:#66BB6A;} - .d2-230079697 .background-color-B3{background-color:#A5D6A7;} - .d2-230079697 .background-color-B4{background-color:#C5E1A5;} - .d2-230079697 .background-color-B5{background-color:#E6EE9C;} - .d2-230079697 .background-color-B6{background-color:#FFF59D;} - .d2-230079697 .background-color-AA2{background-color:#0D47A1;} - .d2-230079697 .background-color-AA4{background-color:#42A5F5;} - .d2-230079697 .background-color-AA5{background-color:#90CAF9;} - .d2-230079697 .background-color-AB4{background-color:#F44336;} - .d2-230079697 .background-color-AB5{background-color:#FFCDD2;} - .d2-230079697 .color-N1{color:#2E2E2E;} - .d2-230079697 .color-N2{color:#2E2E2E;} - .d2-230079697 .color-N3{color:#595959;} - .d2-230079697 .color-N4{color:#858585;} - .d2-230079697 .color-N5{color:#B1B1B1;} - .d2-230079697 .color-N6{color:#DCDCDC;} - .d2-230079697 .color-N7{color:#DCDCDC;} - .d2-230079697 .color-B1{color:#2E7D32;} - .d2-230079697 .color-B2{color:#66BB6A;} - .d2-230079697 .color-B3{color:#A5D6A7;} - .d2-230079697 .color-B4{color:#C5E1A5;} - .d2-230079697 .color-B5{color:#E6EE9C;} - .d2-230079697 .color-B6{color:#FFF59D;} - .d2-230079697 .color-AA2{color:#0D47A1;} - .d2-230079697 .color-AA4{color:#42A5F5;} - .d2-230079697 .color-AA5{color:#90CAF9;} - .d2-230079697 .color-AB4{color:#F44336;} - .d2-230079697 .color-AB5{color:#FFCDD2;}.appendix text.text{fill:#2E2E2E}.md{--color-fg-default:#2E2E2E;--color-fg-muted:#2E2E2E;--color-fg-subtle:#595959;--color-canvas-default:#DCDCDC;--color-canvas-subtle:#DCDCDC;--color-border-default:#2E7D32;--color-border-muted:#66BB6A;--color-neutral-muted:#DCDCDC;--color-accent-fg:#66BB6A;--color-accent-emphasis:#66BB6A;--color-attention-subtle:#2E2E2E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.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-darker);mix-blend-mode:lighten}.sketch-overlay-AA4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AA5{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AB4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AB5{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N3{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N6{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N7{fill:url(#streaks-normal);mix-blend-mode:color-burn}.light-code{display: block}.dark-code{display: none}]]>logsUserNetworkAPI ServercostumesidintPKsillinessintmonsterintlast_updatedtimestampmonstersidintPKmoviestringweightintlast_updatedtimestampCell TowerData ProcessorOnline PortalsatellitestransmitterStorageUI phone logsMake callpersistdisplay access -======= .d2-777983981 .fill-N1{fill:#2E2E2E;} .d2-777983981 .fill-N2{fill:#2E2E2E;} .d2-777983981 .fill-N3{fill:#595959;} @@ -266,8 +103,7 @@ .d2-777983981 .color-AA4{color:#42A5F5;} .d2-777983981 .color-AA5{color:#90CAF9;} .d2-777983981 .color-AB4{color:#F44336;} - .d2-777983981 .color-AB5{color:#FFCDD2;}.appendix text.text{fill:#2E2E2E}.md{--color-fg-default:#2E2E2E;--color-fg-muted:#2E2E2E;--color-fg-subtle:#595959;--color-canvas-default:#DCDCDC;--color-canvas-subtle:#DCDCDC;--color-border-default:#2E7D32;--color-border-muted:#66BB6A;--color-neutral-muted:#DCDCDC;--color-accent-fg:#66BB6A;--color-accent-emphasis:#66BB6A;--color-attention-subtle:#2E2E2E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.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-darker);mix-blend-mode:lighten}.sketch-overlay-AA4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AA5{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AB4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AB5{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N3{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N6{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N7{fill:url(#streaks-normal);mix-blend-mode:color-burn}.light-code{display: block}.dark-code{display: none}]]>logsUserNetworkAPI ServercostumesidintPKsillinessintmonsterintlast_updatedtimestampmonstersidintPKmoviestringweightintlast_updatedtimestampCell TowerData ProcessorOnline PortalsatellitestransmitterStorageUI phone logsMake callpersistdisplay access ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-777983981 .color-AB5{color:#FFCDD2;}.appendix text.text{fill:#2E2E2E}.md{--color-fg-default:#2E2E2E;--color-fg-muted:#2E2E2E;--color-fg-subtle:#595959;--color-canvas-default:#DCDCDC;--color-canvas-subtle:#DCDCDC;--color-border-default:#2E7D32;--color-border-muted:#66BB6A;--color-neutral-muted:#DCDCDC;--color-accent-fg:#66BB6A;--color-accent-emphasis:#66BB6A;--color-attention-subtle:#2E2E2E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-B2{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-B4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.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-darker);mix-blend-mode:lighten}.sketch-overlay-AA4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AA5{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-AB4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AB5{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N3{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N4{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N5{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N6{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N7{fill:url(#streaks-normal);mix-blend-mode:color-burn}.light-code{display: block}.dark-code{display: none}]]>logsUserNetworkAPI ServercostumesidintPKsillinessintmonsterintlast_updatedtimestampmonstersidintPKmoviestringweightintlast_updatedtimestampCell TowerData ProcessorOnline PortalsatellitestransmitterStorageUI phone logsMake callpersistdisplay access diff --git a/e2etests/testdata/txtar/var_in_markdown/dagre/board.exp.json b/e2etests/testdata/txtar/var_in_markdown/dagre/board.exp.json index 9310e8460..2832d3786 100644 --- a/e2etests/testdata/txtar/var_in_markdown/dagre/board.exp.json +++ b/e2etests/testdata/txtar/var_in_markdown/dagre/board.exp.json @@ -191,6 +191,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 167.5, @@ -238,6 +239,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 167.5, diff --git a/e2etests/testdata/txtar/var_in_markdown/dagre/sketch.exp.svg b/e2etests/testdata/txtar/var_in_markdown/dagre/sketch.exp.svg index 49f57ba74..6a2b7366b 100644 --- a/e2etests/testdata/txtar/var_in_markdown/dagre/sketch.exp.svg +++ b/e2etests/testdata/txtar/var_in_markdown/dagre/sketch.exp.svg @@ -1,27 +1,27 @@ -Kube

Kube is a service

Let ${y} be ${x}
 
-
ba +
ba diff --git a/e2etests/testdata/txtar/var_in_markdown/elk/board.exp.json b/e2etests/testdata/txtar/var_in_markdown/elk/board.exp.json index 431f493e9..e84073283 100644 --- a/e2etests/testdata/txtar/var_in_markdown/elk/board.exp.json +++ b/e2etests/testdata/txtar/var_in_markdown/elk/board.exp.json @@ -191,6 +191,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 139.5, @@ -229,6 +230,7 @@ "labelHeight": 0, "labelPosition": "", "labelPercentage": 0, + "link": "", "route": [ { "x": 139.5, diff --git a/e2etests/testdata/txtar/var_in_markdown/elk/sketch.exp.svg b/e2etests/testdata/txtar/var_in_markdown/elk/sketch.exp.svg index 80041bd46..d4c69f520 100644 --- a/e2etests/testdata/txtar/var_in_markdown/elk/sketch.exp.svg +++ b/e2etests/testdata/txtar/var_in_markdown/elk/sketch.exp.svg @@ -1,27 +1,27 @@ -Kube

Kube is a service

Let ${y} be ${x}
 
-
ba +
ba diff --git a/e2etests/testdata/unicode/chinese/dagre/sketch.exp.svg b/e2etests/testdata/unicode/chinese/dagre/sketch.exp.svg index f98982358..3903de2ce 100644 --- a/e2etests/testdata/unicode/chinese/dagre/sketch.exp.svg +++ b/e2etests/testdata/unicode/chinese/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -🙈🙈🙈🙈🙈🙈🙈🙈✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️ -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-3342222526 .fill-N1{fill:#0A0F25;} - .d2-3342222526 .fill-N2{fill:#676C7E;} - .d2-3342222526 .fill-N3{fill:#9499AB;} - .d2-3342222526 .fill-N4{fill:#CFD2DD;} - .d2-3342222526 .fill-N5{fill:#DEE1EB;} - .d2-3342222526 .fill-N6{fill:#EEF1F8;} - .d2-3342222526 .fill-N7{fill:#FFFFFF;} - .d2-3342222526 .fill-B1{fill:#0D32B2;} - .d2-3342222526 .fill-B2{fill:#0D32B2;} - .d2-3342222526 .fill-B3{fill:#E3E9FD;} - .d2-3342222526 .fill-B4{fill:#E3E9FD;} - .d2-3342222526 .fill-B5{fill:#EDF0FD;} - .d2-3342222526 .fill-B6{fill:#F7F8FE;} - .d2-3342222526 .fill-AA2{fill:#4A6FF3;} - .d2-3342222526 .fill-AA4{fill:#EDF0FD;} - .d2-3342222526 .fill-AA5{fill:#F7F8FE;} - .d2-3342222526 .fill-AB4{fill:#EDF0FD;} - .d2-3342222526 .fill-AB5{fill:#F7F8FE;} - .d2-3342222526 .stroke-N1{stroke:#0A0F25;} - .d2-3342222526 .stroke-N2{stroke:#676C7E;} - .d2-3342222526 .stroke-N3{stroke:#9499AB;} - .d2-3342222526 .stroke-N4{stroke:#CFD2DD;} - .d2-3342222526 .stroke-N5{stroke:#DEE1EB;} - .d2-3342222526 .stroke-N6{stroke:#EEF1F8;} - .d2-3342222526 .stroke-N7{stroke:#FFFFFF;} - .d2-3342222526 .stroke-B1{stroke:#0D32B2;} - .d2-3342222526 .stroke-B2{stroke:#0D32B2;} - .d2-3342222526 .stroke-B3{stroke:#E3E9FD;} - .d2-3342222526 .stroke-B4{stroke:#E3E9FD;} - .d2-3342222526 .stroke-B5{stroke:#EDF0FD;} - .d2-3342222526 .stroke-B6{stroke:#F7F8FE;} - .d2-3342222526 .stroke-AA2{stroke:#4A6FF3;} - .d2-3342222526 .stroke-AA4{stroke:#EDF0FD;} - .d2-3342222526 .stroke-AA5{stroke:#F7F8FE;} - .d2-3342222526 .stroke-AB4{stroke:#EDF0FD;} - .d2-3342222526 .stroke-AB5{stroke:#F7F8FE;} - .d2-3342222526 .background-color-N1{background-color:#0A0F25;} - .d2-3342222526 .background-color-N2{background-color:#676C7E;} - .d2-3342222526 .background-color-N3{background-color:#9499AB;} - .d2-3342222526 .background-color-N4{background-color:#CFD2DD;} - .d2-3342222526 .background-color-N5{background-color:#DEE1EB;} - .d2-3342222526 .background-color-N6{background-color:#EEF1F8;} - .d2-3342222526 .background-color-N7{background-color:#FFFFFF;} - .d2-3342222526 .background-color-B1{background-color:#0D32B2;} - .d2-3342222526 .background-color-B2{background-color:#0D32B2;} - .d2-3342222526 .background-color-B3{background-color:#E3E9FD;} - .d2-3342222526 .background-color-B4{background-color:#E3E9FD;} - .d2-3342222526 .background-color-B5{background-color:#EDF0FD;} - .d2-3342222526 .background-color-B6{background-color:#F7F8FE;} - .d2-3342222526 .background-color-AA2{background-color:#4A6FF3;} - .d2-3342222526 .background-color-AA4{background-color:#EDF0FD;} - .d2-3342222526 .background-color-AA5{background-color:#F7F8FE;} - .d2-3342222526 .background-color-AB4{background-color:#EDF0FD;} - .d2-3342222526 .background-color-AB5{background-color:#F7F8FE;} - .d2-3342222526 .color-N1{color:#0A0F25;} - .d2-3342222526 .color-N2{color:#676C7E;} - .d2-3342222526 .color-N3{color:#9499AB;} - .d2-3342222526 .color-N4{color:#CFD2DD;} - .d2-3342222526 .color-N5{color:#DEE1EB;} - .d2-3342222526 .color-N6{color:#EEF1F8;} - .d2-3342222526 .color-N7{color:#FFFFFF;} - .d2-3342222526 .color-B1{color:#0D32B2;} - .d2-3342222526 .color-B2{color:#0D32B2;} - .d2-3342222526 .color-B3{color:#E3E9FD;} - .d2-3342222526 .color-B4{color:#E3E9FD;} - .d2-3342222526 .color-B5{color:#EDF0FD;} - .d2-3342222526 .color-B6{color:#F7F8FE;} - .d2-3342222526 .color-AA2{color:#4A6FF3;} - .d2-3342222526 .color-AA4{color:#EDF0FD;} - .d2-3342222526 .color-AA5{color:#F7F8FE;} - .d2-3342222526 .color-AB4{color:#EDF0FD;} - .d2-3342222526 .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}]]>🙈🙈🙈🙈🙈🙈🙈🙈✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️ -======= .d2-3356403988 .fill-N1{fill:#0A0F25;} .d2-3356403988 .fill-N2{fill:#676C7E;} .d2-3356403988 .fill-N3{fill:#9499AB;} @@ -252,8 +89,7 @@ .d2-3356403988 .color-AA4{color:#EDF0FD;} .d2-3356403988 .color-AA5{color:#F7F8FE;} .d2-3356403988 .color-AB4{color:#EDF0FD;} - .d2-3356403988 .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}]]>🙈🙈🙈🙈🙈🙈🙈🙈✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️ ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-3356403988 .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}]]>🙈🙈🙈🙈🙈🙈🙈🙈✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️ diff --git a/e2etests/testdata/unicode/emojis/elk/sketch.exp.svg b/e2etests/testdata/unicode/emojis/elk/sketch.exp.svg index facae6ae3..c698c2a27 100644 --- a/e2etests/testdata/unicode/emojis/elk/sketch.exp.svg +++ b/e2etests/testdata/unicode/emojis/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -🙈🙈🙈🙈🙈🙈🙈🙈✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️ -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-2559513672 .fill-N1{fill:#0A0F25;} - .d2-2559513672 .fill-N2{fill:#676C7E;} - .d2-2559513672 .fill-N3{fill:#9499AB;} - .d2-2559513672 .fill-N4{fill:#CFD2DD;} - .d2-2559513672 .fill-N5{fill:#DEE1EB;} - .d2-2559513672 .fill-N6{fill:#EEF1F8;} - .d2-2559513672 .fill-N7{fill:#FFFFFF;} - .d2-2559513672 .fill-B1{fill:#0D32B2;} - .d2-2559513672 .fill-B2{fill:#0D32B2;} - .d2-2559513672 .fill-B3{fill:#E3E9FD;} - .d2-2559513672 .fill-B4{fill:#E3E9FD;} - .d2-2559513672 .fill-B5{fill:#EDF0FD;} - .d2-2559513672 .fill-B6{fill:#F7F8FE;} - .d2-2559513672 .fill-AA2{fill:#4A6FF3;} - .d2-2559513672 .fill-AA4{fill:#EDF0FD;} - .d2-2559513672 .fill-AA5{fill:#F7F8FE;} - .d2-2559513672 .fill-AB4{fill:#EDF0FD;} - .d2-2559513672 .fill-AB5{fill:#F7F8FE;} - .d2-2559513672 .stroke-N1{stroke:#0A0F25;} - .d2-2559513672 .stroke-N2{stroke:#676C7E;} - .d2-2559513672 .stroke-N3{stroke:#9499AB;} - .d2-2559513672 .stroke-N4{stroke:#CFD2DD;} - .d2-2559513672 .stroke-N5{stroke:#DEE1EB;} - .d2-2559513672 .stroke-N6{stroke:#EEF1F8;} - .d2-2559513672 .stroke-N7{stroke:#FFFFFF;} - .d2-2559513672 .stroke-B1{stroke:#0D32B2;} - .d2-2559513672 .stroke-B2{stroke:#0D32B2;} - .d2-2559513672 .stroke-B3{stroke:#E3E9FD;} - .d2-2559513672 .stroke-B4{stroke:#E3E9FD;} - .d2-2559513672 .stroke-B5{stroke:#EDF0FD;} - .d2-2559513672 .stroke-B6{stroke:#F7F8FE;} - .d2-2559513672 .stroke-AA2{stroke:#4A6FF3;} - .d2-2559513672 .stroke-AA4{stroke:#EDF0FD;} - .d2-2559513672 .stroke-AA5{stroke:#F7F8FE;} - .d2-2559513672 .stroke-AB4{stroke:#EDF0FD;} - .d2-2559513672 .stroke-AB5{stroke:#F7F8FE;} - .d2-2559513672 .background-color-N1{background-color:#0A0F25;} - .d2-2559513672 .background-color-N2{background-color:#676C7E;} - .d2-2559513672 .background-color-N3{background-color:#9499AB;} - .d2-2559513672 .background-color-N4{background-color:#CFD2DD;} - .d2-2559513672 .background-color-N5{background-color:#DEE1EB;} - .d2-2559513672 .background-color-N6{background-color:#EEF1F8;} - .d2-2559513672 .background-color-N7{background-color:#FFFFFF;} - .d2-2559513672 .background-color-B1{background-color:#0D32B2;} - .d2-2559513672 .background-color-B2{background-color:#0D32B2;} - .d2-2559513672 .background-color-B3{background-color:#E3E9FD;} - .d2-2559513672 .background-color-B4{background-color:#E3E9FD;} - .d2-2559513672 .background-color-B5{background-color:#EDF0FD;} - .d2-2559513672 .background-color-B6{background-color:#F7F8FE;} - .d2-2559513672 .background-color-AA2{background-color:#4A6FF3;} - .d2-2559513672 .background-color-AA4{background-color:#EDF0FD;} - .d2-2559513672 .background-color-AA5{background-color:#F7F8FE;} - .d2-2559513672 .background-color-AB4{background-color:#EDF0FD;} - .d2-2559513672 .background-color-AB5{background-color:#F7F8FE;} - .d2-2559513672 .color-N1{color:#0A0F25;} - .d2-2559513672 .color-N2{color:#676C7E;} - .d2-2559513672 .color-N3{color:#9499AB;} - .d2-2559513672 .color-N4{color:#CFD2DD;} - .d2-2559513672 .color-N5{color:#DEE1EB;} - .d2-2559513672 .color-N6{color:#EEF1F8;} - .d2-2559513672 .color-N7{color:#FFFFFF;} - .d2-2559513672 .color-B1{color:#0D32B2;} - .d2-2559513672 .color-B2{color:#0D32B2;} - .d2-2559513672 .color-B3{color:#E3E9FD;} - .d2-2559513672 .color-B4{color:#E3E9FD;} - .d2-2559513672 .color-B5{color:#EDF0FD;} - .d2-2559513672 .color-B6{color:#F7F8FE;} - .d2-2559513672 .color-AA2{color:#4A6FF3;} - .d2-2559513672 .color-AA4{color:#EDF0FD;} - .d2-2559513672 .color-AA5{color:#F7F8FE;} - .d2-2559513672 .color-AB4{color:#EDF0FD;} - .d2-2559513672 .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}]]>🙈🙈🙈🙈🙈🙈🙈🙈✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️ -======= .d2-2808318858 .fill-N1{fill:#0A0F25;} .d2-2808318858 .fill-N2{fill:#676C7E;} .d2-2808318858 .fill-N3{fill:#9499AB;} @@ -252,8 +89,7 @@ .d2-2808318858 .color-AA4{color:#EDF0FD;} .d2-2808318858 .color-AA5{color:#F7F8FE;} .d2-2808318858 .color-AB4{color:#EDF0FD;} - .d2-2808318858 .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}]]>🙈🙈🙈🙈🙈🙈🙈🙈✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️ ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-2808318858 .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}]]>🙈🙈🙈🙈🙈🙈🙈🙈✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊✊☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️☁️ diff --git a/e2etests/testdata/unicode/japanese-full/dagre/sketch.exp.svg b/e2etests/testdata/unicode/japanese-full/dagre/sketch.exp.svg index 6cb68f20f..3c513a9dd 100644 --- a/e2etests/testdata/unicode/japanese-full/dagre/sketch.exp.svg +++ b/e2etests/testdata/unicode/japanese-full/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -ある日、トマトが道を歩いていたら、道路の向こうからキュウリがやって来ました。トマトは驚いて尋ねました。「キュウリさん、どうしてあなたはここにいるのですか?」 キュウリは答えました。「あなたと同じ理由でここにいます。サラダになるために。」「バナナは皮を剥いて食べるものです。」 「バカは死ななきゃ治らない。」 -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-953633631 .fill-N1{fill:#0A0F25;} - .d2-953633631 .fill-N2{fill:#676C7E;} - .d2-953633631 .fill-N3{fill:#9499AB;} - .d2-953633631 .fill-N4{fill:#CFD2DD;} - .d2-953633631 .fill-N5{fill:#DEE1EB;} - .d2-953633631 .fill-N6{fill:#EEF1F8;} - .d2-953633631 .fill-N7{fill:#FFFFFF;} - .d2-953633631 .fill-B1{fill:#0D32B2;} - .d2-953633631 .fill-B2{fill:#0D32B2;} - .d2-953633631 .fill-B3{fill:#E3E9FD;} - .d2-953633631 .fill-B4{fill:#E3E9FD;} - .d2-953633631 .fill-B5{fill:#EDF0FD;} - .d2-953633631 .fill-B6{fill:#F7F8FE;} - .d2-953633631 .fill-AA2{fill:#4A6FF3;} - .d2-953633631 .fill-AA4{fill:#EDF0FD;} - .d2-953633631 .fill-AA5{fill:#F7F8FE;} - .d2-953633631 .fill-AB4{fill:#EDF0FD;} - .d2-953633631 .fill-AB5{fill:#F7F8FE;} - .d2-953633631 .stroke-N1{stroke:#0A0F25;} - .d2-953633631 .stroke-N2{stroke:#676C7E;} - .d2-953633631 .stroke-N3{stroke:#9499AB;} - .d2-953633631 .stroke-N4{stroke:#CFD2DD;} - .d2-953633631 .stroke-N5{stroke:#DEE1EB;} - .d2-953633631 .stroke-N6{stroke:#EEF1F8;} - .d2-953633631 .stroke-N7{stroke:#FFFFFF;} - .d2-953633631 .stroke-B1{stroke:#0D32B2;} - .d2-953633631 .stroke-B2{stroke:#0D32B2;} - .d2-953633631 .stroke-B3{stroke:#E3E9FD;} - .d2-953633631 .stroke-B4{stroke:#E3E9FD;} - .d2-953633631 .stroke-B5{stroke:#EDF0FD;} - .d2-953633631 .stroke-B6{stroke:#F7F8FE;} - .d2-953633631 .stroke-AA2{stroke:#4A6FF3;} - .d2-953633631 .stroke-AA4{stroke:#EDF0FD;} - .d2-953633631 .stroke-AA5{stroke:#F7F8FE;} - .d2-953633631 .stroke-AB4{stroke:#EDF0FD;} - .d2-953633631 .stroke-AB5{stroke:#F7F8FE;} - .d2-953633631 .background-color-N1{background-color:#0A0F25;} - .d2-953633631 .background-color-N2{background-color:#676C7E;} - .d2-953633631 .background-color-N3{background-color:#9499AB;} - .d2-953633631 .background-color-N4{background-color:#CFD2DD;} - .d2-953633631 .background-color-N5{background-color:#DEE1EB;} - .d2-953633631 .background-color-N6{background-color:#EEF1F8;} - .d2-953633631 .background-color-N7{background-color:#FFFFFF;} - .d2-953633631 .background-color-B1{background-color:#0D32B2;} - .d2-953633631 .background-color-B2{background-color:#0D32B2;} - .d2-953633631 .background-color-B3{background-color:#E3E9FD;} - .d2-953633631 .background-color-B4{background-color:#E3E9FD;} - .d2-953633631 .background-color-B5{background-color:#EDF0FD;} - .d2-953633631 .background-color-B6{background-color:#F7F8FE;} - .d2-953633631 .background-color-AA2{background-color:#4A6FF3;} - .d2-953633631 .background-color-AA4{background-color:#EDF0FD;} - .d2-953633631 .background-color-AA5{background-color:#F7F8FE;} - .d2-953633631 .background-color-AB4{background-color:#EDF0FD;} - .d2-953633631 .background-color-AB5{background-color:#F7F8FE;} - .d2-953633631 .color-N1{color:#0A0F25;} - .d2-953633631 .color-N2{color:#676C7E;} - .d2-953633631 .color-N3{color:#9499AB;} - .d2-953633631 .color-N4{color:#CFD2DD;} - .d2-953633631 .color-N5{color:#DEE1EB;} - .d2-953633631 .color-N6{color:#EEF1F8;} - .d2-953633631 .color-N7{color:#FFFFFF;} - .d2-953633631 .color-B1{color:#0D32B2;} - .d2-953633631 .color-B2{color:#0D32B2;} - .d2-953633631 .color-B3{color:#E3E9FD;} - .d2-953633631 .color-B4{color:#E3E9FD;} - .d2-953633631 .color-B5{color:#EDF0FD;} - .d2-953633631 .color-B6{color:#F7F8FE;} - .d2-953633631 .color-AA2{color:#4A6FF3;} - .d2-953633631 .color-AA4{color:#EDF0FD;} - .d2-953633631 .color-AA5{color:#F7F8FE;} - .d2-953633631 .color-AB4{color:#EDF0FD;} - .d2-953633631 .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}]]>ある日、トマトが道を歩いていたら、道路の向こうからキュウリがやって来ました。トマトは驚いて尋ねました。「キュウリさん、どうしてあなたはここにいるのですか?」 キュウリは答えました。「あなたと同じ理由でここにいます。サラダになるために。」「バナナは皮を剥いて食べるものです。」 「バカは死ななきゃ治らない。」 -======= .d2-256778433 .fill-N1{fill:#0A0F25;} .d2-256778433 .fill-N2{fill:#676C7E;} .d2-256778433 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-256778433 .color-AA4{color:#EDF0FD;} .d2-256778433 .color-AA5{color:#F7F8FE;} .d2-256778433 .color-AB4{color:#EDF0FD;} - .d2-256778433 .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}]]>ある日、トマトが道を歩いていたら、道路の向こうからキュウリがやって来ました。トマトは驚いて尋ねました。「キュウリさん、どうしてあなたはここにいるのですか?」 キュウリは答えました。「あなたと同じ理由でここにいます。サラダになるために。」「バナナは皮を剥いて食べるものです。」 「バカは死ななきゃ治らない。」 ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-256778433 .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}]]>ある日、トマトが道を歩いていたら、道路の向こうからキュウリがやって来ました。トマトは驚いて尋ねました。「キュウリさん、どうしてあなたはここにいるのですか?」 キュウリは答えました。「あなたと同じ理由でここにいます。サラダになるために。」「バナナは皮を剥いて食べるものです。」 「バカは死ななきゃ治らない。」 diff --git a/e2etests/testdata/unicode/japanese-full/elk/sketch.exp.svg b/e2etests/testdata/unicode/japanese-full/elk/sketch.exp.svg index ef932c0dd..05ddb5604 100644 --- a/e2etests/testdata/unicode/japanese-full/elk/sketch.exp.svg +++ b/e2etests/testdata/unicode/japanese-full/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -ある日、トマトが道を歩いていたら、道路の向こうからキュウリがやって来ました。トマトは驚いて尋ねました。「キュウリさん、どうしてあなたはここにいるのですか?」 キュウリは答えました。「あなたと同じ理由でここにいます。サラダになるために。」「バナナは皮を剥いて食べるものです。」 「バカは死ななきゃ治らない。」 -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-2895298439 .fill-N1{fill:#0A0F25;} - .d2-2895298439 .fill-N2{fill:#676C7E;} - .d2-2895298439 .fill-N3{fill:#9499AB;} - .d2-2895298439 .fill-N4{fill:#CFD2DD;} - .d2-2895298439 .fill-N5{fill:#DEE1EB;} - .d2-2895298439 .fill-N6{fill:#EEF1F8;} - .d2-2895298439 .fill-N7{fill:#FFFFFF;} - .d2-2895298439 .fill-B1{fill:#0D32B2;} - .d2-2895298439 .fill-B2{fill:#0D32B2;} - .d2-2895298439 .fill-B3{fill:#E3E9FD;} - .d2-2895298439 .fill-B4{fill:#E3E9FD;} - .d2-2895298439 .fill-B5{fill:#EDF0FD;} - .d2-2895298439 .fill-B6{fill:#F7F8FE;} - .d2-2895298439 .fill-AA2{fill:#4A6FF3;} - .d2-2895298439 .fill-AA4{fill:#EDF0FD;} - .d2-2895298439 .fill-AA5{fill:#F7F8FE;} - .d2-2895298439 .fill-AB4{fill:#EDF0FD;} - .d2-2895298439 .fill-AB5{fill:#F7F8FE;} - .d2-2895298439 .stroke-N1{stroke:#0A0F25;} - .d2-2895298439 .stroke-N2{stroke:#676C7E;} - .d2-2895298439 .stroke-N3{stroke:#9499AB;} - .d2-2895298439 .stroke-N4{stroke:#CFD2DD;} - .d2-2895298439 .stroke-N5{stroke:#DEE1EB;} - .d2-2895298439 .stroke-N6{stroke:#EEF1F8;} - .d2-2895298439 .stroke-N7{stroke:#FFFFFF;} - .d2-2895298439 .stroke-B1{stroke:#0D32B2;} - .d2-2895298439 .stroke-B2{stroke:#0D32B2;} - .d2-2895298439 .stroke-B3{stroke:#E3E9FD;} - .d2-2895298439 .stroke-B4{stroke:#E3E9FD;} - .d2-2895298439 .stroke-B5{stroke:#EDF0FD;} - .d2-2895298439 .stroke-B6{stroke:#F7F8FE;} - .d2-2895298439 .stroke-AA2{stroke:#4A6FF3;} - .d2-2895298439 .stroke-AA4{stroke:#EDF0FD;} - .d2-2895298439 .stroke-AA5{stroke:#F7F8FE;} - .d2-2895298439 .stroke-AB4{stroke:#EDF0FD;} - .d2-2895298439 .stroke-AB5{stroke:#F7F8FE;} - .d2-2895298439 .background-color-N1{background-color:#0A0F25;} - .d2-2895298439 .background-color-N2{background-color:#676C7E;} - .d2-2895298439 .background-color-N3{background-color:#9499AB;} - .d2-2895298439 .background-color-N4{background-color:#CFD2DD;} - .d2-2895298439 .background-color-N5{background-color:#DEE1EB;} - .d2-2895298439 .background-color-N6{background-color:#EEF1F8;} - .d2-2895298439 .background-color-N7{background-color:#FFFFFF;} - .d2-2895298439 .background-color-B1{background-color:#0D32B2;} - .d2-2895298439 .background-color-B2{background-color:#0D32B2;} - .d2-2895298439 .background-color-B3{background-color:#E3E9FD;} - .d2-2895298439 .background-color-B4{background-color:#E3E9FD;} - .d2-2895298439 .background-color-B5{background-color:#EDF0FD;} - .d2-2895298439 .background-color-B6{background-color:#F7F8FE;} - .d2-2895298439 .background-color-AA2{background-color:#4A6FF3;} - .d2-2895298439 .background-color-AA4{background-color:#EDF0FD;} - .d2-2895298439 .background-color-AA5{background-color:#F7F8FE;} - .d2-2895298439 .background-color-AB4{background-color:#EDF0FD;} - .d2-2895298439 .background-color-AB5{background-color:#F7F8FE;} - .d2-2895298439 .color-N1{color:#0A0F25;} - .d2-2895298439 .color-N2{color:#676C7E;} - .d2-2895298439 .color-N3{color:#9499AB;} - .d2-2895298439 .color-N4{color:#CFD2DD;} - .d2-2895298439 .color-N5{color:#DEE1EB;} - .d2-2895298439 .color-N6{color:#EEF1F8;} - .d2-2895298439 .color-N7{color:#FFFFFF;} - .d2-2895298439 .color-B1{color:#0D32B2;} - .d2-2895298439 .color-B2{color:#0D32B2;} - .d2-2895298439 .color-B3{color:#E3E9FD;} - .d2-2895298439 .color-B4{color:#E3E9FD;} - .d2-2895298439 .color-B5{color:#EDF0FD;} - .d2-2895298439 .color-B6{color:#F7F8FE;} - .d2-2895298439 .color-AA2{color:#4A6FF3;} - .d2-2895298439 .color-AA4{color:#EDF0FD;} - .d2-2895298439 .color-AA5{color:#F7F8FE;} - .d2-2895298439 .color-AB4{color:#EDF0FD;} - .d2-2895298439 .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}]]>ある日、トマトが道を歩いていたら、道路の向こうからキュウリがやって来ました。トマトは驚いて尋ねました。「キュウリさん、どうしてあなたはここにいるのですか?」 キュウリは答えました。「あなたと同じ理由でここにいます。サラダになるために。」「バナナは皮を剥いて食べるものです。」 「バカは死ななきゃ治らない。」 -======= .d2-3932455137 .fill-N1{fill:#0A0F25;} .d2-3932455137 .fill-N2{fill:#676C7E;} .d2-3932455137 .fill-N3{fill:#9499AB;} @@ -259,8 +96,7 @@ .d2-3932455137 .color-AA4{color:#EDF0FD;} .d2-3932455137 .color-AA5{color:#F7F8FE;} .d2-3932455137 .color-AB4{color:#EDF0FD;} - .d2-3932455137 .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}]]>ある日、トマトが道を歩いていたら、道路の向こうからキュウリがやって来ました。トマトは驚いて尋ねました。「キュウリさん、どうしてあなたはここにいるのですか?」 キュウリは答えました。「あなたと同じ理由でここにいます。サラダになるために。」「バナナは皮を剥いて食べるものです。」 「バカは死ななきゃ治らない。」 ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-3932455137 .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}]]>ある日、トマトが道を歩いていたら、道路の向こうからキュウリがやって来ました。トマトは驚いて尋ねました。「キュウリさん、どうしてあなたはここにいるのですか?」 キュウリは答えました。「あなたと同じ理由でここにいます。サラダになるために。」「バナナは皮を剥いて食べるものです。」 「バカは死ななきゃ治らない。」 diff --git a/e2etests/testdata/unicode/japanese-mixed/dagre/sketch.exp.svg b/e2etests/testdata/unicode/japanese-mixed/dagre/sketch.exp.svg index 1928d3ad1..e8821e766 100644 --- a/e2etests/testdata/unicode/japanese-mixed/dagre/sketch.exp.svg +++ b/e2etests/testdata/unicode/japanese-mixed/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -トマトが赤くなったのはなぜですか?Because it saw the salad dressing!👩‍👩‍👧‍👶👩‍👩‍👧‍👶トマトが赤くなったのはなぜですか?Because it saw the salad dressing!👩‍👩‍👧‍👶👩‍👩‍👧‍👶今日はTokyoでsushiを食べました先日、Shibuyaで友達とshoppingを楽😊しんだ後、ramen屋でdelicious😊なラーメンを食べた。English English English先日先日先日 -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-799413400 .fill-N1{fill:#0A0F25;} - .d2-799413400 .fill-N2{fill:#676C7E;} - .d2-799413400 .fill-N3{fill:#9499AB;} - .d2-799413400 .fill-N4{fill:#CFD2DD;} - .d2-799413400 .fill-N5{fill:#DEE1EB;} - .d2-799413400 .fill-N6{fill:#EEF1F8;} - .d2-799413400 .fill-N7{fill:#FFFFFF;} - .d2-799413400 .fill-B1{fill:#0D32B2;} - .d2-799413400 .fill-B2{fill:#0D32B2;} - .d2-799413400 .fill-B3{fill:#E3E9FD;} - .d2-799413400 .fill-B4{fill:#E3E9FD;} - .d2-799413400 .fill-B5{fill:#EDF0FD;} - .d2-799413400 .fill-B6{fill:#F7F8FE;} - .d2-799413400 .fill-AA2{fill:#4A6FF3;} - .d2-799413400 .fill-AA4{fill:#EDF0FD;} - .d2-799413400 .fill-AA5{fill:#F7F8FE;} - .d2-799413400 .fill-AB4{fill:#EDF0FD;} - .d2-799413400 .fill-AB5{fill:#F7F8FE;} - .d2-799413400 .stroke-N1{stroke:#0A0F25;} - .d2-799413400 .stroke-N2{stroke:#676C7E;} - .d2-799413400 .stroke-N3{stroke:#9499AB;} - .d2-799413400 .stroke-N4{stroke:#CFD2DD;} - .d2-799413400 .stroke-N5{stroke:#DEE1EB;} - .d2-799413400 .stroke-N6{stroke:#EEF1F8;} - .d2-799413400 .stroke-N7{stroke:#FFFFFF;} - .d2-799413400 .stroke-B1{stroke:#0D32B2;} - .d2-799413400 .stroke-B2{stroke:#0D32B2;} - .d2-799413400 .stroke-B3{stroke:#E3E9FD;} - .d2-799413400 .stroke-B4{stroke:#E3E9FD;} - .d2-799413400 .stroke-B5{stroke:#EDF0FD;} - .d2-799413400 .stroke-B6{stroke:#F7F8FE;} - .d2-799413400 .stroke-AA2{stroke:#4A6FF3;} - .d2-799413400 .stroke-AA4{stroke:#EDF0FD;} - .d2-799413400 .stroke-AA5{stroke:#F7F8FE;} - .d2-799413400 .stroke-AB4{stroke:#EDF0FD;} - .d2-799413400 .stroke-AB5{stroke:#F7F8FE;} - .d2-799413400 .background-color-N1{background-color:#0A0F25;} - .d2-799413400 .background-color-N2{background-color:#676C7E;} - .d2-799413400 .background-color-N3{background-color:#9499AB;} - .d2-799413400 .background-color-N4{background-color:#CFD2DD;} - .d2-799413400 .background-color-N5{background-color:#DEE1EB;} - .d2-799413400 .background-color-N6{background-color:#EEF1F8;} - .d2-799413400 .background-color-N7{background-color:#FFFFFF;} - .d2-799413400 .background-color-B1{background-color:#0D32B2;} - .d2-799413400 .background-color-B2{background-color:#0D32B2;} - .d2-799413400 .background-color-B3{background-color:#E3E9FD;} - .d2-799413400 .background-color-B4{background-color:#E3E9FD;} - .d2-799413400 .background-color-B5{background-color:#EDF0FD;} - .d2-799413400 .background-color-B6{background-color:#F7F8FE;} - .d2-799413400 .background-color-AA2{background-color:#4A6FF3;} - .d2-799413400 .background-color-AA4{background-color:#EDF0FD;} - .d2-799413400 .background-color-AA5{background-color:#F7F8FE;} - .d2-799413400 .background-color-AB4{background-color:#EDF0FD;} - .d2-799413400 .background-color-AB5{background-color:#F7F8FE;} - .d2-799413400 .color-N1{color:#0A0F25;} - .d2-799413400 .color-N2{color:#676C7E;} - .d2-799413400 .color-N3{color:#9499AB;} - .d2-799413400 .color-N4{color:#CFD2DD;} - .d2-799413400 .color-N5{color:#DEE1EB;} - .d2-799413400 .color-N6{color:#EEF1F8;} - .d2-799413400 .color-N7{color:#FFFFFF;} - .d2-799413400 .color-B1{color:#0D32B2;} - .d2-799413400 .color-B2{color:#0D32B2;} - .d2-799413400 .color-B3{color:#E3E9FD;} - .d2-799413400 .color-B4{color:#E3E9FD;} - .d2-799413400 .color-B5{color:#EDF0FD;} - .d2-799413400 .color-B6{color:#F7F8FE;} - .d2-799413400 .color-AA2{color:#4A6FF3;} - .d2-799413400 .color-AA4{color:#EDF0FD;} - .d2-799413400 .color-AA5{color:#F7F8FE;} - .d2-799413400 .color-AB4{color:#EDF0FD;} - .d2-799413400 .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}]]>トマトが赤くなったのはなぜですか?Because it saw the salad dressing!👩‍👩‍👧‍👶👩‍👩‍👧‍👶トマトが赤くなったのはなぜですか?Because it saw the salad dressing!👩‍👩‍👧‍👶👩‍👩‍👧‍👶今日はTokyoでsushiを食べました先日、Shibuyaで友達とshoppingを楽😊しんだ後、ramen屋でdelicious😊なラーメンを食べた。English English English先日先日先日 -======= .d2-1608792862 .fill-N1{fill:#0A0F25;} .d2-1608792862 .fill-N2{fill:#676C7E;} .d2-1608792862 .fill-N3{fill:#9499AB;} @@ -252,8 +89,7 @@ .d2-1608792862 .color-AA4{color:#EDF0FD;} .d2-1608792862 .color-AA5{color:#F7F8FE;} .d2-1608792862 .color-AB4{color:#EDF0FD;} - .d2-1608792862 .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}]]>トマトが赤くなったのはなぜですか?Because it saw the salad dressing!👩‍👩‍👧‍👶👩‍👩‍👧‍👶トマトが赤くなったのはなぜですか?Because it saw the salad dressing!👩‍👩‍👧‍👶👩‍👩‍👧‍👶今日はTokyoでsushiを食べました先日、Shibuyaで友達とshoppingを楽😊しんだ後、ramen屋でdelicious😊なラーメンを食べた。English English English先日先日先日 ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-1608792862 .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}]]>トマトが赤くなったのはなぜですか?Because it saw the salad dressing!👩‍👩‍👧‍👶👩‍👩‍👧‍👶トマトが赤くなったのはなぜですか?Because it saw the salad dressing!👩‍👩‍👧‍👶👩‍👩‍👧‍👶今日はTokyoでsushiを食べました先日、Shibuyaで友達とshoppingを楽😊しんだ後、ramen屋でdelicious😊なラーメンを食べた。English English English先日先日先日 diff --git a/e2etests/testdata/unicode/japanese-mixed/elk/sketch.exp.svg b/e2etests/testdata/unicode/japanese-mixed/elk/sketch.exp.svg index 30aa74821..f8d9e5a44 100644 --- a/e2etests/testdata/unicode/japanese-mixed/elk/sketch.exp.svg +++ b/e2etests/testdata/unicode/japanese-mixed/elk/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -トマトが赤くなったのはなぜですか?Because it saw the salad dressing!👩‍👩‍👧‍👶👩‍👩‍👧‍👶トマトが赤くなったのはなぜですか?Because it saw the salad dressing!👩‍👩‍👧‍👶👩‍👩‍👧‍👶今日はTokyoでsushiを食べました先日、Shibuyaで友達とshoppingを楽😊しんだ後、ramen屋でdelicious😊なラーメンを食べた。English English English先日先日先日 -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-1875542808 .fill-N1{fill:#0A0F25;} - .d2-1875542808 .fill-N2{fill:#676C7E;} - .d2-1875542808 .fill-N3{fill:#9499AB;} - .d2-1875542808 .fill-N4{fill:#CFD2DD;} - .d2-1875542808 .fill-N5{fill:#DEE1EB;} - .d2-1875542808 .fill-N6{fill:#EEF1F8;} - .d2-1875542808 .fill-N7{fill:#FFFFFF;} - .d2-1875542808 .fill-B1{fill:#0D32B2;} - .d2-1875542808 .fill-B2{fill:#0D32B2;} - .d2-1875542808 .fill-B3{fill:#E3E9FD;} - .d2-1875542808 .fill-B4{fill:#E3E9FD;} - .d2-1875542808 .fill-B5{fill:#EDF0FD;} - .d2-1875542808 .fill-B6{fill:#F7F8FE;} - .d2-1875542808 .fill-AA2{fill:#4A6FF3;} - .d2-1875542808 .fill-AA4{fill:#EDF0FD;} - .d2-1875542808 .fill-AA5{fill:#F7F8FE;} - .d2-1875542808 .fill-AB4{fill:#EDF0FD;} - .d2-1875542808 .fill-AB5{fill:#F7F8FE;} - .d2-1875542808 .stroke-N1{stroke:#0A0F25;} - .d2-1875542808 .stroke-N2{stroke:#676C7E;} - .d2-1875542808 .stroke-N3{stroke:#9499AB;} - .d2-1875542808 .stroke-N4{stroke:#CFD2DD;} - .d2-1875542808 .stroke-N5{stroke:#DEE1EB;} - .d2-1875542808 .stroke-N6{stroke:#EEF1F8;} - .d2-1875542808 .stroke-N7{stroke:#FFFFFF;} - .d2-1875542808 .stroke-B1{stroke:#0D32B2;} - .d2-1875542808 .stroke-B2{stroke:#0D32B2;} - .d2-1875542808 .stroke-B3{stroke:#E3E9FD;} - .d2-1875542808 .stroke-B4{stroke:#E3E9FD;} - .d2-1875542808 .stroke-B5{stroke:#EDF0FD;} - .d2-1875542808 .stroke-B6{stroke:#F7F8FE;} - .d2-1875542808 .stroke-AA2{stroke:#4A6FF3;} - .d2-1875542808 .stroke-AA4{stroke:#EDF0FD;} - .d2-1875542808 .stroke-AA5{stroke:#F7F8FE;} - .d2-1875542808 .stroke-AB4{stroke:#EDF0FD;} - .d2-1875542808 .stroke-AB5{stroke:#F7F8FE;} - .d2-1875542808 .background-color-N1{background-color:#0A0F25;} - .d2-1875542808 .background-color-N2{background-color:#676C7E;} - .d2-1875542808 .background-color-N3{background-color:#9499AB;} - .d2-1875542808 .background-color-N4{background-color:#CFD2DD;} - .d2-1875542808 .background-color-N5{background-color:#DEE1EB;} - .d2-1875542808 .background-color-N6{background-color:#EEF1F8;} - .d2-1875542808 .background-color-N7{background-color:#FFFFFF;} - .d2-1875542808 .background-color-B1{background-color:#0D32B2;} - .d2-1875542808 .background-color-B2{background-color:#0D32B2;} - .d2-1875542808 .background-color-B3{background-color:#E3E9FD;} - .d2-1875542808 .background-color-B4{background-color:#E3E9FD;} - .d2-1875542808 .background-color-B5{background-color:#EDF0FD;} - .d2-1875542808 .background-color-B6{background-color:#F7F8FE;} - .d2-1875542808 .background-color-AA2{background-color:#4A6FF3;} - .d2-1875542808 .background-color-AA4{background-color:#EDF0FD;} - .d2-1875542808 .background-color-AA5{background-color:#F7F8FE;} - .d2-1875542808 .background-color-AB4{background-color:#EDF0FD;} - .d2-1875542808 .background-color-AB5{background-color:#F7F8FE;} - .d2-1875542808 .color-N1{color:#0A0F25;} - .d2-1875542808 .color-N2{color:#676C7E;} - .d2-1875542808 .color-N3{color:#9499AB;} - .d2-1875542808 .color-N4{color:#CFD2DD;} - .d2-1875542808 .color-N5{color:#DEE1EB;} - .d2-1875542808 .color-N6{color:#EEF1F8;} - .d2-1875542808 .color-N7{color:#FFFFFF;} - .d2-1875542808 .color-B1{color:#0D32B2;} - .d2-1875542808 .color-B2{color:#0D32B2;} - .d2-1875542808 .color-B3{color:#E3E9FD;} - .d2-1875542808 .color-B4{color:#E3E9FD;} - .d2-1875542808 .color-B5{color:#EDF0FD;} - .d2-1875542808 .color-B6{color:#F7F8FE;} - .d2-1875542808 .color-AA2{color:#4A6FF3;} - .d2-1875542808 .color-AA4{color:#EDF0FD;} - .d2-1875542808 .color-AA5{color:#F7F8FE;} - .d2-1875542808 .color-AB4{color:#EDF0FD;} - .d2-1875542808 .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}]]>トマトが赤くなったのはなぜですか?Because it saw the salad dressing!👩‍👩‍👧‍👶👩‍👩‍👧‍👶トマトが赤くなったのはなぜですか?Because it saw the salad dressing!👩‍👩‍👧‍👶👩‍👩‍👧‍👶今日はTokyoでsushiを食べました先日、Shibuyaで友達とshoppingを楽😊しんだ後、ramen屋でdelicious😊なラーメンを食べた。English English English先日先日先日 -======= .d2-1959121102 .fill-N1{fill:#0A0F25;} .d2-1959121102 .fill-N2{fill:#676C7E;} .d2-1959121102 .fill-N3{fill:#9499AB;} @@ -252,8 +89,7 @@ .d2-1959121102 .color-AA4{color:#EDF0FD;} .d2-1959121102 .color-AA5{color:#F7F8FE;} .d2-1959121102 .color-AB4{color:#EDF0FD;} - .d2-1959121102 .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}]]>トマトが赤くなったのはなぜですか?Because it saw the salad dressing!👩‍👩‍👧‍👶👩‍👩‍👧‍👶トマトが赤くなったのはなぜですか?Because it saw the salad dressing!👩‍👩‍👧‍👶👩‍👩‍👧‍👶今日はTokyoでsushiを食べました先日、Shibuyaで友達とshoppingを楽😊しんだ後、ramen屋でdelicious😊なラーメンを食べた。English English English先日先日先日 ->>>>>>> 33280fed5 (fixed e2e tests) + .d2-1959121102 .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}]]>トマトが赤くなったのはなぜですか?Because it saw the salad dressing!👩‍👩‍👧‍👶👩‍👩‍👧‍👶トマトが赤くなったのはなぜですか?Because it saw the salad dressing!👩‍👩‍👧‍👶👩‍👩‍👧‍👶今日はTokyoでsushiを食べました先日、Shibuyaで友達とshoppingを楽😊しんだ後、ramen屋でdelicious😊なラーメンを食べた。English English English先日先日先日 diff --git a/e2etests/testdata/unicode/mixed-language-2/dagre/sketch.exp.svg b/e2etests/testdata/unicode/mixed-language-2/dagre/sketch.exp.svg index 31083dddf..6df921081 100644 --- a/e2etests/testdata/unicode/mixed-language-2/dagre/sketch.exp.svg +++ b/e2etests/testdata/unicode/mixed-language-2/dagre/sketch.exp.svg @@ -1,26 +1,6 @@ -<<<<<<< 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مەن سىزنى ياخشى ئۈمىد ق - -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-841573658 .fill-N1{fill:#0A0F25;} - .d2-841573658 .fill-N2{fill:#676C7E;} - .d2-841573658 .fill-N3{fill:#9499AB;} - .d2-841573658 .fill-N4{fill:#CFD2DD;} - .d2-841573658 .fill-N5{fill:#DEE1EB;} - .d2-841573658 .fill-N6{fill:#EEF1F8;} - .d2-841573658 .fill-N7{fill:#FFFFFF;} - .d2-841573658 .fill-B1{fill:#0D32B2;} - .d2-841573658 .fill-B2{fill:#0D32B2;} - .d2-841573658 .fill-B3{fill:#E3E9FD;} - .d2-841573658 .fill-B4{fill:#E3E9FD;} - .d2-841573658 .fill-B5{fill:#EDF0FD;} - .d2-841573658 .fill-B6{fill:#F7F8FE;} - .d2-841573658 .fill-AA2{fill:#4A6FF3;} - .d2-841573658 .fill-AA4{fill:#EDF0FD;} - .d2-841573658 .fill-AA5{fill:#F7F8FE;} - .d2-841573658 .fill-AB4{fill:#EDF0FD;} - .d2-841573658 .fill-AB5{fill:#F7F8FE;} - .d2-841573658 .stroke-N1{stroke:#0A0F25;} - .d2-841573658 .stroke-N2{stroke:#676C7E;} - .d2-841573658 .stroke-N3{stroke:#9499AB;} - .d2-841573658 .stroke-N4{stroke:#CFD2DD;} - .d2-841573658 .stroke-N5{stroke:#DEE1EB;} - .d2-841573658 .stroke-N6{stroke:#EEF1F8;} - .d2-841573658 .stroke-N7{stroke:#FFFFFF;} - .d2-841573658 .stroke-B1{stroke:#0D32B2;} - .d2-841573658 .stroke-B2{stroke:#0D32B2;} - .d2-841573658 .stroke-B3{stroke:#E3E9FD;} - .d2-841573658 .stroke-B4{stroke:#E3E9FD;} - .d2-841573658 .stroke-B5{stroke:#EDF0FD;} - .d2-841573658 .stroke-B6{stroke:#F7F8FE;} - .d2-841573658 .stroke-AA2{stroke:#4A6FF3;} - .d2-841573658 .stroke-AA4{stroke:#EDF0FD;} - .d2-841573658 .stroke-AA5{stroke:#F7F8FE;} - .d2-841573658 .stroke-AB4{stroke:#EDF0FD;} - .d2-841573658 .stroke-AB5{stroke:#F7F8FE;} - .d2-841573658 .background-color-N1{background-color:#0A0F25;} - .d2-841573658 .background-color-N2{background-color:#676C7E;} - .d2-841573658 .background-color-N3{background-color:#9499AB;} - .d2-841573658 .background-color-N4{background-color:#CFD2DD;} - .d2-841573658 .background-color-N5{background-color:#DEE1EB;} - .d2-841573658 .background-color-N6{background-color:#EEF1F8;} - .d2-841573658 .background-color-N7{background-color:#FFFFFF;} - .d2-841573658 .background-color-B1{background-color:#0D32B2;} - .d2-841573658 .background-color-B2{background-color:#0D32B2;} - .d2-841573658 .background-color-B3{background-color:#E3E9FD;} - .d2-841573658 .background-color-B4{background-color:#E3E9FD;} - .d2-841573658 .background-color-B5{background-color:#EDF0FD;} - .d2-841573658 .background-color-B6{background-color:#F7F8FE;} - .d2-841573658 .background-color-AA2{background-color:#4A6FF3;} - .d2-841573658 .background-color-AA4{background-color:#EDF0FD;} - .d2-841573658 .background-color-AA5{background-color:#F7F8FE;} - .d2-841573658 .background-color-AB4{background-color:#EDF0FD;} - .d2-841573658 .background-color-AB5{background-color:#F7F8FE;} - .d2-841573658 .color-N1{color:#0A0F25;} - .d2-841573658 .color-N2{color:#676C7E;} - .d2-841573658 .color-N3{color:#9499AB;} - .d2-841573658 .color-N4{color:#CFD2DD;} - .d2-841573658 .color-N5{color:#DEE1EB;} - .d2-841573658 .color-N6{color:#EEF1F8;} - .d2-841573658 .color-N7{color:#FFFFFF;} - .d2-841573658 .color-B1{color:#0D32B2;} - .d2-841573658 .color-B2{color:#0D32B2;} - .d2-841573658 .color-B3{color:#E3E9FD;} - .d2-841573658 .color-B4{color:#E3E9FD;} - .d2-841573658 .color-B5{color:#EDF0FD;} - .d2-841573658 .color-B6{color:#F7F8FE;} - .d2-841573658 .color-AA2{color:#4A6FF3;} - .d2-841573658 .color-AA4{color:#EDF0FD;} - .d2-841573658 .color-AA5{color:#F7F8FE;} - .d2-841573658 .color-AB4{color:#EDF0FD;} - .d2-841573658 .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-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مەن سىزنى ياخشى ئۈمىد ق - ->>>>>>> 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;} @@ -408,9 +89,8 @@ .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مەن سىزنى ياخشى ئۈمىد ق + .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) 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 b95e68057..e7f5c9542 100644 --- a/e2etests/testdata/unicode/mixed-language-2/elk/sketch.exp.svg +++ b/e2etests/testdata/unicode/mixed-language-2/elk/sketch.exp.svg @@ -1,26 +1,6 @@ -<<<<<<< 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مەن سىزنى ياخشى ئۈمىد ق - -||||||| parent of 33280fed5 (fixed e2e tests) - .d2-801881618 .fill-N1{fill:#0A0F25;} - .d2-801881618 .fill-N2{fill:#676C7E;} - .d2-801881618 .fill-N3{fill:#9499AB;} - .d2-801881618 .fill-N4{fill:#CFD2DD;} - .d2-801881618 .fill-N5{fill:#DEE1EB;} - .d2-801881618 .fill-N6{fill:#EEF1F8;} - .d2-801881618 .fill-N7{fill:#FFFFFF;} - .d2-801881618 .fill-B1{fill:#0D32B2;} - .d2-801881618 .fill-B2{fill:#0D32B2;} - .d2-801881618 .fill-B3{fill:#E3E9FD;} - .d2-801881618 .fill-B4{fill:#E3E9FD;} - .d2-801881618 .fill-B5{fill:#EDF0FD;} - .d2-801881618 .fill-B6{fill:#F7F8FE;} - .d2-801881618 .fill-AA2{fill:#4A6FF3;} - .d2-801881618 .fill-AA4{fill:#EDF0FD;} - .d2-801881618 .fill-AA5{fill:#F7F8FE;} - .d2-801881618 .fill-AB4{fill:#EDF0FD;} - .d2-801881618 .fill-AB5{fill:#F7F8FE;} - .d2-801881618 .stroke-N1{stroke:#0A0F25;} - .d2-801881618 .stroke-N2{stroke:#676C7E;} - .d2-801881618 .stroke-N3{stroke:#9499AB;} - .d2-801881618 .stroke-N4{stroke:#CFD2DD;} - .d2-801881618 .stroke-N5{stroke:#DEE1EB;} - .d2-801881618 .stroke-N6{stroke:#EEF1F8;} - .d2-801881618 .stroke-N7{stroke:#FFFFFF;} - .d2-801881618 .stroke-B1{stroke:#0D32B2;} - .d2-801881618 .stroke-B2{stroke:#0D32B2;} - .d2-801881618 .stroke-B3{stroke:#E3E9FD;} - .d2-801881618 .stroke-B4{stroke:#E3E9FD;} - .d2-801881618 .stroke-B5{stroke:#EDF0FD;} - .d2-801881618 .stroke-B6{stroke:#F7F8FE;} - .d2-801881618 .stroke-AA2{stroke:#4A6FF3;} - .d2-801881618 .stroke-AA4{stroke:#EDF0FD;} - .d2-801881618 .stroke-AA5{stroke:#F7F8FE;} - .d2-801881618 .stroke-AB4{stroke:#EDF0FD;} - .d2-801881618 .stroke-AB5{stroke:#F7F8FE;} - .d2-801881618 .background-color-N1{background-color:#0A0F25;} - .d2-801881618 .background-color-N2{background-color:#676C7E;} - .d2-801881618 .background-color-N3{background-color:#9499AB;} - .d2-801881618 .background-color-N4{background-color:#CFD2DD;} - .d2-801881618 .background-color-N5{background-color:#DEE1EB;} - .d2-801881618 .background-color-N6{background-color:#EEF1F8;} - .d2-801881618 .background-color-N7{background-color:#FFFFFF;} - .d2-801881618 .background-color-B1{background-color:#0D32B2;} - .d2-801881618 .background-color-B2{background-color:#0D32B2;} - .d2-801881618 .background-color-B3{background-color:#E3E9FD;} - .d2-801881618 .background-color-B4{background-color:#E3E9FD;} - .d2-801881618 .background-color-B5{background-color:#EDF0FD;} - .d2-801881618 .background-color-B6{background-color:#F7F8FE;} - .d2-801881618 .background-color-AA2{background-color:#4A6FF3;} - .d2-801881618 .background-color-AA4{background-color:#EDF0FD;} - .d2-801881618 .background-color-AA5{background-color:#F7F8FE;} - .d2-801881618 .background-color-AB4{background-color:#EDF0FD;} - .d2-801881618 .background-color-AB5{background-color:#F7F8FE;} - .d2-801881618 .color-N1{color:#0A0F25;} - .d2-801881618 .color-N2{color:#676C7E;} - .d2-801881618 .color-N3{color:#9499AB;} - .d2-801881618 .color-N4{color:#CFD2DD;} - .d2-801881618 .color-N5{color:#DEE1EB;} - .d2-801881618 .color-N6{color:#EEF1F8;} - .d2-801881618 .color-N7{color:#FFFFFF;} - .d2-801881618 .color-B1{color:#0D32B2;} - .d2-801881618 .color-B2{color:#0D32B2;} - .d2-801881618 .color-B3{color:#E3E9FD;} - .d2-801881618 .color-B4{color:#E3E9FD;} - .d2-801881618 .color-B5{color:#EDF0FD;} - .d2-801881618 .color-B6{color:#F7F8FE;} - .d2-801881618 .color-AA2{color:#4A6FF3;} - .d2-801881618 .color-AA4{color:#EDF0FD;} - .d2-801881618 .color-AA5{color:#F7F8FE;} - .d2-801881618 .color-AB4{color:#EDF0FD;} - .d2-801881618 .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-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مەن سىزنى ياخشى ئۈمىد ق - ->>>>>>> 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;} @@ -408,9 +89,8 @@ .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مەن سىزنى ياخشى ئۈمىد ق + .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) diff --git a/e2etests/testdata/unicode/mixed-language/dagre/sketch.exp.svg b/e2etests/testdata/unicode/mixed-language/dagre/sketch.exp.svg index 243cd4594..5937543dc 100644 --- a/e2etests/testdata/unicode/mixed-language/dagre/sketch.exp.svg +++ b/e2etests/testdata/unicode/mixed-language/dagre/sketch.exp.svg @@ -1,22 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD -