Skip to content

Commit

Permalink
Merge pull request #17 from srdarkseer/new-design
Browse files Browse the repository at this point in the history
New design
  • Loading branch information
srdarkseer authored May 11, 2024
2 parents f2b15ab + 2e13b2a commit b4e572c
Show file tree
Hide file tree
Showing 14 changed files with 278 additions and 212 deletions.
Binary file added public/images/background.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/download-bg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions public/images/download-icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/form-bg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
40 changes: 40 additions & 0 deletions public/images/logo-pattern.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 9 additions & 5 deletions src/components/ui/button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,26 @@ const buttonVariants = cva(
{
variants: {
variant: {
default: "bg-primary dark:text-white text-primary-foreground hover:bg-primary/90",
default:
"bg-primary dark:text-white text-primary-foreground hover:bg-primary/90",
destructive:
"bg-destructive text-destructive-foreground hover:bg-destructive/90",
outline:
"border border-input bg-background hover:bg-accent hover:text-accent-foreground",
"border border-white bg-background hover:bg-primary hover:border-black hover:text-black",
secondary:
"bg-secondary text-secondary-foreground hover:bg-secondary/80",
ghost: "hover:bg-accent hover:text-accent-foreground",
link: "text-primary underline-offset-4 hover:underline",
whiteBg: "bg-white dark:bg-darkGreen text-primary dark:text-white hover:bg-white/80 dark:hover:bg-darkGreen/70 hover:text-black dark:hover:text-white",
clear: ""
whiteBg:
"bg-white dark:bg-darkGreen text-primary dark:text-white hover:bg-white/80 dark:hover:bg-darkGreen/70 hover:text-black dark:hover:text-white",
clear: "",
gradient1:
"bg-gradient-to-r from-primary via-primary/90 to-primary/0 transition ease-in delay-500 duration-500 hover:bg-gradient-green",
},
size: {
default: "h-12 rounded-full px-6 py-2",
sm: "h-9 rounded-full px-3",
lg: "h-14 rounded-full px-8",
lg: "h-14 w-56 rounded-full px-8",
icon: "",
},
},
Expand Down
4 changes: 2 additions & 2 deletions src/components/ui/dialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@ const DialogContent = React.forwardRef<
<DialogPrimitive.Content
ref={ref}
className={cn(
"fixed left-[50%] top-[50%] z-40 grid w-full max-w-sm sm:max-w-4xl min-h-[70vh] sm:min-h-[75vh] translate-x-[-50%] translate-y-[-50%] gap-4 bg-white dark:bg-pine sm:px-20 sm:py-12 shadow-lg rounded-lg duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] ",
"fixed left-[50%] top-[50%] z-40 grid w-full max-w-sm sm:max-w-4xl min-h-[30vh] sm:min-h-[55vh] translate-x-[-50%] translate-y-[-50%] gap-4 sm:px-20 sm:py-12 shadow-lg rounded-lg duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] ",
className
)}
{...props}
>
{children}
<DialogPrimitive.Close className="absolute -right-5 sm:-right-7 -top-10 rounded-sm ring-offset-background transition-opacity focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:pointer-events-none data-[state=open]:bg-accent data-[state=open]:text-muted-foreground">
<DialogPrimitive.Close className="absolute right-7 top-6 rounded-sm ring-offset-background transition-opacity focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:pointer-events-none data-[state=open]:bg-accent data-[state=open]:text-muted-foreground">
<X className="h-7 w-7 text-white" />
<span className="sr-only">Close</span>
</DialogPrimitive.Close>
Expand Down
2 changes: 1 addition & 1 deletion src/components/ui/input.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const Input = React.forwardRef<HTMLInputElement, InputProps>(
<input
type={type}
className={cn(
"flex h-10 w-full rounded-md border border-gray-400 bg-white dark:bg-hunterGreen px-3 py-2 text-sm file:bg-transparent file:text-sm file:font-medium placeholder:text-muted-foreground disabled:cursor-not-allowed disabled:opacity-50",
"flex h-14 w-full rounded-md border border-gray-400 bg-slate px-3 py-2 text-sm file:bg-transparent file:text-sm file:font-medium focus:outline-primary placeholder:text-silver disabled:cursor-not-allowed disabled:opacity-50 border-none",
className
)}
ref={ref}
Expand Down
4 changes: 2 additions & 2 deletions src/layouts/MainLayout/MainLayout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ function MainLayout({ children }: any) {
</div>

<main className="pt-20">
<div className="block sm:hidden">
{/* <div className="block sm:hidden">
<Banner />
</div>
</div> */}
{children}
</main>
</>
Expand Down
14 changes: 7 additions & 7 deletions src/layouts/MainLayout/components/Topbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ const TopBar: FC = () => {

return (
<header
className={`fixed z-20 w-full transition-all duration-300 bg-gradient-to-l from-primary to-forestGreen ${
isScrolled ? "shadow-md py-3.5" : "py-4"
className={`fixed z-20 w-full transition-all duration-300 ${
isScrolled ? "shadow-md py-10" : "py-10"
}`}
>
<div className="container flex items-center justify-between">
Expand All @@ -71,9 +71,9 @@ const TopBar: FC = () => {
{/* Button Section */}
<div className="flex items-center gap-5">
<Button
variant="whiteBg"
size="default"
className="font-light"
variant="outline"
size="lg"
className="font-light text-lg"
disabled={connecting}
onClick={() => (wallet ? disconnect(wallet) : connect())}
>
Expand All @@ -83,11 +83,11 @@ const TopBar: FC = () => {
? "Disconnect"
: "Authorize with wallet"}
</Button>
<Switch
{/* <Switch
defaultChecked={true}
id="theme-mode"
onClick={toggleThemeHandler}
/>
/> */}
</div>
</div>
</header>
Expand Down
124 changes: 70 additions & 54 deletions src/styles/globals.css
Original file line number Diff line number Diff line change
@@ -1,76 +1,92 @@
@tailwind base;
@tailwind components;
@tailwind utilities;
@tailwind components;
@tailwind utilities;

@layer base {
:root {
--background: 0 0% 90%;
--foreground: 222.2 84% 4.9%;
@layer base {
:root {
--background: 0 0% 90%;
--foreground: 222.2 84% 4.9%;

--card: 0 0% 100%;
--card-foreground: 222.2 84% 4.9%;
--card: 0 0% 100%;
--card-foreground: 222.2 84% 4.9%;

--popover: 0 0% 100%;
--popover-foreground: 222.2 84% 4.9%;
--popover: 0 0% 100%;
--popover-foreground: 222.2 84% 4.9%;

--primary: 222.2 47.4% 11.2%;
--primary-foreground: 210 40% 98%;
--primary: 222.2 47.4% 11.2%;
--primary-foreground: 210 40% 98%;

--secondary: 210 40% 96.1%;
--secondary-foreground: 222.2 47.4% 11.2%;
--secondary: 210 40% 96.1%;
--secondary-foreground: 222.2 47.4% 11.2%;

--muted: 210 40% 96.1%;
--muted-foreground: 215.4 16.3% 46.9%;
--muted: 210 40% 96.1%;
--muted-foreground: 215.4 16.3% 46.9%;

--accent: 210 40% 96.1%;
--accent-foreground: 222.2 47.4% 11.2%;
--accent: 210 40% 96.1%;
--accent-foreground: 222.2 47.4% 11.2%;

--destructive: 0 84.2% 60.2%;
--destructive-foreground: 210 40% 98%;
--destructive: 0 84.2% 60.2%;
--destructive-foreground: 210 40% 98%;

--border: 214.3 31.8% 91.4%;
--input: 214.3 31.8% 91.4%;
--ring: 222.2 84% 4.9%;
--border: 214.3 31.8% 91.4%;
--input: 214.3 31.8% 91.4%;
--ring: 222.2 84% 4.9%;

--radius: 0.5rem;
}
--radius: 0.5rem;
}

.dark {
--background: 0 0% 0%;
--foreground: 210 40% 98%;
.dark {
--background: 0 0% 0%;
--foreground: 210 40% 98%;

--card: 222.2 84% 4.9%;
--card-foreground: 210 40% 98%;
--card: 222.2 84% 4.9%;
--card-foreground: 210 40% 98%;

--popover: 222.2 84% 4.9%;
--popover-foreground: 210 40% 98%;
--popover: 222.2 84% 4.9%;
--popover-foreground: 210 40% 98%;

--primary: 210 40% 98%;
--primary-foreground: 222.2 47.4% 11.2%;
--primary: 210 40% 98%;
--primary-foreground: 222.2 47.4% 11.2%;

--secondary: 217.2 32.6% 17.5%;
--secondary-foreground: 210 40% 98%;
--secondary: 217.2 32.6% 17.5%;
--secondary-foreground: 210 40% 98%;

--muted: 217.2 32.6% 17.5%;
--muted-foreground: 215 20.2% 65.1%;
--muted: 217.2 32.6% 17.5%;
--muted-foreground: 215 20.2% 65.1%;

--accent: 217.2 32.6% 17.5%;
--accent-foreground: 210 40% 98%;
--accent: 217.2 32.6% 17.5%;
--accent-foreground: 210 40% 98%;

--destructive: 0 62.8% 30.6%;
--destructive-foreground: 210 40% 98%;
--destructive: 0 62.8% 30.6%;
--destructive-foreground: 210 40% 98%;

--border: 217.2 32.6% 17.5%;
--input: 217.2 32.6% 17.5%;
--ring: 212.7 26.8% 83.9%;
}
--border: 217.2 32.6% 17.5%;
--input: 217.2 32.6% 17.5%;
--ring: 212.7 26.8% 83.9%;
}
}

@layer base {
* {
@apply border-border;
}
body {
@apply bg-background text-foreground;
}
}
@layer base {
* {
@apply border-border;
}
body {
@apply bg-background text-foreground;
}
/* Ensure this style is placed in a CSS file that is loaded into your HTML document */
.gradient-text {
font-size: 48px; /* Example size; adjust as needed */
font-weight: bold; /* Bold text shows gradients better */
background: linear-gradient(
45deg,
#00523d 0%,
/* Green at 0% */ #000000 50%,
/* Transition to black by 50% */ #00523d 100% /* Back to green at 100% */
);
-webkit-background-clip: text;
background-clip: text;
-webkit-text-fill-color: transparent;
text-fill-color: transparent; /* Standard property for text color transparency */
display: inline; /* Inline display to fit the content */
}
}
Loading

0 comments on commit b4e572c

Please sign in to comment.