Skip to content

Commit ce9ce2c

Browse files
committed
Update colors
1 parent 48b41aa commit ce9ce2c

15 files changed

Lines changed: 61 additions & 47 deletions

web/components/answers/compatibility-questions-display.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,9 @@ export function CompatibilityAnswerBlock(props: {
452452
return (
453453
<Col
454454
data-testid="profile-compatibility-section"
455-
className={'bg-canvas-50 flex-grow gap-4 whitespace-pre-line rounded-xl p-4 leading-relaxed'}
455+
className={
456+
'bg-canvas-50 border border-canvas-200 flex-grow gap-4 whitespace-pre-line rounded-xl p-4 leading-relaxed'
457+
}
456458
>
457459
<Row
458460
className="justify-between gap-1 font-semibold"

web/components/buttons/button.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ export function buttonClass(size: SizeType, color: ColorType) {
5757
color === 'gray' &&
5858
'bg-canvas-200 text-ink-900 disabled:bg-ink-200 disabled:text-ink-500 hover:bg-canvas-300 hover:text-ink-1000',
5959
color === 'gray-outline' && [outline, 'text-ink-600 hover:bg-canvas-25'],
60-
color === 'gradient' && [gradient, 'from-primary-500 to-blue-400'],
60+
color === 'gradient' && [gradient, 'from-primary-500 to-primary-800'],
6161
color === 'gradient-pink' && [gradient, 'from-primary-500 to-fuchsia-500'],
6262
color === 'gray-white' &&
6363
'text-ink-500 hover:text-ink-900 disabled:text-ink-300 disabled:bg-transparent',

web/components/buttons/sign-up-button.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ export function GoogleButton({onClick, isLoading = false, ...props}: GoogleButto
4949
className={clsx(
5050
'w-full flex items-center justify-center gap-2 py-2 px-4 border border-gray-300',
5151
'rounded-full shadow-sm text-sm font-medium',
52-
'hover:bg-canvas-25 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500',
52+
'hover:bg-canvas-25 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-primary-500',
5353
'disabled:opacity-70 disabled:cursor-not-allowed',
5454
)}
5555
{...props}

web/components/filters/search.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ export const Search = forwardRef<
231231
setOpenBookmarks(true)
232232
})
233233
}}
234-
size={'xs'}
234+
// size={'xs'}
235235
color={'none'}
236236
className={'text-white bg-primary-500 hover:bg-primary-400 rounded-xl'}
237237
>

web/components/nav/sidebar-item.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export function SidebarItem(props: {item: Item; currentPage?: string}) {
2828
}
2929

3030
const sidebarClass = clsx(
31-
isCurrentPage ? 'bg-canvas-900 text-primary-600' : 'text-[#776f65] hover:text-primary-700',
31+
isCurrentPage ? 'bg-canvas-900 text-primary-600' : 'sidebar-text hover:text-primary-600',
3232
'group flex items-center rounded-xl px-3 py-2 text-sm font-medium',
3333
'focus-visible:bg-ink-100 outline-none transition-all',
3434
)

web/components/nav/sidebar.tsx

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import {ArrowLeftOnRectangleIcon, ArrowRightOnRectangleIcon} from '@heroicons/re
22
import clsx from 'clsx'
33
import {ANDROID_APP_URL} from 'common/constants'
44
import {buildArray} from 'common/util/array'
5-
import Image from 'next/image'
65
import Router, {useRouter} from 'next/router'
6+
import {FaGooglePlay} from 'react-icons/fa'
77
import {Button, ColorType, SizeType} from 'web/components/buttons/button'
88
import {LanguagePicker} from 'web/components/language/language-picker'
99
import {useProfile} from 'web/hooks/use-profile'
@@ -49,7 +49,7 @@ export default function Sidebar(props: {
4949
)}
5050
style={style}
5151
>
52-
<SiteLogo className={'text-white'} />
52+
<SiteLogo className={'text-black invert'} />
5353

5454
{user === undefined && <div className="h-[24px]" />}
5555

@@ -78,16 +78,23 @@ export default function Sidebar(props: {
7878
<div className="mb-[12px] mt-auto flex flex-col gap-1">
7979
<div className="h-px bg-canvas-900" />
8080
{!isAndroid && (
81-
<Image
82-
src="https://firebasestorage.googleapis.com/v0/b/compass-130ba.firebasestorage.app/o/misc%2FGoogle_Play_Store_badge_EN.svg.png?alt=media&token=3e0e8605-800a-422b-84d1-8ecec8af3e80"
83-
alt="divider"
84-
width={160}
85-
height={80}
86-
className="mx-auto pt-4 hover:opacity-70 cursor-pointer"
87-
onClick={() => router.push(ANDROID_APP_URL)}
81+
<SidebarItem
82+
item={{
83+
key: 'nav.android_app',
84+
name: 'Get it on Google Play',
85+
icon: FaGooglePlay,
86+
href: ANDROID_APP_URL,
87+
}}
88+
currentPage={currentPage}
89+
/>
90+
)}
91+
{user === null && (
92+
<LanguagePicker
93+
className={
94+
'w-fit mx-3 mt-2 pr-12 mb-2 bg-transparent border-canvas-900 sidebar-text hover:text-primary-600'
95+
}
8896
/>
8997
)}
90-
{user === null && <LanguagePicker className={'w-fit mx-3 pr-12 mb-2'} />}
9198
{bottomNavOptions.map((item) => (
9299
<SidebarItem key={item.key} item={item} currentPage={currentPage} />
93100
))}

web/components/photos-modal.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ export const ViewProfileCardButton = (props: {
7575
const username = user.username
7676
return (
7777
<>
78-
<Button onClick={() => setOpen(true)}>
78+
<Button onClick={() => setOpen(true)} className={'bg-canvas-50 '}>
7979
{t('share_profile.view_profile_card', 'View Profile Card')}
8080
</Button>
8181
<Modal open={open} setOpen={setOpen} size={'lg'} className={''}>

web/components/required-profile-form.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ export const RequiredProfileUserForm = (props: {
9494
{/*)}*/}
9595
<Col className={'gap-8 pb-[env(safe-area-inset-bottom)] w-fit'}>
9696
{(step === 0 || profileCreatedAlready) && (
97-
<Col>
97+
<Col className={'gap-2'}>
9898
<label className={clsx(labelClassName)}>
9999
{t('profile.basics.display_name', 'Display name')}
100100
</label>

web/components/searches/button.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ export function BookmarkSearchButton(props: {
3636
<Button
3737
onClick={() => setOpen(true)}
3838
color="gray-outline"
39-
size={'xs'}
39+
// size={'xs'}
4040
className={'rounded-xl bg-canvas-50'}
4141
>
4242
{t('saved_searches.button', 'Saved Searches')}
@@ -164,7 +164,7 @@ export function BookmarkStarButton(props: {
164164
<Button
165165
onClick={() => setOpen(true)}
166166
color="gray-outline"
167-
size={'xs'}
167+
// size={'xs'}
168168
className={'rounded-xl bg-canvas-50'}
169169
>
170170
👥 {t('saved_people.button', 'Saved People')}

web/components/site-logo.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export default function SiteLogo(props: {noLink?: boolean; className?: string})
88
const {noLink, className} = props
99
const inner = (
1010
<>
11-
<FavIconBlack className="dark:invert" />
11+
<FavIconBlack className={className?.includes('invert') ? '' : 'dark:invert'} />
1212
<div className={clsx('my-auto text-xl font-thin logo')}>
1313
{IS_PROD ? 'Compass' : 'Compass dev'}
1414
</div>

0 commit comments

Comments
 (0)