From d319c3b0429c45b0c09a682299f715fa59ff9fcd Mon Sep 17 00:00:00 2001 From: oddlama Date: Wed, 20 Mar 2024 03:25:57 +0100 Subject: [PATCH] chore: make topology svgs square --- topology/icons/services/adguardhome.svg | 6 +- topology/icons/services/forgejo.svg | 8 ++- topology/icons/services/grafana.svg | 2 +- topology/icons/services/kanidm.svg | 34 +++++++++- topology/icons/services/loki.svg | 75 ++++++++++++++++++++- topology/icons/services/nginx.svg | 6 +- topology/icons/services/oauth2-proxy.svg | 11 ++- topology/icons/services/openssh.svg | 15 ++--- topology/icons/services/radicale.svg | 12 +++- topology/icons/services/samba.svg | 14 +++- topology/icons/services/vaultwarden.svg | 12 ++-- topology/icons/services/wireguard.svg | 12 ++-- topology/topology/renderers/svg/default.nix | 11 +-- 13 files changed, 176 insertions(+), 42 deletions(-) diff --git a/topology/icons/services/adguardhome.svg b/topology/icons/services/adguardhome.svg index 0d9b102..bab046d 100644 --- a/topology/icons/services/adguardhome.svg +++ b/topology/icons/services/adguardhome.svg @@ -1 +1,5 @@ - \ No newline at end of file + + + + + diff --git a/topology/icons/services/forgejo.svg b/topology/icons/services/forgejo.svg index b856343..424bf1e 100644 --- a/topology/icons/services/forgejo.svg +++ b/topology/icons/services/forgejo.svg @@ -1 +1,7 @@ - \ No newline at end of file + + + + + + + diff --git a/topology/icons/services/grafana.svg b/topology/icons/services/grafana.svg index 0cb40a9..fc3494d 100644 --- a/topology/icons/services/grafana.svg +++ b/topology/icons/services/grafana.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/topology/icons/services/kanidm.svg b/topology/icons/services/kanidm.svg index acd77ec..312ce85 100644 --- a/topology/icons/services/kanidm.svg +++ b/topology/icons/services/kanidm.svg @@ -1 +1,33 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/topology/icons/services/loki.svg b/topology/icons/services/loki.svg index 5ba43ce..c582c32 100644 --- a/topology/icons/services/loki.svg +++ b/topology/icons/services/loki.svg @@ -1 +1,74 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/topology/icons/services/nginx.svg b/topology/icons/services/nginx.svg index 8d95e4b..f0cbded 100644 --- a/topology/icons/services/nginx.svg +++ b/topology/icons/services/nginx.svg @@ -1 +1,5 @@ - \ No newline at end of file + + + + + diff --git a/topology/icons/services/oauth2-proxy.svg b/topology/icons/services/oauth2-proxy.svg index b269949..30b7670 100644 --- a/topology/icons/services/oauth2-proxy.svg +++ b/topology/icons/services/oauth2-proxy.svg @@ -1 +1,10 @@ - \ No newline at end of file + + + + + + + + + + diff --git a/topology/icons/services/openssh.svg b/topology/icons/services/openssh.svg index ce9ebaf..1d77361 100644 --- a/topology/icons/services/openssh.svg +++ b/topology/icons/services/openssh.svg @@ -1,10 +1,7 @@ - - - - - - - - - + + + + + + diff --git a/topology/icons/services/radicale.svg b/topology/icons/services/radicale.svg index 531ecde..49d9bb7 100644 --- a/topology/icons/services/radicale.svg +++ b/topology/icons/services/radicale.svg @@ -1 +1,11 @@ - \ No newline at end of file + + + + + + + + + + + diff --git a/topology/icons/services/samba.svg b/topology/icons/services/samba.svg index 2b663ce..d8327e2 100644 --- a/topology/icons/services/samba.svg +++ b/topology/icons/services/samba.svg @@ -1 +1,13 @@ - \ No newline at end of file + + + + + + + + + + + + + diff --git a/topology/icons/services/vaultwarden.svg b/topology/icons/services/vaultwarden.svg index 5a96508..1f94a8b 100644 --- a/topology/icons/services/vaultwarden.svg +++ b/topology/icons/services/vaultwarden.svg @@ -1,7 +1,5 @@ - - \ No newline at end of file + + + + + diff --git a/topology/icons/services/wireguard.svg b/topology/icons/services/wireguard.svg index 81823b3..86f3cb3 100644 --- a/topology/icons/services/wireguard.svg +++ b/topology/icons/services/wireguard.svg @@ -1,7 +1,5 @@ - - \ No newline at end of file + + + + + diff --git a/topology/topology/renderers/svg/default.nix b/topology/topology/renderers/svg/default.nix index 6c2567f..8a0aa44 100644 --- a/topology/topology/renderers/svg/default.nix +++ b/topology/topology/renderers/svg/default.nix @@ -48,7 +48,7 @@ else if hasSuffix ".png" file # FIXME: TODO png, jpg, ... then '' - " + " '' else builtins.throw "Unsupported icon file type: ${file}"; @@ -161,15 +161,6 @@ ''; - mkInfoCardTitle = node: - mkRootCard "rounded-t-xl" - /* - html - */ - '' - ${mkTitle node} - ''; - mkInfoCardFull = node: let services = filter (x: !x.hidden) (attrValues node.services); in