Skip to content

Commit a1a21bf

Browse files
authored
Merge branch 'main' into saminacodes-patch-1
2 parents 315ad70 + 4745786 commit a1a21bf

File tree

30 files changed

+438
-151
lines changed

30 files changed

+438
-151
lines changed

apps/dashboard/src/@/components/blocks/SettingsCard.stories.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export const Mobile: Story = {
2828

2929
function Story() {
3030
return (
31-
<div className="min-h-screen bg-background py-6 text-foreground">
31+
<div className="min-h-dvh bg-background py-6 text-foreground">
3232
<div className="container flex max-w-[1100px] flex-col gap-10 lg:p-10">
3333
<BadgeContainer label="No Header">
3434
<SettingsCard

apps/dashboard/src/@/components/ui/button.stories.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export const AllVariants: Story = {
2020

2121
function Component() {
2222
return (
23-
<div className="flex min-h-screen flex-col gap-6 bg-background p-6 text-foreground">
23+
<div className="flex min-h-dvh flex-col gap-6 bg-background p-6 text-foreground">
2424
<Variants size="default" />
2525
<Variants size="sm" />
2626
<Variants size="icon" />

apps/dashboard/src/@/components/ui/select.stories.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ function randomName() {
3131

3232
function Component() {
3333
return (
34-
<div className="flex min-h-screen flex-col gap-10 bg-background p-6 text-foreground">
34+
<div className="flex min-h-dvh flex-col gap-10 bg-background p-6 text-foreground">
3535
<BadgeContainer label="5 items, no placeholder, no label, value filled">
3636
<SelectDemo listItems={5} selectFirst />
3737
</BadgeContainer>

apps/dashboard/src/@/styles/globals.css

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,11 @@ input:-webkit-autofill:active {
157157
transition: background-color 5000s ease-in-out 0s;
158158
}
159159

160+
.shiki,
161+
.shiki span {
162+
background-color: var(--background) !important;
163+
}
164+
160165
.dark .shiki,
161166
.dark .shiki span {
162167
color: var(--shiki-dark) !important;

apps/dashboard/src/app/(dashboard)/layout.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export default function DashboardLayout(props: {
77
}) {
88
return (
99
<ErrorProvider>
10-
<div className="flex min-h-screen flex-col bg-background">
10+
<div className="flex min-h-dvh flex-col bg-background">
1111
<div className="border-border border-b bg-muted/50">
1212
<TeamHeader />
1313
</div>

apps/dashboard/src/app/account/components/AccountHeaderUI.stories.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ function Variants(props: {
4747

4848
return (
4949
<ThirdwebProvider>
50-
<div className="flex min-h-screen flex-col gap-6 bg-gray-700 px-4 py-10">
50+
<div className="flex min-h-dvh flex-col gap-6 bg-gray-700 px-4 py-10">
5151
<BadgeContainer label="Account Loaded">
5252
<Comp
5353
teamsAndProjects={teamsAndProjectsStub}

apps/dashboard/src/app/account/layout.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export default async function AccountLayout(props: {
2020
}
2121

2222
return (
23-
<div className="flex min-h-screen flex-col bg-background">
23+
<div className="flex min-h-dvh flex-col bg-background">
2424
<div className="flex grow flex-col">
2525
<HeaderAndNav teams={teams} twAccount={account} />
2626
{props.children}

apps/dashboard/src/app/drops/[slug]/layout.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { ErrorProvider } from "contexts/error-handler";
44
export default function DashboardLayout(props: { children: React.ReactNode }) {
55
return (
66
<ErrorProvider>
7-
<div className="flex min-h-screen flex-col bg-background">
7+
<div className="flex min-h-dvh flex-col bg-background">
88
{/* <DashboardHeader /> */}
99
<div className="flex grow flex-col">{props.children}</div>
1010
<AppFooter />

apps/dashboard/src/app/login/LoginPage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ export function LoginAndOnboardingPage(props: {
4848
redirectPath: string;
4949
}) {
5050
return (
51-
<div className="relative flex min-h-screen flex-col overflow-hidden bg-background">
51+
<div className="relative flex min-h-dvh flex-col overflow-hidden bg-background">
5252
<div className="border-b bg-background">
5353
<header className="container flex w-full flex-row items-center justify-between px-6 py-4">
5454
<div className="flex shrink-0 items-center gap-3">

apps/dashboard/src/app/nebula-app/(app)/components/ChatPageContent.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ export function ChatPageContent(props: {
4343
try {
4444
const content = JSON.parse(message.content) as {
4545
session_id: string;
46-
request_id: string;
4746
data: string;
4847
type: "sign_transaction" | (string & {});
4948
};

0 commit comments

Comments
 (0)