Skip to content

The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.

chore: CSS cleanup (#47443)

Gildas Garcia70c3bafe6327
diff --git a/apps/studio/components/grid/components/common/DefaultValue.tsx b/apps/studio/components/grid/components/common/DefaultValue.tsx
index 6a94b026097..bf46676a977 100644
--- a/apps/studio/components/grid/components/common/DefaultValue.tsx
+++ b/apps/studio/components/grid/components/common/DefaultValue.tsx
@@ -1,3 +1,3 @@
export const DefaultValue = () => {
- return <span className="sb-grid-default-value opacity-50">DEFAULT</span>
+ return <span className="opacity-50">DEFAULT</span>
}
diff --git a/apps/studio/components/grid/components/common/DropdownControl.tsx b/apps/studio/components/grid/components/common/DropdownControl.tsx
index fe49c3ccc45..ab498bf368c 100644
--- a/apps/studio/components/grid/components/common/DropdownControl.tsx
+++ b/apps/studio/components/grid/components/common/DropdownControl.tsx
@@ -30,8 +30,8 @@ export const DropdownControl = ({
<DropdownMenu>
<DropdownMenuTrigger className={className}>{children}</DropdownMenuTrigger>
<DropdownMenuContent side={side} align={align}>
- <div className="dropdown-control" style={{ maxHeight: '30vh' }}>
- {options.length === 0 && <p className="dropdown-control__empty-text">No more items</p>}
+ <div className="overflow-auto" style={{ maxHeight: '30vh' }}>
+ {options.length === 0 && <p>No more items</p>}
{options.map((x) => {
return (
<DropdownMenuItemTooltip
diff --git a/apps/studio/components/grid/components/common/EmptyValue.tsx b/apps/studio/components/grid/components/common/EmptyValue.tsx
index b1196a5c556..f4172a3f7f2 100644
--- a/apps/studio/components/grid/components/common/EmptyValue.tsx
+++ b/apps/studio/components/grid/components/common/EmptyValue.tsx
@@ -1,3 +1,3 @@
export const EmptyValue = () => {
- return <span className="sb-grid-empty-value opacity-50">EMPTY</span>
+ return <span className="block opacity-50">EMPTY</span>
}
diff --git a/apps/studio/components/grid/components/common/NullValue.tsx b/apps/studio/components/grid/components/common/NullValue.tsx
index a2f45c9398c..c9cafa35019 100644
--- a/apps/studio/components/grid/components/common/NullValue.tsx
+++ b/apps/studio/components/grid/components/common/NullValue.tsx
@@ -1,3 +1,3 @@
export const NullValue = () => {
- return <span className="null-value opacity-50">NULL</span>
+ return <span className="block opacity-50">NULL</span>
}
diff --git a/apps/studio/components/grid/components/editor/JsonEditor.tsx b/apps/studio/components/grid/components/editor/JsonEditor.tsx
index 21c6224df7a..da56dfba3c3 100644
--- a/apps/studio/components/grid/components/editor/JsonEditor.tsx
+++ b/apps/studio/components/grid/components/editor/JsonEditor.tsx
@@ -165,7 +165,7 @@ export const JsonEditor = <TRow, TSummaryRow = unknown>({
<div
className={`${
!!value && jsonString.trim().length == 0 ? 'sb-grid-fill-container' : ''
- } sb-grid-json-editor__trigger`}
+ } text-grid overflow-hidden text-ellipsis px-2`}
onClick={() => setIsPopoverOpen(!isPopoverOpen)}
>
{value === null || value === '' ? <NullValue /> : jsonString}
diff --git a/apps/studio/components/grid/components/editor/NumberEditor.tsx b/apps/studio/components/grid/components/editor/NumberEditor.tsx
index f61f087a032..3d5ed3866f1 100644
--- a/apps/studio/components/grid/components/editor/NumberEditor.tsx
+++ b/apps/studio/components/grid/components/editor/NumberEditor.tsx
@@ -25,7 +25,7 @@ export function NumberEditor<TRow, TSummaryRow = unknown>({
return (
<input
- className="sb-grid-number-editor"
+ className="h-full w-full px-2"
ref={autoFocusAndSelect}
value={value ?? ''}
onChange={onChange}
diff --git a/apps/studio/components/grid/components/editor/TextEditor.tsx b/apps/studio/components/grid/components/editor/TextEditor.tsx
index a3931a74654..f049c1df4a0 100644
--- a/apps/studio/components/grid/components/editor/TextEditor.tsx
+++ b/apps/studio/components/grid/components/editor/TextEditor.tsx
@@ -119,7 +119,7 @@ export const TextEditor = <TRow, TSummaryRow = unknown>({
<div
className={cn(
!!value && value.toString().trim().length === 0 && 'sb-grid-fill-container',
- 'sb-grid-text-editor__trigger'
+ 'text-grid overflow-hidden text-ellipsis px-2'
)}
onClick={() => setIsPopoverOpen(!isPopoverOpen)}
>
diff --git a/apps/studio/components/grid/components/editor/TimeEditor.tsx b/apps/studio/components/grid/components/editor/TimeEditor.tsx
index b092ccd2b81..59cfcfdbd2a 100644
--- a/apps/studio/components/grid/components/editor/TimeEditor.tsx
+++ b/apps/studio/components/grid/components/editor/TimeEditor.tsx
@@ -42,7 +42,7 @@ function BaseEditor<TRow, TSummaryRow = unknown>({
return (
<input
- className="sb-grid-time-editor"
+ className="h-full w-full px-2"
ref={autoFocusAndSelect}
defaultValue={value ?? ''}
onChange={onChange}
diff --git a/apps/studio/components/grid/components/formatter/ForeignKeyFormatter.tsx b/apps/studio/components/grid/components/formatter/ForeignKeyFormatter.tsx
index 50e8bb81595..500ae29d11d 100644
--- a/apps/studio/components/grid/components/formatter/ForeignKeyFormatter.tsx
+++ b/apps/studio/components/grid/components/formatter/ForeignKeyFormatter.tsx
@@ -56,8 +56,8 @@ export const ForeignKeyFormatter = (props: Props) => {
foreignKeyColumn?.format === 'bytea' && !!value ? convertByteaToHex(value) : value
return (
- <div className="sb-grid-foreign-key-formatter flex justify-between">
- <span className="sb-grid-foreign-key-formatter__text">
+ <div className="flex w-full items-center justify-between flex justify-between">
+ <span className="m-0 grow overflow-hidden text-ellipsis">
{formattedValue === null ? <NullValue /> : formattedValue}
</span>
{isLoading && formattedValue !== null && (
diff --git a/apps/studio/components/grid/components/header/sort/SortPopoverPrimitive.tsx b/apps/studio/components/grid/components/header/sort/SortPopoverPrimitive.tsx
index 0be00fd5cd4..350898ed730 100644
--- a/apps/studio/components/grid/components/header/sort/SortPopoverPrimitive.tsx
+++ b/apps/studio/components/grid/components/header/sort/SortPopoverPrimitive.tsx
@@ -290,7 +290,7 @@ export const SortPopoverPrimitive = ({
asChild
variant="dashed"
iconRight={<ChevronDown size="14" className="text-foreground-light" />}
- className="sb-grid-dropdown__item-trigger"
+ className="my-1"
data-testid="table-editor-pick-column-to-sort-button"
>
<span>Pick {localSorts.length > 1 ? 'another' : 'a'} column to sort by</span>
diff --git a/apps/studio/components/interfaces/Database/Schemas/SchemaTableNode.tsx b/apps/studio/components/interfaces/Database/Schemas/SchemaTableNode.tsx
index 1d3b6457b6d..88554e4a406 100644
--- a/apps/studio/components/interfaces/Database/Schemas/SchemaTableNode.tsx
+++ b/apps/studio/components/interfaces/Database/Schemas/SchemaTableNode.tsx
@@ -249,15 +249,7 @@ const TableNodeComponent = ({
)}
>
{column.isPrimary && (
- <Key
- size={8}
- strokeWidth={1}
- className={cn(
- // 'sb-grid-column-header__inner__primary-key'
- 'shrink-0',
- 'text-light'
- )}
- />
+ <Key size={8} strokeWidth={1} className={cn('shrink-0', 'text-light')} />
)}
{column.isNullable && (
<DiamondIcon size={8} strokeWidth={1} className="shrink-0 text-light" />
diff --git a/apps/studio/components/interfaces/RoleImpersonationSelector/UserImpersonationSelector.tsx b/apps/studio/components/interfaces/RoleImpersonationSelector/UserImpersonationSelector.tsx
index 620096182df..8b6240caf8a 100644
--- a/apps/studio/components/interfaces/RoleImpersonationSelector/UserImpersonationSelector.tsx
+++ b/apps/studio/components/interfaces/RoleImpersonationSelector/UserImpersonationSelector.tsx
@@ -235,7 +235,7 @@ export const UserImpersonationSelector = () => {
<InputGroup>
<InputGroupInput
size="tiny"
- className="table-editor-search border-none"
+ className="pr-10 border-none"
placeholder="Search by id, email, phone, or name..."
onChange={(e) => setSearchText(e.target.value)}
value={searchText}
diff --git a/apps/studio/components/interfaces/TableGridEditor/GridHeaderActions.tsx b/apps/studio/components/interfaces/TableGridEditor/GridHeaderActions.tsx
index f54d2f3fa50..189c57fc216 100644
--- a/apps/studio/components/interfaces/TableGridEditor/GridHeaderActions.tsx
+++ b/apps/studio/components/interfaces/TableGridEditor/GridHeaderActions.tsx
@@ -182,7 +182,7 @@ export const GridHeaderActions = ({ table, isRefetching }: GridHeaderActionsProp
}
return (
- <div className="sb-grid-header__inner">
+ <div className="flex items-center space-x-2">
{showHeaderActions && (
<div className="flex items-center gap-x-2">
{isReadOnly && (
diff --git a/apps/studio/pages/_app.tsx b/apps/studio/pages/_app.tsx
index 4dfc5012278..1c1342f96b8 100644
--- a/apps/studio/pages/_app.tsx
+++ b/apps/studio/pages/_app.tsx
@@ -1,5 +1,4 @@
import '@/styles/code.css'
-import '@/styles/editor.css'
import '@/styles/focus.css'
import '@/styles/globals.css'
import '@/styles/graphiql-base.css'
diff --git a/apps/studio/routes/__root.tsx b/apps/studio/routes/__root.tsx
index f386d7126b3..13385f879a9 100644
--- a/apps/studio/routes/__root.tsx
+++ b/apps/studio/routes/__root.tsx
@@ -2,7 +2,6 @@
import 'react-data-grid/lib/styles.css'
import '@/styles/code.css'
-import '@/styles/editor.css'
import '@/styles/focus.css'
// Vite-only: defines @font-face for the custom fonts. The Next pipeline
// (pages/_app.tsx) loads these via next/font instead, so this import has no
diff --git a/apps/studio/styles/code.css b/apps/studio/styles/code.css
index 57e5638bd62..a409149a06c 100644
--- a/apps/studio/styles/code.css
+++ b/apps/studio/styles/code.css
@@ -108,20 +108,6 @@
padding: 4px 8px;
}
}
-
- &.codeBlockWrapper .sbui-btn-container {
- position: absolute;
- top: 2px;
- right: 3px;
-
- visibility: hidden;
- opacity: 0;
- }
-
- &.codeBlockWrapper:hover .sbui-btn-container {
- visibility: visible;
- opacity: 1;
- }
}
.CustomCodeBlock {
diff --git a/apps/studio/styles/editor.css b/apps/studio/styles/editor.css
deleted file mode 100644
index 3f028e8c9e0..00000000000
--- a/apps/studio/styles/editor.css
+++ /dev/null
@@ -1,28 +0,0 @@
-@reference "./globals.css";
-
-.table-editor-columns .sbui-formlayout--responsive {
- gap: 0rem !important;
-}
-
-.table-editor-column-type .sbui-listbox-option-container {
- width: 400px;
-}
-
-.table-editor-column-type .sbui-listbox {
- @apply px-2;
-}
-
-.column-type-disabled {
- @apply pointer-events-none;
-}
-
-.column-type-disabled .sbui-listbox-label {
- @apply opacity-50;
-}
-
-/* This fix should ideally be in the UI library */
-.table-editor-search {
- input {
- @apply pr-10;
- }
-}
diff --git a/apps/studio/styles/grid.css b/apps/studio/styles/grid.css
index a79accae238..77b3f2fb20e 100644
--- a/apps/studio/styles/grid.css
+++ b/apps/studio/styles/grid.css
@@ -298,106 +298,6 @@
color: inherit;
}
-/*
- DropdownControl
-*/
-
-.dropdown-control {
- @apply overflow-auto;
-}
-
-.dropdown-control .sbui-typography {
- @apply block px-2 py-4;
-}
-
-/*
- NullValue
-*/
-
-.null-value {
- @apply block;
-}
-
-/*
- CheckboxEditor
-*/
-
-.sb-grid-checkbox-editor {
- @apply flex h-full w-full;
-}
-
-.sb-grid-checkbox-editor__input {
- @apply h-4 w-4;
- outline: 4px auto -webkit-focus-ring-color;
-}
-
-/*
- JsonEditor
-*/
-
-.sb-grid-json-editor__trigger {
- @apply text-grid overflow-hidden text-ellipsis px-2;
-}
-
-/*
- NumberEditor
-*/
-
-.sb-grid-number-editor {
- @apply h-full w-full px-2;
-}
-
-/*
- SelectEditor
-*/
-
-.sb-grid-select-editor {
- button {
- @apply border-none rounded-none shadow-none;
- box-shadow: none !important;
- }
-}
-
-/*
- TextEditor
-*/
-
-.sb-grid-text-editor__trigger {
- @apply text-grid overflow-hidden text-ellipsis px-2;
-}
-
-/*
- TimeEditor
-*/
-
-.sb-grid-time-editor {
- @apply h-full w-full px-2;
-}
-
-/*
- Footer
-*/
-
-.sb-grid-footer {
- @apply bg-surface-100 flex h-10 items-center justify-between px-2;
-}
-
-.sb-grid-footer__inner {
- @apply flex items-center;
-}
-
-/*
- ForeignKeyFormatter
-*/
-
-.sb-grid-foreign-key-formatter {
- @apply flex w-full items-center justify-between;
-}
-
-.sb-grid-foreign-key-formatter__text {
- @apply m-0 grow overflow-hidden text-ellipsis;
-}
-
/*
ColumnHeader
*/
@@ -432,22 +332,6 @@
@apply border-brand text-brand;
}
-/*
- Grid
-*/
-
-.sb-grid-grid--loading {
- @apply flex justify-center bg-transparent;
-}
-
-.sb-grid-grid--loading__inner {
- @apply flex items-center;
-}
-
-.sb-grid-grid--loading__inner__text {
- @apply m-8;
-}
-
/*
SelectColumn
*/
@@ -464,95 +348,3 @@
/* @apply focus:ring-brand-300; */
@apply border-background-surface-100;
}
-
-/*
- Header
-*/
-
-.sb-grid-header {
- @apply bg-surface-100 flex h-10 justify-between px-2;
-}
-
-.sb-grid-header__inner {
- @apply flex items-center space-x-2;
-}
-
-.sb-grid-header__inner__divider {
- @apply py-2;
-}
-
-.row_header__selected-rows {
- @apply ml-2 mr-2;
-}
-
-/*
- StatusLabel
-*/
-
-.sb-grid-status-label {
- @apply text-grid text-white;
-}
-
-.sb-grid-status-label__no-msg {
- @apply flex h-5 w-5;
-}
-
-.sb-grid-status-label__no-msg > div {
- @apply m-auto h-2 w-2 rounded-full bg-green-900;
-}
-
-/*
- Empty value
-*/
-
-.sb-grid-empty-value {
- @apply block;
-}
-
-/*
-header/sort/SortDropdown
-*/
-
-.sb-grid-sort-popover {
- @apply w-96;
-}
-
-.sb-grid-dropdown__empty {
- @apply py-2;
-}
-
-.sb-grid-dropdown__empty__text {
- @apply block;
-}
-
-.sb-grid-dropdown__item-trigger {
- @apply my-1;
-}
-
-/*
-header/sort/SortRow
-*/
-
-.sb-grid-sort-row {
- @apply flex justify-between space-x-3;
-}
-
-.sb-grid-sort-row__item {
- @apply flex items-center space-x-3;
-}
-
-.sb-grid-sort-row__item__remove {
- @apply bg-transparent p-0 hover:bg-transparent;
-}
-
-.sb-grid-sort-row__item__label {
- @apply flex items-center space-x-2;
-}
-
-.sb-grid-sort-row__item_toogle {
- @apply flex w-28 items-center gap-0 space-x-3;
-}
-
-.sb-grid-sort-row__item__move {
- @apply flex cursor-move;
-}
diff --git a/apps/studio/styles/storage.css b/apps/studio/styles/storage.css
index b3cbbdc3a9a..030119ca13d 100644
--- a/apps/studio/styles/storage.css
+++ b/apps/studio/styles/storage.css
@@ -1,42 +1,5 @@
@reference "./globals.css";
-.storage-container {
- .sbui-space-col {
- @apply grow;
- #files {
- @apply h-full;
- }
- }
- .sbui-btn {
- @apply focus:outline-hidden;
- }
- .sbui-btn-default {
- @apply border;
- border-color: transparent !important;
- }
- .sbui-checkbox-container {
- @apply w-auto;
- }
- .sbui-input-container {
- input {
- @apply text-sm;
- }
- .sbui-btn-container {
- .sbui-btn {
- @apply py-1;
- }
- }
- }
- .sbui-menu__item {
- span {
- @apply text-sm;
- }
- }
- .sbui-overlay-container {
- @apply z-10;
- }
-}
-
/* May need to just comment this out, the smooth scrolling looks weird */
/* .file-explorer { */
/* scroll-behavior: smooth; */
@@ -53,7 +16,3 @@ button[aria-haspopup='menu']:focus-visible {
.sql-editor-container {
@apply p-0;
}
-
-.sbui-dropdown__trigger:focus {
- outline: none;
-}
diff --git a/apps/www/styles/globals.css b/apps/www/styles/globals.css
index 1d85888eeb8..b5a771a962d 100644
--- a/apps/www/styles/globals.css
+++ b/apps/www/styles/globals.css
@@ -265,11 +265,6 @@ h6:not(.overwrite) {
@apply text-foreground-lighter text-xs;
}
-.sbui-border-fix select {
- @apply border-solid;
- border-width: 1px;
-}
-
.section--masked {
/* overflow: hidden; */
}
@@ -313,20 +308,6 @@ h6:not(.overwrite) {
@apply border border-strong;
}
-.sbui-tabs--alt div[role='tablist'] .sbui-btn-primary {
- @apply bg-border-stronger text-white;
- text-shadow: none;
- font-weight: 400;
-}
-.sbui-tabs--alt div[role='tablist'] .sbui-btn-text {
- @apply text-border-muted;
- font-weight: 400;
- shadow: none;
-}
-
-.sbui-tabs--underline-alt div[role='tablist'] .sbui-tab-button-underline--active {
- @apply border-foreground-muted;
-}
/* override position of tabs */
.dashboard-tabs > div > div {
justify-content: center;
@@ -351,14 +332,6 @@ table {
border-collapse: collapse;
}
-.sbui-typography-container thead {
- @apply text-border;
-}
-
-.sbui-typography a {
- @apply wrap-break-word;
-}
-
/*
* sets the image in @Next/Image components to respect the height of the content
*/
diff --git a/packages/ui-patterns/package.json b/packages/ui-patterns/package.json
index 78b5a3dfbf1..5bb970e0e70 100644
--- a/packages/ui-patterns/package.json
+++ b/packages/ui-patterns/package.json
@@ -762,14 +762,6 @@
"import": "./src/form/Layout/FormLayout.tsx",
"types": "./src/form/Layout/FormLayout.tsx"
},
- "./form/Layout/InputIconContainer.module.css": {
- "import": "./src/form/Layout/InputIconContainer.module.css",
- "types": "./src/form/Layout/InputIconContainer.module.css"
- },
- "./form/Layout/InputIconContainer": {
- "import": "./src/form/Layout/InputIconContainer.tsx",
- "types": "./src/form/Layout/InputIconContainer.tsx"
- },
"./form/utils": {
"import": "./src/form/utils.tsx",
"types": "./src/form/utils.tsx"
diff --git a/packages/ui-patterns/src/form/Layout/InputIconContainer.module.css b/packages/ui-patterns/src/form/Layout/InputIconContainer.module.css
deleted file mode 100644
index ac9cbf96c20..00000000000
--- a/packages/ui-patterns/src/form/Layout/InputIconContainer.module.css
+++ /dev/null
@@ -1,6 +0,0 @@
-.sbui-input-icon-container {
- @apply absolute inset-y-0 left-0 pl-2 flex items-center pointer-events-none;
- /* set the default color of the icon */
- @apply text-gray-600;
- @apply dark:text-white;
-}
diff --git a/packages/ui-patterns/src/form/Layout/InputIconContainer.tsx b/packages/ui-patterns/src/form/Layout/InputIconContainer.tsx
deleted file mode 100644
index b30791dcb6b..00000000000
--- a/packages/ui-patterns/src/form/Layout/InputIconContainer.tsx
+++ /dev/null
@@ -1,15 +0,0 @@
-import { cn } from 'ui'
-import styleHandler from 'ui/src/lib/theme/styleHandler'
-
-export default function InputIconContainer({
- icon,
- className,
- size,
-}: {
- icon: React.ReactNode
- className?: string
- size: 'tiny' | 'small' | 'medium' | 'large' | 'xlarge' | 'xxlarge' | 'xxxlarge' | null
-}) {
- const __styles = styleHandler('inputIconContainer')
- return <div className={cn(__styles.base, __styles.size[size ?? 'small'], className)}>{icon}</div>
-}