From 94a686309a2562070e95f6d68afd36d0095c8893 Mon Sep 17 00:00:00 2001 From: CarinaWolli Date: Mon, 8 Apr 2024 18:01:34 -0400 Subject: [PATCH 1/5] add new styling for emoji links --- .../reminders/templates/emailRatingTemplate.ts | 8 ++++---- packages/ui/components/editor/ExampleTheme.ts | 1 + packages/ui/components/editor/stylesEditor.css | 17 ++++++++++++----- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/packages/features/ee/workflows/lib/reminders/templates/emailRatingTemplate.ts b/packages/features/ee/workflows/lib/reminders/templates/emailRatingTemplate.ts index bd33798d41469..0c291ce108468 100644 --- a/packages/features/ee/workflows/lib/reminders/templates/emailRatingTemplate.ts +++ b/packages/features/ee/workflows/lib/reminders/templates/emailRatingTemplate.ts @@ -54,11 +54,11 @@ const emailRatingTemplate = ({ const introHtml = `Hi${ name ? ` ${name}` : "" - },

We're always looking to improve our customer's experience. How satisfied were you with your recent meeting?

`; + },

We're always looking to improve our customer's experience. How satisfied were you with your recent meeting?`; - const ratingHtml = `😠 🙁 😐 😄 😍

`; + const ratingHtml = `
😠 🙁 😐 😄 😍

`; - const noShowHtml = `
${organizer} didn't join the meeting


`; + const noShowHtml = `


${organizer} didn't join the meeting


`; const eventHtml = `
Event:
${eventName}

`; @@ -68,7 +68,7 @@ const emailRatingTemplate = ({ const branding = !isBrandingDisabled && !isEditingMode ? `

_

Scheduling by ${APP_NAME}` : ""; - const endingHtml = `This survey was triggered by a Workflow in Cal.${branding}`; + const endingHtml = `This survey was triggered by a Workflow in Cal.${branding}

`; const emailBody = introHtml + ratingHtml + noShowHtml + eventHtml + dateTimeHtml + attendeeHtml + endingHtml; diff --git a/packages/ui/components/editor/ExampleTheme.ts b/packages/ui/components/editor/ExampleTheme.ts index c08b06cbc7db0..1971de2dd78fb 100644 --- a/packages/ui/components/editor/ExampleTheme.ts +++ b/packages/ui/components/editor/ExampleTheme.ts @@ -4,6 +4,7 @@ const exampleTheme = { heading: { h1: "editor-heading-h1", h2: "editor-heading-h2", + h6: "editor-heading-h6", }, list: { nested: { diff --git a/packages/ui/components/editor/stylesEditor.css b/packages/ui/components/editor/stylesEditor.css index 2ac72e23a5e25..ac4640d63fd87 100644 --- a/packages/ui/components/editor/stylesEditor.css +++ b/packages/ui/components/editor/stylesEditor.css @@ -1,7 +1,3 @@ -.editor a { - text-decoration: underline; - font-size: 14px; -} .editor li { padding-left: 1.28571429em; @@ -56,9 +52,20 @@ font-style: italic; } +//only used for emoji links +.editor-heading-h6 { + font-size: 20px ; + text-decoration: none !important; +} + +h6 a { + font-size: 20px ; + text-decoration: none !important; +} + .editor-link { color: rgb(33, 111, 219); - text-decoration: none; + text-decoration: underline; } .editor-tokenFunction { From 3049eb5ed5c79634451ca53703176779cd20079a Mon Sep 17 00:00:00 2001 From: CarinaWolli Date: Mon, 8 Apr 2024 18:34:45 -0400 Subject: [PATCH 2/5] fix double lines on enter --- packages/ui/components/editor/plugins/ToolbarPlugin.tsx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/ui/components/editor/plugins/ToolbarPlugin.tsx b/packages/ui/components/editor/plugins/ToolbarPlugin.tsx index 225cb82501615..d6b07e9ea981d 100644 --- a/packages/ui/components/editor/plugins/ToolbarPlugin.tsx +++ b/packages/ui/components/editor/plugins/ToolbarPlugin.tsx @@ -376,7 +376,12 @@ export default function ToolbarPlugin(props: TextEditorProps) { editor.registerUpdateListener(({ editorState, prevEditorState }) => { editorState.read(() => { const textInHtml = $generateHtmlFromNodes(editor).replace(/</g, "<").replace(/>/g, ">"); - props.setText(textInHtml); + props.setText( + textInHtml.replace( + /]*>\s*
\s*<\/p>/g, + '

' + ) + ); }); if (!prevEditorState._selection) editor.blur(); }); From 5c75d7c92a8fcdc10dd7a1c1fa1356375b9296e6 Mon Sep 17 00:00:00 2001 From: CarinaWolli Date: Tue, 9 Apr 2024 14:16:45 -0400 Subject: [PATCH 3/5] UI fixes --- .../bookings/views/bookings-single-view.tsx | 12 +++++----- .../reminders/providers/sendgridProvider.ts | 21 +++++++++++++++- .../templates/emailRatingTemplate.ts | 24 +++++++++---------- .../editor/plugins/ToolbarPlugin.tsx | 7 +----- .../ui/components/editor/stylesEditor.css | 7 +++--- 5 files changed, 42 insertions(+), 29 deletions(-) diff --git a/apps/web/modules/bookings/views/bookings-single-view.tsx b/apps/web/modules/bookings/views/bookings-single-view.tsx index 3d1367bb02a3c..3215bac5c2611 100644 --- a/apps/web/modules/bookings/views/bookings-single-view.tsx +++ b/apps/web/modules/bookings/views/bookings-single-view.tsx @@ -860,10 +860,10 @@ export default function Success(props: PageProps) { ) : ( <> -
+