The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:
TypeScript analyticsbibusiness-intelligencebusinessintelligenceclojuredashboarddatadata-analysisdata-visualizationdatabasemetabasemysqlpostgrespostgresqlreportingslacksql-editorvisualization
remove emotion from browse pages (#71184)
Aleksandr Lesnenkocd7eb82bdb73
diff --git a/frontend/src/metabase/browse/components/BrowseContainer.module.css b/frontend/src/metabase/browse/components/BrowseContainer.module.cssnew file mode 100644index 00000000000..092b099c193--- /dev/null+++ b/frontend/src/metabase/browse/components/BrowseContainer.module.css@@ -0,0 +1,30 @@+.browseContainer {+ container-name: ItemsTableContainer;+ container-type: inline-size;+ background-color: var(--mb-color-background-secondary);+ min-height: 100%;+}++.browseHeader {+ padding: var(--mantine-spacing-md) 2.5rem 3rem 2.5rem;+}++.browseMain {+ padding: 0 2.5rem;+ padding-bottom: var(--mantine-spacing-xl);+}++.centeredEmptyState {+ display: flex;+ flex: 1;+ flex-flow: column nowrap;+ align-items: center;+ justify-content: center;+ width: 100%;+ height: 100%;+}++.learnAboutDataIcon {+ min-width: 14px;+ min-height: 14px;+}diff --git a/frontend/src/metabase/browse/components/BrowseContainer.styled.tsx b/frontend/src/metabase/browse/components/BrowseContainer.styled.tsxdeleted file mode 100644index c42038cd11f..00000000000--- a/frontend/src/metabase/browse/components/BrowseContainer.styled.tsx+++ /dev/null@@ -1,51 +0,0 @@-// eslint-disable-next-line no-restricted-imports-import styled from "@emotion/styled";--import { EmptyState } from "metabase/common/components/EmptyState";-import { Flex, Icon } from "metabase/ui";--export const BrowseContainer = styled.div`- display: flex;- flex: 1;- flex-flow: column nowrap;- padding-top: 1rem;- container-name: ItemsTableContainer;- container-type: inline-size;- background-color: var(--mb-color-background-secondary);- min-height: 100%;-`;--export const BrowseSection = styled(Flex)`- max-width: 64rem;- margin: 0 auto;- width: 100%;-` as unknown as typeof Flex;--export const BrowseHeader = styled.div`- display: flex;- flex-direction: column;- padding: 1rem 2.5rem 3rem 2.5rem;-`;--export const BrowseMain = styled.div`- display: flex;- flex-flow: column nowrap;- flex: 1;- padding: 0 2.5rem;- padding-bottom: 2rem;-`;--export const CenteredEmptyState = styled(EmptyState)`- display: flex;- flex: 1;- flex-flow: column nowrap;- align-items: center;- justify-content: center;- width: 100%;- height: 100%;-`;--export const LearnAboutDataIcon = styled(Icon)`- min-width: 14px;- min-height: 14px;-`;diff --git a/frontend/src/metabase/browse/components/BrowseDataHeader.tsx b/frontend/src/metabase/browse/components/BrowseDataHeader.tsxindex cc769eb058c..f0d3ce5638e 100644--- a/frontend/src/metabase/browse/components/BrowseDataHeader.tsx+++ b/frontend/src/metabase/browse/components/BrowseDataHeader.tsx@@ -5,17 +5,13 @@ import { trackDataReferenceClicked } from "metabase/collections/analytics";import { PLUGIN_UPLOAD_MANAGEMENT } from "metabase/plugins";import { Flex, Group, Icon, Text, Title } from "metabase/ui";-import {- BrowseHeader,- BrowseSection,- LearnAboutDataIcon,-} from "./BrowseContainer.styled";-import { BrowseHeaderIconContainer } from "./BrowseHeader.styled";+import S from "./BrowseContainer.module.css";+import HeaderS from "./BrowseHeader.module.css";export const BrowseDataHeader = () => {return (- <BrowseHeader>- <BrowseSection>+ <Flex className={S.browseHeader} direction="column">+ <Flex maw="64rem" mx="auto" w="100%"><Flexw="100%"h="2.25rem"@@ -31,20 +27,20 @@ export const BrowseDataHeader = () => {</Title><LearnAboutDataLink /></Flex>- </BrowseSection>- </BrowseHeader>+ </Flex>+ </Flex>);};const LearnAboutDataLink = () => (- <Flex p=".75rem" justify="flex-end" align="center" gap="md">+ <Flex p="0.75rem" justify="flex-end" align="center" gap="md"><Link to="reference" onClick={trackDataReferenceClicked}>- <BrowseHeaderIconContainer>- <LearnAboutDataIcon size={14} name="reference" />- <Text size="md" lh="1" fw="bold" ml=".5rem" c="inherit">+ <Flex className={HeaderS.browseHeaderIconContainer} align="center">+ <Icon className={S.learnAboutDataIcon} size={14} name="reference" />+ <Text size="md" lh="1" fw="bold" ml="sm" c="inherit">{t`Learn about our data`}</Text>- </BrowseHeaderIconContainer>+ </Flex></Link><PLUGIN_UPLOAD_MANAGEMENT.GdriveDbMenu /></Flex>diff --git a/frontend/src/metabase/browse/components/BrowseHeader.module.css b/frontend/src/metabase/browse/components/BrowseHeader.module.cssnew file mode 100644index 00000000000..2af39335b09--- /dev/null+++ b/frontend/src/metabase/browse/components/BrowseHeader.module.css@@ -0,0 +1,9 @@+.browseHeaderIconContainer {+ display: flex;+ align-items: center;+ color: var(--mb-color-text-secondary);++ &:hover {+ color: var(--mb-color-brand);+ }+}diff --git a/frontend/src/metabase/browse/components/BrowseHeader.styled.tsx b/frontend/src/metabase/browse/components/BrowseHeader.styled.tsxdeleted file mode 100644index dbcfdcf9b50..00000000000--- a/frontend/src/metabase/browse/components/BrowseHeader.styled.tsx+++ /dev/null@@ -1,18 +0,0 @@-// eslint-disable-next-line no-restricted-imports-import styled from "@emotion/styled";--export const BrowseHeaderContent = styled.div`- display: flex;- align-items: center;- padding: 1rem 0.5rem 0.5rem 0;-`;--export const BrowseHeaderIconContainer = styled.div`- display: flex;- align-items: center;- color: var(--mb-color-text-secondary);-- &:hover {- color: var(--mb-color-brand);- }-`;diff --git a/frontend/src/metabase/browse/components/BrowseTable.module.css b/frontend/src/metabase/browse/components/BrowseTable.module.cssnew file mode 100644index 00000000000..06b46754aa9--- /dev/null+++ b/frontend/src/metabase/browse/components/BrowseTable.module.css@@ -0,0 +1,91 @@+.tableRow {+ cursor: pointer;++ &:focus {+ outline: 2px solid var(--mb-color-focus);+ }+}++.tableRowSkeleton {+ &:focus {+ outline: 2px solid var(--mb-color-focus);+ }++ &:hover {+ background-color: unset !important;+ }++ td {+ cursor: unset !important;+ }+}++.cell {+ &:is(td) {+ padding: 0.25em 0.5rem 0.25em 0.5rem;+ }++ &:focus {+ outline: 2px solid var(--mb-color-focus);++ button,+ a {+ outline: none;+ }+ }+}++.collectionCell {+ &:is(td) {+ padding: 0;+ }++ &:focus {+ outline: 2px solid var(--mb-color-focus);++ button,+ a {+ outline: none;+ }+ }+}++.hideAtXs {+ @container ItemsTableContainer (max-width: 23em) {+ display: none;+ }+}++.hideAtSm {+ @container ItemsTableContainer (max-width: 40em) {+ display: none;+ }+}++.hideAtMd {+ @container ItemsTableContainer (max-width: 60em) {+ display: none;+ }+}++.nameColumn {+ width: 220px;++ @container ItemsTableContainer (max-width: 60em) {+ width: 220px;+ }++ @container ItemsTableContainer (max-width: 40em) {+ width: 160px;+ }+}++.collectionLink {+ display: block;+ padding: 1em 0.5em;+ box-sizing: border-box;++ &:hover {+ color: var(--mb-color-icon-brand) !important;+ }+}diff --git a/frontend/src/metabase/browse/components/BrowseTable.styled.tsx b/frontend/src/metabase/browse/components/BrowseTable.styled.tsxdeleted file mode 100644index b4f24a5d989..00000000000--- a/frontend/src/metabase/browse/components/BrowseTable.styled.tsx+++ /dev/null@@ -1,68 +0,0 @@-// eslint-disable-next-line no-restricted-imports-import styled from "@emotion/styled";--import {- TableColumn,- hideResponsively,-} from "metabase/common/components/ItemsTable/BaseItemsTable.styled";-import type { ResponsiveProps } from "metabase/common/components/ItemsTable/utils";-import { Link } from "metabase/common/components/Link";-import { breakpoints } from "metabase/ui/theme";--export const TableRow = styled.tr<{ skeleton?: boolean }>`- :focus {- outline: 2px solid var(--mb-color-focus);- }- ${(props) =>- props.skeleton- ? `- :hover { background-color: unset ! important; }- td { cursor: unset ! important; }- `- : `cursor: pointer;`}-`;--export const Cell = styled.td<ResponsiveProps>`- td& {- padding: 0.25em 0.5rem 0.25em 0.5rem;- }-- &:focus {- outline: 2px solid var(--mb-color-focus);-- button,- a {- outline: none;- }- }-- ${hideResponsively}-`;--export const NameColumn = styled(TableColumn)`- width: 220px;-- @container ${(props) => props.containerName} (max-width: ${breakpoints.md}) {- width: 220px;- }-- @container ${(props) => props.containerName} (max-width: ${breakpoints.sm}) {- width: 160px;- }-`;--export const CollectionTableCell = styled(Cell)`- td& {- padding: 0;- }-`;--export const CollectionLink = styled(Link)`- display: block;- padding: 1em 0.5em;- box-sizing: border-box;-- &:hover {- color: var(--mb-color-icon-brand) !important;- }-`;diff --git a/frontend/src/metabase/browse/databases/BrowseDatabases.tsx b/frontend/src/metabase/browse/databases/BrowseDatabases.tsxindex 6e4065004bf..676339ffe2b 100644--- a/frontend/src/metabase/browse/databases/BrowseDatabases.tsx+++ b/frontend/src/metabase/browse/databases/BrowseDatabases.tsx@@ -4,6 +4,7 @@ import { t } from "ttag";import NoResults from "assets/img/no_results.svg";import { useListDatabasesQuery } from "metabase/api";+import { EmptyState } from "metabase/common/components/EmptyState";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import CS from "metabase/css/core/index.css";import { getEngineLogo } from "metabase/databases/utils/engine";@@ -11,15 +12,10 @@ import { useSelector } from "metabase/lib/redux";import * as Urls from "metabase/lib/urls";import { newDatabase } from "metabase/lib/urls";import { getUserIsAdmin } from "metabase/selectors/user";-import { Box, Group, Stack, Text, Title } from "metabase/ui";+import { Box, Flex, Group, Stack, Text, Title } from "metabase/ui";import { BrowseCard } from "../components/BrowseCard";-import {- BrowseContainer,- BrowseMain,- BrowseSection,- CenteredEmptyState,-} from "../components/BrowseContainer.styled";+import S from "../components/BrowseContainer.module.css";import { BrowseDataHeader } from "../components/BrowseDataHeader";import { BrowseGrid } from "../components/BrowseGrid";@@ -42,10 +38,11 @@ export const BrowseDatabases = () => {if (!databases?.length && !isAdmin) {return (- <CenteredEmptyState- title={<Box mb=".5rem">{t`No databases here yet`}</Box>}+ <EmptyState+ className={S.centeredEmptyState}+ title={<Box mb="sm">{t`No databases here yet`}</Box>}illustrationElement={- <Box mb=".5rem">+ <Box mb="sm"><img src={NoResults} /></Box>}@@ -54,10 +51,16 @@ export const BrowseDatabases = () => {}return (- <BrowseContainer>+ <Flex+ className={S.browseContainer}+ flex={1}+ direction="column"+ wrap="nowrap"+ pt="md"+ ><BrowseDataHeader />- <BrowseMain>- <BrowseSection direction="column">+ <Flex className={S.browseMain} direction="column" wrap="nowrap" flex={1}>+ <Flex maw="64rem" mx="auto" w="100%" direction="column"><BrowseGrid data-testid="database-browser">{databases &&databases.length > 0 &&@@ -72,9 +75,9 @@ export const BrowseDatabases = () => {))}{isAdmin && <AddDatabaseCard />}</BrowseGrid>- </BrowseSection>- </BrowseMain>- </BrowseContainer>+ </Flex>+ </Flex>+ </Flex>);};diff --git a/frontend/src/metabase/browse/metrics/BrowseMetrics.tsx b/frontend/src/metabase/browse/metrics/BrowseMetrics.tsxindex fdd7182bf53..570bf667b1a 100644--- a/frontend/src/metabase/browse/metrics/BrowseMetrics.tsx+++ b/frontend/src/metabase/browse/metrics/BrowseMetrics.tsx@@ -28,12 +28,7 @@ import {Tooltip,} from "metabase/ui";-import {- BrowseContainer,- BrowseHeader,- BrowseMain,- BrowseSection,-} from "../components/BrowseContainer.styled";+import S from "../components/BrowseContainer.module.css";import { MetricsTable } from "./MetricsTable";import { trackNewMetricInitiated } from "./analytics";@@ -70,9 +65,21 @@ export function BrowseMetrics() {const canCreateMetric = !isEmbeddingIframe && hasDataAccess;return (- <BrowseContainer aria-labelledby={titleId}>- <BrowseHeader role="heading" data-testid="browse-metrics-header">- <BrowseSection>+ <Flex+ className={S.browseContainer}+ flex={1}+ direction="column"+ wrap="nowrap"+ pt="md"+ aria-labelledby={titleId}+ >+ <Flex+ className={S.browseHeader}+ direction="column"+ role="heading"+ data-testid="browse-metrics-header"+ >+ <Flex maw="64rem" mx="auto" w="100%"><Flexw="100%"h="2.25rem"@@ -112,10 +119,10 @@ export function BrowseMetrics() {)}</Group></Flex>- </BrowseSection>- </BrowseHeader>- <BrowseMain>- <BrowseSection>+ </Flex>+ </Flex>+ <Flex className={S.browseMain} direction="column" wrap="nowrap" flex={1}>+ <Flex maw="64rem" mx="auto" w="100%"><Stack mb="lg" gap="md" w="100%">{isEmpty ? (<MetricsEmptyState@@ -133,9 +140,9 @@ export function BrowseMetrics() {</DelayedLoadingAndErrorWrapper>)}</Stack>- </BrowseSection>- </BrowseMain>- </BrowseContainer>+ </Flex>+ </Flex>+ </Flex>);}diff --git a/frontend/src/metabase/browse/metrics/MetricsTable.tsx b/frontend/src/metabase/browse/metrics/MetricsTable.tsxindex ae74f5a6ac3..e12ab1c0644 100644--- a/frontend/src/metabase/browse/metrics/MetricsTable.tsx+++ b/frontend/src/metabase/browse/metrics/MetricsTable.tsx@@ -1,3 +1,4 @@+import cx from "classnames";import { type MouseEvent, useCallback, useMemo, useState } from "react";import { push } from "react-router-redux";import { c, t } from "ttag";@@ -20,6 +21,7 @@ import {} from "metabase/common/components/ItemsTable/BaseItemsTable.styled";import { Columns } from "metabase/common/components/ItemsTable/Columns";import type { ResponsiveProps } from "metabase/common/components/ItemsTable/utils";+import { Link } from "metabase/common/components/Link";import { MarkdownPreview } from "metabase/common/components/MarkdownPreview";import { Bookmarks } from "metabase/entities/bookmarks";import { Questions } from "metabase/entities/questions";@@ -37,13 +39,7 @@ import {} from "metabase/ui";import type { SortingOptions } from "metabase-types/api";-import {- Cell,- CollectionLink,- CollectionTableCell,- NameColumn,- TableRow,-} from "../components/BrowseTable.styled";+import BrowseTableS from "../components/BrowseTable.module.css";import { trackMetricBookmarked } from "./analytics";import type { MetricResult, SortColumn } from "./types";@@ -103,7 +99,7 @@ export function MetricsTable({<Table aria-label={skeleton ? undefined : t`Table of metrics`}><colgroup>{/* <col> for Name column */}- <NameColumn {...nameProps} />+ <col className={BrowseTableS.nameColumn} /><TableColumn {...collectionProps} width={`${collectionWidth}%`} /><TableColumn {...descriptionProps} width={`${descriptionWidth}%`} /><TableColumn {...menuProps} width={DOTMENU_WIDTH} />@@ -208,13 +204,16 @@ function MetricRow({ metric }: { metric?: MetricResult }) {);return (- <TableRow onClick={handleClick}>+ <tr+ className={metric ? BrowseTableS.tableRow : BrowseTableS.tableRowSkeleton}+ onClick={handleClick}+ ><NameCell metric={metric} /><CollectionCell metric={metric} /><DescriptionCell metric={metric} /><MenuCell metric={metric} /><Columns.RightEdge.Cell />- </TableRow>+ </tr>);}@@ -284,27 +283,28 @@ function CollectionCell({ metric }: { metric?: MetricResult }) {);return (- <CollectionTableCell+ <td+ className={cx(BrowseTableS.collectionCell, BrowseTableS.hideAtSm)}data-testid={`path-for-collection: ${collectionName}`}- {...collectionProps}>{metric?.collection ? (- <CollectionLink+ <Link+ className={BrowseTableS.collectionLink}to={Urls.collection(metric.collection)}onClick={stopPropagation}>{content}- </CollectionLink>+ </Link>) : (content)}- </CollectionTableCell>+ </td>);}function DescriptionCell({ metric }: { metric?: MetricResult }) {return (- <Cell {...descriptionProps}>+ <td className={cx(BrowseTableS.cell, BrowseTableS.hideAtMd)}>{metric ? (<MarkdownPreviewlineClamp={12}@@ -316,7 +316,7 @@ function DescriptionCell({ metric }: { metric?: MetricResult }) {) : (<SkeletonText />)}- </Cell>+ </td>);}@@ -401,7 +401,11 @@ function MenuCell({ metric }: { metric?: MetricResult }) {}, [metric, createBookmark, deleteBookmark, dispatch]);return (- <Cell onClick={stopPropagation} style={{ padding: 0 }}>+ <td+ className={BrowseTableS.cell}+ onClick={stopPropagation}+ style={{ padding: 0 }}+ ><Menu position="bottom-end"><Menu.Target><Button@@ -426,6 +430,6 @@ function MenuCell({ metric }: { metric?: MetricResult }) {))}</Menu.Dropdown></Menu>- </Cell>+ </td>);}diff --git a/frontend/src/metabase/browse/models/BrowseModels.tsx b/frontend/src/metabase/browse/models/BrowseModels.tsxindex 06528ed3aeb..2c8f5d5b23c 100644--- a/frontend/src/metabase/browse/models/BrowseModels.tsx+++ b/frontend/src/metabase/browse/models/BrowseModels.tsx@@ -31,12 +31,7 @@ import {Tooltip,} from "metabase/ui";-import {- BrowseContainer,- BrowseHeader,- BrowseMain,- BrowseSection,-} from "../components/BrowseContainer.styled";+import S from "../components/BrowseContainer.module.css";import { ModelsVideo } from "./EmptyStates";import { ModelExplanationBanner } from "./ModelExplanationBanner";@@ -70,9 +65,21 @@ export const BrowseModels = () => {!isEmbeddingIframe && hasDataAccess && hasNativeWrite;return (- <BrowseContainer aria-labelledby={titleId}>- <BrowseHeader role="heading" data-testid="browse-models-header">- <BrowseSection>+ <Flex+ className={S.browseContainer}+ flex={1}+ direction="column"+ wrap="nowrap"+ pt="md"+ aria-labelledby={titleId}+ >+ <Flex+ className={S.browseHeader}+ direction="column"+ role="heading"+ data-testid="browse-models-header"+ >+ <Flex maw="64rem" mx="auto" w="100%"><Flexw="100%"h="2.25rem"@@ -109,10 +116,10 @@ export const BrowseModels = () => {)}</Group></Flex>- </BrowseSection>- </BrowseHeader>- <BrowseMain>- <BrowseSection>+ </Flex>+ </Flex>+ <Flex className={S.browseMain} direction="column" wrap="nowrap" flex={1}>+ <Flex maw="64rem" mx="auto" w="100%"><Stack mb="lg" gap="md" w="100%">{isEmpty ? (<Stack gap="lg" align="center" data-testid="empty-state">@@ -156,9 +163,9 @@ export const BrowseModels = () => {</>)}</Stack>- </BrowseSection>- </BrowseMain>- </BrowseContainer>+ </Flex>+ </Flex>+ </Flex>);};diff --git a/frontend/src/metabase/browse/models/ModelsTable.tsx b/frontend/src/metabase/browse/models/ModelsTable.tsxindex 872f2180766..bf1f2a5e256 100644--- a/frontend/src/metabase/browse/models/ModelsTable.tsx+++ b/frontend/src/metabase/browse/models/ModelsTable.tsx@@ -1,3 +1,4 @@+import cx from "classnames";import { type MouseEvent, useCallback, useState } from "react";import { push } from "react-router-redux";import { t } from "ttag";@@ -16,6 +17,7 @@ import {} from "metabase/common/components/ItemsTable/BaseItemsTable.styled";import { Columns } from "metabase/common/components/ItemsTable/Columns";import type { ResponsiveProps } from "metabase/common/components/ItemsTable/utils";+import { Link } from "metabase/common/components/Link";import { MarkdownPreview } from "metabase/common/components/MarkdownPreview";import { getIcon } from "metabase/lib/icon";import { useDispatch } from "metabase/lib/redux";@@ -23,13 +25,7 @@ import * as Urls from "metabase/lib/urls";import { FixedSizeIcon, Flex, Icon, Repeat, Skeleton } from "metabase/ui";import type { SortingOptions } from "metabase-types/api";-import {- Cell,- CollectionLink,- CollectionTableCell,- NameColumn,- TableRow,-} from "../components/BrowseTable.styled";+import BrowseTableS from "../components/BrowseTable.module.css";import { trackModelClick } from "./analytics";import type { ModelResult, SortColumn } from "./types";@@ -80,7 +76,7 @@ export const ModelsTable = ({<Table aria-label={skeleton ? undefined : t`Table of models`}><colgroup>{/* <col> for Name column */}- <NameColumn containerName={itemsTableContainerName} />+ <col className={BrowseTableS.nameColumn} />{/* <col> for Collection column */}<TableColumn {...collectionProps} width={`${collectionWidth}%`} />@@ -192,12 +188,15 @@ const ModelRow = ({ model }: { model?: ModelResult }) => {);return (- <TableRow onClick={handleClick}>+ <tr+ className={model ? BrowseTableS.tableRow : BrowseTableS.tableRowSkeleton}+ onClick={handleClick}+ ><NameCell model={model} /><CollectionCell model={model} /><DescriptionCell model={model} /><Columns.RightEdge.Cell />- </TableRow>+ </tr>);};@@ -250,27 +249,28 @@ function CollectionCell({ model }: { model?: ModelResult }) {);return (- <CollectionTableCell+ <td+ className={cx(BrowseTableS.collectionCell, BrowseTableS.hideAtXs)}data-testid={`path-for-collection: ${collectionName}`}- {...collectionProps}>{model?.collection ? (- <CollectionLink+ <Link+ className={BrowseTableS.collectionLink}to={Urls.collection(model.collection)}onClick={stopPropagation}>{content}- </CollectionLink>+ </Link>) : (content)}- </CollectionTableCell>+ </td>);}function DescriptionCell({ model }: { model?: ModelResult }) {return (- <Cell {...descriptionProps}>+ <td className={cx(BrowseTableS.cell, BrowseTableS.hideAtSm)}>{model ? (<MarkdownPreviewlineClamp={12}@@ -282,6 +282,6 @@ function DescriptionCell({ model }: { model?: ModelResult }) {) : (<SkeletonText />)}- </Cell>+ </td>);}diff --git a/frontend/src/metabase/browse/models/RecentModels.module.css b/frontend/src/metabase/browse/models/RecentModels.module.cssnew file mode 100644index 00000000000..acaccc71ed3--- /dev/null+++ b/frontend/src/metabase/browse/models/RecentModels.module.css@@ -0,0 +1,8 @@+.recentModelsGrid {+ display: grid;+ grid-template-columns: repeat(auto-fill, minmax(13rem, 1fr));+ gap: var(--mantine-spacing-sm);+ margin: 0;+ width: 100%;+ margin-bottom: var(--mantine-spacing-sm);+}diff --git a/frontend/src/metabase/browse/models/RecentModels.styled.tsx b/frontend/src/metabase/browse/models/RecentModels.styled.tsxdeleted file mode 100644index ac635b2a82f..00000000000--- a/frontend/src/metabase/browse/models/RecentModels.styled.tsx+++ /dev/null@@ -1,11 +0,0 @@-// eslint-disable-next-line no-restricted-imports-import styled from "@emotion/styled";--export const RecentModelsGrid = styled.div`- display: grid;- grid-template-columns: repeat(auto-fill, minmax(13rem, 1fr));- gap: 0.5rem;- margin: 0;- width: 100%;- margin-bottom: 0.5rem;-`;diff --git a/frontend/src/metabase/browse/models/RecentModels.tsx b/frontend/src/metabase/browse/models/RecentModels.tsxindex 0f758df2cc2..910be0be93f 100644--- a/frontend/src/metabase/browse/models/RecentModels.tsx+++ b/frontend/src/metabase/browse/models/RecentModels.tsx@@ -4,7 +4,7 @@ import PinnedItemCard from "metabase/collections/components/PinnedItemCard";import { Box, Repeat, Text } from "metabase/ui";import type { RecentCollectionItem } from "metabase-types/api";-import { RecentModelsGrid } from "./RecentModels.styled";+import S from "./RecentModels.module.css";import { trackModelClick } from "./analytics";export function RecentModels({@@ -35,7 +35,7 @@ export function RecentModels({mb="lg"style={{ visibility: skeleton ? "hidden" : undefined }}>{t`Recents`}</Text>- <RecentModelsGrid>+ <div className={S.recentModelsGrid}>{skeleton ? (<Repeat times={2}><PinnedItemCard skeleton iconForSkeleton="model" />@@ -49,7 +49,7 @@ export function RecentModels({/>)))}- </RecentModelsGrid>+ </div></Box>);}diff --git a/frontend/src/metabase/browse/schemas/BrowseSchemas.tsx b/frontend/src/metabase/browse/schemas/BrowseSchemas.tsxindex a7947b726e8..6f4892adc75 100644--- a/frontend/src/metabase/browse/schemas/BrowseSchemas.tsx+++ b/frontend/src/metabase/browse/schemas/BrowseSchemas.tsx@@ -7,17 +7,13 @@ import CS from "metabase/css/core/index.css";import { Databases } from "metabase/entities/databases";import { Schemas } from "metabase/entities/schemas";import * as Urls from "metabase/lib/urls";+import { Flex } from "metabase/ui";import type { CollectionItem } from "metabase-types/api";import { BrowseCard } from "../components/BrowseCard";-import {- BrowseContainer,- BrowseMain,- BrowseSection,-} from "../components/BrowseContainer.styled";+import S from "../components/BrowseContainer.module.css";import { BrowseDataHeader } from "../components/BrowseDataHeader";import { BrowseGrid } from "../components/BrowseGrid";-import { BrowseHeaderContent } from "../components/BrowseHeader.styled";const BrowseSchemasContainer = ({schemas,@@ -29,10 +25,17 @@ const BrowseSchemasContainer = ({const { slug } = params;const dbId = Urls.extractEntityId(slug);return (- <BrowseContainer data-testid="browse-schemas">+ <Flex+ className={S.browseContainer}+ flex={1}+ direction="column"+ wrap="nowrap"+ pt="md"+ data-testid="browse-schemas"+ ><BrowseDataHeader />- <BrowseMain>- <BrowseSection direction="column">+ <Flex className={S.browseMain} direction="column" wrap="nowrap" flex={1}>+ <Flex maw="64rem" mx="auto" w="100%" direction="column">{schemas.length === 1 ? (<TableBrowserschemas={schemas}@@ -45,14 +48,14 @@ const BrowseSchemasContainer = ({/>) : (<>- <BrowseHeaderContent>+ <Flex align="center" pt="md" pr="sm" pb="sm"><BrowserCrumbscrumbs={[{ title: t`Databases`, to: "/browse/databases" },{ title: <Databases.Name id={dbId} /> },]}/>- </BrowseHeaderContent>+ </Flex>{schemas.length === 0 ? (<h2className={cx(CS.full, CS.textCentered, CS.textMedium)}@@ -73,9 +76,9 @@ const BrowseSchemasContainer = ({)}</>)}- </BrowseSection>- </BrowseMain>- </BrowseContainer>+ </Flex>+ </Flex>+ </Flex>);};diff --git a/frontend/src/metabase/browse/tables/BrowseTables.tsx b/frontend/src/metabase/browse/tables/BrowseTables.tsxindex 409fe3104f0..7b3d60cf73a 100644--- a/frontend/src/metabase/browse/tables/BrowseTables.tsx+++ b/frontend/src/metabase/browse/tables/BrowseTables.tsx@@ -1,8 +1,6 @@-import {- BrowseContainer,- BrowseMain,- BrowseSection,-} from "../components/BrowseContainer.styled";+import { Flex } from "metabase/ui";++import S from "../components/BrowseContainer.module.css";import { BrowseDataHeader } from "../components/BrowseDataHeader";import TableBrowser from "../containers/TableBrowser";@@ -15,13 +13,19 @@ export const BrowseTables = ({};}) => {return (- <BrowseContainer>+ <Flex+ className={S.browseContainer}+ flex={1}+ direction="column"+ wrap="nowrap"+ pt="md"+ ><BrowseDataHeader />- <BrowseMain>- <BrowseSection direction="column">+ <Flex className={S.browseMain} direction="column" wrap="nowrap" flex={1}>+ <Flex maw="64rem" mx="auto" w="100%" direction="column"><TableBrowser dbId={dbId} schemaName={schemaName} />- </BrowseSection>- </BrowseMain>- </BrowseContainer>+ </Flex>+ </Flex>+ </Flex>);};diff --git a/frontend/src/metabase/browse/tables/TableBrowser/TableBrowser.jsx b/frontend/src/metabase/browse/tables/TableBrowser/TableBrowser.jsxindex 9fbf08a0a65..699a40fa5a3 100644--- a/frontend/src/metabase/browse/tables/TableBrowser/TableBrowser.jsx+++ b/frontend/src/metabase/browse/tables/TableBrowser/TableBrowser.jsx@@ -13,10 +13,9 @@ import { isSyncInProgress } from "metabase/lib/syncing";import { PLUGIN_TABLE_EDITING } from "metabase/plugins";import { getShallowDatabases as getDatabases } from "metabase/selectors/metadata";import { getUserIsAdmin } from "metabase/selectors/user";-import { ActionIcon, Group, Icon, Loader, Paper } from "metabase/ui";+import { ActionIcon, Flex, Group, Icon, Loader, Paper } from "metabase/ui";import { isVirtualCardId } from "metabase-lib/v1/metadata/utils/saved-questions";-import { BrowseHeaderContent } from "../../components/BrowseHeader.styled";import { trackBrowseXRayClicked, trackTableClick } from "../analytics";import S from "./TableBrowser.module.css";@@ -52,7 +51,7 @@ export const TableBrowser = ({return (<>- <BrowseHeaderContent>+ <Flex align="center" pt="md" pr="sm" pb="sm"><BrowserCrumbscrumbs={[{ title: t`Databases`, to: "/browse/databases" },@@ -60,7 +59,7 @@ export const TableBrowser = ({showSchemaInHeader && { title: schemaName },]}/>- </BrowseHeaderContent>+ </Flex><BrowseGrid pt="lg">{tables.map((table) => (<TableBrowserItem