From de2e6b0c1d6c5a12c8a4e7c906da764f69832f89 Mon Sep 17 00:00:00 2001 From: Catherine Lee <55311782+c298lee@users.noreply.github.com> Date: Thu, 4 Apr 2024 18:40:30 -0400 Subject: [PATCH 1/5] font size config --- packages/feedback/src/core/components/Actor.css.ts | 1 - packages/feedback/src/core/createMainStyles.ts | 1 + packages/feedback/src/modal/components/Dialog.css.ts | 3 +-- packages/feedback/src/types/theme.ts | 4 ++++ 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/feedback/src/core/components/Actor.css.ts b/packages/feedback/src/core/components/Actor.css.ts index 38c542d6e1b7..9a5984353793 100644 --- a/packages/feedback/src/core/components/Actor.css.ts +++ b/packages/feedback/src/core/components/Actor.css.ts @@ -23,7 +23,6 @@ export function createActorStyles(): HTMLStyleElement { border-radius: var(--border-radius); cursor: pointer; - font-size: 14px; font-weight: 600; font-family: inherit; padding: 12px 16px; diff --git a/packages/feedback/src/core/createMainStyles.ts b/packages/feedback/src/core/createMainStyles.ts index 9eb5bd4dc2ab..4da47107ed2e 100644 --- a/packages/feedback/src/core/createMainStyles.ts +++ b/packages/feedback/src/core/createMainStyles.ts @@ -50,6 +50,7 @@ export function createMainStyles(colorScheme: 'system' | 'dark' | 'light', theme --z-index: 100000; --font-family: ${themes.themeLight.fontFamily}; --font-size: ${themes.themeLight.fontSize}; + --font-size-label: ${themes.themeLight.fontSizeLabel}; font-family: var(--font-family); font-size: var(--font-size); diff --git a/packages/feedback/src/modal/components/Dialog.css.ts b/packages/feedback/src/modal/components/Dialog.css.ts index 72fe0bd59cb4..d2e8f4d608fe 100644 --- a/packages/feedback/src/modal/components/Dialog.css.ts +++ b/packages/feedback/src/modal/components/Dialog.css.ts @@ -128,7 +128,7 @@ export function createDialogStyles(): HTMLStyleElement { border: var(--input-border); border-radius: var(--form-content-border-radius); color: var(--input-foreground); - font-size: 14px; + font-size: var(--font-size); font-weight: 500; padding: 6px 12px; } @@ -153,7 +153,6 @@ export function createDialogStyles(): HTMLStyleElement { border: var(--cancel-border); border-radius: var(--form-content-border-radius); cursor: pointer; - font-size: 14px; font-weight: 600; padding: 6px 16px; font-family: inherit; diff --git a/packages/feedback/src/types/theme.ts b/packages/feedback/src/types/theme.ts index 1bfb2e580a99..3a032a63e267 100644 --- a/packages/feedback/src/types/theme.ts +++ b/packages/feedback/src/types/theme.ts @@ -7,6 +7,10 @@ export interface FeedbackTheme { * Font size for widget */ fontSize: string; + /** + * Font size for widget labels + */ + fontSizeLabel: string; /** * Background color for actor and dialog */ From 8d5fb8a26cd02c6bd7c595e0f88012a1e16ee9c4 Mon Sep 17 00:00:00 2001 From: Catherine Lee <55311782+c298lee@users.noreply.github.com> Date: Thu, 4 Apr 2024 18:42:30 -0400 Subject: [PATCH 2/5] add font size --- packages/feedback/src/constants/theme.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/feedback/src/constants/theme.ts b/packages/feedback/src/constants/theme.ts index 7fff31f48964..f9407ad2b05c 100644 --- a/packages/feedback/src/constants/theme.ts +++ b/packages/feedback/src/constants/theme.ts @@ -5,6 +5,7 @@ const SUBMIT_COLOR = 'rgba(108, 95, 199, 1)'; export const LIGHT_THEME = { fontFamily: "system-ui, 'Helvetica Neue', Arial, sans-serif", fontSize: '14px', + fontSizeLabel: '14px', background: LIGHT_BACKGROUND, backgroundHover: '#f6f6f7', From d014108421efff4b2ea32cd8bde4d1c0f4d30ee0 Mon Sep 17 00:00:00 2001 From: Catherine Lee <55311782+c298lee@users.noreply.github.com> Date: Thu, 4 Apr 2024 18:48:38 -0400 Subject: [PATCH 3/5] remove font size label --- packages/feedback/src/constants/theme.ts | 1 - packages/feedback/src/core/createMainStyles.ts | 1 - packages/feedback/src/types/theme.ts | 4 ---- 3 files changed, 6 deletions(-) diff --git a/packages/feedback/src/constants/theme.ts b/packages/feedback/src/constants/theme.ts index f9407ad2b05c..7fff31f48964 100644 --- a/packages/feedback/src/constants/theme.ts +++ b/packages/feedback/src/constants/theme.ts @@ -5,7 +5,6 @@ const SUBMIT_COLOR = 'rgba(108, 95, 199, 1)'; export const LIGHT_THEME = { fontFamily: "system-ui, 'Helvetica Neue', Arial, sans-serif", fontSize: '14px', - fontSizeLabel: '14px', background: LIGHT_BACKGROUND, backgroundHover: '#f6f6f7', diff --git a/packages/feedback/src/core/createMainStyles.ts b/packages/feedback/src/core/createMainStyles.ts index 4da47107ed2e..9eb5bd4dc2ab 100644 --- a/packages/feedback/src/core/createMainStyles.ts +++ b/packages/feedback/src/core/createMainStyles.ts @@ -50,7 +50,6 @@ export function createMainStyles(colorScheme: 'system' | 'dark' | 'light', theme --z-index: 100000; --font-family: ${themes.themeLight.fontFamily}; --font-size: ${themes.themeLight.fontSize}; - --font-size-label: ${themes.themeLight.fontSizeLabel}; font-family: var(--font-family); font-size: var(--font-size); diff --git a/packages/feedback/src/types/theme.ts b/packages/feedback/src/types/theme.ts index 3a032a63e267..1bfb2e580a99 100644 --- a/packages/feedback/src/types/theme.ts +++ b/packages/feedback/src/types/theme.ts @@ -7,10 +7,6 @@ export interface FeedbackTheme { * Font size for widget */ fontSize: string; - /** - * Font size for widget labels - */ - fontSizeLabel: string; /** * Background color for actor and dialog */ From 1d76656fb4cfa6547853f6a1abffad3fb196aba5 Mon Sep 17 00:00:00 2001 From: Catherine Lee <55311782+c298lee@users.noreply.github.com> Date: Thu, 4 Apr 2024 18:53:25 -0400 Subject: [PATCH 4/5] font size to buttons --- packages/feedback/src/core/components/Actor.css.ts | 1 + packages/feedback/src/modal/components/Dialog.css.ts | 1 + 2 files changed, 2 insertions(+) diff --git a/packages/feedback/src/core/components/Actor.css.ts b/packages/feedback/src/core/components/Actor.css.ts index 9a5984353793..8cac1a677d5c 100644 --- a/packages/feedback/src/core/components/Actor.css.ts +++ b/packages/feedback/src/core/components/Actor.css.ts @@ -25,6 +25,7 @@ export function createActorStyles(): HTMLStyleElement { cursor: pointer; font-weight: 600; font-family: inherit; + font-size: var(--font-size); padding: 12px 16px; text-decoration: none; z-index: 9000; diff --git a/packages/feedback/src/modal/components/Dialog.css.ts b/packages/feedback/src/modal/components/Dialog.css.ts index d2e8f4d608fe..3dc6419e006f 100644 --- a/packages/feedback/src/modal/components/Dialog.css.ts +++ b/packages/feedback/src/modal/components/Dialog.css.ts @@ -156,6 +156,7 @@ export function createDialogStyles(): HTMLStyleElement { font-weight: 600; padding: 6px 16px; font-family: inherit; + font-size: var(--font-size); } .btn[disabled] { opacity: 0.6; From c5ccf53777879fa1851334929ec09d26d87f7255 Mon Sep 17 00:00:00 2001 From: Catherine Lee <55311782+c298lee@users.noreply.github.com> Date: Thu, 4 Apr 2024 18:54:58 -0400 Subject: [PATCH 5/5] rearrange --- packages/feedback/src/core/components/Actor.css.ts | 2 +- packages/feedback/src/modal/components/Dialog.css.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/feedback/src/core/components/Actor.css.ts b/packages/feedback/src/core/components/Actor.css.ts index 8cac1a677d5c..de295e9fc1f4 100644 --- a/packages/feedback/src/core/components/Actor.css.ts +++ b/packages/feedback/src/core/components/Actor.css.ts @@ -23,9 +23,9 @@ export function createActorStyles(): HTMLStyleElement { border-radius: var(--border-radius); cursor: pointer; - font-weight: 600; font-family: inherit; font-size: var(--font-size); + font-weight: 600; padding: 12px 16px; text-decoration: none; z-index: 9000; diff --git a/packages/feedback/src/modal/components/Dialog.css.ts b/packages/feedback/src/modal/components/Dialog.css.ts index 3dc6419e006f..9a8e3dc8aa68 100644 --- a/packages/feedback/src/modal/components/Dialog.css.ts +++ b/packages/feedback/src/modal/components/Dialog.css.ts @@ -153,10 +153,10 @@ export function createDialogStyles(): HTMLStyleElement { border: var(--cancel-border); border-radius: var(--form-content-border-radius); cursor: pointer; - font-weight: 600; - padding: 6px 16px; font-family: inherit; font-size: var(--font-size); + font-weight: 600; + padding: 6px 16px; } .btn[disabled] { opacity: 0.6;