Skip to content

Commit

Permalink
Merge branch 'main' of github.com:nextui-org/nextui into canary
Browse files Browse the repository at this point in the history
  • Loading branch information
jrgarciadev committed Jul 17, 2024
2 parents e968f54 + 8c74f31 commit 0071ec2
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 2 deletions.
2 changes: 1 addition & 1 deletion apps/docs/components/marketing/custom-themes/styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export const shopCartStyles = tv({
"!ease-soft-spring",
"!duration-300",
],
contentWrapper: "flex flex-col justify-center transition-all h-full h-[200px]",
contentWrapper: "flex flex-col justify-center transition-all h-full min-h-[200px]",
title: ["relative", "w-full", "flex-none", "text-xl", "font-semibold", "text-foreground"],
description: ["my-2", "w-full", "text-base", "text-default-500"],
price: "relative text-lg font-semibold text-foreground",
Expand Down
6 changes: 6 additions & 0 deletions apps/docs/content/docs/guide/cli.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,12 @@ Tailwind CSS settings have been updated in: /project-path/tailwind.config.js

## upgrade

Upgrade all the NextUI components within your project.

```codeBlock bash
nextui upgrade --all
```

Upgrade specific NextUI components within your project using the upgrade command to ensure they are up to date.

```codeBlock bash
Expand Down
1 change: 0 additions & 1 deletion apps/docs/styles/globals.css
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ html {

body {
min-height: 100vh;
position: relative;
}
/* Experimental */
/* body::after {
Expand Down

0 comments on commit 0071ec2

Please sign in to comment.