From 8b7b556ed2b5403e0670062b4a1128c400462f04 Mon Sep 17 00:00:00 2001 From: Lewis Carhart Date: Tue, 26 Aug 2025 01:36:24 +0100 Subject: [PATCH 1/3] refactor: standardize color usage across components - Updated various components to use 'text-primary' for status indicators and icons, enhancing visual consistency. - Adjusted border colors in HostDetails and EmployeeTasks components to align with the new color scheme. - Simplified background styles in PolicyPage and status-indicator for a more cohesive design. --- .../people/[employeeId]/components/EmployeeTasks.tsx | 2 +- .../[orgId]/people/devices/components/HostDetails.tsx | 4 ++-- apps/app/src/components/status-indicator.tsx | 2 +- .../app/(app)/(home)/[orgId]/policy/[policyId]/page.tsx | 8 ++++---- packages/ui/src/components/editor/index.tsx | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/apps/app/src/app/(app)/[orgId]/people/[employeeId]/components/EmployeeTasks.tsx b/apps/app/src/app/(app)/[orgId]/people/[employeeId]/components/EmployeeTasks.tsx index c64095991..fc96b5309 100644 --- a/apps/app/src/app/(app)/[orgId]/people/[employeeId]/components/EmployeeTasks.tsx +++ b/apps/app/src/app/(app)/[orgId]/people/[employeeId]/components/EmployeeTasks.tsx @@ -131,7 +131,7 @@ export const EmployeeTasks = ({ >

{policy.name}

{policy.response === 'pass' ? ( -
+
Pass
diff --git a/apps/app/src/app/(app)/[orgId]/people/devices/components/HostDetails.tsx b/apps/app/src/app/(app)/[orgId]/people/devices/components/HostDetails.tsx index 65bca1673..d5fcfca59 100644 --- a/apps/app/src/app/(app)/[orgId]/people/devices/components/HostDetails.tsx +++ b/apps/app/src/app/(app)/[orgId]/people/devices/components/HostDetails.tsx @@ -22,12 +22,12 @@ export const HostDetails = ({ host, onClose }: { host: Host; onClose: () => void key={policy.id} className={cn( 'hover:bg-muted/50 flex items-center justify-between rounded-md border border-l-4 p-3 shadow-sm transition-colors', - policy.response === 'pass' ? 'border-l-green-500' : 'border-l-red-500', + policy.response === 'pass' ? 'border-l-primary' : 'border-l-red-500', )} >

{policy.name}

{policy.response === 'pass' ? ( -
+
Pass
diff --git a/apps/app/src/components/status-indicator.tsx b/apps/app/src/components/status-indicator.tsx index 575b8e256..f8960e20d 100644 --- a/apps/app/src/components/status-indicator.tsx +++ b/apps/app/src/components/status-indicator.tsx @@ -37,7 +37,7 @@ export const STATUS_COLORS: Record = { done: 'bg-primary', // Completed/Done - Blue - closed: 'bg-primary dark:bg-blue-400', + closed: 'bg-primary', // Neutral - Gray archived: 'bg-gray-500 dark:bg-gray-400', diff --git a/apps/portal/src/app/(app)/(home)/[orgId]/policy/[policyId]/page.tsx b/apps/portal/src/app/(app)/(home)/[orgId]/policy/[policyId]/page.tsx index b04816271..44fc2115d 100644 --- a/apps/portal/src/app/(app)/(home)/[orgId]/policy/[policyId]/page.tsx +++ b/apps/portal/src/app/(app)/(home)/[orgId]/policy/[policyId]/page.tsx @@ -63,9 +63,9 @@ export default async function PolicyPage({ {isAccepted && ( -
- - +
+ + You have accepted this policy
@@ -79,7 +79,7 @@ export default async function PolicyPage({ )} -
+
{policy.updatedAt && ( diff --git a/packages/ui/src/components/editor/index.tsx b/packages/ui/src/components/editor/index.tsx index 99940275b..cbedcc7d4 100644 --- a/packages/ui/src/components/editor/index.tsx +++ b/packages/ui/src/components/editor/index.tsx @@ -58,7 +58,7 @@ export const Editor = ({ immediatelyRender: false, editorProps: { attributes: { - class: `prose prose-lg dark:prose-invert prose-headings:font-title font-default focus:outline-hidden max-w-full ${className || ''}`, + class: `prose prose-lg prose-headings:font-title font-default focus:outline-hidden max-w-full ${className || ''}`, }, }, onUpdate: ({ editor }) => { From fb7354a6c18a5635b812aa83e97e21aad176c96b Mon Sep 17 00:00:00 2001 From: Lewis Carhart Date: Tue, 26 Aug 2025 01:42:26 +0100 Subject: [PATCH 2/3] refactor: improve styling consistency in ToDoOverview component - Adjusted spacing in the ToDoOverview component for better alignment of elements. - Standardized background color usage for task and policy completion messages to enhance visual coherence. --- .../(app)/[orgId]/frameworks/components/ToDoOverview.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/app/src/app/(app)/[orgId]/frameworks/components/ToDoOverview.tsx b/apps/app/src/app/(app)/[orgId]/frameworks/components/ToDoOverview.tsx index b888f30ba..a83c87365 100644 --- a/apps/app/src/app/(app)/[orgId]/frameworks/components/ToDoOverview.tsx +++ b/apps/app/src/app/(app)/[orgId]/frameworks/components/ToDoOverview.tsx @@ -60,7 +60,7 @@ export function ToDoOverview({ return status.replace('_', ' ').replace(/\b\w/g, (l) => l.toUpperCase()); }; - const memberRoles = currentMember?.role?.split(',').map(r => r.trim()) ?? []; + const memberRoles = currentMember?.role?.split(',').map((r) => r.trim()) ?? []; const isOwner = memberRoles.includes('owner') || false; const publishPolicies = useAction(publishAllPoliciesAction, { @@ -147,7 +147,7 @@ export function ToDoOverview({ )} {unpublishedPolicies.length === 0 ? ( -
+
All policies are published!
@@ -192,7 +192,7 @@ export function ToDoOverview({ {incompleteTasks.length === 0 ? ( -
+
All tasks are completed!
From cdd413cb69f34b69cb833a66181033a7130ab263 Mon Sep 17 00:00:00 2001 From: Lewis Carhart Date: Tue, 26 Aug 2025 01:47:45 +0100 Subject: [PATCH 3/3] refactor: standardize color usage in FrameworkOverview and TrustPortalSwitch components - Updated background colors in FrameworkOverview and TrustPortalSwitch components to use 'bg-primary' for status indicators, enhancing visual consistency across the application. - Adjusted the closed risk status color in RisksAssignee to align with the new color scheme. --- .../[frameworkInstanceId]/components/FrameworkOverview.tsx | 2 +- .../settings/trust-portal/components/TrustPortalSwitch.tsx | 2 +- apps/app/src/components/risks/charts/RisksAssignee.tsx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/app/src/app/(app)/[orgId]/frameworks/[frameworkInstanceId]/components/FrameworkOverview.tsx b/apps/app/src/app/(app)/[orgId]/frameworks/[frameworkInstanceId]/components/FrameworkOverview.tsx index 975c5384c..15fbd1da0 100644 --- a/apps/app/src/app/(app)/[orgId]/frameworks/[frameworkInstanceId]/components/FrameworkOverview.tsx +++ b/apps/app/src/app/(app)/[orgId]/frameworks/[frameworkInstanceId]/components/FrameworkOverview.tsx @@ -139,7 +139,7 @@ export function FrameworkOverview({
-
+
Complete
{compliantControls} diff --git a/apps/app/src/app/(app)/[orgId]/settings/trust-portal/components/TrustPortalSwitch.tsx b/apps/app/src/app/(app)/[orgId]/settings/trust-portal/components/TrustPortalSwitch.tsx index 0564ba678..af6ca0fcb 100644 --- a/apps/app/src/app/(app)/[orgId]/settings/trust-portal/components/TrustPortalSwitch.tsx +++ b/apps/app/src/app/(app)/[orgId]/settings/trust-portal/components/TrustPortalSwitch.tsx @@ -514,7 +514,7 @@ function ComplianceFramework({ - + Compliant diff --git a/apps/app/src/components/risks/charts/RisksAssignee.tsx b/apps/app/src/components/risks/charts/RisksAssignee.tsx index 250b2040e..a4fd9cd78 100644 --- a/apps/app/src/components/risks/charts/RisksAssignee.tsx +++ b/apps/app/src/components/risks/charts/RisksAssignee.tsx @@ -25,7 +25,7 @@ interface UserRiskStats { const riskStatusColors = { open: 'bg-yellow-500', pending: 'bg-blue-500', - closed: 'bg-green-500', + closed: 'bg-primary', archived: 'bg-gray-500', };