diff --git a/js/app/components/settings/branding-admin.tsx b/js/app/components/settings/branding-admin.tsx index 0f81c4b29..2e22d1615 100644 --- a/js/app/components/settings/branding-admin.tsx +++ b/js/app/components/settings/branding-admin.tsx @@ -572,6 +572,107 @@ export function BrandingAdmin() { )} + {t("branding-bundle")} + + + + + + {t("branding-bundle-description")} + + + + + + setBundleMerge((v) => !v)} + style={[zero.layout.flex.direction.row, zero.gap.all[2]]} + > + + {bundleMerge ? "☑" : "☐"} {t("branding-bundle-merge")} + + + {bundlePreview && ( + + + {t("branding-bundle-preview", { + name: bundlePreview.name, + })} + + {bundlePreview.changes + .filter((c) => c.action !== "unchanged") + .map((c) => ( + + {c.action === "added" + ? "+" + : c.action === "removed" + ? "−" + : "~"}{" "} + {c.key} + {c.detail ? `: ${c.detail}` : ""} + + ))} + {bundlePreview.changes.every( + (c) => c.action === "unchanged", + ) && ( + + {t("branding-bundle-no-changes")} + + )} + {bundlePreview.warnings.map((w) => ( + + {w} + + ))} + + + + + + )} + + + + + {t("branding-configuration")} @@ -1328,107 +1429,6 @@ export function BrandingAdmin() { - {t("branding-bundle")} - - - - - - {t("branding-bundle-description")} - - - - - - setBundleMerge((v) => !v)} - style={[zero.layout.flex.direction.row, zero.gap.all[2]]} - > - - {bundleMerge ? "☑" : "☐"} {t("branding-bundle-merge")} - - - {bundlePreview && ( - - - {t("branding-bundle-preview", { - name: bundlePreview.name, - })} - - {bundlePreview.changes - .filter((c) => c.action !== "unchanged") - .map((c) => ( - - {c.action === "added" - ? "+" - : c.action === "removed" - ? "−" - : "~"}{" "} - {c.key} - {c.detail ? `: ${c.detail}` : ""} - - ))} - {bundlePreview.changes.every( - (c) => c.action === "unchanged", - ) && ( - - {t("branding-bundle-no-changes")} - - )} - {bundlePreview.warnings.map((w) => ( - - {w} - - ))} - - - - - - )} - - - - - {t("branding-navigation")}