From 8c0a6d648a52b66c346b6e9eea0772c560305f34 Mon Sep 17 00:00:00 2001 From: Bri Date: Sat, 27 Apr 2024 12:52:49 -0400 Subject: [PATCH 1/6] updates primary and secondary button colors --- bun.lockb | Bin 322283 -> 322283 bytes src/app/(site)/create/page.tsx | 1 + src/components/ui/button.tsx | 4 ++-- src/styles/globals.css | 28 ++++++++++++++++++---------- tailwind.config.ts | 4 ++++ 5 files changed, 25 insertions(+), 12 deletions(-) diff --git a/bun.lockb b/bun.lockb index 32160b1a336e3d9e08eaa4e8f19c61e61c6fc424..34b6865b76fba6b0143cea3b2d34d962d17c1e58 100755 GIT binary patch delta 33 lcmaETRrvK);f5B*7N#xCk9F9Y7{H+Yl@9avS2`?=`vBKV3o!ry delta 33 pcmaETRrvK);f5B*7N#xCk9F7?;|%o-^o-hH=`e49rNhFw4*=;q41E9q diff --git a/src/app/(site)/create/page.tsx b/src/app/(site)/create/page.tsx index 4aa10b3..4968c8c 100644 --- a/src/app/(site)/create/page.tsx +++ b/src/app/(site)/create/page.tsx @@ -2,6 +2,7 @@ import { useState } from "react"; +// @ts-expect-error ts doesnt like the /zod path even though its valid import { zodResolver } from "@hookform/resolvers/zod"; import { Button } from "~/components/ui/button"; import { Checkbox } from "~/components/ui/checkbox"; diff --git a/src/components/ui/button.tsx b/src/components/ui/button.tsx index 1f9e57e..5ac5689 100644 --- a/src/components/ui/button.tsx +++ b/src/components/ui/button.tsx @@ -9,7 +9,7 @@ const buttonVariants = cva( { variants: { variant: { - default: "bg-primary text-primary-foreground hover:bg-primary/90", + default: "bg-primary text-primary-foreground hover:bg-primary-hover hover:text-primary-foreground-hover", destructive: "bg-destructive text-destructive-foreground hover:bg-destructive/90", success: @@ -17,7 +17,7 @@ const buttonVariants = cva( outline: "border border-input bg-background hover:bg-accent hover:text-accent-foreground", secondary: - "bg-secondary text-secondary-foreground hover:bg-secondary/80", + "bg-secondary text-secondary-foreground hover:bg-secondary-hover hover:text-secondary-hover", ghost: "hover:bg-accent hover:text-accent-foreground", link: "text-primary underline-offset-4 hover:underline", }, diff --git a/src/styles/globals.css b/src/styles/globals.css index e7799dc..2ff6d78 100644 --- a/src/styles/globals.css +++ b/src/styles/globals.css @@ -10,17 +10,21 @@ --card-foreground: 224 72% 5% /* gray-950 */; --popover: 0 0% 100% /* white */; --popover-foreground: 224 72% 5% /* gray-950 */; - --primary: 244 76% 59% /* indigo-600 */; - --primary-foreground: 226 100% 97% /* indigo-50 */; - --secondary: 220 15% 96% /* gray-100 */; - --secondary-foreground: 221 40% 11% /* gray-900 */; + --primary: 244 76% 59% /* #5247E6 */; + --primary-foreground: 228 100% 97% /* #F0F3FF */; + --primary-hover: 244 66% 48% /* 352ACD */; + --primary-foreground-hover: 0 0% 100% /* #FFFFFF */; + --secondary: 227 69% 5% /* #040816 */; + --secondary-foreground: 240 20% 99% /* #FCFCFD */; + --secondary-hover: 215 28% 17% /* #1F2937 */; + --secondary-foreground-hover: 240 20% 99% /* #FCFCFD */; --muted: 220 15% 96% /* gray-100 */; --muted-foreground: 220 9% 47% /* gray-500 */; --accent: 220 15% 96% /* gray-100 */; --accent-foreground: 221 40% 11% /* gray-900 */; --destructive: 0 85% 61% /* red-500 */; --destructive-foreground: 210 20% 99% /* gray-50 */; - --border: 220 14% 91% /* gray-200 */; + --border: 215 28% 17% /* #1F2937 */; --input: 220 14% 91% /* gray-200 */; --outline: 220 14% 91% /* gray-200 */; --ring: 244 76% 59% /* indigo-600 */; @@ -53,10 +57,14 @@ --card-foreground: 210 20% 99% /* gray-50 */; --popover: 224 72% 5% /* gray-950 */; --popover-foreground: 210 20% 99% /* gray-50 */; - --primary: 244 76% 59% /* indigo-600 */; - --primary-foreground: 226 100% 97% /* indigo-50 */; - --secondary: 215 28% 17% /* gray-800 */; - --secondary-foreground: 210 20% 99% /* gray-50 */; + --primary: 244 76% 59% /* #5247E6 */; + --primary-foreground: 228 100% 97% /* #F0F3FF */; + --primary-hover: 244 66% 48% /* 352ACD */; + --primary-foreground-hover: 0 0% 100% /* #FFFFFF */; + --secondary: 227 69% 5% /* #040816 */; + --secondary-foreground: 240 20% 99% /* #FCFCFD */; + --secondary-hover: 215 28% 17% /* #1F2937 */; + --secondary-foreground-hover: 240 20% 99% /* #FCFCFD */; --muted: 215 28% 17% /* gray-800 */; --muted-foreground: 218 11% 65% /* gray-400 */; --accent: 215 28% 17% /* gray-800 */; @@ -83,7 +91,7 @@ --nc-textarea-font-family: inherit; --nc-textarea-font-size: inherit; --nc-text-background: #111827; - --nc-hover-background: #333c4c; + --nc-hover-background: #333c4c; --nc-text-color: #d1d5db; --nc-text-color-dark: #9ca3af; --nc-primary-color: #374151; diff --git a/tailwind.config.ts b/tailwind.config.ts index 9767124..19def98 100644 --- a/tailwind.config.ts +++ b/tailwind.config.ts @@ -25,10 +25,14 @@ module.exports = { primary: { DEFAULT: "hsl(var(--primary))", foreground: "hsl(var(--primary-foreground))", + hover: "hsl(var(--primary-hover))", + "foreground-hover": "hsl(var(--primary-foreground-hover))", }, secondary: { DEFAULT: "hsl(var(--secondary))", foreground: "hsl(var(--secondary-foreground))", + hover: "hsl(var(--secondary-hover))", + "foreground-hover": "hsl(var(--secondary-foreground-hover))", }, destructive: { DEFAULT: "hsl(var(--destructive))", From 469df3040dafe1f9d3b198cd7b1728b5fa33e694 Mon Sep 17 00:00:00 2001 From: Bri Date: Sat, 27 Apr 2024 13:16:44 -0400 Subject: [PATCH 2/6] prevent scrollbar from causing jump when a dropdown is open --- src/styles/globals.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/styles/globals.css b/src/styles/globals.css index 2ff6d78..d283b8b 100644 --- a/src/styles/globals.css +++ b/src/styles/globals.css @@ -99,6 +99,10 @@ } } @layer base { + html { + margin-left: calc(100vw - 100%); + margin-right: 0; + } * { @apply border-border; } From 7526836a28783d03fc8fd1e1467f246c05a4718d Mon Sep 17 00:00:00 2001 From: Bri Date: Sun, 28 Apr 2024 12:37:48 -0400 Subject: [PATCH 3/6] bitcoin price, hero image and bounty feed styles --- .gitignore | 2 + src/app/(site)/layout.tsx | 3 +- src/app/(site)/page.tsx | 5 + src/app/layout.tsx | 2 +- src/components/bounty-feed/BountyCard.tsx | 77 ++++---- src/components/bounty-feed/BountyFeed.tsx | 11 +- src/components/hero/Hero.tsx | 38 ++++ src/components/hero/HeroImage.svg | 55 ++++++ src/components/hero/HeroImage.tsx | 207 ++++++++++++++++++++++ src/components/ui/button.tsx | 5 +- src/components/ui/icons/index.ts | 5 + src/components/ui/icons/zap.tsx | 21 +++ src/server/index.ts | 20 ++- src/store/price-store.ts | 22 +++ src/styles/globals.css | 9 +- tailwind.config.ts | 13 ++ 16 files changed, 454 insertions(+), 41 deletions(-) create mode 100644 src/components/hero/Hero.tsx create mode 100644 src/components/hero/HeroImage.svg create mode 100644 src/components/hero/HeroImage.tsx create mode 100644 src/components/ui/icons/index.ts create mode 100644 src/components/ui/icons/zap.tsx create mode 100644 src/store/price-store.ts diff --git a/.gitignore b/.gitignore index fd3dbb5..f696615 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,5 @@ yarn-error.log* # typescript *.tsbuildinfo next-env.d.ts + +certificates \ No newline at end of file diff --git a/src/app/(site)/layout.tsx b/src/app/(site)/layout.tsx index 1d36e92..0e5f9c7 100644 --- a/src/app/(site)/layout.tsx +++ b/src/app/(site)/layout.tsx @@ -1,8 +1,8 @@ import Footer from "~/components/footer/Footer"; import Header from "~/components/header/Header"; +import Hero from "~/components/hero/Hero"; import RelaySheet from "~/components/relays/RelaySheet"; - export default function RootLayout({ children, }: { @@ -16,6 +16,7 @@ export default function RootLayout({
+ {children}