diff --git a/web/components/home/home.tsx b/web/components/home/home.tsx
index 323a968a..8a11ed70 100644
--- a/web/components/home/home.tsx
+++ b/web/components/home/home.tsx
@@ -65,7 +65,7 @@ export function LoggedOutHome() {
className="text-2xl font-bold text-center">
Find people who share your values, not just your photos.
-
+
@@ -74,6 +74,7 @@ export function LoggedOutHome() {
+
>
);
}
diff --git a/web/components/love-page.tsx b/web/components/love-page.tsx
index 56df676a..7b8ba96f 100644
--- a/web/components/love-page.tsx
+++ b/web/components/love-page.tsx
@@ -62,7 +62,7 @@ export function LovePage(props: {
+ className="sticky top-0 hidden self-start px-2 lg:col-span-2 lg:flex sidebar-nav bg-canvas-25"
+ />
)}
@@ -100,8 +100,7 @@ export function LovePage(props: {
const Profiles = { name: 'Profiles', href: '/', icon: SolidHomeIcon };
const ProfilesHome = { name: 'Profiles', href: '/', icon: HomeIcon };
const faq = { name: 'FAQ', href: '/faq', icon: SolidQuestionIcon };
-const About = { name: 'About', href: '/about', icon: SolidQuestionIcon };
-const AboutQuestionMark = { name: 'About', href: '/about', icon: QuestionMarkCircleIcon };
+const About = { name: 'About', href: '/about', icon: QuestionMarkCircleIcon };
const Signin = { name: 'Sign in', href: '/signin', icon: UserCircleIcon };
const Notifs = {name: 'Notifs', href: `/notifications`, icon: NotificationsIcon};
const NotifsSolid = {name: 'Notifs', href: `/notifications`, icon: SolidNotificationsIcon};
@@ -138,13 +137,13 @@ const getDesktopNav = (user: User | null | undefined) => {
ProfilesHome,
Notifs,
Messages,
- AboutQuestionMark,
+ About,
faq
)
return buildArray(
// { name: 'Profiles', href: '/', icon: HomeIcon },
- AboutQuestionMark,
+ About,
faq
)
}
@@ -152,7 +151,7 @@ const getDesktopNav = (user: User | null | undefined) => {
// No sidebar when signed out
const getSidebarNavigation = (_toggleModal: () => void) => {
return buildArray(
- AboutQuestionMark,
+ About,
faq
)
}
diff --git a/web/components/markdown.tsx b/web/components/markdown.tsx
index d953b762..39e9e1cc 100644
--- a/web/components/markdown.tsx
+++ b/web/components/markdown.tsx
@@ -29,10 +29,10 @@ export default function MarkdownPage({content, filename}: Props) {
return (
-
+
+ a: ({node, children, ...props}) => {children}
}}
>{content}
diff --git a/web/components/nav/love-bottom-nav-bar.tsx b/web/components/nav/love-bottom-nav-bar.tsx
index 60ccef23..e43d46a9 100644
--- a/web/components/nav/love-bottom-nav-bar.tsx
+++ b/web/components/nav/love-bottom-nav-bar.tsx
@@ -38,7 +38,7 @@ export function BottomNavBar(props: {
}
return (
-
+
{navigationOptions.map((item) => (
-
+
track('click love profile preview')}
href={`/${user.username}`}
- className="cursor-pointer group block dark:bg-gray-800 rounded-lg overflow-hidden shadow hover:shadow-md transition-shadow duration-200 h-full"
+ className="cursor-pointer group block bg-canvas-100 rounded-lg overflow-hidden shadow hover:shadow-md transition-shadow duration-200 h-full"
>
+ className="relative h-40 w-full overflow-hidden rounded transition-all hover:scale-y-105 hover:drop-shadow">
{/*{pinned_url ? (*/}
{/*
-
+
diff --git a/web/pages/about.tsx b/web/pages/about.tsx
index dc9e7d07..ea86f5ba 100644
--- a/web/pages/about.tsx
+++ b/web/pages/about.tsx
@@ -17,7 +17,7 @@ export const AboutBlock = (props: {
export default function About() {
return (
-
+
diff --git a/web/pages/index.tsx b/web/pages/index.tsx
index f2885984..9c508ad8 100644
--- a/web/pages/index.tsx
+++ b/web/pages/index.tsx
@@ -12,7 +12,7 @@ export default function ProfilesPage() {
return (
-
+
{user ? : }
diff --git a/web/styles/globals.css b/web/styles/globals.css
index d029518d..88a5ef17 100644
--- a/web/styles/globals.css
+++ b/web/styles/globals.css
@@ -37,8 +37,9 @@
/* Background / Canvas Grey Scale */
--color-canvas-0: 255 255 255; /* white */
+ --color-canvas-25: 245 245 245;
--color-canvas-50: 245 245 245;
- --color-canvas-100: 230 230 230;
+ --color-canvas-100: 245 245 245;
--color-canvas-200: 210 210 210;
--color-canvas-300: 190 190 190;
--color-canvas-400: 160 160 160;
@@ -109,9 +110,10 @@
--color-ink-50: 17 17 17; /* #111111 */
--color-ink-0: 0 0 0; /* black */
- --color-canvas-0: 32 30 37;
- --color-canvas-50: 22 20 25;
- --color-canvas-100: 46 41 51;
+ --color-canvas-25: 0 0 0;
+ --color-canvas-0: 20 20 20;
+ --color-canvas-50: 20 20 20;
+ --color-canvas-100: 40 40 40;
--color-primary-950: 239 246 255; /* very light blue */
--color-primary-900: 219 234 254; /* light blue */
diff --git a/web/tailwind.config.js b/web/tailwind.config.js
index c7f17b4c..de2044d2 100644
--- a/web/tailwind.config.js
+++ b/web/tailwind.config.js
@@ -310,6 +310,7 @@ module.exports = {
},
canvas: {
0: 'rgb(var(--color-canvas-0) / )',
+ 25: 'rgb(var(--color-canvas-25) / )',
50: 'rgb(var(--color-canvas-50) / )',
100: 'rgb(var(--color-canvas-100) / )',
},
@@ -328,17 +329,17 @@ module.exports = {
950: 'rgb(var(--color-primary-950) / )',
},
gray: {
- 50: 'hsl(240, 40%, 98%)',
- 100: 'hsl(235, 46%, 95%)',
- 200: 'hsl(236, 33%, 90%)',
- 300: 'hsl(238, 26%, 81%)',
- 400: 'hsl(238, 19%, 68%)',
- 500: 'hsl(240, 12%, 52%)',
- 600: 'hsl(240, 16%, 40%)',
- 700: 'hsl(240, 20%, 30%)',
- 800: 'hsl(240, 30%, 22%)',
- 900: 'hsl(242, 45%, 15%)',
- 950: 'hsl(264,11%,9%)',
+ 50: 'hsl(0, 0%, 95%)',
+ 100: 'hsl(0, 0%, 90%)',
+ 200: 'hsl(0, 0%, 80%)',
+ 300: 'hsl(0, 0%, 70%)',
+ 400: 'hsl(0, 0%, 60%)',
+ 500: 'hsl(0, 0%, 50%)',
+ 600: 'hsl(0, 0%, 40%)',
+ 700: 'hsl(0, 0%, 30%)',
+ 800: 'hsl(0, 0%, 20%)',
+ 900: 'hsl(0,0%,10%)',
+ 950: 'hsl(0,0%,5%)',
},
warning: '#F0D630',
error: '#E70D3D',