diff --git a/apps/design-system/styles/globals.css b/apps/design-system/styles/globals.css index 9ef3d8f9229..6e015819cfb 100644 --- a/apps/design-system/styles/globals.css +++ b/apps/design-system/styles/globals.css @@ -4,7 +4,7 @@ @import './../../../packages/ui/build/css/source/global.css'; @import './../../../packages/ui/build/css/themes/dark.css'; -@import './../../../packages/ui/build/css/themes/deep-dark.css'; +@import './../../../packages/ui/build/css/themes/classic-dark.css'; @import './../../../packages/ui/build/css/themes/light.css'; /* @layer base { diff --git a/apps/docs/styles/main.scss b/apps/docs/styles/main.scss index 2ea5486c6ee..e1dde0f01ec 100644 --- a/apps/docs/styles/main.scss +++ b/apps/docs/styles/main.scss @@ -3,8 +3,7 @@ @tailwind utilities; @import './../../../packages/ui/build/css/source/global.css'; -@import './../../../packages/ui/build/css/themes/dark.css'; -@import './../../../packages/ui/build/css/themes/deep-dark.css'; +@import './../../../packages/ui/build/css/themes/dark-combined.css'; @import './../../../packages/ui/build/css/themes/light.css'; @font-face { diff --git a/apps/studio/components/grid/components/header/Header.tsx b/apps/studio/components/grid/components/header/Header.tsx index 77a12051692..8e6a88a3c93 100644 --- a/apps/studio/components/grid/components/header/Header.tsx +++ b/apps/studio/components/grid/components/header/Header.tsx @@ -61,7 +61,7 @@ const Header = ({ return (
-
+
{customHeader ? ( <>{customHeader} ) : ( diff --git a/apps/studio/components/grid/components/header/filter/FilterPopover.tsx b/apps/studio/components/grid/components/header/filter/FilterPopover.tsx index 7b87e65d27c..b83a6ef54ae 100644 --- a/apps/studio/components/grid/components/header/filter/FilterPopover.tsx +++ b/apps/studio/components/grid/components/header/filter/FilterPopover.tsx @@ -51,10 +51,7 @@ const FilterPopover = ({ table, filters, setParams }: FilterPopoverProps) => { return ( - diff --git a/apps/studio/components/grid/components/header/sort/SortPopover.tsx b/apps/studio/components/grid/components/header/sort/SortPopover.tsx index b73860bfa6e..39e1811aa51 100644 --- a/apps/studio/components/grid/components/header/sort/SortPopover.tsx +++ b/apps/studio/components/grid/components/header/sort/SortPopover.tsx @@ -42,10 +42,7 @@ const SortPopover = ({ table, sorts, setParams }: SortPopoverProps) => { return ( - diff --git a/apps/studio/components/interfaces/Account/Preferences/ThemeSettings.tsx b/apps/studio/components/interfaces/Account/Preferences/ThemeSettings.tsx index 9e4e9676728..e90964a05fd 100644 --- a/apps/studio/components/interfaces/Account/Preferences/ThemeSettings.tsx +++ b/apps/studio/components/interfaces/Account/Preferences/ThemeSettings.tsx @@ -41,7 +41,7 @@ const ThemeSettings = () => { > {singleThemes.map((theme: Theme) => ( - + ))} diff --git a/apps/studio/components/interfaces/Realtime/Inspector/MessageSelection.tsx b/apps/studio/components/interfaces/Realtime/Inspector/MessageSelection.tsx index db121fd1bb3..23dc53820e8 100644 --- a/apps/studio/components/interfaces/Realtime/Inspector/MessageSelection.tsx +++ b/apps/studio/components/interfaces/Realtime/Inspector/MessageSelection.tsx @@ -24,12 +24,12 @@ const MessageSelection = ({ log, onClose }: MessageSelectionProps) => { return (
diff --git a/apps/studio/components/interfaces/Realtime/Inspector/MessagesTable.tsx b/apps/studio/components/interfaces/Realtime/Inspector/MessagesTable.tsx index 11e493aebf4..976980787da 100644 --- a/apps/studio/components/interfaces/Realtime/Inspector/MessagesTable.tsx +++ b/apps/studio/components/interfaces/Realtime/Inspector/MessagesTable.tsx @@ -187,7 +187,7 @@ const MessagesTable = ({ 'font-mono tracking-tight', isEqual(row, focusedLog) ? 'bg-scale-800 rdg-row--focused' - : ' bg-scale-200 hover:bg-scale-300 cursor-pointer', + : ' bg-200 hover:bg-scale-300 cursor-pointer', isErrorLog(row) && '!bg-warning-300', ]) }} diff --git a/apps/studio/components/interfaces/RoleImpersonationSelector/RoleImpersonationPopover.tsx b/apps/studio/components/interfaces/RoleImpersonationSelector/RoleImpersonationPopover.tsx index 216963c7a3d..2cdf1ec43a6 100644 --- a/apps/studio/components/interfaces/RoleImpersonationSelector/RoleImpersonationPopover.tsx +++ b/apps/studio/components/interfaces/RoleImpersonationSelector/RoleImpersonationPopover.tsx @@ -47,11 +47,7 @@ const RoleImpersonationPopover = ({
- + diff --git a/apps/studio/components/interfaces/RoleImpersonationSelector/RoleImpersonationRadio.tsx b/apps/studio/components/interfaces/RoleImpersonationSelector/RoleImpersonationRadio.tsx index 25895706f72..49a9afaac34 100644 --- a/apps/studio/components/interfaces/RoleImpersonationSelector/RoleImpersonationRadio.tsx +++ b/apps/studio/components/interfaces/RoleImpersonationSelector/RoleImpersonationRadio.tsx @@ -1,4 +1,5 @@ -import { IconCheck, IconMinus, cn } from 'ui' +import { Check, Minus } from 'lucide-react' +import { cn } from 'ui' export interface RoleImpersonationRadioProps { label?: string @@ -19,7 +20,7 @@ function RoleImpersonationRadio({