From 4639514a3b3f3976ff867048daac4183e5c6d6f3 Mon Sep 17 00:00:00 2001 From: Simon Backx Date: Wed, 5 Apr 2023 11:07:11 +0200 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20Added=20email=20design=20customizat?= =?UTF-8?q?ion?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fixes https://github.com/TryGhost/Team/issues/2671 Co-authored-by: Fabien 'egg' O'Carroll Co-authored-by: Sanne de Vries --- .../components/modals/newsletters/edit.hbs | 12 +- .../modals/newsletters/edit/design-labs.hbs | 301 ---- .../modals/newsletters/edit/design-labs.js | 105 -- .../modals/newsletters/edit/design.hbs | 46 +- .../modals/newsletters/edit/design.js | 68 + .../modals/newsletters/edit/preview-labs.hbs | 137 -- .../modals/newsletters/edit/preview-labs.js | 137 -- .../modals/newsletters/edit/preview.hbs | 223 +-- .../modals/newsletters/edit/preview.js | 76 + ghost/email-service/lib/email-renderer.js | 19 +- .../email-templates/partials/styles-old.hbs | 1532 ----------------- .../lib/email-templates/template-old.hbs | 240 --- 12 files changed, 306 insertions(+), 2590 deletions(-) delete mode 100644 ghost/admin/app/components/modals/newsletters/edit/design-labs.hbs delete mode 100644 ghost/admin/app/components/modals/newsletters/edit/design-labs.js delete mode 100644 ghost/admin/app/components/modals/newsletters/edit/preview-labs.hbs delete mode 100644 ghost/admin/app/components/modals/newsletters/edit/preview-labs.js delete mode 100644 ghost/email-service/lib/email-templates/partials/styles-old.hbs delete mode 100644 ghost/email-service/lib/email-templates/template-old.hbs diff --git a/ghost/admin/app/components/modals/newsletters/edit.hbs b/ghost/admin/app/components/modals/newsletters/edit.hbs index 3a14690983..cdf5a90ee1 100644 --- a/ghost/admin/app/components/modals/newsletters/edit.hbs +++ b/ghost/admin/app/components/modals/newsletters/edit.hbs @@ -8,11 +8,7 @@ diff --git a/ghost/admin/app/components/modals/newsletters/edit/design-labs.hbs b/ghost/admin/app/components/modals/newsletters/edit/design-labs.hbs deleted file mode 100644 index 2c6b10e4ea..0000000000 --- a/ghost/admin/app/components/modals/newsletters/edit/design-labs.hbs +++ /dev/null @@ -1,301 +0,0 @@ - diff --git a/ghost/admin/app/components/modals/newsletters/edit/design-labs.js b/ghost/admin/app/components/modals/newsletters/edit/design-labs.js deleted file mode 100644 index 10054fbe7e..0000000000 --- a/ghost/admin/app/components/modals/newsletters/edit/design-labs.js +++ /dev/null @@ -1,105 +0,0 @@ -import Component from '@glimmer/component'; -import {IMAGE_EXTENSIONS} from 'ghost-admin/components/gh-image-uploader'; -import {action} from '@ember/object'; -import {inject as service} from '@ember/service'; -import {textColorForBackgroundColor} from '@tryghost/color-utils'; - -export default class EditNewsletterDesignForm extends Component { - @service settings; - - imageExtensions = IMAGE_EXTENSIONS; - - @action - onCheckboxChange(property, event) { - this.args.newsletter[property] = event.target.checked; - } - - @action - toggleProperty(property) { - this.args.newsletter[property] = !this.args.newsletter[property]; - } - - @action - imageUploaded(property, images) { - if (images[0]) { - this.args.newsletter[property] = images[0].url; - } - } - - @action - changeSetting(property, value) { - this.args.newsletter[property] = value; - } - - @action - toggleSetting(property, event) { - this.args.newsletter[property] = event.target.checked; - } - - get backgroundColorIsDark() { - if (this.args.newsletter.backgroundColor === 'dark') { - return true; - } - if (this.args.newsletter.backgroundColor === 'light') { - return false; - } - return textColorForBackgroundColor(this.args.newsletter.backgroundColor).hex().toLowerCase() === '#ffffff'; - } - - get backgroundPresetColors() { - return [ - { - value: '#f0f0f0', - name: 'Lightgrey', - class: '', - style: 'background: #f0f0f0 !important;' - }, - { - value: 'light', - name: 'White', - class: 'white', - style: '' - } - ]; - } - - get borderPresetColors() { - return [ - { - value: 'accent', - name: 'Accent', - class: 'accent', - style: '' - }, - { - value: 'auto', - name: 'Auto', - class: this.backgroundColorIsDark ? 'white' : 'black', - style: '' - }, - { - value: null, - name: 'Transparent', - class: 'transparent', - style: '' - } - ]; - } - - get titlePresetColors() { - return [ - { - value: 'accent', - name: 'Accent', - class: 'accent', - style: '' - }, - { - value: null, - name: 'Auto', - class: this.backgroundColorIsDark ? 'white' : 'black', - style: '' - } - ]; - } -} diff --git a/ghost/admin/app/components/modals/newsletters/edit/design.hbs b/ghost/admin/app/components/modals/newsletters/edit/design.hbs index a2676d1ef9..2c6b10e4ea 100644 --- a/ghost/admin/app/components/modals/newsletters/edit/design.hbs +++ b/ghost/admin/app/components/modals/newsletters/edit/design.hbs @@ -60,7 +60,7 @@ {{#if this.settings.icon}} -
+