diff --git a/apps/design-system/app/globals.css b/apps/design-system/app/globals.css deleted file mode 100644 index f7f07cd6431..00000000000 --- a/apps/design-system/app/globals.css +++ /dev/null @@ -1,29 +0,0 @@ -@tailwind base; -@tailwind components; -@tailwind utilities; - -/* :root { - --foreground-rgb: 0, 0, 0; - --background-start-rgb: 214, 219, 220; - --background-end-rgb: 255, 255, 255; -} - -@media (prefers-color-scheme: dark) { - :root { - --foreground-rgb: 255, 255, 255; - --background-start-rgb: 0, 0, 0; - --background-end-rgb: 0, 0, 0; - } -} */ - -body { - /* color: rgb(var(--foreground-rgb)); - background: linear-gradient(to bottom, transparent, rgb(var(--background-end-rgb))) - rgb(var(--background-start-rgb)); */ -} -/* -@layer utilities { - .text-balance { - text-wrap: balance; - } -} */ diff --git a/apps/design-system/app/layout.tsx b/apps/design-system/app/layout.tsx index a7d6c82e2dd..143adbc56f9 100644 --- a/apps/design-system/app/layout.tsx +++ b/apps/design-system/app/layout.tsx @@ -1,5 +1,5 @@ import '@/styles/globals.css' -import '../../studio/styles/typography.css' +import 'config/typography.css' import type { Metadata, Viewport } from 'next' diff --git a/apps/design-system/package.json b/apps/design-system/package.json index bb801fa920b..cd1e80e428b 100644 --- a/apps/design-system/package.json +++ b/apps/design-system/package.json @@ -60,7 +60,7 @@ "concurrently": "^8.2.2", "config": "workspace:^", "mdast-util-toc": "^6.1.1", - "postcss": "^8.5.3", + "postcss": "catalog:", "rimraf": "^4.1.3", "shiki": "^1.1.7", "tailwindcss": "catalog:", diff --git a/apps/design-system/registry/default/example/data-grid-demo.tsx b/apps/design-system/registry/default/example/data-grid-demo.tsx index 6bc5f56f677..44bc5edb744 100644 --- a/apps/design-system/registry/default/example/data-grid-demo.tsx +++ b/apps/design-system/registry/default/example/data-grid-demo.tsx @@ -141,7 +141,7 @@ export default function DataGridDemo() { return (
{/* Text Input */} diff --git a/apps/design-system/registry/default/example/sheet-demo.tsx b/apps/design-system/registry/default/example/sheet-demo.tsx index 174eb0eb253..1c2b7d48604 100644 --- a/apps/design-system/registry/default/example/sheet-demo.tsx +++ b/apps/design-system/registry/default/example/sheet-demo.tsx @@ -24,7 +24,7 @@ export default function SheetDemo() { Edit profile Make changes to your profile here. -
+
diff --git a/apps/design-system/registry/default/example/sheet-nonmodal.tsx b/apps/design-system/registry/default/example/sheet-nonmodal.tsx index 9129bc48ddd..203b68fe4bc 100644 --- a/apps/design-system/registry/default/example/sheet-nonmodal.tsx +++ b/apps/design-system/registry/default/example/sheet-nonmodal.tsx @@ -20,7 +20,7 @@ export default function SheetNonmodal() { Log details -
+

This sheet does not block the underlying content, but it does overlap it. diff --git a/apps/design-system/styles/globals.css b/apps/design-system/styles/globals.css index c0a8ac60719..d1f98daa8a0 100644 --- a/apps/design-system/styles/globals.css +++ b/apps/design-system/styles/globals.css @@ -33,7 +33,7 @@ @apply scroll-smooth; } body { - @apply bg text-foreground; + @apply bg-default text-foreground; /* font-feature-settings: "rlig" 1, "calt" 1; */ font-synthesis-weight: none; text-rendering: optimizeLegibility; diff --git a/apps/docs/app/layout.tsx b/apps/docs/app/layout.tsx index e470d95e69b..d5bad10e70d 100644 --- a/apps/docs/app/layout.tsx +++ b/apps/docs/app/layout.tsx @@ -2,7 +2,6 @@ import '@code-hike/mdx/styles.css' import 'config/code-hike.css' import 'ui-patterns/ShimmeringLoader/index.css' import '../styles/main.css' -import '../styles/new-docs.css' import '../styles/prism-okaidia.css' import { GlobalProviders } from '~/features/app.providers' diff --git a/apps/docs/components/Feedback/FeedbackModal.tsx b/apps/docs/components/Feedback/FeedbackModal.tsx index b1e00545bc2..18fc711bf03 100644 --- a/apps/docs/components/Feedback/FeedbackModal.tsx +++ b/apps/docs/components/Feedback/FeedbackModal.tsx @@ -72,7 +72,7 @@ function FeedbackModal({ visible, page, onCancel, onSubmit }: FeedbackModalProps )} />

- 💡 + 💡
Need help or support? This feedback form is for documentation improvements only. For technical support, please submit a{' '} diff --git a/apps/docs/components/Navigation/NavigationMenu/TopNavBar.tsx b/apps/docs/components/Navigation/NavigationMenu/TopNavBar.tsx index c88b9525ed5..66221d9e786 100644 --- a/apps/docs/components/Navigation/NavigationMenu/TopNavBar.tsx +++ b/apps/docs/components/Navigation/NavigationMenu/TopNavBar.tsx @@ -1,16 +1,17 @@ +// End of third-party imports + +import { useIsLoggedIn, useIsUserLoading, useUser } from 'common' +import { isFeatureEnabled } from 'common/enabled-features' +import { DevToolbarTrigger } from 'dev-tools' import { Command, Menu, Search } from 'lucide-react' import dynamic from 'next/dynamic' import Image from 'next/image' import Link from 'next/link' import type { FC } from 'react' import { memo, useState } from 'react' -// End of third-party imports - -import { useIsLoggedIn, useIsUserLoading, useUser } from 'common' -import { isFeatureEnabled } from 'common/enabled-features' -import { DevToolbarTrigger } from 'dev-tools' import { Button, buttonVariants, cn } from 'ui' import { AuthenticatedDropdownMenu, CommandMenuTriggerInput } from 'ui-patterns' + import { getCustomContent } from '../../../lib/custom-content/getCustomContent' import GlobalNavigationMenu from './GlobalNavigationMenu' import useDropdownMenu from './useDropdownMenu' @@ -31,7 +32,7 @@ const TopNavBar: FC = () => { <>