From 30aae50c646cf9559be6b6db980a24d552c26e37 Mon Sep 17 00:00:00 2001 From: ppenguin Date: Fri, 23 Aug 2024 22:55:56 +0200 Subject: [PATCH 1/4] Add new darktheme: Dark berry blue tweak darkberry theme t --- d2themes/d2themescatalog/catalog.go | 1 + d2themes/d2themescatalog/dark_berry_blue.go | 25 +++++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 d2themes/d2themescatalog/dark_berry_blue.go diff --git a/d2themes/d2themescatalog/catalog.go b/d2themes/d2themescatalog/catalog.go index 6341399dd..fffbeb7aa 100644 --- a/d2themes/d2themescatalog/catalog.go +++ b/d2themes/d2themescatalog/catalog.go @@ -31,6 +31,7 @@ var LightCatalog = []d2themes.Theme{ var DarkCatalog = []d2themes.Theme{ DarkMauve, DarkFlagshipTerrastruct, + DarkBerryBlue, } func Find(id int64) d2themes.Theme { diff --git a/d2themes/d2themescatalog/dark_berry_blue.go b/d2themes/d2themescatalog/dark_berry_blue.go new file mode 100644 index 000000000..fd974205c --- /dev/null +++ b/d2themes/d2themescatalog/dark_berry_blue.go @@ -0,0 +1,25 @@ +package d2themescatalog + +import "oss.terrastruct.com/d2/d2themes" + +var DarkBerryBlue = d2themes.Theme{ + ID: 205, + Name: "Dark berry blue", + Colors: d2themes.ColorPalette{ + Neutrals: d2themes.DarkNeutral, + + B1: "#E5F3FF", + B2: "#BCDDFB", + B3: "#77AFE3", + B4: "#3363DD", + B5: "#1F46B7", + B6: "#203586", + + AA2: "#DACEFB", + AA4: "#A169D3", + AA5: "#6649B5", + + AB4: "#9F7ED1", + AB5: "#BA69A6", + }, +} From db24121d3e756940087137e35cc8d6d7dbc9e56e Mon Sep 17 00:00:00 2001 From: ppenguin Date: Thu, 29 Aug 2024 14:33:18 +0200 Subject: [PATCH 2/4] theme ID mod, add description to improvements --- ci/release/changelogs/next.md | 19 +++++++++++-------- .../dark_flagship_terrastruct.go | 2 +- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/ci/release/changelogs/next.md b/ci/release/changelogs/next.md index 092a1ff80..53c433c4b 100644 --- a/ci/release/changelogs/next.md +++ b/ci/release/changelogs/next.md @@ -14,14 +14,17 @@ #### Improvements 🧹 - CLI: - - Support `validate` command. [#2415](https://github.com/terrastruct/d2/pull/2415) - - Watch mode ignores backup files (e.g. files created by certain editors like Helix). [#2131](https://github.com/terrastruct/d2/issues/2131) + - Support `validate` command. [#2415](https://github.com/terrastruct/d2/pull/2415) + - Watch mode ignores backup files (e.g. files created by certain editors like Helix). [#2131](https://github.com/terrastruct/d2/issues/2131) - Compiler: - - `link`s can be set to root path, e.g. `/xyz`. [#2357](https://github.com/terrastruct/d2/issues/2357) + - `link`s can be set to root path, e.g. `/xyz`. [#2357](https://github.com/terrastruct/d2/issues/2357) - Parser: - - impose max key length. It's almost certainly a mistake if an ID gets too long, e.g. missing quotes [#2465](https://github.com/terrastruct/d2/pull/2465) -- Render: - - horizontal padding added for connection labels [#2461](https://github.com/terrastruct/d2/pull/2461) + - impose max key length. It's almost certainly a mistake if an ID gets too long, e.g. missing quotes [#2465](https://github.com/terrastruct/d2/pull/2465) +- # Render: - horizontal padding added for connection labels [#2461](https://github.com/terrastruct/d2/pull/2461) +- Themes [#2065](https://github.com/terrastruct/d2/pull/2065): + - new theme `Dark Berry Blue` (`205`), intended as dark variant of `Mixed Berry Blue` (`5`). + - changed id of `Dark Flagship Terrastruct` (`203`) to mirror the ID of `Flagship Terrastruct` (`3`), improving theme discoverability. + > > > > > > > d19e3b4f2 (theme ID mod, add description to improvements) #### Bugfixes ⛑️ @@ -37,8 +40,8 @@ - fixes substitutions in quotes surrounded by text [#2462](https://github.com/terrastruct/d2/pull/2462) - CLI: fetch and render remote images of mimetype octet-stream correctly [#2370](https://github.com/terrastruct/d2/pull/2370) - Composition: - - spread importing scenarios/steps was not inheriting correctly [#2460](https://github.com/terrastruct/d2/pull/2460) - - imported fields were not merging with current fields/edges [#2464](https://github.com/terrastruct/d2/pull/2464) + - spread importing scenarios/steps was not inheriting correctly [#2460](https://github.com/terrastruct/d2/pull/2460) + - imported fields were not merging with current fields/edges [#2464](https://github.com/terrastruct/d2/pull/2464) - Markdown: fixes nested var substitutions not working [#2456](https://github.com/terrastruct/d2/pull/2456) - d2js: handle unicode characters [#2393](https://github.com/terrastruct/d2/pull/2393) diff --git a/d2themes/d2themescatalog/dark_flagship_terrastruct.go b/d2themes/d2themescatalog/dark_flagship_terrastruct.go index 210c37c95..77d13f6d6 100644 --- a/d2themes/d2themescatalog/dark_flagship_terrastruct.go +++ b/d2themes/d2themescatalog/dark_flagship_terrastruct.go @@ -3,7 +3,7 @@ package d2themescatalog import "oss.terrastruct.com/d2/d2themes" var DarkFlagshipTerrastruct = d2themes.Theme{ - ID: 201, + ID: 203, Name: "Dark Flagship Terrastruct", Colors: d2themes.ColorPalette{ Neutrals: d2themes.DarkNeutral, From 09913eb4d40ac8542c727c4867245704991e2f96 Mon Sep 17 00:00:00 2001 From: ppenguin Date: Wed, 2 Apr 2025 19:42:20 +0200 Subject: [PATCH 3/4] reset dark theme IDs following author's request --- d2themes/d2themescatalog/dark_berry_blue.go | 4 ++-- d2themes/d2themescatalog/dark_flagship_terrastruct.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/d2themes/d2themescatalog/dark_berry_blue.go b/d2themes/d2themescatalog/dark_berry_blue.go index fd974205c..4733b0f91 100644 --- a/d2themes/d2themescatalog/dark_berry_blue.go +++ b/d2themes/d2themescatalog/dark_berry_blue.go @@ -3,8 +3,8 @@ package d2themescatalog import "oss.terrastruct.com/d2/d2themes" var DarkBerryBlue = d2themes.Theme{ - ID: 205, - Name: "Dark berry blue", + ID: 202, + Name: "Dark Berry Blue", Colors: d2themes.ColorPalette{ Neutrals: d2themes.DarkNeutral, diff --git a/d2themes/d2themescatalog/dark_flagship_terrastruct.go b/d2themes/d2themescatalog/dark_flagship_terrastruct.go index 77d13f6d6..210c37c95 100644 --- a/d2themes/d2themescatalog/dark_flagship_terrastruct.go +++ b/d2themes/d2themescatalog/dark_flagship_terrastruct.go @@ -3,7 +3,7 @@ package d2themescatalog import "oss.terrastruct.com/d2/d2themes" var DarkFlagshipTerrastruct = d2themes.Theme{ - ID: 203, + ID: 201, Name: "Dark Flagship Terrastruct", Colors: d2themes.ColorPalette{ Neutrals: d2themes.DarkNeutral, From 741c5952b27e6b549b6d0c75b16a5afae3684455 Mon Sep 17 00:00:00 2001 From: ppenguin Date: Wed, 2 Apr 2025 19:54:26 +0200 Subject: [PATCH 4/4] "fix" next.md; .gitignore --- .gitignore | 7 ++++++- ci/release/changelogs/next.md | 3 --- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index a24ac39c1..224cc5816 100644 --- a/.gitignore +++ b/.gitignore @@ -8,4 +8,9 @@ out d2 # https://github.com/golang/go/blob/8b67cf0bc6ad657fddcbaaa10729d0086f08f9a9/src/cmd/go/internal/test/test.go#L415-L416 -e2etests.test \ No newline at end of file +e2etests.test + +# ignores for direnv/devenv +.devenv* +.direnv/ +devenv.* diff --git a/ci/release/changelogs/next.md b/ci/release/changelogs/next.md index 53c433c4b..950dc521f 100644 --- a/ci/release/changelogs/next.md +++ b/ci/release/changelogs/next.md @@ -22,9 +22,6 @@ - impose max key length. It's almost certainly a mistake if an ID gets too long, e.g. missing quotes [#2465](https://github.com/terrastruct/d2/pull/2465) - # Render: - horizontal padding added for connection labels [#2461](https://github.com/terrastruct/d2/pull/2461) - Themes [#2065](https://github.com/terrastruct/d2/pull/2065): - - new theme `Dark Berry Blue` (`205`), intended as dark variant of `Mixed Berry Blue` (`5`). - - changed id of `Dark Flagship Terrastruct` (`203`) to mirror the ID of `Flagship Terrastruct` (`3`), improving theme discoverability. - > > > > > > > d19e3b4f2 (theme ID mod, add description to improvements) #### Bugfixes ⛑️