diff --git a/package-lock.json b/package-lock.json index aee170d..9f949ec 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,6 +20,7 @@ "react-dom": "^18.2.0", "react-query": "^3.39.3", "react-simple-code-editor": "^0.13.1", + "tailwind-merge": "^2.0.0", "tailwindcss": "3.3.3", "zustand": "^4.4.1" }, @@ -4824,6 +4825,18 @@ "url": "https://opencollective.com/unts" } }, + "node_modules/tailwind-merge": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.0.0.tgz", + "integrity": "sha512-WO8qghn9yhsldLSg80au+3/gY9E4hFxIvQ3qOmlpXnqpDKoMruKfi/56BbbMg6fHTQJ9QD3cc79PoWqlaQE4rw==", + "dependencies": { + "@babel/runtime": "^7.23.1" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/dcastil" + } + }, "node_modules/tailwindcss": { "version": "3.3.3", "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.3.3.tgz", diff --git a/package.json b/package.json index 7efbeb1..d0a51b3 100644 --- a/package.json +++ b/package.json @@ -21,6 +21,7 @@ "react-dom": "^18.2.0", "react-query": "^3.39.3", "react-simple-code-editor": "^0.13.1", + "tailwind-merge": "^2.0.0", "tailwindcss": "3.3.3", "zustand": "^4.4.1" }, @@ -42,6 +43,4 @@ "printWidth": 120, "tabWidth": 4 } - - } diff --git a/src/app/components/Container.tsx b/src/app/components/Container.tsx index 39b0d93..b9c60c4 100644 --- a/src/app/components/Container.tsx +++ b/src/app/components/Container.tsx @@ -1,15 +1,17 @@ +import { twMerge } from 'tailwind-merge'; + interface ContainerTypes { className?: string; children: React.JSX.Element[] | React.JSX.Element; } const Container = ({ children, className }: ContainerTypes) => { - const classesName = `${className} flex-auto flex flex-col flex-initial - bg-gray-400 px-5 py-3 h-5/6 - rounded-lg bg-opacity-20 - backdrop-blur-lg - hover:shadow-lg hover:shadow-blue-950`; + const classesName = twMerge('min-h-full', className); return
No examples registered
+ No examples added