Skip to content

Commit

Permalink
Puffer Branding (#3)
Browse files Browse the repository at this point in the history
  • Loading branch information
indaviande authored and clmntsnr committed Jan 7, 2025
1 parent 9126dda commit 1797e06
Show file tree
Hide file tree
Showing 32 changed files with 79 additions and 87 deletions.
30 changes: 16 additions & 14 deletions merkl.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,13 @@ import { eip712WalletActions } from "viem/zksync";
import { walletConnect } from "wagmi/connectors";

export default createConfig({
appName: "Merkl",
modes: ["dark", "light"],
defaultTheme: "ignite",
opportunityNavigationMode: "supply",
appName: "Puffer",
modes: ["light"],
defaultTheme: "puffer",
deposit: false,
tags: ["puffer"],
opportunityNavigationMode: "direct",
rewardsNavigationMode: "chain",
tokenSymbolPriority: ["ZK", "USDC", "USDC.e", "ETH", "WETH", "WBTC", "wstETH", "USDT", "USDe", "weETH", "DAI"],
rewardsNavigationMode: "chain",
opportunityLibrary: {
Expand Down Expand Up @@ -112,7 +115,7 @@ export default createConfig({
},
themes: {
ignite: {
base: createColoring(["#1755F4", "#FF7900", "#0D1530"], ["#1755F4", "#FF7900", "#FFFFFF"]),
base: createColoring(["#2A35BD", "#BFFF37", "#FFFFFF"], ["#2A35BD", "#BFFF37", "#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"]),
Expand All @@ -133,7 +136,7 @@ export default createConfig({
harm: createColoring(["#d22e14", "#d22e14", "#131620"], ["#FFFFFF", "#40B66B", "white"]),
},
puffer: {
base: createColoring(["#2A35BD", "#BFFF38", "#FFFFFF"], ["#2A35BD", "#BFFF38", "#FFFFFF"]),
base: createColoring(["#2A35BD", "#BFFF37", "#FFFFFF"], ["#2A35BD", "#BFFF37", "#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"]),
Expand Down Expand Up @@ -205,13 +208,12 @@ 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: {
docs: "https://docs.merkl.xyz/",
merkl: "https://merkl.xyz/",
merklTermsConditions: "https://app.merkl.xyz/merklTerms.pdf",
merklPrivacy: "https://privacy.angle.money",
Expand Down Expand Up @@ -268,9 +270,9 @@ export default createConfig({
customStoragePrefix: "wagmi",
projectId: "26c912aadd2132cd869a5edc00aeea0f",
metadata: {
name: "Merkl Lite",
description: "Merkl Lite",
url: "https://app.merkl.xyz",
name: "Puffer",
description: "Puffer",
url: "https://app.merkl.xyz.com",
icons: [],
},
}),
Expand Down
Binary file added public/apple-touch-icon.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/favicon-96x96.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 modified public/favicon.ico
100644 → 100755
Binary file not shown.
3 changes: 3 additions & 0 deletions public/favicon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions public/site.webmanifest
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"name": "Puffer app",
"short_name": "Puffer",
"icons": [
{
"src": "/web-app-manifest-192x192.png",
"sizes": "192x192",
"type": "image/png",
"purpose": "maskable"
},
{
"src": "/web-app-manifest-512x512.png",
"sizes": "512x512",
"type": "image/png",
"purpose": "maskable"
}
],
"theme_color": "#ffffff",
"background_color": "#ffffff",
"display": "standalone"
}
Binary file added public/web-app-manifest-192x192.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/web-app-manifest-512x512.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 src/components/composite/Hero.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
import { useLocation } from "@remix-run/react";
import {
<<<<<<< HEAD
=======
Button,
>>>>>>> 0931a1c (Puffer Branding (#3))
Container,
Divider,
Group,
Expand Down
Binary file removed src/customer/assets/fonts/Obviously_Bold.otf
Binary file not shown.
Binary file removed src/customer/assets/fonts/Obviously_Bold.woff
Binary file not shown.
Binary file removed src/customer/assets/fonts/Obviously_Bold.woff2
Binary file not shown.
Binary file removed src/customer/assets/fonts/Obviously_Bold_Italic.otf
Binary file not shown.
Binary file removed src/customer/assets/fonts/Obviously_Bold_Italic.woff
Binary file not shown.
Binary file not shown.
Binary file removed src/customer/assets/fonts/Obviously_Semi.otf
Binary file not shown.
Binary file removed src/customer/assets/fonts/Obviously_Semi.woff
Binary file not shown.
Binary file removed src/customer/assets/fonts/Obviously_Semi.woff2
Binary file not shown.
Binary file removed src/customer/assets/fonts/Obviously_Semi_Italic.otf
Binary file not shown.
Binary file removed src/customer/assets/fonts/Obviously_Semi_Italic.woff
Binary file not shown.
Binary file not shown.
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 1797e06

Please sign in to comment.