From eef03311995e6ad27eb2613bbe9664eca59f5892 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Mon, 11 Sep 2023 12:18:06 -0700 Subject: [PATCH 1/4] add arrowhead_font_color test --- e2etests/regression_test.go | 1 + .../testdata/files/arrowhead_font_color.d2 | 9 + .../arrowhead_font_color/dagre/board.exp.json | 202 ++++++++++++++++++ .../arrowhead_font_color/dagre/sketch.exp.svg | 103 +++++++++ .../arrowhead_font_color/elk/board.exp.json | 193 +++++++++++++++++ .../arrowhead_font_color/elk/sketch.exp.svg | 103 +++++++++ 6 files changed, 611 insertions(+) create mode 100644 e2etests/testdata/files/arrowhead_font_color.d2 create mode 100644 e2etests/testdata/regression/arrowhead_font_color/dagre/board.exp.json create mode 100644 e2etests/testdata/regression/arrowhead_font_color/dagre/sketch.exp.svg create mode 100644 e2etests/testdata/regression/arrowhead_font_color/elk/board.exp.json create mode 100644 e2etests/testdata/regression/arrowhead_font_color/elk/sketch.exp.svg diff --git a/e2etests/regression_test.go b/e2etests/regression_test.go index f1d20808f..6377a70f5 100644 --- a/e2etests/regression_test.go +++ b/e2etests/regression_test.go @@ -1038,6 +1038,7 @@ cf many required: { loadFromFile(t, "icons_on_top"), loadFromFile(t, "dagre_disconnected_edge"), loadFromFile(t, "outside_grid_label_position"), + loadFromFile(t, "arrowhead_font_color"), } runa(t, tcs) diff --git a/e2etests/testdata/files/arrowhead_font_color.d2 b/e2etests/testdata/files/arrowhead_font_color.d2 new file mode 100644 index 000000000..2187ced7b --- /dev/null +++ b/e2etests/testdata/files/arrowhead_font_color.d2 @@ -0,0 +1,9 @@ +direction: right +x <-> y: { + source-arrowhead: eth1 { + style.font-color: green + } + target-arrowhead: eth2 { + style.font-color: red + } +} diff --git a/e2etests/testdata/regression/arrowhead_font_color/dagre/board.exp.json b/e2etests/testdata/regression/arrowhead_font_color/dagre/board.exp.json new file mode 100644 index 000000000..d5f6edd60 --- /dev/null +++ b/e2etests/testdata/regression/arrowhead_font_color/dagre/board.exp.json @@ -0,0 +1,202 @@ +{ + "name": "", + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "x", + "type": "rectangle", + "pos": { + "x": 0, + "y": 0 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "x", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "y", + "type": "rectangle", + "pos": { + "x": 153, + "y": 0 + }, + "width": 54, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "y", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 9, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + } + ], + "connections": [ + { + "id": "(x <-> y)[0]", + "src": "x", + "srcArrow": "triangle", + "srcLabel": { + "label": "eth1", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 29, + "labelHeight": 21 + }, + "dst": "y", + "dstArrow": "triangle", + "dstLabel": { + "label": "eth2", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 30, + "labelHeight": 21 + }, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 53, + "y": 33 + }, + { + "x": 93, + "y": 33 + }, + { + "x": 113, + "y": 33 + }, + { + "x": 153, + "y": 33 + } + ], + "isCurve": true, + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + } + ], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/regression/arrowhead_font_color/dagre/sketch.exp.svg b/e2etests/testdata/regression/arrowhead_font_color/dagre/sketch.exp.svg new file mode 100644 index 000000000..35dd6a4b9 --- /dev/null +++ b/e2etests/testdata/regression/arrowhead_font_color/dagre/sketch.exp.svg @@ -0,0 +1,103 @@ +xy eth1eth2 + + + + \ No newline at end of file diff --git a/e2etests/testdata/regression/arrowhead_font_color/elk/board.exp.json b/e2etests/testdata/regression/arrowhead_font_color/elk/board.exp.json new file mode 100644 index 000000000..dc1ef858b --- /dev/null +++ b/e2etests/testdata/regression/arrowhead_font_color/elk/board.exp.json @@ -0,0 +1,193 @@ +{ + "name": "", + "isFolderOnly": false, + "fontFamily": "SourceSansPro", + "shapes": [ + { + "id": "x", + "type": "rectangle", + "pos": { + "x": 12, + "y": 12 + }, + "width": 53, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "x", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 8, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "y", + "type": "rectangle", + "pos": { + "x": 135, + "y": 12 + }, + "width": 54, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 0, + "fill": "B6", + "stroke": "B1", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "y", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N1", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 9, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + } + ], + "connections": [ + { + "id": "(x <-> y)[0]", + "src": "x", + "srcArrow": "triangle", + "srcLabel": { + "label": "eth1", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 29, + "labelHeight": 21 + }, + "dst": "y", + "dstArrow": "triangle", + "dstLabel": { + "label": "eth2", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 30, + "labelHeight": 21 + }, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "stroke": "B1", + "borderRadius": 10, + "label": "", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "N2", + "italic": true, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "labelPosition": "", + "labelPercentage": 0, + "route": [ + { + "x": 65, + "y": 45 + }, + { + "x": 135, + "y": 45 + } + ], + "animated": false, + "tooltip": "", + "icon": null, + "zIndex": 0 + } + ], + "root": { + "id": "", + "type": "", + "pos": { + "x": 0, + "y": 0 + }, + "width": 0, + "height": 0, + "opacity": 0, + "strokeDash": 0, + "strokeWidth": 0, + "borderRadius": 0, + "fill": "N7", + "stroke": "", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "", + "fontSize": 0, + "fontFamily": "", + "language": "", + "color": "", + "italic": false, + "bold": false, + "underline": false, + "labelWidth": 0, + "labelHeight": 0, + "zIndex": 0, + "level": 0 + } +} diff --git a/e2etests/testdata/regression/arrowhead_font_color/elk/sketch.exp.svg b/e2etests/testdata/regression/arrowhead_font_color/elk/sketch.exp.svg new file mode 100644 index 000000000..166e58f0c --- /dev/null +++ b/e2etests/testdata/regression/arrowhead_font_color/elk/sketch.exp.svg @@ -0,0 +1,103 @@ +xy eth1eth2 + + + + \ No newline at end of file From cfd7c3996dfde298a47e85a9b014ad98533911a7 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Mon, 11 Sep 2023 12:19:26 -0700 Subject: [PATCH 2/4] render arrowhead labels using style.font-color --- d2exporter/export.go | 6 ++++++ d2renderers/d2svg/d2svg.go | 9 +++++++++ 2 files changed, 15 insertions(+) diff --git a/d2exporter/export.go b/d2exporter/export.go index ed746b867..f79e98af6 100644 --- a/d2exporter/export.go +++ b/d2exporter/export.go @@ -213,6 +213,9 @@ func toConnection(edge *d2graph.Edge, theme *d2themes.Theme) d2target.Connection LabelWidth: edge.SrcArrowhead.LabelDimensions.Width, LabelHeight: edge.SrcArrowhead.LabelDimensions.Height, } + if edge.SrcArrowhead.Style.FontColor != nil { + connection.SrcLabel.Color = edge.SrcArrowhead.Style.FontColor.Value + } } } if edge.DstArrow { @@ -228,6 +231,9 @@ func toConnection(edge *d2graph.Edge, theme *d2themes.Theme) d2target.Connection LabelWidth: edge.DstArrowhead.LabelDimensions.Width, LabelHeight: edge.DstArrowhead.LabelDimensions.Height, } + if edge.DstArrowhead.Style.FontColor != nil { + connection.DstLabel.Color = edge.DstArrowhead.Style.FontColor.Value + } } } if theme != nil && theme.SpecialRules.NoCornerRadius { diff --git a/d2renderers/d2svg/d2svg.go b/d2renderers/d2svg/d2svg.go index 2a7428ac5..f4994f137 100644 --- a/d2renderers/d2svg/d2svg.go +++ b/d2renderers/d2svg/d2svg.go @@ -613,6 +613,15 @@ func renderArrowheadLabel(connection d2target.Connection, text string, isDst boo textEl.X = baselineCenter.X textEl.Y = baselineCenter.Y textEl.Fill = d2target.FG_COLOR + if isDst { + if connection.DstLabel.Color != "" { + textEl.Fill = connection.DstLabel.Color + } + } else { + if connection.SrcLabel.Color != "" { + textEl.Fill = connection.SrcLabel.Color + } + } textEl.ClassName = "text-italic" textEl.Style = fmt.Sprintf("text-anchor:middle;font-size:%vpx", connection.FontSize) textEl.Content = RenderText(text, textEl.X, height) From 3f77d06c20f6adc3f6a4b751f40223236f70585b Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Mon, 11 Sep 2023 12:22:39 -0700 Subject: [PATCH 3/4] update test --- .../arrowhead_font_color/dagre/board.exp.json | 4 +- .../arrowhead_font_color/dagre/sketch.exp.svg | 158 +++++++++--------- .../arrowhead_font_color/elk/board.exp.json | 4 +- .../arrowhead_font_color/elk/sketch.exp.svg | 158 +++++++++--------- 4 files changed, 162 insertions(+), 162 deletions(-) diff --git a/e2etests/testdata/regression/arrowhead_font_color/dagre/board.exp.json b/e2etests/testdata/regression/arrowhead_font_color/dagre/board.exp.json index d5f6edd60..b5243d082 100644 --- a/e2etests/testdata/regression/arrowhead_font_color/dagre/board.exp.json +++ b/e2etests/testdata/regression/arrowhead_font_color/dagre/board.exp.json @@ -96,7 +96,7 @@ "fontSize": 0, "fontFamily": "", "language": "", - "color": "", + "color": "green", "italic": false, "bold": false, "underline": false, @@ -110,7 +110,7 @@ "fontSize": 0, "fontFamily": "", "language": "", - "color": "", + "color": "red", "italic": false, "bold": false, "underline": false, diff --git a/e2etests/testdata/regression/arrowhead_font_color/dagre/sketch.exp.svg b/e2etests/testdata/regression/arrowhead_font_color/dagre/sketch.exp.svg index 35dd6a4b9..7297a6468 100644 --- a/e2etests/testdata/regression/arrowhead_font_color/dagre/sketch.exp.svg +++ b/e2etests/testdata/regression/arrowhead_font_color/dagre/sketch.exp.svg @@ -1,16 +1,16 @@ -xy eth1eth2 + .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 diff --git a/e2etests/testdata/regression/arrowhead_font_color/elk/board.exp.json b/e2etests/testdata/regression/arrowhead_font_color/elk/board.exp.json index dc1ef858b..e080bbbcc 100644 --- a/e2etests/testdata/regression/arrowhead_font_color/elk/board.exp.json +++ b/e2etests/testdata/regression/arrowhead_font_color/elk/board.exp.json @@ -96,7 +96,7 @@ "fontSize": 0, "fontFamily": "", "language": "", - "color": "", + "color": "green", "italic": false, "bold": false, "underline": false, @@ -110,7 +110,7 @@ "fontSize": 0, "fontFamily": "", "language": "", - "color": "", + "color": "red", "italic": false, "bold": false, "underline": false, 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 166e58f0c..df409a223 100644 --- a/e2etests/testdata/regression/arrowhead_font_color/elk/sketch.exp.svg +++ b/e2etests/testdata/regression/arrowhead_font_color/elk/sketch.exp.svg @@ -1,16 +1,16 @@ -xy eth1eth2 + .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 From fdf9ec1f414504883a38ce3af7c66ee89a885646 Mon Sep 17 00:00:00 2001 From: Gavin Nishizawa Date: Mon, 11 Sep 2023 12:27:57 -0700 Subject: [PATCH 4/4] changelog --- ci/release/changelogs/next.md | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/release/changelogs/next.md b/ci/release/changelogs/next.md index bae88cb9e..9a8c1e422 100644 --- a/ci/release/changelogs/next.md +++ b/ci/release/changelogs/next.md @@ -6,6 +6,7 @@ - Latex now includes Mathjax's ASM extension for more powerful Latex functionality [#1544](https://github.com/terrastruct/d2/pull/1544) - `font-color` works on Markdown [#1546](https://github.com/terrastruct/d2/pull/1546) +- `font-color` works on arrowheads [#1582](https://github.com/terrastruct/d2/pull/1582) #### Bugfixes ⛑️