From 142d1fc4f29ac67a53f07dfc2facdc50e995b775 Mon Sep 17 00:00:00 2001 From: Jackson Harper Date: Wed, 8 Mar 2023 15:31:52 +0800 Subject: [PATCH] Update some highlights colours --- .../patterns/LibraryCards/LinkedItemCard.tsx | 4 +- .../templates/homeFeed/HighlightsLayout.tsx | 51 ++++++++++++++++--- 2 files changed, 44 insertions(+), 11 deletions(-) diff --git a/packages/web/components/patterns/LibraryCards/LinkedItemCard.tsx b/packages/web/components/patterns/LibraryCards/LinkedItemCard.tsx index a6fbb7b5b..d712be88c 100644 --- a/packages/web/components/patterns/LibraryCards/LinkedItemCard.tsx +++ b/packages/web/components/patterns/LibraryCards/LinkedItemCard.tsx @@ -5,6 +5,7 @@ import { HighlightItemCard } from './HighlightItemCard' import { PageType } from '../../../lib/networking/fragments/articleFragment' import { LibraryGridCard } from './LibraryGridCard' import { LibraryListCard } from './LibraryListCard' +import { LibraryHighlightGridCard } from './LibraryHighlightGridCard' const shouldHideUrl = (url: string): boolean => { try { @@ -37,9 +38,6 @@ export function LinkedItemCard(props: LinkedItemCardProps): JSX.Element { props.item.siteName || siteName(props.item.originalArticleUrl, props.item.url) - if (props.item.pageType === PageType.HIGHLIGHTS) { - return - } if (props.layout == 'LIST_LAYOUT') { return // return diff --git a/packages/web/components/templates/homeFeed/HighlightsLayout.tsx b/packages/web/components/templates/homeFeed/HighlightsLayout.tsx index 6f4b2b6a2..0ff1df985 100644 --- a/packages/web/components/templates/homeFeed/HighlightsLayout.tsx +++ b/packages/web/components/templates/homeFeed/HighlightsLayout.tsx @@ -24,6 +24,7 @@ import { } from '../../elements/ModalPrimitives' import { StyledText } from '../../elements/StyledText' import { MetaStyle } from '../../patterns/LibraryCards/LibraryCardStyles' +import { LibraryHighlightGridCard } from '../../patterns/LibraryCards/LibraryHighlightGridCard' import { styled, theme } from '../../tokens/stitches.config' type HighlightItemsLayoutProps = { @@ -64,7 +65,7 @@ export function HighlightItemsLayout( css={{ width: '430px', height: '100%', - bg: '#2A2A2A', + bg: '$thBackground', '@lgDown': { width: '100%', }, @@ -82,7 +83,24 @@ export function HighlightItemsLayout( alignment="center" distribution="start" > - + {/* + */} + + + {props.items.map((linkedItem) => ( {props.viewer && ( - { return dayjs(date).fromNow() } +function LibraryItemCard(props: HighlightTitleCardProps): JSX.Element { + return ( + <> + + + + + + + + ) +} + function HighlightTitleCard(props: HighlightTitleCardProps): JSX.Element { return ( HIGHLIGHTS @@ -284,7 +319,7 @@ const StyledQuote = styled(Blockquote, { margin: '0px 0px 0px 0px', fontSize: '16px', lineHeight: '1.50', - color: '#D9D9D9', + color: '$thHighContrast', paddingLeft: '15px', borderLeft: '2px solid $omnivoreCtaYellow', }) @@ -358,11 +393,11 @@ function HighlightItemCard(props: HighlightItemCardProps): JSX.Element { setIsEditing(true)} > @@ -403,7 +438,7 @@ function HighlightCountChip(props: HighlightCountChipProps): JSX.Element { minHeight: '25px', width: '47px', color: props.selected ? '#3D3D3D' : '#898989', - bg: props.selected ? '#D9D9D9' : '#3D3D3D', + bg: props.selected ? '#D9D9D9' : '$thBackground2', fontFamily: '$inter', fontSize: '14px', fontWeight: '500',