diff --git a/apps/admin-x-settings/package.json b/apps/admin-x-settings/package.json index 6e47942169..ceb4a5682a 100644 --- a/apps/admin-x-settings/package.json +++ b/apps/admin-x-settings/package.json @@ -45,10 +45,10 @@ "@ebay/nice-modal-react": "1.2.13", "@sentry/react": "7.70.0", "@tanstack/react-query": "4.36.1", - "@tryghost/color-utils": "0.1.24", + "@tryghost/color-utils": "0.2.0", "@tryghost/limit-service": "^1.2.10", "@tryghost/nql": "0.11.0", - "@tryghost/timezone-data": "0.3.8", + "@tryghost/timezone-data": "0.4.1", "@uiw/react-codemirror": "^4.21.9", "clsx": "2.0.0", "react": "18.2.0", diff --git a/apps/admin-x-settings/src/components/settings/email/newsletters/NewsletterPreview.tsx b/apps/admin-x-settings/src/components/settings/email/newsletters/NewsletterPreview.tsx index 3fc2be8ab1..5e29467872 100644 --- a/apps/admin-x-settings/src/components/settings/email/newsletters/NewsletterPreview.tsx +++ b/apps/admin-x-settings/src/components/settings/email/newsletters/NewsletterPreview.tsx @@ -84,9 +84,9 @@ const NewsletterPreview: React.FC<{newsletter: Newsletter}> = ({newsletter}) => const colors = hasEmailCustomization ? { backgroundColor: backgroundColor(), - borderColor: borderColor(), + borderColor: borderColor() || undefined, secondaryBorderColor, - titleColor: titleColor(), + titleColor: titleColor() || undefined, textColor, secondaryTextColor } : {}; diff --git a/apps/admin-x-settings/src/typings.d.ts b/apps/admin-x-settings/src/typings.d.ts index d8c213c872..f33c952a58 100644 --- a/apps/admin-x-settings/src/typings.d.ts +++ b/apps/admin-x-settings/src/typings.d.ts @@ -1,6 +1,4 @@ -declare module '@tryghost/timezone-data' declare module '@tryghost/limit-service' -declare module '@tryghost/color-utils' declare module '@tryghost/nql' declare module '*.svg' { diff --git a/yarn.lock b/yarn.lock index 7d6b2dc617..b09cf15791 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7655,6 +7655,14 @@ dependencies: color "^3.2.1" +"@tryghost/color-utils@0.2.0": + version "0.2.0" + resolved "https://registry.yarnpkg.com/@tryghost/color-utils/-/color-utils-0.2.0.tgz#c8a2cf06ec9fb8a7b4ed9bcfc2a96b1237b58eda" + integrity sha512-wvv/JwZYV/sy8hoNcXo0xRezUqOV/YLki1OqKUbJGPhqhv9PXsyauezXOyB+lSbhccPvZCuGQRE571VNf1JCfQ== + dependencies: + "@types/color" "3.0.2" + color "^3.2.1" + "@tryghost/config-url-helpers@1.0.6": version "1.0.6" resolved "https://registry.yarnpkg.com/@tryghost/config-url-helpers/-/config-url-helpers-1.0.6.tgz#0f5193b26305fda48236094be69f0b4b44ee2b92" @@ -8115,6 +8123,11 @@ resolved "https://registry.yarnpkg.com/@tryghost/timezone-data/-/timezone-data-0.3.8.tgz#413f8c7efa972bbdb186d95f4eab8d2799704010" integrity sha512-0CkCR6uRwANHvP8BJ/3EPPw4Z55u+WCBFM/+KR2KGCogGQwx8npIDA0zWUyWzKk+Y2Z9IqoHs+IlaA1v3t+Jdw== +"@tryghost/timezone-data@0.4.1": + version "0.4.1" + resolved "https://registry.yarnpkg.com/@tryghost/timezone-data/-/timezone-data-0.4.1.tgz#67f648f8aeb7da565df7c96bf91bac66de0a7af2" + integrity sha512-jIUlJG1Yvv013HORnxOm5ucY+a0EPQ7YLudXUOpmUGU+ctVsubctzHd0Sn+ZIHm8x3wFJKjBSiu9ThtirEZM8g== + "@tryghost/tpl@0.1.24": version "0.1.24" resolved "https://registry.yarnpkg.com/@tryghost/tpl/-/tpl-0.1.24.tgz#fcf585be02531baf651f2f7605466a3df744d0bc" @@ -8326,6 +8339,25 @@ resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.3.5.tgz#ae69bcbb1bebb68c4ac0b11e9d8ed04526b3562b" integrity sha512-mEo1sAde+UCE6b2hxn332f1g1E8WfYRu6p5SvTKr2ZKC1f7gFJXk4h5PyGP9Dt6gCaG8y8XhwnXWC6Iy2cmBng== +"@types/color-convert@*": + version "2.0.2" + resolved "https://registry.yarnpkg.com/@types/color-convert/-/color-convert-2.0.2.tgz#a5fa5da9b866732f8bf86b01964869011e2a2356" + integrity sha512-KGRIgCxwcgazts4MXRCikPbIMzBpjfdgEZSy8TRHU/gtg+f9sOfHdtK8unPfxIoBtyd2aTTwINVLSNENlC8U8A== + dependencies: + "@types/color-name" "*" + +"@types/color-name@*": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.2.tgz#bdeeb6fdcb78969033767951ab0cb26c7514a658" + integrity sha512-JWO/ZyxTKk0bLuOhAavGjnwLR73rUE7qzACnU7gMeyA/gdrSHm2xJwqNPipw2MtaZUaqQ2UG/q7pP6AQiZ8mqw== + +"@types/color@3.0.2": + version "3.0.2" + resolved "https://registry.yarnpkg.com/@types/color/-/color-3.0.2.tgz#3779043e782f562aa9157b5fc6bd07e14fd8e7f3" + integrity sha512-INiJl6sfNn8iyC5paxVzqiVUEj2boIlFki02uRTAkKwAj++7aAF+ZfEv/XrIeBa0XI/fTZuDHW8rEEcEVnON+Q== + dependencies: + "@types/color-convert" "*" + "@types/common-tags@1.8.2": version "1.8.2" resolved "https://registry.yarnpkg.com/@types/common-tags/-/common-tags-1.8.2.tgz#04a2fed0597d18b6eb5eb9d24b62905041c572c9"