From 75d101d8e8436c9b1400fe823c5d5719abcbc6b2 Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Sat, 14 Dec 2024 14:02:37 -0700 Subject: [PATCH] merge --- ci/release/changelogs/next.md | 30 +- .../testdata/all_shapes/sketch.exp.svg | 32 +- .../testdata/all_shapes_dark/sketch.exp.svg | 32 +- .../d2sketch/testdata/animated/sketch.exp.svg | 32 +- .../testdata/animated_dark/sketch.exp.svg | 32 +- .../testdata/arrowheads/sketch.exp.svg | 32 +- .../testdata/arrowheads_dark/sketch.exp.svg | 32 +- .../d2sketch/testdata/basic/sketch.exp.svg | 32 +- .../testdata/basic_dark/sketch.exp.svg | 32 +- .../testdata/child_to_child/sketch.exp.svg | 32 +- .../child_to_child_dark/sketch.exp.svg | 32 +- .../connection-style-fill/sketch.exp.svg | 20 +- .../testdata/connection_label/sketch.exp.svg | 32 +- .../connection_label_dark/sketch.exp.svg | 32 +- .../testdata/crows_feet/sketch.exp.svg | 32 +- .../testdata/crows_feet_dark/sketch.exp.svg | 32 +- .../d2sketch/testdata/dots-all/sketch.exp.svg | 32 +- .../testdata/dots-multiple/sketch.exp.svg | 32 +- .../testdata/dots-real/sketch.exp.svg | 32 +- .../testdata/elk_corners/sketch.exp.svg | 32 +- .../long_arrowhead_label/sketch.exp.svg | 32 +- .../d2sketch/testdata/opacity/sketch.exp.svg | 34 +- .../testdata/opacity_dark/sketch.exp.svg | 34 +- .../testdata/paper-real/sketch.exp.svg | 32 +- .../testdata/root-fill/sketch.exp.svg | 32 +- .../testdata/sql_tables/sketch.exp.svg | 32 +- .../testdata/sql_tables_dark/sketch.exp.svg | 32 +- .../d2sketch/testdata/terminal/sketch.exp.svg | 32 +- .../d2sketch/testdata/twitter/sketch.exp.svg | 34 +- .../testdata/twitter_dark/sketch.exp.svg | 34 +- .../testdata/unfilled_triangle/sketch.exp.svg | 32 +- .../diagram_wider_than_tooltip/sketch.exp.svg | 784 ++------------- .../appendix/testdata/links/sketch.exp.svg | 334 ++----- .../testdata/links_dark/sketch.exp.svg | 334 ++----- .../testdata/tooltip_fill/sketch.exp.svg | 342 ++----- .../tooltip_wider_than_diagram/sketch.exp.svg | 342 ++----- .../testdata/all_shapes/dark_theme.exp.svg | 174 +--- .../testdata/animated/dark_theme.exp.svg | 174 +--- .../testdata/arrowheads/dark_theme.exp.svg | 174 +--- .../testdata/basic/dark_theme.exp.svg | 174 +--- .../child_to_child/dark_theme.exp.svg | 174 +--- .../testdata/code/dark_theme.exp.svg | 56 +- .../connection_label/dark_theme.exp.svg | 174 +--- .../testdata/opacity/dark_theme.exp.svg | 34 +- .../testdata/sql_tables/dark_theme.exp.svg | 174 +--- .../testdata/twitter/dark_theme.exp.svg | 34 +- .../testdata/TestCLI_E2E/abspath.exp.svg | 174 +--- .../testdata/TestCLI_E2E/animation.exp.svg | 56 +- .../testdata/TestCLI_E2E/center.exp.svg | 174 +--- .../testdata/TestCLI_E2E/empty-base.exp.svg | 48 +- .../TestCLI_E2E/hello_world_png.exp.png | Bin 14694 -> 15128 bytes .../TestCLI_E2E/hello_world_png_pad.exp.png | Bin 73646 -> 73268 bytes .../hello_world_png_sketch.exp.png | Bin 21256 -> 21343 bytes .../testdata/TestCLI_E2E/import.exp.svg | 174 +--- .../testdata/TestCLI_E2E/import_vars.exp.svg | 174 +--- .../TestCLI_E2E/internal_linked_pdf.exp.pdf | Bin 62121 -> 62090 bytes .../TestCLI_E2E/multiboard/life/index.exp.svg | 174 +--- .../multiboard/life/scenarios/why.exp.svg | 174 +--- .../multiboard/life_index_d2/index.exp.svg | 174 +--- .../life_index_d2/scenarios/why.exp.svg | 174 +--- .../testdata/TestCLI_E2E/no-nav-pdf.exp.pdf | Bin 91400 -> 91360 bytes .../testdata/TestCLI_E2E/no-nav-pptx.exp.pptx | Bin 118793 -> 119049 bytes .../TestCLI_E2E/pptx-theme-overrides.exp.pptx | Bin 35193 -> 35186 bytes .../TestCLI_E2E/renamed-board.exp.pdf | Bin 107020 -> 107032 bytes .../TestCLI_E2E/sequence-layer/index.exp.svg | 162 +--- .../TestCLI_E2E/sequence-layer/seq.exp.svg | 162 +--- .../sequence-spread-layer/index.exp.svg | 152 +-- .../sequence-spread-layer/seq.exp.svg | 158 +-- .../testdata/TestCLI_E2E/stdin.exp.svg | 174 +--- .../TestCLI_E2E/theme-override.exp.svg | 174 +--- .../testdata/TestCLI_E2E/theme-pdf.exp.pdf | Bin 17219 -> 17223 bytes .../TestCLI_E2E/vars-animation.exp.svg | 56 +- .../testdata/TestCLI_E2E/vars-config.exp.svg | 32 +- .../testdata/TestCLI_E2E/with-font.exp.svg | 174 +--- .../patterns/all_shapes/dagre/sketch.exp.svg | 26 +- .../patterns/multiple/dagre/sketch.exp.svg | 26 +- .../patterns/paper/dagre/sketch.exp.svg | 26 +- .../patterns/real-lines/dagre/sketch.exp.svg | 26 +- .../patterns/real/dagre/sketch.exp.svg | 26 +- .../root-dots-with-fill/dagre/sketch.exp.svg | 26 +- .../patterns/root-dots/dagre/sketch.exp.svg | 26 +- .../patterns/shape/dagre/sketch.exp.svg | 26 +- .../arrowhead_font_color/dagre/sketch.exp.svg | 168 +--- .../arrowhead_font_color/elk/sketch.exp.svg | 168 +--- .../dagre/sketch.exp.svg | 168 +--- .../elk/sketch.exp.svg | 168 +--- .../bold_edge_label/dagre/sketch.exp.svg | 168 +--- .../bold_edge_label/elk/sketch.exp.svg | 168 +--- .../dagre/sketch.exp.svg | 174 +--- .../elk/sketch.exp.svg | 174 +--- .../code_font_size/dagre/sketch.exp.svg | 204 +--- .../code_font_size/elk/sketch.exp.svg | 204 +--- .../dagre-disconnect/dagre/sketch.exp.svg | 168 +--- .../dagre-disconnect/elk/sketch.exp.svg | 168 +--- .../dagre/sketch.exp.svg | 168 +--- .../dagre_broken_arrowhead/elk/sketch.exp.svg | 168 +--- .../dagre_child_id_id/dagre/sketch.exp.svg | 168 +--- .../dagre_child_id_id/elk/sketch.exp.svg | 168 +--- .../dagre/sketch.exp.svg | 168 +--- .../elk/sketch.exp.svg | 168 +--- .../dagre/sketch.exp.svg | 168 +--- .../elk/sketch.exp.svg | 168 +--- .../dagre_special_ids/dagre/sketch.exp.svg | 168 +--- .../dagre_special_ids/elk/sketch.exp.svg | 168 +--- .../dagre/sketch.exp.svg | 168 +--- .../elk/sketch.exp.svg | 168 +--- .../elk_alignment/dagre/sketch.exp.svg | 168 +--- .../elk_alignment/elk/sketch.exp.svg | 168 +--- .../elk_loop_panic/dagre/sketch.exp.svg | 168 +--- .../elk_loop_panic/elk/sketch.exp.svg | 168 +--- .../regression/elk_order/dagre/sketch.exp.svg | 26 +- .../regression/elk_order/elk/sketch.exp.svg | 26 +- .../empty_sequence/dagre/sketch.exp.svg | 168 +--- .../empty_sequence/elk/sketch.exp.svg | 168 +--- .../glob_dimensions/dagre/sketch.exp.svg | 168 +--- .../glob_dimensions/elk/sketch.exp.svg | 168 +--- .../long_arrowhead_label/dagre/sketch.exp.svg | 168 +--- .../long_arrowhead_label/elk/sketch.exp.svg | 168 +--- .../md_h1_li_li/dagre/sketch.exp.svg | 26 +- .../regression/md_h1_li_li/elk/sketch.exp.svg | 26 +- .../dagre/sketch.exp.svg | 168 +--- .../elk/sketch.exp.svg | 168 +--- .../nested_layout_bug/dagre/sketch.exp.svg | 168 +--- .../nested_layout_bug/elk/sketch.exp.svg | 168 +--- .../nested_steps/dagre/sketch.exp.svg | 168 +--- .../nested_steps/elk/sketch.exp.svg | 168 +--- .../dagre/sketch.exp.svg | 174 +--- .../elk/sketch.exp.svg | 174 +--- .../opacity-on-label/dagre/sketch.exp.svg | 28 +- .../opacity-on-label/elk/sketch.exp.svg | 28 +- .../dagre/sketch.exp.svg | 168 +--- .../overlapping-edge-label/elk/sketch.exp.svg | 168 +--- .../root-container/dagre/sketch.exp.svg | 168 +--- .../root-container/elk/sketch.exp.svg | 168 +--- .../dagre/sketch.exp.svg | 324 +------ .../elk/sketch.exp.svg | 324 +------ .../dagre/sketch.exp.svg | 168 +--- .../elk/sketch.exp.svg | 168 +--- .../dagre/sketch.exp.svg | 168 +--- .../elk/sketch.exp.svg | 168 +--- .../dagre/sketch.exp.svg | 324 +------ .../elk/sketch.exp.svg | 324 +------ .../dagre/sketch.exp.svg | 324 +------ .../elk/sketch.exp.svg | 324 +------ .../dagre/sketch.exp.svg | 168 +--- .../elk/sketch.exp.svg | 168 +--- .../unconnected/dagre/sketch.exp.svg | 26 +- .../regression/unconnected/elk/sketch.exp.svg | 26 +- .../dagre/sketch.exp.svg | 180 +--- .../elk/sketch.exp.svg | 180 +--- .../sanity/1_to_2/dagre/sketch.exp.svg | 168 +--- .../testdata/sanity/1_to_2/elk/sketch.exp.svg | 168 +--- .../sanity/basic/dagre/sketch.exp.svg | 168 +--- .../testdata/sanity/basic/elk/sketch.exp.svg | 168 +--- .../child_to_child/dagre/sketch.exp.svg | 168 +--- .../sanity/child_to_child/elk/sketch.exp.svg | 168 +--- .../connection_label/dagre/sketch.exp.svg | 168 +--- .../connection_label/elk/sketch.exp.svg | 168 +--- .../3d_fill_and_stroke/dagre/sketch.exp.svg | 26 +- .../3d_fill_and_stroke/elk/sketch.exp.svg | 26 +- .../stable/all_shapes/dagre/sketch.exp.svg | 168 +--- .../stable/all_shapes/elk/sketch.exp.svg | 168 +--- .../all_shapes_link/dagre/sketch.exp.svg | 896 ++---------------- .../stable/all_shapes_link/elk/sketch.exp.svg | 896 ++---------------- .../all_shapes_multiple/dagre/sketch.exp.svg | 168 +--- .../all_shapes_multiple/elk/sketch.exp.svg | 168 +--- .../all_shapes_shadow/dagre/sketch.exp.svg | 26 +- .../all_shapes_shadow/elk/sketch.exp.svg | 26 +- .../stable/animated/dagre/sketch.exp.svg | 164 +--- .../stable/animated/elk/sketch.exp.svg | 164 +--- .../arrowhead_adjustment/dagre/sketch.exp.svg | 168 +--- .../arrowhead_adjustment/elk/sketch.exp.svg | 168 +--- .../arrowhead_labels/dagre/sketch.exp.svg | 168 +--- .../arrowhead_labels/elk/sketch.exp.svg | 168 +--- .../arrowhead_scaling/dagre/sketch.exp.svg | 168 +--- .../arrowhead_scaling/elk/sketch.exp.svg | 168 +--- .../basic-tooltips/dagre/sketch.exp.svg | 340 ++----- .../stable/basic-tooltips/elk/sketch.exp.svg | 340 ++----- .../stable/binary_tree/dagre/sketch.exp.svg | 168 +--- .../stable/binary_tree/elk/sketch.exp.svg | 168 +--- .../dagre/sketch.exp.svg | 168 +--- .../elk/sketch.exp.svg | 168 +--- .../stable/chaos2/dagre/sketch.exp.svg | 26 +- .../testdata/stable/chaos2/elk/sketch.exp.svg | 26 +- .../circle_arrowhead/dagre/sketch.exp.svg | 168 +--- .../circle_arrowhead/elk/sketch.exp.svg | 168 +--- .../circular_dependency/dagre/sketch.exp.svg | 168 +--- .../circular_dependency/elk/sketch.exp.svg | 168 +--- .../stable/classes/dagre/sketch.exp.svg | 168 +--- .../stable/classes/elk/sketch.exp.svg | 168 +--- .../stable/code_snippet/dagre/sketch.exp.svg | 192 +--- .../stable/code_snippet/elk/sketch.exp.svg | 192 +--- .../complex-layers/dagre/sketch.exp.svg | 88 +- .../stable/complex-layers/elk/sketch.exp.svg | 88 +- .../connected_container/dagre/sketch.exp.svg | 168 +--- .../connected_container/elk/sketch.exp.svg | 168 +--- .../constant_near_stress/dagre/sketch.exp.svg | 26 +- .../constant_near_stress/elk/sketch.exp.svg | 26 +- .../constant_near_title/dagre/sketch.exp.svg | 26 +- .../constant_near_title/elk/sketch.exp.svg | 26 +- .../container_edges/dagre/sketch.exp.svg | 168 +--- .../stable/container_edges/elk/sketch.exp.svg | 168 +--- .../crow_foot_arrowhead/dagre/sketch.exp.svg | 168 +--- .../crow_foot_arrowhead/elk/sketch.exp.svg | 168 +--- .../stable/cycle-order/dagre/sketch.exp.svg | 168 +--- .../stable/cycle-order/elk/sketch.exp.svg | 168 +--- .../dagre-container/dagre/sketch.exp.svg | 168 +--- .../stable/dagre-container/elk/sketch.exp.svg | 168 +--- .../stable/dagre_spacing/dagre/sketch.exp.svg | 168 +--- .../stable/dagre_spacing/elk/sketch.exp.svg | 168 +--- .../dagre_spacing_right/dagre/sketch.exp.svg | 168 +--- .../dagre_spacing_right/elk/sketch.exp.svg | 168 +--- .../stable/dense/dagre/sketch.exp.svg | 168 +--- .../testdata/stable/dense/elk/sketch.exp.svg | 168 +--- .../different_subgraphs/dagre/sketch.exp.svg | 168 +--- .../different_subgraphs/elk/sketch.exp.svg | 168 +--- .../stable/direction/dagre/sketch.exp.svg | 168 +--- .../stable/direction/elk/sketch.exp.svg | 168 +--- .../edge-label-overflow/dagre/sketch.exp.svg | 168 +--- .../edge-label-overflow/elk/sketch.exp.svg | 168 +--- .../elk_border_radius/dagre/sketch.exp.svg | 168 +--- .../elk_border_radius/elk/sketch.exp.svg | 168 +--- .../stable/elk_shim/dagre/sketch.exp.svg | 168 +--- .../stable/elk_shim/elk/sketch.exp.svg | 168 +--- .../stable/ent2d2_basic/dagre/sketch.exp.svg | 168 +--- .../stable/ent2d2_basic/elk/sketch.exp.svg | 168 +--- .../stable/ent2d2_right/dagre/sketch.exp.svg | 168 +--- .../stable/ent2d2_right/elk/sketch.exp.svg | 168 +--- .../stable/font_colors/dagre/sketch.exp.svg | 28 +- .../stable/font_colors/elk/sketch.exp.svg | 28 +- .../stable/font_sizes/dagre/sketch.exp.svg | 174 +--- .../stable/font_sizes/elk/sketch.exp.svg | 174 +--- .../giant_markdown_test/dagre/sketch.exp.svg | 26 +- .../giant_markdown_test/elk/sketch.exp.svg | 26 +- .../dagre/sketch.exp.svg | 168 +--- .../grid_edge_across_cell/elk/sketch.exp.svg | 168 +--- .../grid_label_positions/dagre/sketch.exp.svg | 342 ++----- .../grid_label_positions/elk/sketch.exp.svg | 342 ++----- .../dagre/sketch.exp.svg | 168 +--- .../elk/sketch.exp.svg | 168 +--- .../testdata/stable/hr/dagre/sketch.exp.svg | 26 +- .../testdata/stable/hr/elk/sketch.exp.svg | 26 +- .../icon_positions/dagre/sketch.exp.svg | 168 +--- .../stable/icon_positions/elk/sketch.exp.svg | 168 +--- .../stable/images/dagre/sketch.exp.svg | 168 +--- .../testdata/stable/images/elk/sketch.exp.svg | 168 +--- .../stable/investigate/dagre/sketch.exp.svg | 168 +--- .../stable/investigate/elk/sketch.exp.svg | 168 +--- .../stable/label-near/dagre/sketch.exp.svg | 168 +--- .../stable/label-near/elk/sketch.exp.svg | 168 +--- .../label_positions/dagre/sketch.exp.svg | 168 +--- .../stable/label_positions/elk/sketch.exp.svg | 168 +--- .../stable/large_arch/dagre/sketch.exp.svg | 168 +--- .../stable/large_arch/elk/sketch.exp.svg | 168 +--- .../stable/latex/dagre/sketch.exp.svg | 26 +- .../testdata/stable/latex/elk/sketch.exp.svg | 26 +- .../legend_with_near_key/dagre/sketch.exp.svg | 26 +- .../legend_with_near_key/elk/sketch.exp.svg | 26 +- .../testdata/stable/li1/dagre/sketch.exp.svg | 26 +- .../testdata/stable/li1/elk/sketch.exp.svg | 26 +- .../testdata/stable/li2/dagre/sketch.exp.svg | 26 +- .../testdata/stable/li2/elk/sketch.exp.svg | 26 +- .../testdata/stable/li3/dagre/sketch.exp.svg | 26 +- .../testdata/stable/li3/elk/sketch.exp.svg | 26 +- .../testdata/stable/li4/dagre/sketch.exp.svg | 26 +- .../testdata/stable/li4/elk/sketch.exp.svg | 26 +- .../stable/links/dagre/sketch.exp.svg | 334 ++----- .../testdata/stable/links/elk/sketch.exp.svg | 334 ++----- .../stable/lone_h1/dagre/sketch.exp.svg | 26 +- .../stable/lone_h1/elk/sketch.exp.svg | 26 +- .../stable/markdown/dagre/sketch.exp.svg | 26 +- .../stable/markdown/elk/sketch.exp.svg | 26 +- .../markdown_stroke_fill/dagre/sketch.exp.svg | 26 +- .../markdown_stroke_fill/elk/sketch.exp.svg | 26 +- .../md_code_block_fenced/dagre/sketch.exp.svg | 26 +- .../md_code_block_fenced/elk/sketch.exp.svg | 26 +- .../dagre/sketch.exp.svg | 26 +- .../md_code_block_indented/elk/sketch.exp.svg | 26 +- .../md_code_inline/dagre/sketch.exp.svg | 26 +- .../stable/md_code_inline/elk/sketch.exp.svg | 26 +- .../md_fontsize_10/dagre/sketch.exp.svg | 26 +- .../stable/md_fontsize_10/elk/sketch.exp.svg | 26 +- .../stable/mono-edge/dagre/sketch.exp.svg | 168 +--- .../stable/mono-edge/elk/sketch.exp.svg | 168 +--- .../stable/mono-font/dagre/sketch.exp.svg | 168 +--- .../stable/mono-font/elk/sketch.exp.svg | 168 +--- .../dagre/sketch.exp.svg | 168 +--- .../multiple_box_selection/elk/sketch.exp.svg | 168 +--- .../multiple_offset/dagre/sketch.exp.svg | 178 +--- .../stable/multiple_offset/elk/sketch.exp.svg | 176 +--- .../multiple_offset_left/dagre/sketch.exp.svg | 176 +--- .../multiple_offset_left/elk/sketch.exp.svg | 176 +--- .../multiple_trees/dagre/sketch.exp.svg | 168 +--- .../stable/multiple_trees/elk/sketch.exp.svg | 168 +--- .../stable/n22_e32/dagre/sketch.exp.svg | 168 +--- .../stable/n22_e32/elk/sketch.exp.svg | 168 +--- .../dagre/sketch.exp.svg | 168 +--- .../elk/sketch.exp.svg | 168 +--- .../nested_diagram_types/dagre/sketch.exp.svg | 168 +--- .../nested_diagram_types/elk/sketch.exp.svg | 168 +--- .../stable/nesting_power/dagre/sketch.exp.svg | 92 +- .../stable/nesting_power/elk/sketch.exp.svg | 56 +- .../number_connections/dagre/sketch.exp.svg | 168 +--- .../number_connections/elk/sketch.exp.svg | 168 +--- .../one_container_loop/dagre/sketch.exp.svg | 168 +--- .../one_container_loop/elk/sketch.exp.svg | 168 +--- .../dagre/sketch.exp.svg | 168 +--- .../elk/sketch.exp.svg | 168 +--- .../dagre/sketch.exp.svg | 168 +--- .../outside_bottom_labels/elk/sketch.exp.svg | 168 +--- .../dagre/sketch.exp.svg | 168 +--- .../elk/sketch.exp.svg | 168 +--- .../dagre/sketch.exp.svg | 168 +--- .../elk/sketch.exp.svg | 168 +--- .../testdata/stable/p/dagre/sketch.exp.svg | 26 +- e2etests/testdata/stable/p/elk/sketch.exp.svg | 26 +- .../testdata/stable/pre/dagre/sketch.exp.svg | 26 +- .../testdata/stable/pre/elk/sketch.exp.svg | 26 +- .../self-referencing/dagre/sketch.exp.svg | 168 +--- .../self-referencing/elk/sketch.exp.svg | 168 +--- .../dagre/sketch.exp.svg | 324 +------ .../elk/sketch.exp.svg | 324 +------ .../dagre/sketch.exp.svg | 324 +------ .../elk/sketch.exp.svg | 324 +------ .../dagre/sketch.exp.svg | 348 +------ .../elk/sketch.exp.svg | 348 +------ .../dagre/sketch.exp.svg | 324 +------ .../elk/sketch.exp.svg | 324 +------ .../dagre/sketch.exp.svg | 324 +------ .../elk/sketch.exp.svg | 324 +------ .../dagre/sketch.exp.svg | 168 +--- .../elk/sketch.exp.svg | 168 +--- .../dagre/sketch.exp.svg | 324 +------ .../elk/sketch.exp.svg | 324 +------ .../dagre/sketch.exp.svg | 168 +--- .../elk/sketch.exp.svg | 168 +--- .../dagre/sketch.exp.svg | 324 +------ .../sequence_diagram_note/elk/sketch.exp.svg | 324 +------ .../dagre/sketch.exp.svg | 328 +------ .../sequence_diagram_real/elk/sketch.exp.svg | 328 +------ .../dagre/sketch.exp.svg | 324 +------ .../elk/sketch.exp.svg | 324 +------ .../dagre/sketch.exp.svg | 324 +------ .../elk/sketch.exp.svg | 324 +------ .../dagre/sketch.exp.svg | 324 +------ .../sequence_diagram_span/elk/sketch.exp.svg | 324 +------ .../sequence_diagrams/dagre/sketch.exp.svg | 344 +------ .../sequence_diagrams/elk/sketch.exp.svg | 344 +------ .../simple_grid_edges/dagre/sketch.exp.svg | 168 +--- .../simple_grid_edges/elk/sketch.exp.svg | 168 +--- .../dagre/sketch.exp.svg | 168 +--- .../elk/sketch.exp.svg | 168 +--- .../dagre/sketch.exp.svg | 168 +--- .../elk/sketch.exp.svg | 168 +--- .../stable/sql_tables/dagre/sketch.exp.svg | 168 +--- .../stable/sql_tables/elk/sketch.exp.svg | 168 +--- .../stable/square_3d/dagre/sketch.exp.svg | 26 +- .../stable/square_3d/elk/sketch.exp.svg | 26 +- .../dagre/sketch.exp.svg | 168 +--- .../elk/sketch.exp.svg | 168 +--- .../stable/stylish/dagre/sketch.exp.svg | 32 +- .../stable/stylish/elk/sketch.exp.svg | 32 +- .../stable/teleport_grid/dagre/sketch.exp.svg | 28 +- .../stable/teleport_grid/elk/sketch.exp.svg | 28 +- .../text_font_sizes/dagre/sketch.exp.svg | 26 +- .../stable/text_font_sizes/elk/sketch.exp.svg | 26 +- .../unfilled_triangle/dagre/sketch.exp.svg | 168 +--- .../unfilled_triangle/elk/sketch.exp.svg | 168 +--- .../unnamed_only_height/dagre/sketch.exp.svg | 180 +--- .../unnamed_only_height/elk/sketch.exp.svg | 180 +--- .../unnamed_only_width/dagre/sketch.exp.svg | 180 +--- .../unnamed_only_width/elk/sketch.exp.svg | 180 +--- .../stable/us_map/dagre/sketch.exp.svg | 168 +--- .../testdata/stable/us_map/elk/sketch.exp.svg | 168 +--- .../dagre/sketch.exp.svg | 84 +- .../elk/sketch.exp.svg | 84 +- .../themes/origami/dagre/sketch.exp.svg | 26 +- .../themes/origami/elk/sketch.exp.svg | 26 +- .../themes/terminal/dagre/sketch.exp.svg | 84 +- .../themes/terminal/elk/sketch.exp.svg | 84 +- .../terminal_grayscale/dagre/sketch.exp.svg | 26 +- .../terminal_grayscale/elk/sketch.exp.svg | 26 +- .../container_icon_label/dagre/sketch.exp.svg | 168 +--- .../container_icon_label/elk/sketch.exp.svg | 168 +--- .../dagre/sketch.exp.svg | 168 +--- .../elk/sketch.exp.svg | 168 +--- .../dagre/sketch.exp.svg | 168 +--- .../elk/sketch.exp.svg | 168 +--- .../dagre/sketch.exp.svg | 26 +- .../elk/sketch.exp.svg | 26 +- .../dagre/sketch.exp.svg | 324 +------ .../elk/sketch.exp.svg | 324 +------ .../dagre/sketch.exp.svg | 328 +------ .../elk/sketch.exp.svg | 328 +------ .../dagre/sketch.exp.svg | 44 +- .../shape_set_width_height/elk/sketch.exp.svg | 44 +- .../dagre/sketch.exp.svg | 164 +--- .../elk/sketch.exp.svg | 164 +--- .../dagre/sketch.exp.svg | 162 +--- .../connection-style-fill/elk/sketch.exp.svg | 162 +--- .../connection-underline/dagre/sketch.exp.svg | 164 +--- .../connection-underline/elk/sketch.exp.svg | 164 +--- .../txtar/extended-ascii/dagre/sketch.exp.svg | 20 +- .../txtar/extended-ascii/elk/sketch.exp.svg | 20 +- .../txtar/gradient/dagre/board.exp.json | 1 + .../txtar/gradient/dagre/sketch.exp.svg | 154 +-- .../txtar/gradient/elk/board.exp.json | 1 + .../txtar/gradient/elk/sketch.exp.svg | 154 +-- .../link-on-connections/dagre/sketch.exp.svg | 6 +- .../link-on-connections/elk/sketch.exp.svg | 6 +- .../txtar/md-tables/dagre/board.exp.json | 7 + .../txtar/md-tables/dagre/sketch.exp.svg | 554 +++++------ .../txtar/md-tables/elk/board.exp.json | 7 + .../txtar/md-tables/elk/sketch.exp.svg | 554 +++++------ .../dagre/sketch.exp.svg | 168 +--- .../elk/sketch.exp.svg | 168 +--- .../opacity-zero-route/dagre/sketch.exp.svg | 168 +--- .../opacity-zero-route/elk/sketch.exp.svg | 168 +--- .../dagre/sketch.exp.svg | 162 +--- .../sequence-bounding-box/elk/sketch.exp.svg | 162 +--- .../dagre/sketch.exp.svg | 162 +--- .../elk/sketch.exp.svg | 162 +--- .../sequence-fontsize/dagre/sketch.exp.svg | 162 +--- .../sequence-fontsize/elk/sketch.exp.svg | 162 +--- .../dagre/sketch.exp.svg | 162 +--- .../elk/sketch.exp.svg | 162 +--- .../dagre/sketch.exp.svg | 162 +--- .../elk/sketch.exp.svg | 162 +--- .../dagre/sketch.exp.svg | 162 +--- .../elk/sketch.exp.svg | 162 +--- .../dagre/sketch.exp.svg | 22 +- .../elk/sketch.exp.svg | 22 +- .../dagre/sketch.exp.svg | 26 +- .../elk/sketch.exp.svg | 26 +- .../txtar/sql-icon/dagre/sketch.exp.svg | 50 +- .../txtar/sql-icon/elk/sketch.exp.svg | 50 +- .../sql-table-reserved/dagre/board.exp.json | 1 + .../sql-table-reserved/dagre/sketch.exp.svg | 158 +-- .../sql-table-reserved/elk/board.exp.json | 1 + .../sql-table-reserved/elk/sketch.exp.svg | 158 +-- .../theme-overrides/dagre/sketch.exp.svg | 168 +--- .../txtar/theme-overrides/elk/sketch.exp.svg | 168 +--- .../var_in_markdown/dagre/board.exp.json | 2 + .../var_in_markdown/dagre/sketch.exp.svg | 560 +++++------ .../txtar/var_in_markdown/elk/board.exp.json | 2 + .../txtar/var_in_markdown/elk/sketch.exp.svg | 560 +++++------ .../unicode/chinese/dagre/sketch.exp.svg | 26 +- .../unicode/chinese/elk/sketch.exp.svg | 26 +- .../unicode/emojis/dagre/sketch.exp.svg | 168 +--- .../unicode/emojis/elk/sketch.exp.svg | 168 +--- .../japanese-full/dagre/sketch.exp.svg | 168 +--- .../unicode/japanese-full/elk/sketch.exp.svg | 168 +--- .../japanese-mixed/dagre/sketch.exp.svg | 168 +--- .../unicode/japanese-mixed/elk/sketch.exp.svg | 168 +--- .../mixed-language-2/dagre/sketch.exp.svg | 324 +------ .../mixed-language-2/elk/sketch.exp.svg | 324 +------ .../mixed-language/dagre/sketch.exp.svg | 26 +- .../unicode/mixed-language/elk/sketch.exp.svg | 26 +- e2etests/txtar.txt | 5 - 459 files changed, 3484 insertions(+), 63077 deletions(-) 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 ad098e23dd29188aeef14ae51ba95a81c3eb0541..eb8c79b000e543e4aa71603d50005a40b0f7a6e7 100644 GIT binary patch literal 15128 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 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 f8c4043d1241b93e5817160a2328b1c357945ebd..ebd9743ef87e3f987c56aaead414ee85071e8a36 100644 GIT binary patch literal 73268 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 S(*+Tq1e4Y4Rwb{X?*AVbYkuPZ literal 73646 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 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 3b5375b75e2e0e0edee1544a2831b638e311b5c0..7caa3575f61c4eeb49e3e6aae599f5adef6dc88b 100644 GIT binary patch literal 21343 zcmeIacT`hp^fr1Df`BMh!G@rWqJV%E0f9Ic6loR&Y020?5K$piA&E1JidY5_rCR_6 zX(GKO7QjZ4-a``z0Robc5JGZyP-o_M@BR0?>we$TwOl0UoSgH%yFPpGC%JB8Wwvns zviS&tEZo0u_aOv9!%MM~lJnrtYxloJ?>3#X-+$WD648X$k_Z|l`~8~Tn-BygH}`r0 zoLLM15nnx>Z93aG?Ax<*H?n^3W-=T?c^@+S9m%L(K}QfZWdH7+NBmtzJEgNuH6K&u zHp+LtdFGgLNbAH2i(G_3F8Kmp9tCJQL4zxbR!+*z@48^+kgn z-eawqgzC1LnNCgRD`O!qn4I(swy8%#P<4j)V0GMq5J@>TED0gopo=jio7tnQ|chl{EjCL5RKU&$GDn=S8=Cw-DCg!r>Z5NIihg~Xa z(@yQ_70b7r9ahxv8p?5MUajYkLgB|Z9Kp(vPodN*jWwEMwVxI$kHl_e1&_9#-?)5j z-qmaS^$Y_??jf~)>P}uq&}izjw&xGZFk}8T4}E6Cl$i*NpxS&aj-*0rJXTz%y(Sh8bsG*#uV_S>o-FDXZ9=xM{#>}NN%EuPQknAIeO2US1KB+`wJ`Zvd) zBaBVl^BoSE3RWRkn@d;>%G)=us)A^tvmaB!38EO24y-) zudK%v;{A#k@uOZV&R*=?sG^13d>-RYKY&Gs4%89$YGkcLKI?QlO4EuS;I`&usYV~; zdXtQKLr>^$q;)$c>KZdDMrxcluR6|Px{6iw`<05{Ts(4A5-~U(<00dWMV16ggqy}t zOAwn40zWq1+rQyT3ll;0kwF9@xn-aR-l)LI`A`PSQeXFG; zk-J6dO?%O{NCEwReT*=Me{Th{Y_T2nwJrX6$o)}!i_yK>{x7l#5+^(;YX?^vTnaF} z_(T@1nK*jY<_-z5vDv&JNt>L3O1x*+f9ko(#^{d&*_A5~%uJ0k2>xMRuht{1k0Zy` z<>ipQb^A`SboF$Rl5cyWl7@+&LbL^8S1xW4G^&V`PHnDdO6^#$hCEn^QIgy-#VusT zGD9jGis=jt5+)2(BBH3Kr_fcPx6>}SWPYn%i`es<^SROpS#Uu!R~eL`yjOYY6Kp*) zKK@pgBd`e4&M?TI&0iLP(YwF&$t_z+NhHn2_x8^DM^N2$x<7BkYyxwp|+xdbxDdTeW?cdap-NShf%cc6~Bf;7Q!A?)!3^5GD z@tap_BPZVx=wCqHPduJq<|%Nq?Gns|1G&~A@-~Fd45PWrOLNL@XP?d0=?O$*aXB=? zY7m)x(Tj?s=wJzwiPF9>VRiZ<#KDrFAr9-kyv?QclQ?eyq9pv<6`@{q>2dF4Wc+%B zeuFAWT?zvVzr4laVU>6YzlF|HthBa_YZ;Ko;=+ikxPz)3mQ#2_ z&S-o7E8Q@eXXtmvsykxhIX5EOWwOO;qZ_ZQD}j}EI3*DjhZGQV2Y&I6!wDJ>`T~Qs z1&y4Iv3zPPi>(_cU{wsap|SZy>FSj!Bt);eEHzbvtb`gM*JL zOXQFupNhgSU}tVBc3z(3Ruxh#D$!w)YC!+lqW-^Ub1U_kR1?9yjC#a9mS4Ne)v&Sf za5x$pK5zS9Br{|HA;*ayU5xM?_-XFEkO&u=_ftlULR7GT1W~op$?G%P7pdrQ&Lt?= zD9# zeX(96J_UZlx<)_LC;!X@mBrgkO*f6;Agn^JT@7D@_~z(k7uDRVrtH*mN>L_a^G18q z)kk25yXf~WWE@d*MV=|Oepud9QO4y=+!C%0r}1?VRq>9$K4+7m;-OaA@s5igt(?Cv zjQDj+z*xcw*FW-P8;vh5Iv>?a?{Gt-v9E5W<=>~~A?L>?SRa}E$5shqddK*jvCd}t z0WbH(wcUwMVcr>xYAw%;y0?*KTe=?gz^%s*Bh($_GC$<;20>b^t)pLdf6{9gSD8N3Xv-67F5fy+h@h#O>`sp%$W66IZv11ITPuy? zZml%kN*LXSN^B@Mm2SIXdd;mX6fK1m8ZwGbKm(wn#da$}X-FNhFzFwB95$uIP6>&- zFu#EM*c!74neTRM)q=ec{w>lL_(Y=1c2ljT9po(xs`49VU?KE*aY%ltp`rQBzI1$>*M*AbvHyAcqWBOIFH{ zJBzHM5bcS^J`WQvaVQyyq#$}%b<+N51Y0<|VJzfNIk#nqwqUxg?Ol@$w#=m98yDqB0aax^}*tz|wE5ZII2 zC)#hToh@O}GeuF-wQof&>5ARd%Z4Dx z$nhJzEPh{{bU8HM(=AC?;ETM>?Yd&739;u@_Q&D1YKX!WC81`H*f;hjoEVlu430Q^zX0>FH%iN}LLU^P-cc5& z_MovTXPEtXu-vSxTKVx*8#Fe-acCC~wjAi)eh{-3jV2Xh@rg{-vtn*Sz>sd;3{6-} z|0srw)+rjA9GIHv303XlGpz$Y4kpPGxz=^{@l$rnD;>Z6l`Up-(eGyZ7Le?#TT86v z(Me3?i1buh@QnL075^r?6jNSpsQ&HQ^5zmvKG#zLd|P7S6JaU_i>NM>2mxFZfOpJW`$dvW1A z5&I@7ipKa;5`y0*_dp$R(+l@ijt%$Lh6($Z>GCt8lJtc<#~R$rKmxH@#cRKHDfha{ zU&E2YkzU*^N61MRZgigbtV`cvdi2cHLfv39!-;s){lz-|9~%n1OheW=d*g|N4o)QM z15oNl!r=|2QlF&}RY6?lb9QQR{?5-%&#EBrJZ=+Yt`s{v8!!+Ra)BqCX&P@b=#S)n|nLOu)AGY<7H(UTrZpAT6sTYZpa~qxpg1ZA?@vLvp+>pT(=(aapr3%nDW*2lM;%jbB*3O`HeQ8Eju{wZ8CV- zio~$zr*U>4xee}bmF|5}4TVy($%%BpB?546?#0;(28jYZuT3}`Q>O}+GWh!n{!6X; z%+j9wtiptuLiVG96@?k)lw~)N+UEo-8SoQ~N5Msg)IB+5EweUrW-!Fac3WXnrv@#i zY$68tYP5FP80E#w#hC*jOqV!9eS=&0$F{SQNP7F=I}(^QHCZd5kZLGK?N^*mJvf!k zHD%R4d=SaJ>S@Gc`Q z;5oGjjm^DtRC=nbbS4nTr%h)>(2HD&pE}xfOMQreoC?SK!wG>ChhkdA%#ZPn(QX}v z8W?4ODAvf=8fAMk#J;)LRNjB0$IIGuO5L>9-TVcwQ22Of8_KQG9k?LHabl{>))x4uw-TlOmX8@~2|zqApFaG$drsWI*;BzMq}p zh(+xEBswVj$hH!s^cs3G=}6|gx!gSTxHLx9fz|z|Yn`o-u`ovH$EfkRHEU5MD9W_N z&E^XAg1i4rsTQX4-Xscr+8K4?%G$!s)I%<8uk-`R(59f+<(63FTGIt~lY;#zWQgJ6 z?+THlHbKye+h;0J%#2Q*UZWpk#`{7HJ~>ILYF8Q#F+<<=^_o$buz27 z;3j(OB|ppC+rm9;Stlnb{eRQV7BzQ`U#{}v#PE+K2<$eDJK}nXG>*`Q2mZvUQT3ia zMbz-@2$*>jaB#R6x3EQqM6AXPOG_f`^c73@;cZcgvUPjHh=kFovXOm(vzcWVCbt2e zRu$OMD4s#WM-=WS)@Ln>W}NZN`{|w?Tvv)d=LzY63&b~*(-9uK737fB1jqDT@v92R zePa`DzlQ0z>Y*wdB9Wun9Q1S1(+5Ily{Pb+Urc z^$?Gj?!@21K1We|DU&|zm54A_ssXHR*wJ9q9qe@!J~FeyE+Eq+B@(GkN%jaARd7L} zjm_qXuaK;d;sKGI=;l}*jxu0vzyBEDJtgF5W2R1+m+Fa;KqBB;or1lKz=O?G8e8|N z9Y=j01Q6?RyAhydyo{W^8kBb0Gsolq&T1|k#ToSTuurN~ zND;*Qbs3$9JGwCTbt9YaAHs|v_v)nj)|n@sL9)2bUbyPnv%LrJLj`-(^k%Xg)NJ^DHGJtu zRhw?^mz>E{XIlGpdhbQvKOT8}0xY4T=^&f6+C~Ga&Y(wQm+qz;=?Ug1ZcdTLfO(>~ zIzDHM56>f&2`;4z-mfUM#ZOIyA@~rvXHd;FJo8xJWj^w$pC3<+0Kv6_;9zlMuUhDtIvCQ$nbRk~f)>BB-(8z8 zxBbF5i=wIViiUl|mlW`*U8-!k`?DXC5WV3ktqfPVv8zqg@=)vts7WN~KE_066_-4& zU7rHd)TqKyfdW_WUB*&xU-BU_Y;$?gGh)&9=_cwa+)^kLg(*Gr)L~D18!VDo8aBs~ zYeif;+L8hY$*;~%IgM(q2Boo)Ou2=23}Jq~Z8QIkF{GF}v0D%o3j> zHlD=h0Cw@SyM<)|x}0}szI`NaQbMWu**Os{0OLF;dVaqPV=jd>uJ-@1X2!9(kuaFZ z4mXN#+4f2jQR#_WX$}f(JXgL=zJN>hJRF+It3lGrg#dz+^HlYn-t^K=FYtsYcMOe< zSUT1Muo}x+nkcw}W-LIQm4ymzMZ@Kk)M*h&PuL;odd0Y$Vj<5p>{dAa*T#F0xb8K{ z_pRTHcShkG!-z3g0*^(sIptIt&*B7^X=c zIacE1wJzqyF7ImE6`6wdAZ%;3SqH5 z0a^04H$mN|fqsHO%W+k;$}gFCLLUtIYMmdq8W5w81z<2Whss7rM||Ymikc}p4?+vZ zpknp7o-p%O*0W3&KV^nIGagl0vJWKFa5ib1V!_z>-lEC=hm#s#xmqOmV*XvTYTv+o zVovHI_el=>)7Zf`fO~Rx=K^H?RP>dDi5E@AFlcGaMG2Dosth!i{V{hmfoHqR>)Yqj zPYEp>qSrB;_^L#H_Ve-I5bmHwVi_1A?c?3on2YmB?h~0IMVH=NNBCNlVV)VL9B63? zta0zjRO+^Ev>EIIMI7t-k0J`uR70ieGK%>5Z^^|O#mb(^G^-FacKN}<-TxHo7fYnh ztAr8jD>0w&O{HL?j;u~eH1*}!v@uyj9E0SDYROh)d;quoflSDmnVPSeGjUVF`cFRu zVeWSp7d4%@ZG3-fq_w{N$zP{9vHY@I35bnd{RK>kRP742EF1hbr{w zT8@8i(YTBTyL6PsVMjMOHd`ZZkB4E+zR2SmgzYMe5R@}b9PjqU2ao->B|!VjQzcYl z&9Q!m6JP-qU4O81m4;48;9s698+u4!ydFJ&JVJbP?W+;wuMV#z(~| zLUzfiF1-pR#)8s6D-!nL-B5UE)ynp%Na15Uu4ktHLkt>wpD3eacnFHWr{T6o^~tNC ze-w7w@p&GnDwhkeG%un$3~Hg>qa{UtiykN=sfs3f7lIF7WCVW2amsR5JsQoKEgJGg zhRqFbk@Qi~Vwi#X3sxZw&VR+cDyUB56>;J?Wq%nqdu{3}9t-})h)$af8NOdn&j?Bu zI}#lE9CEWzNc+hJaBnA^n;l6&b+N)yQbITntxe0Og*X`9dvwm!E;b@Q zueGg-70x6l+{~}XM{9TAHswvcnt79w7b5N=y{2y`8oSpiYUK+Esx3`R{jJD*Q1~(9 z8sls(pmuMW^>H&Sjf8?Kaccu&!tmSc!-7|xCZ?R{q4gQkCi+3a1cuv1r`&PX!ijGh zZ(7N`qn2Ym_UK*UAXnQA`l@wou896p`^*Fihzq%(;AJT)q zx$?3n*e7PFU1CfAkbCAb;WayvLfjQ|ucFu-j3TmaY^xjDsLOk;v#^)Wl(2W*nG@!` z^?sVHQ((xxW~b@?nDsP*j*HR|W5}o5N z(jEa0+{H|s$h5$JNtlSOtxdHUu)!{c)(O7V&o11jndM9SGigX_TxjO1tNMGRob2s#W+z56yQPFU1|EHM8Kiw^^! zV<;!72E~)xO9iPd(Dzt&*&voG2RC2kTlGMyAGH6CS7b@J@mEQ zdv!IW{{q1ly$gDkqL83bi^Vhams(j(uBFZ+$*j@a1p7I;&{l@L2R#Y#J+eGs)d&-g zkbhKL2FU>Ma+s-WvmlG;=}Z1>)MDIWxmzEt*o*(!pu+HA89cVnR&+U>D$lE+O1{_w zHH>s|jDmeB3CRld_WRA|CFBR_A%tUZqnkSm?v9nrd~R4gyBK?$s~{(Z#gK18J2`lpb4QMu>DcKs_DH9gDgt*niac9)N7(kwjN%O z@dcrOmPKRoM2Zw6s{z8evsWtu3m_+P?Y*~>3w}&q60j6FMTyVYn`jTGTAG$DA?HHR z(&G=m!{{_f97nyzZeh$pVdi7EvgL;k!q`W?K1uQ>7I6Pg#Yk-8EfAvFhmDwC_|%2K z^tx`*d@Lfvs3hC6=Y7woy1UDDWiy^!LQlZb{Eh7{0CrS!>x;C+lR-@G|7*nrS?b=3 zU23pIxs+zjg*wo4aq|8OC?|W@Yr;KiwRkv@IjAY4eSU)6o@c9zK>jnA-2m=(j?()C z-0h2Dh6_4Ol*|9b{%AOu;&%sk3QcSzMNiNTyr+9MFyL=Kk*1U0Zhq498Cr(i|$Qc12}yB z?>|eTHQ?4_7)c9JBc6{>dEelH$9RnuUG10OxWGtj@QEdRlis+LqD9H43 zbGwn$#!IN3pNzD^@1?3Ehc9E*AZ>I{^@Y}Lm6($F+eQ-wk2b*m^XP8lxov*x5)+AG zm7FzI23r!Jwml2P08MX06jOBXcZ;_NjvO%zORM#zQ1zdrWOZ$Vva4~mok|3Pna z{s6NzNhEn5tPG7!JgpT;RREDMTJ?{pzw@TPcN9s~-LR>`e;4sx1K&4FeIeQ^tQ&Sp zj!r)UI~DQI{$HB>SURqTVqIZ-_xOCC6m?pf`);E7Ij$ z$+_m=O?JzZ41Nd8Qkk=MyyzLC>sO*cjJ@+a0-*XC8?X5P#U``F;TL`G*v-;UpHF11tls-6~`sPkmc+kKNSpooTX2l2%DM5!Sj3RL z0fbG*syzT+lYk}`Zf3yexaQXyc5~T+`i<#OW_FE zaczZG%=htA3s~idAPw{`8g>12*zY&ZgLM}RQ#Iy{Q0@qXhBp6GigV6%4T8vDd@?Ze$DAvxllsxW|G7M}I7sOE&VMBI z-QB-8F-X`o@ZcS4au)F5|NE|g#w!ch47BK@z6XK-My8#BaWS4HFQq<9`eX3sa*{t9 zr&90^LYv6ke;5ln5ri!ot^QCrsQ)+z$NuhEmmv}DT%LLMyFRiZr?t%58P7ckK8OA; z$vN4bB|oXON_tXhZN2Jeu+IMDh&Al3=DXIuJGv%#|9>`R50K=+vVYYs3PG@QI4FS; zEnG%U60i;CY|-CRpXEV;ul|+CoI0@(%S2Z6BQ)y4%Kjhb^Fv4AHm@c=uKnpYKdtgV zlK9~^m;Z71BkZyT>xNF+__~21{hp7TkOu)=bGF+|9tFi6`&V&4;z%UK`IT~NHX^f- z{nya{6QblEh+?uboP*_voZ`O`?xztNeHZy=krylcE1S7k^j#?5_4kk2|1firH!ix& zMC)ltzEd1uDT-tp$y=6-8gtsvn7g4LsvQfYBN6~jJ^I34VL`%9 zgE>qaZ~7e_jya9%)He)x{Tfitt3vPYP=q`INuZCOWG?wsQKROmhpZP%=iml`t>pMF z64f7^b%J$h4Q88o+YYq-UcdhFuc8RP!RRwnN^S|nYQ4nMOEt+w=w_9!2Z2{{aryy^ zO}(Pum>Uc7DTVJmBvP z-hHFG*%T8OX1BOm0GoEb<^$#i*!zuhw_nS<>DE^2z}&fu_7GzZ5Xzi+XF`5RZCo5T z(ZrevRrLxMCkmRQtFL2jz}XvKcToy%y5rKBGjCZnAw02k-R^0khoOeTIu|Umu58b| zeTgyHc4wqr*x3_Wtncvh&t*n0>04>an+nV!i>8|)LKb~T44f_iv_xXx_cxW(F@s6(D z(EQ%gDV{Zpqcz>d{H)F_6CYtCyrf>u(&Uoyg`ss>XO)3& za*JxEp$G5^kFDBt1RX3n!a9wG&ifzDYI+Oc=#t<~=IBzXOA`yd4yf|p6Jvsm+l8eY zi{;3@;6=TTCrJSJ?OEbGU1m9q5%+&({$6eTim*Gs&P?@^&+tbycAi_*Z#G$gSI>Jd z2*>Ko#TiqNxZ3L-%TF_%_U#_lx$1;)UL301X*+u$Uomt@< zpmIxy4|sQ>^%=u<1vwea_3*~Z(C?j1-_Xq3IL`3&u$Hc~n>RbwuHDjwY?s;MN=)5& zZr0!e=TD=l(_LG6X9r#eDoy+39y{`OB*BO$9cofM>Tm*DTotu@wz71xv=LUw+YQS9 zuVk^*uE8u(FS}SPLm$imKcuonppEt`8HA}z`SN2KqmLQjZ%ut;8DAmlex0g#-vl~) zA#eINeKvB}ydzO7N$Wjqi}7VoMVnHuz8&at8_9p9V~vST(<+Bcn|-&YGmT9H$=HB?kvi#kGt4B-HP`q}Og->{L+Q zOZ&@98(Q7nnpsCoKly4W`>HGLXlg0?GdmX-;T>GF6SYwPuU`0EufuU{lBCZgL{lQR{ezt1?v7e|Em{+Zg`!N$N`0!QnGdW2W`yuk%l z;eOjwzaZzdY6c^i9K~t3bWKw;In|ZzE1RKpEL^_ymq6 zN!0=(*R&nQ^V>OLp5osBP8|#H!&1+SCK@9Wyd#->&PZ#{-{KifRB6L!RS7)8Qo&>7 zJoJLkv^FpHE6ntkS^$OLlH<)c1JQxpO3f;VOjmm(@i{O z|CwS{3;mLlyfD(hD8eGT+MNY&dKKyIvKuPDpJq3>S6}`UL(&PX z4hK}Rn^6$xAsSPvwilF5O&h7$*Ijn3voGqMk2s6RsqTj{VS{JxHih@V^RYiaQ?U2S zmuAAU*Qa;bBk!*<>Ye}`+}nIeoV{lJM5alkpvohGzdCWa$k}i1@<7*M)f27m&TrTl zQrT$=V>kHPYM*1_=@_02P{{5m3F92sBd?-|t>$Y2PyoaeCCyq2>iJZvVdgWvyBvxf zAay=7Ma&d_*7h;dd~S9=OsV~WXpWFCX+R_(ki8vX<; zBGENO*PA#HBk{Iv%OU(W#EAf1(Bv4|ZAA{M(&umqPiU3)Ys)$8b;q?%Hv@&Jsh!5g z26la-tw***C&}D`Wr@0)QS+UG{MF;O2Mq8pSc+lcqtAhuRxF6}n0*4PSSOKh;Mtt{FZjcsn{us>3m!JL{wtX;<04fkg-X;9cwDWb%U>(XbQpnbBmEXH_MDP@gCsWHM&c*O7>p93PaxS;o zE{2o56O~w&AZl#^TPGUT9jRNSZ7cl5t{?0*ZB?k*+N9Gw`lNafaibdIL%-?$qbToc zL+2PF24dLUbtd25xB9>o#^bhE7de=}-Z=%;uzmVbXthtOcgiwx(z1o;CBMTOBk32K z2n$@Yku|%vv}|x+v;G>L89wAw=B>i62clkXVX-^oH&N`(Zka0N`f2)#Yxp_y84I8v z_oROb+8V6(=)y#4}ER}*%Q^> z(MOM@P49^_ftEj)*;$-fAJx^MnfQ8Vq0*pJbDUjUzspM07PpdJZ=s~^NkK>f=wK$Y z+mUZ)kd`Mn(`}g_Yt<+`O}w66C(OEeRW zO5>)LUGS}bC`n{`#5v#+fEsRK>f@D|ws|C5;<#n!p-RC=VlT`!^H#xR!=68xn|nQ7g>)(S{MQLE)IP@Z8-a2# znvK@BF|c}ya(X0^DqwlpFxYusLIj^mFa zCp}7~Z$sg^*-*I_=wCjN z!3@CR^@QM+IM?IsU|Ha4JsJDQ55QedEN>3Y9{y&;$*R8V!;d=loH6+k@Eh`L zL(5>x?18)|KU!8)EKSVDZ-U6}$)SG%igwf(<>Viksv+E-DjH;CuiDAiGStL&*KsWX z;YSyY`M#A~7c7zJkj2n$Qss6(_ZeNNyU(@8WY{}}<-c!0=O{CUx;S<%_NuQch z<^j7MlLzW>Gakg;{Hu)%wVltcLwvq?pZhu4JdoHAzS$BqHL{;za)X;7{Pcw0SQ&CA zXMi%TU#1p!iQ{G6Xj;q_jxlFLctwn|fX#YGOjW1*IE_U$n;L9^gu4VoIu$n_gti7F zIW0yu5Vh7*m0s?#JoA!k*USy2vEHz7T_MfWpJpdiyJAH2w{1cptZ{R~G~hY|T67nC zET~$Q*gNXAUpPsdePiW)GV(NSyw2~bB6B)oZb%$H{i6@(m-_YtrUH`c&GaY3^gRHZ zxZ})Amb#f&+hwxoz{MKWq6`$$gPAkbX~z&Qr7OyWIT`=bb0SlQOYCCZ_u-b)jJB4T z?wE~dHKe$7_`Z)(U3d7C`E*);2XCQyyC=gvO}Qax>0#- zOgYg7@gJ`V(Ty_>@~uBJWsJcIB5SM~gXXO@t?{p@ub<_VmFCh@VMrEIBkT&QbLLnO z!@X^xW-1D|T9FMt-#eh0UW(n1N*o1d7p@d_{$&!ykGY3F%Q4PQtkDrPZfwkUB!-N? z|5R@pFnz#bRmO>lOy6axW(XRacHdxqBD7qx=;kguHs;6>2-wzyIjw6hoc6Pd)#Y-C z92NTC2l9jl-C;769i6-Z+JnmmY;w2{J*g@oCevdgbDl1uozQ+uO%I~;XK~<3noAJ11kpLsee0 zev*(ehzk->Y%_Vx;F|VrG;MoM3e$_77DQ|9!;tbWR);|t-91ti9X0=j7SJE*yJX|` z2XV&I*gH)>%@62g5I4;BMG3p7-=4;`CJ1It_eo@y`3`TIBjz!=d4syetZ7;l2uMr; zanG+JV=k#=8DR18R6{hD7DinBTlEfB6#Y|1;6<{qojBu_?B~TFIQ=1k*N~!b${OsN z8A}Lc6NSNE)6pemmAu+4&WRFEP%aY9HH2<8PqZ zGG40sGvnyM+;m7kaUh_PLdZg6)0+&gQInz3vRcH({0Jn%=J9GrzDCmQ&~4#aUaQ?~ zu}aWvcunall_0itW3=oVW1uy;=YHOa$pd>|D^A`DtQnU*)=I(yIuC`{dOHfe={SB` z!ggUfb~0M9+-tg#^@1Y&oHY3eV9~My6;jfuH$t8SEc5}34~Ghue=1Da6cj7sy|xP` z<6?H=8Ge{cUueZUIwy=MWj@>2=nBx(x+wz^^&Twrcey3!5w{s`_Z1rZC2IgjWK089 ze~4nC8`zUSwp|%GWA6=mMv(pn!f3Y0B^l2G1Lf_%0v}(dU{nLX&d`^zPgsA7NF2_i z1PPt#XRM2TdTg#{aobUDMiH^fwh+170tn1?Hi3v+G0deYKy-WH!h5Mc$Pl(=PTyeh za3PyUpIuiX@d?5u6_l6=uN9eu(yB7TP5Ts1mk<1%eMk13D6 zLrnZQvIizdSHA42SZm`hVtY}T0@>tD{;<~r_vTO`BiP%NLv#cB8Yz2L>xlI^z?At} z4B118?~vNc%Y18Mw^^Ns*Ywv(}CewbDlM!7oQJtt&0CjomkPUz*VL|eAYK5$?2j5KoKx(c=%3TXT$ zup7M!#3pk3D{gv(MV5^>58}Ao3z;-6T{YYJiE@5R7}54U6jDFhP!AcHpS&?*Wolsw@g&#e=S=10ofyS$4oX>Z%+W@h>s~=eE!GjVjx%)B!w7LRX zr~E+c1|n{KyY9d-GqEP1yEV46#ln>ydd~YvcnkGc>^408Fz7y1@AtY^^*M&YH=KZQ zM@x?F=`+wRR4?r-+l6_o`$c&B-;D6~e;~`mdQahw@`9ds*f3{S;+$h)!D z;Ww!J)Tg5xwFK#=0#*%QEz2H@=ov{iEGp||;nibVoV@2;<0f3FXJ2&?l^AXw*9~sx><<;Olc?5bJzQ^@NuTkiqOz^oM4#N5Z z&@;+j{{2UUzF{z=Z-K{mi+(ontTg%kgyL)ac zzqa*DTfdC(mu~^%;#bJ{72tp6t+}-QD;@tr8UJ5_C%*6`@07!rc=QSc{_WpmwL9Z? H{N?`(hX7L| literal 21256 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 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 b1ef566beb81f6edb077ee18618599687d1e97ce..deb3744f2c748d55e1ec3bf32167389c55a7fe1e 100644 GIT binary patch delta 47485 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 delta 47375 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 z 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�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 C{PfiT 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 5a6a7c3644119bd74359e897b151ea27fe06f249..75f717b6baf6d4d4d522488584529216e1c503b1 100644 GIT binary patch delta 75613 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

vasxK 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 z

O|XxWt!>@$4i=or8~V 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 z

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 D#g-G2 delta 86394 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�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

mK*+O4G^9+Ivfs9zTfAj{KgSDC0d& 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%0D+%9s3qKF01_=>=yO70x+< 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 A)Bpeg 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 d8d7d5d9b2fbb8f993d1db0909b78d58f90d736d..765957789565ecfcfbda48f550f42240ea35c10a 100644 GIT binary patch delta 456 zcmV;(0XP2nk^=IQ0~Sk0!?XeMU^IAHTs8U z65DTItgV%}%^}B``OP=qNOQQFykpOh(Z+D(UDI*~K}Tc5aOB_aZ+0I!LsG#g7Xuvm z49KtK#X+ZD#|(ElCdgy~FBoHN@-ASn(~+NuQZEGR6L^J9Ob{mTe;#7?im-`!5J~Ar zHGtT+?FZq3lu@L_BDzaemA{fTy2_@f?23rd0vvbpk1CWjE}FFng!M(CFyPpw}98m{Ul%(bxwI=F@yO^?$nJ8J_KOZn7&_4OgS(f6gm` zVH4W^{5Nam`{n2B`x`D7LmT!V1^;*UyChcl#imvSL(KE?8id8@_TJ^600030|4>T@ y2rio*+lm1I06PPdaA+K}BX-jg2`-x++lm1I06UZah)@9nlTe8x23vRl0002L-rErX delta 458 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�j-^=?T{r}n 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�%)S8yRiS2NP(Th?&}cJgYv6}#hfwTahw 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∓WYW8J1qV~tqQbb3lmGPN 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 R0gYQw0F91LR$UJ5{{v<1LJk -||||||| 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 79e8b42da37221c85c4f96434958c18ac235f948..c6437033f6fda1896735d2ceb7ffb93e8c204445 100644 GIT binary patch delta 4656 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 delta 5084 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 YgJ`@i0mYa!v0SJ}kkZsNx7jH54CHICKEN'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 NetworkReadyOff⬤Enter 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 NetworkReadyOff⬤Enter 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 NetworkReadyOff⬤Enter 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 NetworkReadyOff⬤Enter 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 NetworkReadyOff⬤Enter 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 NetworkReadyOff⬤Enter 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 NetworkReadyOff⬤Enter 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 NetworkReadyOff⬤Enter 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_logindatetimea := 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_logindatetimea := 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_logindatetimea := 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_logindatetimea := 5 b := 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_logindatetimea := 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_logindatetimea := 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_logindatetimea := 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_logindatetimea := 5 b := 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() intvoidcloudyyyya := 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() intvoidcloudyyyya := 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() intvoidcloudyyyya := 5 ->>>>>>> 33280fed5 (fixed e2e tests) -||||||| parent of cb2f2823c (Fix changes) - .d2-2490829050 .fill-N1{fill:#0A0F25;} - .d2-2490829050 .fill-N2{fill:#676C7E;} - .d2-2490829050 .fill-N3{fill:#9499AB;} - .d2-2490829050 .fill-N4{fill:#CFD2DD;} - .d2-2490829050 .fill-N5{fill:#DEE1EB;} - .d2-2490829050 .fill-N6{fill:#EEF1F8;} - .d2-2490829050 .fill-N7{fill:#FFFFFF;} - .d2-2490829050 .fill-B1{fill:#0D32B2;} - .d2-2490829050 .fill-B2{fill:#0D32B2;} - .d2-2490829050 .fill-B3{fill:#E3E9FD;} - .d2-2490829050 .fill-B4{fill:#E3E9FD;} - .d2-2490829050 .fill-B5{fill:#EDF0FD;} - .d2-2490829050 .fill-B6{fill:#F7F8FE;} - .d2-2490829050 .fill-AA2{fill:#4A6FF3;} - .d2-2490829050 .fill-AA4{fill:#EDF0FD;} - .d2-2490829050 .fill-AA5{fill:#F7F8FE;} - .d2-2490829050 .fill-AB4{fill:#EDF0FD;} - .d2-2490829050 .fill-AB5{fill:#F7F8FE;} - .d2-2490829050 .stroke-N1{stroke:#0A0F25;} - .d2-2490829050 .stroke-N2{stroke:#676C7E;} - .d2-2490829050 .stroke-N3{stroke:#9499AB;} - .d2-2490829050 .stroke-N4{stroke:#CFD2DD;} - .d2-2490829050 .stroke-N5{stroke:#DEE1EB;} - .d2-2490829050 .stroke-N6{stroke:#EEF1F8;} - .d2-2490829050 .stroke-N7{stroke:#FFFFFF;} - .d2-2490829050 .stroke-B1{stroke:#0D32B2;} - .d2-2490829050 .stroke-B2{stroke:#0D32B2;} - .d2-2490829050 .stroke-B3{stroke:#E3E9FD;} - .d2-2490829050 .stroke-B4{stroke:#E3E9FD;} - .d2-2490829050 .stroke-B5{stroke:#EDF0FD;} - .d2-2490829050 .stroke-B6{stroke:#F7F8FE;} - .d2-2490829050 .stroke-AA2{stroke:#4A6FF3;} - .d2-2490829050 .stroke-AA4{stroke:#EDF0FD;} - .d2-2490829050 .stroke-AA5{stroke:#F7F8FE;} - .d2-2490829050 .stroke-AB4{stroke:#EDF0FD;} - .d2-2490829050 .stroke-AB5{stroke:#F7F8FE;} - .d2-2490829050 .background-color-N1{background-color:#0A0F25;} - .d2-2490829050 .background-color-N2{background-color:#676C7E;} - .d2-2490829050 .background-color-N3{background-color:#9499AB;} - .d2-2490829050 .background-color-N4{background-color:#CFD2DD;} - .d2-2490829050 .background-color-N5{background-color:#DEE1EB;} - .d2-2490829050 .background-color-N6{background-color:#EEF1F8;} - .d2-2490829050 .background-color-N7{background-color:#FFFFFF;} - .d2-2490829050 .background-color-B1{background-color:#0D32B2;} - .d2-2490829050 .background-color-B2{background-color:#0D32B2;} - .d2-2490829050 .background-color-B3{background-color:#E3E9FD;} - .d2-2490829050 .background-color-B4{background-color:#E3E9FD;} - .d2-2490829050 .background-color-B5{background-color:#EDF0FD;} - .d2-2490829050 .background-color-B6{background-color:#F7F8FE;} - .d2-2490829050 .background-color-AA2{background-color:#4A6FF3;} - .d2-2490829050 .background-color-AA4{background-color:#EDF0FD;} - .d2-2490829050 .background-color-AA5{background-color:#F7F8FE;} - .d2-2490829050 .background-color-AB4{background-color:#EDF0FD;} - .d2-2490829050 .background-color-AB5{background-color:#F7F8FE;} - .d2-2490829050 .color-N1{color:#0A0F25;} - .d2-2490829050 .color-N2{color:#676C7E;} - .d2-2490829050 .color-N3{color:#9499AB;} - .d2-2490829050 .color-N4{color:#CFD2DD;} - .d2-2490829050 .color-N5{color:#DEE1EB;} - .d2-2490829050 .color-N6{color:#EEF1F8;} - .d2-2490829050 .color-N7{color:#FFFFFF;} - .d2-2490829050 .color-B1{color:#0D32B2;} - .d2-2490829050 .color-B2{color:#0D32B2;} - .d2-2490829050 .color-B3{color:#E3E9FD;} - .d2-2490829050 .color-B4{color:#E3E9FD;} - .d2-2490829050 .color-B5{color:#EDF0FD;} - .d2-2490829050 .color-B6{color:#F7F8FE;} - .d2-2490829050 .color-AA2{color:#4A6FF3;} - .d2-2490829050 .color-AA4{color:#EDF0FD;} - .d2-2490829050 .color-AA5{color:#F7F8FE;} - .d2-2490829050 .color-AB4{color:#EDF0FD;} - .d2-2490829050 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>a labelblabelsa class+public() boolvoid-private() intvoidcloudyyyya := 5 -======= .d2-3769254545 .fill-N1{fill:#0A0F25;} .d2-3769254545 .fill-N2{fill:#676C7E;} .d2-3769254545 .fill-N3{fill:#9499AB;} @@ -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() intvoidcloudyyyya := 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() intvoidcloudyyyya := 5 b := a + 7 -<<<<<<< HEAD -<<<<<<< HEAD fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b)cyldiadocssix cornersa random iconoverpackdocs pagetoohard o saysinglepersona queuea squarea step at a timedatausersidintnamevarchar result := callThisFunction(obj, 5) midthis sideother side +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() intvoidcloudyyyya := 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() intvoidcloudyyyya := 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() intvoidcloudyyyya := 5 ->>>>>>> 33280fed5 (fixed e2e tests) -||||||| parent of cb2f2823c (Fix changes) - .d2-2490829050 .fill-N1{fill:#0A0F25;} - .d2-2490829050 .fill-N2{fill:#676C7E;} - .d2-2490829050 .fill-N3{fill:#9499AB;} - .d2-2490829050 .fill-N4{fill:#CFD2DD;} - .d2-2490829050 .fill-N5{fill:#DEE1EB;} - .d2-2490829050 .fill-N6{fill:#EEF1F8;} - .d2-2490829050 .fill-N7{fill:#FFFFFF;} - .d2-2490829050 .fill-B1{fill:#0D32B2;} - .d2-2490829050 .fill-B2{fill:#0D32B2;} - .d2-2490829050 .fill-B3{fill:#E3E9FD;} - .d2-2490829050 .fill-B4{fill:#E3E9FD;} - .d2-2490829050 .fill-B5{fill:#EDF0FD;} - .d2-2490829050 .fill-B6{fill:#F7F8FE;} - .d2-2490829050 .fill-AA2{fill:#4A6FF3;} - .d2-2490829050 .fill-AA4{fill:#EDF0FD;} - .d2-2490829050 .fill-AA5{fill:#F7F8FE;} - .d2-2490829050 .fill-AB4{fill:#EDF0FD;} - .d2-2490829050 .fill-AB5{fill:#F7F8FE;} - .d2-2490829050 .stroke-N1{stroke:#0A0F25;} - .d2-2490829050 .stroke-N2{stroke:#676C7E;} - .d2-2490829050 .stroke-N3{stroke:#9499AB;} - .d2-2490829050 .stroke-N4{stroke:#CFD2DD;} - .d2-2490829050 .stroke-N5{stroke:#DEE1EB;} - .d2-2490829050 .stroke-N6{stroke:#EEF1F8;} - .d2-2490829050 .stroke-N7{stroke:#FFFFFF;} - .d2-2490829050 .stroke-B1{stroke:#0D32B2;} - .d2-2490829050 .stroke-B2{stroke:#0D32B2;} - .d2-2490829050 .stroke-B3{stroke:#E3E9FD;} - .d2-2490829050 .stroke-B4{stroke:#E3E9FD;} - .d2-2490829050 .stroke-B5{stroke:#EDF0FD;} - .d2-2490829050 .stroke-B6{stroke:#F7F8FE;} - .d2-2490829050 .stroke-AA2{stroke:#4A6FF3;} - .d2-2490829050 .stroke-AA4{stroke:#EDF0FD;} - .d2-2490829050 .stroke-AA5{stroke:#F7F8FE;} - .d2-2490829050 .stroke-AB4{stroke:#EDF0FD;} - .d2-2490829050 .stroke-AB5{stroke:#F7F8FE;} - .d2-2490829050 .background-color-N1{background-color:#0A0F25;} - .d2-2490829050 .background-color-N2{background-color:#676C7E;} - .d2-2490829050 .background-color-N3{background-color:#9499AB;} - .d2-2490829050 .background-color-N4{background-color:#CFD2DD;} - .d2-2490829050 .background-color-N5{background-color:#DEE1EB;} - .d2-2490829050 .background-color-N6{background-color:#EEF1F8;} - .d2-2490829050 .background-color-N7{background-color:#FFFFFF;} - .d2-2490829050 .background-color-B1{background-color:#0D32B2;} - .d2-2490829050 .background-color-B2{background-color:#0D32B2;} - .d2-2490829050 .background-color-B3{background-color:#E3E9FD;} - .d2-2490829050 .background-color-B4{background-color:#E3E9FD;} - .d2-2490829050 .background-color-B5{background-color:#EDF0FD;} - .d2-2490829050 .background-color-B6{background-color:#F7F8FE;} - .d2-2490829050 .background-color-AA2{background-color:#4A6FF3;} - .d2-2490829050 .background-color-AA4{background-color:#EDF0FD;} - .d2-2490829050 .background-color-AA5{background-color:#F7F8FE;} - .d2-2490829050 .background-color-AB4{background-color:#EDF0FD;} - .d2-2490829050 .background-color-AB5{background-color:#F7F8FE;} - .d2-2490829050 .color-N1{color:#0A0F25;} - .d2-2490829050 .color-N2{color:#676C7E;} - .d2-2490829050 .color-N3{color:#9499AB;} - .d2-2490829050 .color-N4{color:#CFD2DD;} - .d2-2490829050 .color-N5{color:#DEE1EB;} - .d2-2490829050 .color-N6{color:#EEF1F8;} - .d2-2490829050 .color-N7{color:#FFFFFF;} - .d2-2490829050 .color-B1{color:#0D32B2;} - .d2-2490829050 .color-B2{color:#0D32B2;} - .d2-2490829050 .color-B3{color:#E3E9FD;} - .d2-2490829050 .color-B4{color:#E3E9FD;} - .d2-2490829050 .color-B5{color:#EDF0FD;} - .d2-2490829050 .color-B6{color:#F7F8FE;} - .d2-2490829050 .color-AA2{color:#4A6FF3;} - .d2-2490829050 .color-AA4{color:#EDF0FD;} - .d2-2490829050 .color-AA5{color:#F7F8FE;} - .d2-2490829050 .color-AB4{color:#EDF0FD;} - .d2-2490829050 .color-AB5{color:#F7F8FE;}.appendix text.text{fill:#0A0F25}.md{--color-fg-default:#0A0F25;--color-fg-muted:#676C7E;--color-fg-subtle:#9499AB;--color-canvas-default:#FFFFFF;--color-canvas-subtle:#EEF1F8;--color-border-default:#0D32B2;--color-border-muted:#0D32B2;--color-neutral-muted:#EEF1F8;--color-accent-fg:#0D32B2;--color-accent-emphasis:#0D32B2;--color-attention-subtle:#676C7E;--color-danger-fg:red;}.sketch-overlay-B1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B2{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-B3{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-B6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-AA4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AA5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB4{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-AB5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N1{fill:url(#streaks-darker);mix-blend-mode:lighten}.sketch-overlay-N2{fill:url(#streaks-dark);mix-blend-mode:overlay}.sketch-overlay-N3{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N4{fill:url(#streaks-normal);mix-blend-mode:color-burn}.sketch-overlay-N5{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N6{fill:url(#streaks-bright);mix-blend-mode:darken}.sketch-overlay-N7{fill:url(#streaks-bright);mix-blend-mode:darken}.light-code{display: block}.dark-code{display: none}]]>a labelblabelsa class+public() boolvoid-private() intvoidcloudyyyya := 5 -======= .d2-3769254545 .fill-N1{fill:#0A0F25;} .d2-3769254545 .fill-N2{fill:#676C7E;} .d2-3769254545 .fill-N3{fill:#9499AB;} @@ -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() intvoidcloudyyyya := 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() intvoidcloudyyyya := 5 b := a + 7 -<<<<<<< HEAD -<<<<<<< HEAD fmt.Printf("%d", b)a := 5 b := a + 7 -fmt.Printf("%d", b)cyldiadocssix cornersa random iconoverpackdocs pagetoohard o saysinglepersona queuea squarea step at a timedatausersidintnamevarchar result := callThisFunction(obj, 5) midthis sideother side +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_logindatetimea := 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_logindatetimea := 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_logindatetimea := 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_logindatetimea := 5 b := 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_logindatetimea := 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_logindatetimea := 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_logindatetimea := 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_logindatetimea := 5 b := 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_logindatetimea := 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_logindatetimea := 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_logindatetimea := 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_logindatetimea := 5 b := 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_logindatetimea := 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_logindatetimea := 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_logindatetimea := 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_logindatetimea := 5 b := 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 -