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

Fix buttons in apps, Fix checkbox in the grid #4568

Merged
merged 2 commits into from
Dec 28, 2023
Merged

Fix buttons in apps, Fix checkbox in the grid #4568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7653bdf
Fix apps colors, fix grid checkbox
andrzejewsky Dec 22, 2023
6b935d7
Fix apps colors, fix grid checkbox
andrzejewsky Dec 22, 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
5 changes: 5 additions & 0 deletions .changeset/selfish-pets-hammer.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"saleor-dashboard": patch
---

Fix apps colors, fix grid checkbox
7 changes: 6 additions & 1 deletion src/apps/components/InstalledAppListRow/InstalledAppListRow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,12 @@ export const InstalledAppListRow: React.FC<InstalledApp> = props => {
{`v${app.version}`}
</Text>
{isExternal && (
<Chip data-test-id="app-external-label" size="large">
<Chip
data-test-id="app-external-label"
size="large"
backgroundColor="default1"
borderColor="default1"
>
<Text variant="caption" size="small">
<FormattedMessage {...appsMessages.externalApp} />
</Text>
Expand Down
7 changes: 6 additions & 1 deletion src/apps/components/NotInstalledAppListRow/NotInstalledAppListRow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,12 @@ export const NotInstalledAppListRow: React.FC<AppInstallation> = props => {
<AppAvatar logo={logo} />
<Text variant="bodyStrong">{appInstallation.appName}</Text>
{isExternal && (
<Chip data-test-id="app-external-label" size="large">
<Chip
data-test-id="app-external-label"
size="large"
backgroundColor="default1"
borderColor="default1"
>
<Text variant="caption" size="small">
<FormattedMessage {...appsMessages.externalApp} />
</Text>
Expand Down
8 changes: 7 additions & 1 deletion src/components/Datagrid/Datagrid.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,13 @@ export const Datagrid: React.FC<DatagridProps> = ({
}

const overrideTheme: Partial<Theme> = {
bgCell: themeValues.colors.background.default1Hovered,
/*
Grid-specific colors. Transparency matters when we highlight entire row.
*/
bgCell:
theme === "defaultLight"
? "hsla(220, 18%, 97%, 1)"
: "hsla(211, 32%, 19%, 1)",
bgCellMedium: themeValues.colors.background.default1Hovered,
};

Expand Down
Loading