Skip to content

fix(feedback): Improve feedback border color in dark-mode, and prevent auto-dark mode when a theme is picked #12126

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 21, 2024
Merged

fix(feedback): Improve feedback border color in dark-mode, and prevent auto-dark mode when a theme is picked #12126

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1930ff8
fix(feedback): Improve feedback border color in dark-mode, and preven…
ryan953 May 20, 2024
79a405e
Update createMainStyles.ts
ryan953 May 21, 2024
1aaa2ba
Merge branch 'develop' into ryan953/fix-feedback-border-color
ryan953 May 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion packages/feedback/src/core/createMainStyles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const DEFAULT_DARK: InternalTheme = {
accentBackground: PURPLE,
successColor: '#2da98c',
errorColor: '#f55459',
border: '1.5px solid rgba(41, 35, 47, 0.5)',
border: '1.5px solid rgba(235, 230, 239, 0.15)',
boxShadow: '0px 4px 24px 0px rgba(43, 34, 51, 0.12)',
outline: '1px auto var(--accent-background)',
interactiveFilter: 'brightness(150%)',
Expand Down Expand Up @@ -66,6 +66,8 @@ export function createMainStyles({ colorScheme, themeDark, themeLight }: Feedbac
font-family: var(--font-family);
font-size: var(--font-size);

${colorScheme !== 'system' ? 'color-scheme: only light;' : ''}

${getThemedCssVariables(
colorScheme === 'dark' ? { ...DEFAULT_DARK, ...themeDark } : { ...DEFAULT_LIGHT, ...themeLight },
)}
Expand Down