diff --git a/packages/web/components/patterns/HighlightBar.tsx b/packages/web/components/patterns/HighlightBar.tsx index b454cade3..f1129e089 100644 --- a/packages/web/components/patterns/HighlightBar.tsx +++ b/packages/web/components/patterns/HighlightBar.tsx @@ -27,12 +27,12 @@ type HighlightBarProps = { anchorCoordinates: PageCoordinates isNewHighlight: boolean isSharedToFeed: boolean - isTouchscreenDevice: boolean + displayNearCursor: boolean handleButtonClick: (action: HighlightAction) => void } export function HighlightBar(props: HighlightBarProps): JSX.Element { - if (props.isTouchscreenDevice) { + if (!props.displayNearCursor) { return ( - - css= - {{ - width: '350px', - background: '$grayBg', - borderRadius: '4px', - border: '1px solid $grayBorder', - boxShadow: '$cardBoxShadow', - }} - - - + + ) } } @@ -94,7 +93,7 @@ function BarContent(props: HighlightBarProps): JSX.Element { css={{ height: '100%', alignItems: 'center', - width: props.isTouchscreenDevice ? '100%' : 'auto', + width: props.displayNearCursor ? 'auto' : '100%', }} > {props.isNewHighlight ? ( diff --git a/packages/web/components/patterns/HighlightView.tsx b/packages/web/components/patterns/HighlightView.tsx index 5ada52dd4..6e69f9842 100644 --- a/packages/web/components/patterns/HighlightView.tsx +++ b/packages/web/components/patterns/HighlightView.tsx @@ -33,7 +33,7 @@ export function HighlightView(props: HighlightViewProps): JSX.Element { } }}> {props.highlight.prefix} - + {lines.map((line: string, index: number) => ( {line} diff --git a/packages/web/components/patterns/LibraryCards/HighlightItemCard.tsx b/packages/web/components/patterns/LibraryCards/HighlightItemCard.tsx index d493d8fd6..b290a68dd 100644 --- a/packages/web/components/patterns/LibraryCards/HighlightItemCard.tsx +++ b/packages/web/components/patterns/LibraryCards/HighlightItemCard.tsx @@ -48,7 +48,7 @@ export function HighlightItemCard(props: HighlightItemCardProps): JSX.Element { > ) diff --git a/packages/web/components/tokens/stitches.config.ts b/packages/web/components/tokens/stitches.config.ts index 2fcf45ce5..9bc77b0a2 100644 --- a/packages/web/components/tokens/stitches.config.ts +++ b/packages/web/components/tokens/stitches.config.ts @@ -129,7 +129,7 @@ export const { styled, css, theme, getCssText, globalCss, keyframes, config } = grayProgressBackground: '#FFFFFF', // Semantic Colors - highlightBackground: 'rgba(255, 210, 52, 0.65)', + highlightBackground: '250, 227, 146', highlight: '#FFD234', highlightText: '#3D3D3D', error: '#FA5E4A', @@ -202,7 +202,7 @@ const darkThemeSpec = { grayProgressBackground: '#616161', // Semantic Colors - highlightBackground: '#867740', + highlightBackground: '134, 119, 64', highlight: '#FFD234', highlightText: 'white', error: '#FA5E4A', @@ -263,7 +263,7 @@ export const globalStyles = globalCss({ // browser prefers this loaded here vs in the article styling css '.article-inner-css': { '::selection': { - background: '$highlightBackground', + background: 'rgb($highlightBackground)', }, }, }) diff --git a/packages/web/styles/articleInnerStyling.css b/packages/web/styles/articleInnerStyling.css index 7b9681644..9e2c463db 100644 --- a/packages/web/styles/articleInnerStyling.css +++ b/packages/web/styles/articleInnerStyling.css @@ -13,13 +13,14 @@ .highlight { color: var(--colors-highlightText); - background-color: var(--colors-highlightBackground); + background-color: rgb(var(--colors-highlightBackground)); cursor: pointer; } .highlight_with_note { color: var(--colors-highlightText); - border-bottom: 2px var(--colors-highlightBackground) solid; + background-color: rgba(var(--colors-highlightBackground), 0.35); + border-bottom: 2px rgb(var(--colors-highlightBackground)) solid; border-radius: 2px; cursor: pointer; }