Skip to content

Commit 0fd821f

Browse files
[dashboard] fix toast contrast (#20630)
* [dashboard] fix toast contrast Tool: gitpod/catfood.gitpod.cloud * driveby: less `isGitpodIo` Tool: gitpod/catfood.gitpod.cloud * Align colors with info alert Tool: gitpod/catfood.gitpod.cloud
1 parent 56376cf commit 0fd821f

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

components/dashboard/src/components/toasts/Toast.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,25 +71,25 @@ export const Toast: FC<Props> = ({ id, message, duration = 5000, autoHide = true
7171
"relative flex justify-between items-start",
7272
"w-full md:w-112 max-w-full",
7373
"p-4 md:rounded-md",
74-
"bg-gray-800 dark:bg-gray-50",
75-
"text-white dark:text-gray-800",
74+
"dark:bg-gray-100 bg-gray-700",
75+
"dark:text-gray-500 text-gray-300", // colors taken from src/components/Alert.tsx "info" variant
7676
"transition-transform animate-toast-in-right",
7777
)}
7878
onMouseEnter={onMouseEnter}
7979
onMouseLeave={onMouseLeave}
8080
role="alert"
8181
aria-labelledby={elId}
8282
>
83-
<div className="flex-grow text-white dark:text-gray-800" id={elId}>
84-
{typeof message === "string" ? <p>{message}</p> : message}
83+
<div className="flex-grow" id={elId}>
84+
{typeof message === "string" ? <span>{message}</span> : message}
8585
</div>
8686
<div>
8787
<Button
8888
variant="ghost"
8989
// TODO: Determine if we can lift this button style into a variant
9090
className={cn(
9191
"p-2 ml-2 -mt-1",
92-
"text-white hover:text-gray-300 dark:text-gray-800 dark:hover:text-gray-600",
92+
"text-pk-content-invert-primary hover:text-pk-content-invert-secondary",
9393
)}
9494
onClick={handleRemove}
9595
>

components/dashboard/src/teams/TeamPolicies.tsx

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
* See License.AGPL.txt in the project root for license information.
55
*/
66

7-
import { isGitpodIo } from "../utils";
87
import { OrganizationSettings } from "@gitpod/public-api/lib/gitpod/v1/organization_pb";
98
import { FormEvent, useCallback, useEffect, useState } from "react";
109
import Alert from "../components/Alert";
@@ -32,6 +31,7 @@ import { EditorOptions } from "./policies/EditorOptions";
3231
import { RolePermissionsRestrictions } from "./policies/RoleRestrictions";
3332
import { OrgWorkspaceClassesOptions } from "./policies/OrgWorkspaceClassesOptions";
3433
import { useDefaultOrgTimeoutQuery } from "../data/organizations/default-org-timeout-query";
34+
import { useInstallationConfiguration } from "../data/installation/installation-config-query";
3535

3636
export default function TeamPoliciesPage() {
3737
useDocumentTitle("Organization Settings - Policies");
@@ -42,6 +42,9 @@ export default function TeamPoliciesPage() {
4242
const { data: settings, isLoading } = useOrgSettingsQuery();
4343
const updateTeamSettings = useUpdateOrgSettingsMutation();
4444

45+
const { data: installationConfig } = useInstallationConfiguration();
46+
const isDedicatedInstallation = installationConfig?.isDedicatedInstallation ?? true; // we bias towards being on dedicated so the callout doesn't show when we're not sure
47+
4548
const billingMode = useOrgBillingMode();
4649
const [workspaceTimeout, setWorkspaceTimeout] = useState<string | undefined>(undefined);
4750
const [allowTimeoutChangeByMembers, setAllowTimeoutChangeByMembers] = useState<boolean | undefined>(undefined);
@@ -210,7 +213,7 @@ export default function TeamPoliciesPage() {
210213
handleUpdateTeamSettings={handleUpdateTeamSettings}
211214
/>
212215

213-
{isGitpodIo() && <WorkspaceClassesEnterpriseCallout />}
216+
{!isDedicatedInstallation && <WorkspaceClassesEnterpriseCallout />}
214217

215218
<EditorOptions
216219
isOwner={isOwner}

0 commit comments

Comments
 (0)