diff --git a/packages/web/components/elements/Button.tsx b/packages/web/components/elements/Button.tsx index 8e6d2f57b..2d0fe45d3 100644 --- a/packages/web/components/elements/Button.tsx +++ b/packages/web/components/elements/Button.tsx @@ -20,7 +20,7 @@ export const Button = styled('button', { }, ctaDarkYellow: { border: 0, - fontSize: '14px', + fontSize: '16px', fontWeight: 500, fontStyle: 'normal', fontFamily: 'Inter', @@ -30,6 +30,21 @@ export const Button = styled('button', { bg: '$omnivoreCtaYellow', p: '10px 12px', }, + ctaOutlineYellow: { + boxSizing: 'border-box', + '-moz-box-sizing': 'border-box', + '-webkit-box-sizing': 'border-box', + border: '1px solid $omnivoreCtaYellow', + fontSize: '16px', + fontWeight: 500, + fontStyle: 'normal', + fontFamily: 'Inter', + borderRadius: '8px', + cursor: 'pointer', + color: '$utilityTextDefault', + bg: 'transparent', + p: '9px 12px', + }, ctaLightGray: { border: 0, fontSize: '14px', diff --git a/packages/web/components/elements/FormElements.tsx b/packages/web/components/elements/FormElements.tsx index 2c26ec6b5..67062c2e7 100644 --- a/packages/web/components/elements/FormElements.tsx +++ b/packages/web/components/elements/FormElements.tsx @@ -73,7 +73,7 @@ export function GeneralFormInput(props: FormInputProps): JSX.Element { ) } else if (props.type === 'select') { return ( - {input.options?.map((label, index) => ( ))} @@ -103,6 +103,7 @@ export function GeneralFormInput(props: FormInputProps): JSX.Element { fontSize: '16px', textIndent: '8px', marginBottom: '2px', + height: '38px', color: '$grayTextContrast', '&:focus': { outline: 'none', diff --git a/packages/web/components/elements/ModalPrimitives.tsx b/packages/web/components/elements/ModalPrimitives.tsx index b1e9083de..c3478ec46 100644 --- a/packages/web/components/elements/ModalPrimitives.tsx +++ b/packages/web/components/elements/ModalPrimitives.tsx @@ -37,7 +37,7 @@ export const ModalContent = styled(Modal, { left: '50%', transform: 'translate(-50%, -50%)', width: '90vw', - maxWidth: '600px', + maxWidth: '450px', maxHeight: '85vh', '@smDown': { maxWidth: '95%', diff --git a/packages/web/components/elements/StyledText.tsx b/packages/web/components/elements/StyledText.tsx index a7674cf39..938f174ab 100644 --- a/packages/web/components/elements/StyledText.tsx +++ b/packages/web/components/elements/StyledText.tsx @@ -45,7 +45,7 @@ const textVariants = { }, modalHeadline: { fontWeight: '500', - fontSize: '16px', + fontSize: '24px', lineHeight: '1', color: '$grayText', margin: 0, @@ -65,7 +65,7 @@ const textVariants = { shareHighlightModalAnnotation: { fontSize: '18px', lineHeight: '23.4px', - color: '$textSubtle', + color: '$utilityTextSubtle', m: 0, }, footnote: { @@ -105,7 +105,7 @@ const textVariants = { lineHeight: '22.5px', letterSpacing: '0.01em', margin: '0px', - color: '$textSubtle', + color: '$utilityTextSubtle', }, highlightTitle: { fontSize: '14px', @@ -133,9 +133,8 @@ const textVariants = { menuTitle: { pt: '0px', m: '0px', - cursor: 'default', - color: '$grayText', - fontSize: 16, + color: '$utilityTextSubtle', + fontSize: 14, fontFamily: 'inter', fontWeight: '500', lineHeight: 'unset', diff --git a/packages/web/components/patterns/FormModal.tsx b/packages/web/components/patterns/FormModal.tsx index e9d56ac4a..5f00d2765 100644 --- a/packages/web/components/patterns/FormModal.tsx +++ b/packages/web/components/patterns/FormModal.tsx @@ -8,8 +8,8 @@ import { Button } from '../elements/Button' import { StyledText } from '../elements/StyledText' import { useState } from 'react' import { FormInputProps, GeneralFormInput } from '../elements/FormElements' -import { CrossIcon } from '../elements/images/CrossIcon' import { theme } from '../tokens/stitches.config' +import { X } from 'phosphor-react' export interface FormModalProps { inputs?: FormInputProps[] @@ -30,30 +30,31 @@ export function FormModal(props: FormModalProps): JSX.Element { event.preventDefault() props.onOpenChange(false) }} - css={{ overflow: 'auto', p: '0' }} + css={{ overflow: 'auto', px: '24px' }} > - + {props.title} +
{ @@ -63,32 +64,32 @@ export function FormModal(props: FormModalProps): JSX.Element { }} > {inputs.map((input, index) => ( - - - + + 0 ? '10px' : 'unset' }}> {input.label} - - + - + ))} + diff --git a/packages/web/components/templates/homeFeed/AddLinkModal.tsx b/packages/web/components/templates/homeFeed/AddLinkModal.tsx index 02b4105ef..bba8f2d75 100644 --- a/packages/web/components/templates/homeFeed/AddLinkModal.tsx +++ b/packages/web/components/templates/homeFeed/AddLinkModal.tsx @@ -63,7 +63,7 @@ export function AddLinkModal(props: AddLinkModalProps): JSX.Element { { // remove focus from modal ;(document.activeElement as HTMLElement).blur() @@ -89,7 +89,6 @@ export function AddLinkModal(props: AddLinkModalProps): JSX.Element { /> - { diff --git a/packages/web/components/tokens/stitches.config.ts b/packages/web/components/tokens/stitches.config.ts index 0e74af7e6..cb8746211 100644 --- a/packages/web/components/tokens/stitches.config.ts +++ b/packages/web/components/tokens/stitches.config.ts @@ -114,7 +114,10 @@ export const { styled, css, theme, getCssText, globalCss, keyframes, config } = grayBorder: '#F0F0F0', grayTextContrast: '#3A3939', graySolid: '#9C9B9A', + textDefault: 'rgba(255, 255, 255, 0.8)', utilityTextDefault: '#3B3938', + utilityTextSubtle: 'rgba(255, 255, 255, 0.65)', + textNonessential: 'rgba(10, 8, 6, 0.4)', grayBgSubtle: 'hsl(0 0% 97.3%)', grayBgHover: 'hsl(0 0% 93.0%)', @@ -153,8 +156,7 @@ export const { styled, css, theme, getCssText, globalCss, keyframes, config } = tooltipIcons: '#FDFAEC', //utility - textDefault: 'rgba(10, 8, 6, 0.8)', - textSubtle: 'rgba(10, 8, 6, 0.65)', + utilityTextSubtle: 'rgba(10, 8, 6, 0.65)', textNonEssential: 'rgba(10, 8, 6, 0.4)', overlay: 'rgba(63, 62, 60, 0.2)', }, @@ -179,7 +181,9 @@ const darkThemeSpec = { grayTextContrast: '#D8D7D7', grayBorder: '#323232', graySolid: '#9C9B9A', + textDefault: 'rgba(10, 8, 6, 0.8)', utilityTextDefault: '#CDCDCD', + textNonessential: 'rgba(97, 97, 97, 1)', grayBgSubtle: 'hsl(0 0% 9.8%)', grayBgHover: 'hsl(0 0% 13.8%)', @@ -205,8 +209,7 @@ const darkThemeSpec = { avatarFont: 'rgba(255, 255, 255, 0.8)', //utility - textDefault: 'rgba(255, 255, 255, 0.8)', - textSubtle: 'rgba(255, 255, 255, 0.65)', + utilityTextSubtle: 'rgba(255, 255, 255, 0.65)', textNonEssential: 'rgba(10, 8, 6, 0.4)', overlay: 'rgba(10, 8, 6, 0.65)',