Skip to content

Commit 1c286d4

Browse files
committed
Merge branch 'staging'
2 parents 3cad78e + 1949b8b commit 1c286d4

File tree

3 files changed

+42
-13
lines changed

3 files changed

+42
-13
lines changed

Diff for: chain-registry

Submodule chain-registry updated 129 files

Diff for: src/components/RouteDisplay.tsx

+18
Original file line numberDiff line numberDiff line change
@@ -331,6 +331,24 @@ const RouteDisplay: FC<Props> = ({ route }) => {
331331
].denomOut;
332332
}
333333

334+
if ("swapOut" in operation.swap) {
335+
_actions.push({
336+
type: "SWAP",
337+
sourceAsset: operation.swap.swapOut.swapOperations[0].denomIn,
338+
destinationAsset:
339+
operation.swap.swapOut.swapOperations[
340+
operation.swap.swapOut.swapOperations.length - 1
341+
].denomOut,
342+
chain: operation.swap.swapOut.swapVenue.chainID,
343+
venue: operation.swap.swapOut.swapVenue.name,
344+
});
345+
346+
asset =
347+
operation.swap.swapOut.swapOperations[
348+
operation.swap.swapOut.swapOperations.length - 1
349+
].denomOut;
350+
}
351+
334352
return;
335353
}
336354

Diff for: tailwind.config.js

+23-12
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
/* eslint-disable @typescript-eslint/no-var-requires */
2+
3+
const defaultTheme = require("tailwindcss/defaultTheme");
24
const plugin = require("tailwindcss/plugin");
35

46
/** @type {import('tailwindcss').Config} */
@@ -8,24 +10,17 @@ module.exports = {
810
"./src/components/**/*.{js,ts,jsx,tsx,mdx}",
911
"./src/app/**/*.{js,ts,jsx,tsx,mdx}",
1012
],
11-
safelist: [
12-
"bg-indigo-400/10",
13-
"text-indigo-400",
14-
"bg-blue-400/10",
15-
"text-blue-400",
16-
"bg-emerald-400/10",
17-
"text-emerald-400",
18-
"border-rose-500",
19-
"border-emerald-500",
20-
"border-l-8",
21-
],
2213
theme: {
2314
extend: {
2415
animation: {
2516
"accordion-open": `accordion-open 150ms cubic-bezier(0.87, 0, 0.13, 1)`,
2617
"accordion-closed": `accordion-closed 150ms cubic-bezier(0.87, 0, 0.13, 1)`,
2718
"collapsible-open": `collapsible-open 150ms cubic-bezier(0.87, 0, 0.13, 1)`,
2819
"collapsible-closed": `collapsible-closed 150ms cubic-bezier(0.87, 0, 0.13, 1)`,
20+
"slide-up-and-fade": `slide-up-and-fade 400ms cubic-bezier(0.16, 1, 0.3, 1)`,
21+
"slide-right-and-fade": `slide-right-and-fade 400ms cubic-bezier(0.16, 1, 0.3, 1)`,
22+
"slide-down-and-fade": `slide-down-and-fade 400ms cubic-bezier(0.16, 1, 0.3, 1)`,
23+
"slide-left-and-fade": `slide-left-and-fade 400ms cubic-bezier(0.16, 1, 0.3, 1)`,
2924
},
3025
backgroundImage: {
3126
"gradient-radial": "radial-gradient(var(--tw-gradient-stops))",
@@ -35,7 +30,7 @@ module.exports = {
3530
squiggle: "url('/squiggle.svg')",
3631
},
3732
fontFamily: {
38-
sans: ["Jost", "sans-serif"],
33+
sans: ["Jost", ...defaultTheme.fontFamily.sans],
3934
},
4035
keyframes: {
4136
"accordion-open": {
@@ -54,6 +49,22 @@ module.exports = {
5449
from: { height: "var(--radix-collapsible-content-height)" },
5550
to: { height: 0 },
5651
},
52+
"slide-up-and-fade": {
53+
from: { opacity: 0, transform: "translateY(2px)" },
54+
to: { opacity: 1, transform: "translateY(0)" },
55+
},
56+
"slide-right-and-fade": {
57+
from: { opacity: 0, transform: "translateX(-2px)" },
58+
to: { opacity: 1, transform: "translateX(0)" },
59+
},
60+
"slide-down-and-fade": {
61+
from: { opacity: 0, transform: "translateY(-2px)" },
62+
to: { opacity: 1, transform: "translateY(0)" },
63+
},
64+
"slide-left-and-fade": {
65+
from: { opacity: 0, transform: "translateX(2px)" },
66+
to: { opacity: 1, transform: "translateX(0)" },
67+
},
5768
},
5869
},
5970
},

0 commit comments

Comments
 (0)