From 2f06dbcb58312e78d8d2dbe6d369e9e0537e712b Mon Sep 17 00:00:00 2001 From: Colin Dawson Date: Sun, 1 Feb 2026 23:11:41 +0000 Subject: [PATCH] More code tweaks to finish off tidying up the ui. --- .env | 3 ++- public/runtime-env.js | 2 +- src/Sass/_domains.scss | 4 ++-- src/Sass/general.scss | 8 ++++++-- src/modules/homepage/Env.tsx | 6 ++++++ .../domains/components/MailTemplatesTab.tsx | 4 ++-- src/types/globals.ts | 15 ++++++++------- 7 files changed, 27 insertions(+), 15 deletions(-) diff --git a/.env b/.env index 51dfa74..4aa2f97 100644 --- a/.env +++ b/.env @@ -1,3 +1,4 @@ NODE_ENV=development API_URL=http://localhost:3001/api/ -EXTERNAL_LOGIN=true \ No newline at end of file +EXTERNAL_LOGIN=true +CKEDITOR_LICENSE_KEY=GPL \ No newline at end of file diff --git a/public/runtime-env.js b/public/runtime-env.js index 81c1e73..8fe1694 100644 --- a/public/runtime-env.js +++ b/public/runtime-env.js @@ -1 +1 @@ -window.__RUNTIME_CONFIG__ = {"NODE_ENV":"development","API_URL":"http://localhost:3001/api/","EXTERNAL_LOGIN":"true"}; \ No newline at end of file +window.__RUNTIME_CONFIG__ = {"NODE_ENV":"development","API_URL":"http://localhost:3001/api/","EXTERNAL_LOGIN":"true","CKEDITOR_LICENSE_KEY":"GPL"}; \ No newline at end of file diff --git a/src/Sass/_domains.scss b/src/Sass/_domains.scss index fbfb311..f917dac 100644 --- a/src/Sass/_domains.scss +++ b/src/Sass/_domains.scss @@ -6,9 +6,9 @@ grid-gap: $gridGap; } -.two-column-grid-1-3 { +.two-column-grid { display: grid; - grid-template-columns: 1fr 3fr; + grid-template-columns: fit-content(50%) auto; grid-gap: $gridGap; } diff --git a/src/Sass/general.scss b/src/Sass/general.scss index d3cd968..973bce5 100644 --- a/src/Sass/general.scss +++ b/src/Sass/general.scss @@ -1,7 +1,11 @@ .loading { - cursor: wait; + cursor: wait; } .pagination { - padding:0; + padding: 0; +} + +.fit-content-width { + width: fit-content; } diff --git a/src/modules/homepage/Env.tsx b/src/modules/homepage/Env.tsx index ee37cae..c282d2c 100644 --- a/src/modules/homepage/Env.tsx +++ b/src/modules/homepage/Env.tsx @@ -16,6 +16,12 @@ const EnvPage: React.FC = () => { window.__RUNTIME_CONFIG__.EXTERNAL_LOGIN ={" "} {window.__RUNTIME_CONFIG__.EXTERNAL_LOGIN ? "true" : "false"}

+

+ window.__RUNTIME_CONFIG__?.CKEDITOR_LICENSE_KEY ={" "} + {window.__RUNTIME_CONFIG__?.CKEDITOR_LICENSE_KEY === "GPL" + ? "GPL" + : "hidden"} +

); }; diff --git a/src/modules/manager/domains/components/MailTemplatesTab.tsx b/src/modules/manager/domains/components/MailTemplatesTab.tsx index 08ac084..a96c46c 100644 --- a/src/modules/manager/domains/components/MailTemplatesTab.tsx +++ b/src/modules/manager/domains/components/MailTemplatesTab.tsx @@ -51,8 +51,8 @@ const MailTemplatesTab: React.FC = () => { return ( -
-
+
+
    {types.map((x) => { return ( diff --git a/src/types/globals.ts b/src/types/globals.ts index fa2c950..1aac836 100644 --- a/src/types/globals.ts +++ b/src/types/globals.ts @@ -1,11 +1,12 @@ export {}; declare global { - interface Window { - __RUNTIME_CONFIG__: { - NODE_ENV: string; - API_URL: string; - EXTERNAL_LOGIN: boolean; - }; - } + interface Window { + __RUNTIME_CONFIG__: { + NODE_ENV: string; + API_URL: string; + EXTERNAL_LOGIN: boolean; + CKEDITOR_LICENSE_KEY?: string; + }; + } }