Skip to content
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

darkMode Fixes #1800

Merged
merged 6 commits into from
Oct 16, 2023
Merged

darkMode Fixes #1800

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7c018d9
darkMode Fixes
carkom Oct 15, 2023
7b7a6ed
notes
carkom Oct 15, 2023
7fbb551
AutoComplete Colors
carkom Oct 15, 2023
7a7c993
Sync button fix
carkom Oct 15, 2023
7ad5688
Merge branch 'master' into darkFixes
carkom Oct 15, 2023
7cc282c
dark color changes
carkom Oct 16, 2023
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
6 changes: 5 additions & 1 deletion packages/desktop-client/src/components/LoggedInUser.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,11 @@ export default function LoggedInUser({

return (
<View style={{ flexDirection: 'row', alignItems: 'center', ...style }}>
<Button type="bare" onClick={() => setMenuOpen(true)} style={{ color }}>
<Button
type="bare"
onClick={() => setMenuOpen(true)}
style={color && { color }}
>
{serverMessage()}
</Button>

Expand Down
2 changes: 1 addition & 1 deletion packages/desktop-client/src/components/Titlebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ export function SyncButton({ style, isMobile = false }: SyncButtonProps) {
syncState === 'offline' ||
syncState === 'local'
? theme.altTableText
: null;
: 'inherit';

const activeStyle = isMobile
? {
Expand Down
4 changes: 2 additions & 2 deletions packages/desktop-client/src/components/autocomplete/Autocomplete.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,8 +504,8 @@ function SingleAutocomplete({
offset={2}
style={{
padding: 0,
backgroundColor: theme.menuItemText,
color: theme.tableBackground,
backgroundColor: theme.menuAutoCompleteBackground,
color: theme.menuAutoCompleteText,
minWidth: 200,
...tooltipStyle,
}}
Expand Down
20 changes: 11 additions & 9 deletions packages/desktop-client/src/style/themes/dark.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ export const pageBackgroundLineTop = colorPalette.purple400;
export const pageBackgroundLineMid = colorPalette.navy900;
export const pageBackgroundLineBottom = colorPalette.navy150;
export const pageText = colorPalette.navy150;
export const pageTextLight = pageText;
export const pageTextLight = colorPalette.navy300;
export const pageTextSubdued = colorPalette.navy500;
export const altpageTextSubdued = pageTextSubdued;
export const pageTextDark = colorPalette.navy800;
export const pageTextDark = colorPalette.navy100;
export const pageTextPositive = colorPalette.purple200;
export const pageTextLink = colorPalette.purple400;
export const altPageTextLink = pageTextLink;
Expand Down Expand Up @@ -78,7 +78,7 @@ export const altMenuBackground = colorPalette.navy700;
export const alt2MenuBackground = altMenuBackground;
export const altMenuItemBackground = colorPalette.navy700;
export const altMenuItemBackgroundHover = colorPalette.navy600;
export const alt2MenuItemBackgroundHover = altMenuItemBackgroundHover;
export const alt2MenuItemBackgroundHover = colorPalette.navy300;
export const altMenuItemText = colorPalette.navy150;
export const alt2MenuItemText = altMenuItemText;
export const altMenuItemTextHover = colorPalette.navy150;
Expand All @@ -87,6 +87,8 @@ export const altMenuItemTextHeader = colorPalette.purple500;
export const alt2MenuItemTextHeader = altMenuItemTextHeader;
export const altMenuBorder = colorPalette.navy200;
export const altMenuBorderHover = colorPalette.purple400;
export const menuAutoCompleteBackground = colorPalette.navy400;
export const menuAutoCompleteText = colorPalette.navy900;

export const mobileNavBackground = colorPalette.navy800;
export const mobileNavItem = colorPalette.navy150;
Expand Down Expand Up @@ -154,11 +156,11 @@ export const buttonBareDisabledText = buttonNormalDisabledText;
export const buttonBareDisabledBackground = buttonBareBackground;

export const noticeBackground = colorPalette.green800;
export const noticeBackgroundLight = noticeBackground;
export const noticeBackgroundDark = noticeBackground;
export const noticeBackgroundLight = colorPalette.green900;
export const noticeBackgroundDark = colorPalette.green500;
export const noticeText = colorPalette.green300;
export const noticeTextLight = noticeText;
export const noticeTextDark = noticeText;
export const noticeTextLight = colorPalette.green500;
export const noticeTextDark = colorPalette.green150;
export const noticeTextMenu = colorPalette.green500;
export const noticeBorder = colorPalette.green800;
export const warningBackground = colorPalette.orange800;
Expand All @@ -174,8 +176,8 @@ export const errorText = colorPalette.red200;
export const altErrorText = errorText;
export const alt2ErrorText = errorText;
export const errorAccent = colorPalette.red500;
export const upcomingBackground = tableBackground;
export const upcomingText = tableTextInactive;
export const upcomingBackground = colorPalette.purple700;
export const upcomingText = colorPalette.purple100;
export const altUpcomingText = upcomingText;
export const upcomingAccent = tableBorder;

Expand Down
2 changes: 2 additions & 0 deletions packages/desktop-client/src/style/themes/development.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@ export const altMenuItemTextHeader = colorPalette.purple500;
export const alt2MenuItemTextHeader = colorPalette.orange150;
export const altMenuBorder = colorPalette.navy200;
export const altMenuBorderHover = colorPalette.purple400;
export const menuAutoCompleteBackground = colorPalette.navy900;
export const menuAutoCompleteText = colorPalette.white;

export const mobileNavBackground = colorPalette.white;
export const mobileNavItem = colorPalette.gray300;
Expand Down
2 changes: 2 additions & 0 deletions packages/desktop-client/src/style/themes/light.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,8 @@ export const altMenuItemTextHeader = colorPalette.navy400;
export const alt2MenuItemTextHeader = colorPalette.orange150;
export const altMenuBorder = colorPalette.blue700;
export const altMenuBorderHover = colorPalette.purple300;
export const menuAutoCompleteBackground = colorPalette.navy900;
export const menuAutoCompleteText = colorPalette.white;

export const mobileNavBackground = colorPalette.white;
export const mobileNavItem = colorPalette.gray300;
Expand Down
5 changes: 5 additions & 0 deletions upcoming-release-notes/1800.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
category: Enhancements
authors: [carkom]
---
Fixes dark mode issues: server status color, and upcoming pill on schedules page
Loading