diff --git a/ci/release/changelogs/next.md b/ci/release/changelogs/next.md index c8eb0dc2a..ea756902b 100644 --- a/ci/release/changelogs/next.md +++ b/ci/release/changelogs/next.md @@ -41,3 +41,4 @@ - Sequence diagram note ordering was sometimes wrong. [#796](https://github.com/terrastruct/d2/pull/796) - Images can now be set to sizes smaller than 128x128. [#702](https://github.com/terrastruct/d2/pull/702) - Fixes class height when there are no rows. [#756](https://github.com/terrastruct/d2/pull/756) +- Border radius was not firefox-compatible. [#799](https://github.com/terrastruct/d2/pull/799) diff --git a/e2etests/stable_test.go b/e2etests/stable_test.go index 99322c205..bca51d2e7 100644 --- a/e2etests/stable_test.go +++ b/e2etests/stable_test.go @@ -2013,6 +2013,18 @@ x: { y: { style.border-radius: 10 } +multiple2: { + style.border-radius: 6 + style.multiple: true +} +double: { + style.border-radius: 6 + style.double-border: true +} +three-dee: { + style.border-radius: 6 + style.3d: true +} `, }, { diff --git a/e2etests/testdata/stable/border-radius/dagre/board.exp.json b/e2etests/testdata/stable/border-radius/dagre/board.exp.json index 01c354ee8..c29f14165 100644 --- a/e2etests/testdata/stable/border-radius/dagre/board.exp.json +++ b/e2etests/testdata/stable/border-radius/dagre/board.exp.json @@ -83,6 +83,129 @@ "labelPosition": "INSIDE_MIDDLE_CENTER", "zIndex": 0, "level": 1 + }, + { + "id": "multiple2", + "type": "rectangle", + "pos": { + "x": 227, + "y": 0 + }, + "width": 112, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 6, + "fill": "#F7F8FE", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": true, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "multiple2", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 67, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "double", + "type": "rectangle", + "pos": { + "x": 399, + "y": 0 + }, + "width": 94, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 6, + "fill": "#F7F8FE", + "stroke": "#0D32B2", + "shadow": false, + "3d": false, + "multiple": false, + "double-border": true, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "double", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 49, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 + }, + { + "id": "three-dee", + "type": "rectangle", + "pos": { + "x": 553, + "y": 0 + }, + "width": 114, + "height": 66, + "opacity": 1, + "strokeDash": 0, + "strokeWidth": 2, + "borderRadius": 6, + "fill": "#F7F8FE", + "stroke": "#0D32B2", + "shadow": false, + "3d": true, + "multiple": false, + "double-border": false, + "tooltip": "", + "link": "", + "icon": null, + "iconPosition": "", + "blend": false, + "fields": null, + "methods": null, + "columns": null, + "label": "three-dee", + "fontSize": 16, + "fontFamily": "DEFAULT", + "language": "", + "color": "#0A0F25", + "italic": false, + "bold": true, + "underline": false, + "labelWidth": 69, + "labelHeight": 21, + "labelPosition": "INSIDE_MIDDLE_CENTER", + "zIndex": 0, + "level": 1 } ], "connections": [] diff --git a/e2etests/testdata/stable/border-radius/dagre/sketch.exp.svg b/e2etests/testdata/stable/border-radius/dagre/sketch.exp.svg index fce49f8cb..24313ab08 100644 --- a/e2etests/testdata/stable/border-radius/dagre/sketch.exp.svg +++ b/e2etests/testdata/stable/border-radius/dagre/sketch.exp.svg @@ -3,7 +3,7 @@ id="d2-svg" style="background: white;" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" -width="371" height="270" viewBox="-102 -102 371 270">