diff --git a/packages/web/app/components/activity-feed/ascents-feed.tsx b/packages/web/app/components/activity-feed/ascents-feed.tsx index 8916a72a2..3ad900ee7 100644 --- a/packages/web/app/components/activity-feed/ascents-feed.tsx +++ b/packages/web/app/components/activity-feed/ascents-feed.tsx @@ -69,10 +69,10 @@ const getGroupStatusSummary = (group: GroupedAscentFeedItem): { text: string; ic let color: string; if (group.flashCount > 0) { icon = ; - color = 'gold'; + color = 'default'; } else if (group.sendCount > 0) { icon = ; - color = 'green'; + color = 'default'; } else { icon = ; color = 'default'; diff --git a/packages/web/app/components/climb-actions/actions/tick-action.tsx b/packages/web/app/components/climb-actions/actions/tick-action.tsx index 5eedbd343..ae78d3dd0 100644 --- a/packages/web/app/components/climb-actions/actions/tick-action.tsx +++ b/packages/web/app/components/climb-actions/actions/tick-action.tsx @@ -42,7 +42,6 @@ export function TickAction({ ); }, [logbook, climb, angle]); - const hasSuccessfulAscent = filteredLogbook.some((asc) => asc.is_ascent); const badgeCount = filteredLogbook.length; const handleClick = useCallback((e?: React.MouseEvent) => { @@ -91,7 +90,7 @@ export function TickAction({ const iconSize = size === 'small' ? 14 : size === 'large' ? 20 : 16; const icon = ; - const badgeColor = hasSuccessfulAscent ? 'cyan' : 'red'; + const badgeColor = themeTokens.neutral[400]; const drawers = ( <> diff --git a/packages/web/app/components/logbook/logbook-section.tsx b/packages/web/app/components/logbook/logbook-section.tsx index e06ddd391..5a9c0c393 100644 --- a/packages/web/app/components/logbook/logbook-section.tsx +++ b/packages/web/app/components/logbook/logbook-section.tsx @@ -66,7 +66,7 @@ export const LogbookSection: React.FC = ({ climb }) => { {summary.totalAttempts} attempt{summary.totalAttempts !== 1 ? 's' : ''} in {summary.sessionCount} session{summary.sessionCount !== 1 ? 's' : ''} {summary.successfulAscents > 0 && ( - } color="success"> + } color="default"> {summary.successfulAscents} send{summary.successfulAscents !== 1 ? 's' : ''} )} diff --git a/packages/web/app/components/logbook/logbook-view.tsx b/packages/web/app/components/logbook/logbook-view.tsx index 8b836cc97..9478ba8ab 100644 --- a/packages/web/app/components/logbook/logbook-view.tsx +++ b/packages/web/app/components/logbook/logbook-view.tsx @@ -3,6 +3,7 @@ import { Card, Rate, Tag, Typography, Space, Flex, Empty } from 'antd'; import { CheckOutlined, CloseOutlined } from '@ant-design/icons'; import { Climb } from '@/app/lib/types'; import { useBoardProvider } from '../board-provider/board-provider-context'; +import { themeTokens } from '@/app/theme/theme-config'; import dayjs from 'dayjs'; const { Text } = Typography; @@ -41,9 +42,9 @@ export const LogbookView: React.FC = ({ currentClimb }) => { <> {ascent.angle}° {ascent.is_ascent ? ( - + ) : ( - + )} )} diff --git a/packages/web/app/components/logbook/tick-button.tsx b/packages/web/app/components/logbook/tick-button.tsx index 45cf04e4b..813635641 100644 --- a/packages/web/app/components/logbook/tick-button.tsx +++ b/packages/web/app/components/logbook/tick-button.tsx @@ -8,6 +8,7 @@ import { track } from '@vercel/analytics'; import { LogAscentDrawer } from './log-ascent-drawer'; import AuthModal from '../auth/auth-modal'; import { constructClimbInfoUrl } from '@/app/lib/url-utils'; +import { themeTokens } from '@/app/theme/theme-config'; const { Text, Paragraph } = Typography; @@ -43,7 +44,6 @@ export const TickButton: React.FC = ({ currentClimb, angle, boa () => logbook.filter((asc) => asc.climb_uuid === currentClimb?.uuid && Number(asc.angle) === angle), [logbook, currentClimb?.uuid, angle], ); - const hasSuccessfulAscent = filteredLogbook.some((asc) => asc.is_ascent); const badgeCount = filteredLogbook.length; return ( @@ -52,7 +52,7 @@ export const TickButton: React.FC = ({ currentClimb, angle, boa count={badgeCount > 0 ? badgeCount : 0} overflowCount={100} showZero={false} - color={hasSuccessfulAscent ? 'cyan' : 'red'} + color={themeTokens.neutral[400]} >