Skip to content

Commit

Permalink
Puffer styles (#2)
Browse files Browse the repository at this point in the history
* bun lock

* fonts, visuals & colors pushed

* invert colors

* switch tag to soft

* change fonts & colors

* change twitter to x url

* update: dappkit

* remove: modifications

* doc: add hosting readme

* fix: typos

---------

Co-authored-by: indaviande <[email protected]>
Co-authored-by: Baptiste Guerin <[email protected]>
Co-authored-by: picodes <[email protected]>
  • Loading branch information
4 people authored Dec 4, 2024
1 parent 70a0fe0 commit 0c19ecb
Show file tree
Hide file tree
Showing 10 changed files with 71 additions and 54 deletions.
48 changes: 33 additions & 15 deletions merkl.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,31 @@ import hero from "src/customer/assets/images/hero.jpg?url";
import { eip712WalletActions } from "viem/zksync";

export default createConfig({
appName: "Merkl",
modes: ["dark"],
defaultTheme: "merkl",
appName: "Puffer",
defaultTheme: "puffer",
modes: ["light"],
themes: {
merkl: {
base: createColoring(["#1F2333", "#B8AAFD", "#131620"], ["#FCF8F5", "#B8AAFD", "white"]),
info: createColoring(["#2ABDFF", "#2ABDFF", "#131620"], ["#FFFFFF", "#40B66B", "white"]),
good: createColoring(["#40B66B", "#40B66B", "#131620"], ["#FFFFFF", "#40B66B", "white"]),
warn: createColoring(["#ff9600", "#ff9600", "#131620"], ["#FFFFFF", "#40B66B", "white"]),
harm: createColoring(["#d22e14", "#d22e14", "#131620"], ["#FFFFFF", "#40B66B", "white"]),
base: createColoring(
["#2A35BD", "#F5F9FF", "#FFFFFF"],
["#2A35BD", "#F5F9FF", "#FFFFFF"]
),
info: createColoring(
["#2ABDFF", "#2ABDFF", "#131620"],
["#FFFFFF", "#40B66B", "white"]
),
good: createColoring(
["#40B66B", "#40B66B", "#131620"],
["#FFFFFF", "#40B66B", "white"]
),
warn: createColoring(
["#ff9600", "#ff9600", "#131620"],
["#FFFFFF", "#40B66B", "white"]
),
harm: createColoring(
["#d22e14", "#d22e14", "#131620"],
["#FFFFFF", "#40B66B", "white"]
),
},
},
sizing: {
Expand Down Expand Up @@ -88,10 +103,10 @@ export default createConfig({
},
},
socials: {
discord: "",
telegram: "https://t.me/+2T0RNabX2ANkMzAx",
x: "https://x.com/zksyncignite",
github: "",
discord: "https://discord.com/invite/pufferfi",
telegram: "https://t.me/puffer_fi",
x: "https://x.com/puffer_finance",
github: "https://github.com/PufferFinance",
},
links: {
merkl: "https://merkl.xyz/",
Expand Down Expand Up @@ -133,7 +148,10 @@ export default createConfig({
],
client({ chain }) {
if (chain.id === zksync.id)
return createClient({ chain, transport: custom(window.ethereum!) }).extend(eip712WalletActions());
return createClient({
chain,
transport: custom(window.ethereum!),
}).extend(eip712WalletActions());
return createClient({ chain, transport: http() });
},
ssr: true,
Expand All @@ -143,8 +161,8 @@ export default createConfig({
customStoragePrefix: "wagmi",
projectId: "26c912aadd2132cd869a5edc00aeea0f",
metadata: {
name: "Merkl Lite",
description: "Merkl Lite",
name: "Puffer",
description: "Puffer",
url: "https://app.merkl.xyz.com",
icons: [],
},
Expand Down
8 changes: 4 additions & 4 deletions src/config/type.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@ export type MerklConfig<T extends Themes> = {
wagmi: Parameters<typeof createWagmiConfig>["0"];
appName: string;
routes: routesType;
images: {
[name: string]: string;
};
socials: {
[key: string]: string;
};
Expand All @@ -37,7 +34,10 @@ export type MerklConfig<T extends Themes> = {
};
};

export function createConfig<T extends Themes>({ wagmi, ...config }: MerklConfig<T>) {
export function createConfig<T extends Themes>({
wagmi,
...config
}: MerklConfig<T>) {
const wagmiConfig = createWagmiConfig(wagmi);

return { wagmi: wagmiConfig, ...config };
Expand Down
Binary file added src/customer/assets/fonts/Recoleta-Bold.otf
Binary file not shown.
Binary file added src/customer/assets/fonts/Recoleta-Bold.ttf
Binary file not shown.
Binary file added src/customer/assets/fonts/Recoleta-Bold.woff
Binary file not shown.
Binary file added src/customer/assets/fonts/Recoleta-Bold.woff2
Binary file not shown.
28 changes: 11 additions & 17 deletions src/customer/assets/images/customer-dark-logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 0c19ecb

Please sign in to comment.