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
Refactor .styled files to CSS modules with CSS variables (#66851)
Copilote51a02cd56ac
diff --git a/frontend/src/metabase/admin/app/components/DeprecationNotice/DeprecationNotice.module.css b/frontend/src/metabase/admin/app/components/DeprecationNotice/DeprecationNotice.module.cssnew file mode 100644index 00000000000..62d94f7f66d--- /dev/null+++ b/frontend/src/metabase/admin/app/components/DeprecationNotice/DeprecationNotice.module.css@@ -0,0 +1,27 @@+.NoticeRoot {+ display: flex;+ padding: 1rem 1rem 1rem 1.5rem;+ align-items: center;+ background-color: var(--mb-color-background-secondary);+}++.NoticeContent {+ flex: 1 1 auto;+ margin: 0 0.75rem;+ color: var(--mb-color-text-primary);+}++.NoticeWarningIcon {+ color: var(--mb-color-accent5);+ width: 1.5rem;+ height: 1.5rem;+}++.NoticeCloseIcon {+ color: var(--mb-color-background-tertiary);+ cursor: pointer;+}++.NoticeCloseIcon:hover {+ color: var(--mb-color-admin-navbar);+}diff --git a/frontend/src/metabase/admin/app/components/DeprecationNotice/DeprecationNotice.styled.tsx b/frontend/src/metabase/admin/app/components/DeprecationNotice/DeprecationNotice.styled.tsxdeleted file mode 100644index 2400383d84a..00000000000--- a/frontend/src/metabase/admin/app/components/DeprecationNotice/DeprecationNotice.styled.tsx+++ /dev/null@@ -1,33 +0,0 @@-// eslint-disable-next-line no-restricted-imports-import styled from "@emotion/styled";--import { Icon } from "metabase/ui";-import { color } from "metabase/ui/utils/colors";--export const NoticeRoot = styled.div`- display: flex;- padding: 1rem 1rem 1rem 1.5rem;- align-items: center;- background-color: var(--mb-color-background-secondary);-`;--export const NoticeContent = styled.div`- flex: 1 1 auto;- margin: 0 0.75rem;- color: var(--mb-color-text-primary);-`;--export const NoticeWarningIcon = styled(Icon)`- color: ${() => color("accent5")};- width: 1.5rem;- height: 1.5rem;-`;--export const NoticeCloseIcon = styled(Icon)`- color: var(--mb-color-background-tertiary-inverse);- cursor: pointer;-- &:hover {- color: ${() => color("admin-navbar")};- }-`;diff --git a/frontend/src/metabase/admin/app/components/DeprecationNotice/DeprecationNotice.tsx b/frontend/src/metabase/admin/app/components/DeprecationNotice/DeprecationNotice.tsxindex d52ba519174..6d5108a3504 100644--- a/frontend/src/metabase/admin/app/components/DeprecationNotice/DeprecationNotice.tsx+++ b/frontend/src/metabase/admin/app/components/DeprecationNotice/DeprecationNotice.tsx@@ -1,13 +1,9 @@import { jt, t } from "ttag";import Link from "metabase/common/components/Link";+import { Icon } from "metabase/ui";-import {- NoticeCloseIcon,- NoticeContent,- NoticeRoot,- NoticeWarningIcon,-} from "./DeprecationNotice.styled";+import S from "./DeprecationNotice.module.css";export interface DeprecationNoticeProps {hasSlackBot: boolean;@@ -27,13 +23,13 @@ const DeprecationNotice = ({}return (- <NoticeRoot role="status">- <NoticeWarningIcon name="warning" />- <NoticeContent>+ <div className={S.NoticeRoot} role="status">+ <Icon name="warning" className={S.NoticeWarningIcon} />+ <div className={S.NoticeContent}>{getBannerContent(hasSlackBot, hasDeprecatedDatabase)}- </NoticeContent>- <NoticeCloseIcon name="close" onClick={onClose} />- </NoticeRoot>+ </div>+ <Icon name="close" className={S.NoticeCloseIcon} onClick={onClose} />+ </div>);};diff --git a/frontend/src/metabase/admin/permissions/components/CollectionPermissionsModal/CollectionPermissionsModal.jsx b/frontend/src/metabase/admin/permissions/components/CollectionPermissionsModal/CollectionPermissionsModal.jsxindex 3d3e75e24e7..7cd9932c045 100644--- a/frontend/src/metabase/admin/permissions/components/CollectionPermissionsModal/CollectionPermissionsModal.jsx+++ b/frontend/src/metabase/admin/permissions/components/CollectionPermissionsModal/CollectionPermissionsModal.jsx@@ -27,7 +27,7 @@ import {import { permissionEditorPropTypes } from "../PermissionsEditor";import { PermissionsTable } from "../PermissionsTable";-import { PermissionTableContainer } from "./CollectionPermissionsModal.styled";+import S from "./CollectionPermissionsModal.module.css";const getDefaultTitle = (namespace) =>namespace === "snippets"@@ -146,14 +146,14 @@ const CollectionPermissionsModal = ({</Button>,]}>- <PermissionTableContainer>+ <div className={S.PermissionTableContainer}>{permissionEditor && (<PermissionsTable{...permissionEditor}onChange={handlePermissionChange}/>)}- </PermissionTableContainer>+ </div></ModalContent>);};diff --git a/frontend/src/metabase/admin/permissions/components/CollectionPermissionsModal/CollectionPermissionsModal.module.css b/frontend/src/metabase/admin/permissions/components/CollectionPermissionsModal/CollectionPermissionsModal.module.cssnew file mode 100644index 00000000000..fc41cf6b6a9--- /dev/null+++ b/frontend/src/metabase/admin/permissions/components/CollectionPermissionsModal/CollectionPermissionsModal.module.css@@ -0,0 +1,4 @@+.PermissionTableContainer {+ overflow: auto;+ height: 50vh;+}diff --git a/frontend/src/metabase/admin/permissions/components/CollectionPermissionsModal/CollectionPermissionsModal.styled.tsx b/frontend/src/metabase/admin/permissions/components/CollectionPermissionsModal/CollectionPermissionsModal.styled.tsxdeleted file mode 100644index 6eff969127f..00000000000--- a/frontend/src/metabase/admin/permissions/components/CollectionPermissionsModal/CollectionPermissionsModal.styled.tsx+++ /dev/null@@ -1,7 +0,0 @@-// eslint-disable-next-line no-restricted-imports-import styled from "@emotion/styled";--export const PermissionTableContainer = styled.div`- overflow: auto;- height: 50vh;-`;diff --git a/frontend/src/metabase/admin/permissions/components/EntityViewSwitch/EntityViewSwitch.module.css b/frontend/src/metabase/admin/permissions/components/EntityViewSwitch/EntityViewSwitch.module.cssnew file mode 100644index 00000000000..70b6e1168c2--- /dev/null+++ b/frontend/src/metabase/admin/permissions/components/EntityViewSwitch/EntityViewSwitch.module.css@@ -0,0 +1,3 @@+.EntityViewSwitchRoot {+ padding: 0.25rem 0;+}diff --git a/frontend/src/metabase/admin/permissions/components/EntityViewSwitch/EntityViewSwitch.styled.tsx b/frontend/src/metabase/admin/permissions/components/EntityViewSwitch/EntityViewSwitch.styled.tsxdeleted file mode 100644index 795a1e09049..00000000000--- a/frontend/src/metabase/admin/permissions/components/EntityViewSwitch/EntityViewSwitch.styled.tsx+++ /dev/null@@ -1,6 +0,0 @@-// eslint-disable-next-line no-restricted-imports-import styled from "@emotion/styled";--export const EntityViewSwitchRoot = styled.div`- padding: 0.25rem 0;-`;diff --git a/frontend/src/metabase/admin/permissions/components/EntityViewSwitch/EntityViewSwitch.tsx b/frontend/src/metabase/admin/permissions/components/EntityViewSwitch/EntityViewSwitch.tsxindex a4496523b10..e62ecd0ebf3 100644--- a/frontend/src/metabase/admin/permissions/components/EntityViewSwitch/EntityViewSwitch.tsx+++ b/frontend/src/metabase/admin/permissions/components/EntityViewSwitch/EntityViewSwitch.tsx@@ -2,7 +2,7 @@ import { t } from "ttag";import Radio from "metabase/common/components/Radio";-import { EntityViewSwitchRoot } from "./EntityViewSwitch.styled";+import S from "./EntityViewSwitch.module.css";type EntityView = "group" | "database";@@ -15,7 +15,7 @@ export const EntityViewSwitch = ({value,onChange,}: EntityViewSwitchProps) => (- <EntityViewSwitchRoot>+ <div className={S.EntityViewSwitchRoot}><Radio<string>variant="bubble"colorScheme="accent7"@@ -32,5 +32,5 @@ export const EntityViewSwitch = ({value={value}onChange={onChange}/>- </EntityViewSwitchRoot>+ </div>);diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditor.jsx b/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditor.jsxindex e8b020d5161..d173065b912 100644--- a/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditor.jsx+++ b/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditor.jsx@@ -4,7 +4,7 @@ import { UpsellPermissions } from "metabase/admin/upsells";import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";import { Box } from "metabase/ui";-import { PermissionsEditorRoot } from "./PermissionsEditor.styled";+import S from "./PermissionsEditor.module.css";import {PermissionsEditorContent,permissionEditorContentPropTypes,@@ -18,7 +18,7 @@ export const permissionEditorPropTypes = {export const PermissionsEditor = ({ isLoading, error, ...contentProps }) => {return (- <PermissionsEditorRoot>+ <div className={S.PermissionsEditorRoot}><LoadingAndErrorWrapper loading={isLoading} error={error} noWrapper><><Box mx="xl" mb="md">@@ -27,7 +27,7 @@ export const PermissionsEditor = ({ isLoading, error, ...contentProps }) => {<PermissionsEditorContent {...contentProps} /></></LoadingAndErrorWrapper>- </PermissionsEditorRoot>+ </div>);};diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditor.module.css b/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditor.module.cssnew file mode 100644index 00000000000..01307aca50d--- /dev/null+++ b/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditor.module.css@@ -0,0 +1,6 @@+.PermissionsEditorRoot {+ flex-grow: 1;+ position: relative;+ overflow: auto;+ padding: 1rem 0 0 0;+}diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditor.styled.tsx b/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditor.styled.tsxdeleted file mode 100644index a50349c62c0..00000000000--- a/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditor.styled.tsx+++ /dev/null@@ -1,9 +0,0 @@-// eslint-disable-next-line no-restricted-imports-import styled from "@emotion/styled";--export const PermissionsEditorRoot = styled.div`- flex-grow: 1;- position: relative;- overflow: auto;- padding: 1rem 0 0 0;-`;diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorEmptyState.jsx b/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorEmptyState.jsxindex 7c01fb082e8..116f9855334 100644--- a/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorEmptyState.jsx+++ b/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorEmptyState.jsx@@ -2,7 +2,7 @@ import PropTypes from "prop-types";import EmptyState from "metabase/common/components/EmptyState";-import { EmptyStateRoot } from "./PermissionsEditorEmptyState.styled";+import S from "./PermissionsEditorEmptyState.module.css";const propTypes = {icon: PropTypes.string.isRequired,@@ -10,9 +10,9 @@ const propTypes = {};export const PermissionsEditorEmptyState = (props) => (- <EmptyStateRoot>+ <div className={S.EmptyStateRoot}><EmptyState {...props} />- </EmptyStateRoot>+ </div>);PermissionsEditorEmptyState.propTypes = propTypes;diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorEmptyState.module.css b/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorEmptyState.module.cssnew file mode 100644index 00000000000..db0bd2307f8--- /dev/null+++ b/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorEmptyState.module.css@@ -0,0 +1,5 @@+.EmptyStateRoot {+ display: flex;+ align-items: center;+ margin: 0 auto;+}diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorEmptyState.styled.tsx b/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorEmptyState.styled.tsxdeleted file mode 100644index 255f80d3f67..00000000000--- a/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorEmptyState.styled.tsx+++ /dev/null@@ -1,8 +0,0 @@-// eslint-disable-next-line no-restricted-imports-import styled from "@emotion/styled";--export const EmptyStateRoot = styled.div`- display: flex;- align-items: center;- margin: 0 auto;-`;diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsSidebar/PermissionsSidebarContent.module.css b/frontend/src/metabase/admin/permissions/components/PermissionsSidebar/PermissionsSidebarContent.module.cssnew file mode 100644index 00000000000..0b8bde58143--- /dev/null+++ b/frontend/src/metabase/admin/permissions/components/PermissionsSidebar/PermissionsSidebarContent.module.css@@ -0,0 +1,7 @@+.SidebarContentTitle {+ display: flex;+ align-items: center;+ font-size: 14px;+ font-weight: 700;+ margin-top: 0.5rem;+}diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsSidebar/PermissionsSidebarContent.styled.tsx b/frontend/src/metabase/admin/permissions/components/PermissionsSidebar/PermissionsSidebarContent.styled.tsxdeleted file mode 100644index 49512c73126..00000000000--- a/frontend/src/metabase/admin/permissions/components/PermissionsSidebar/PermissionsSidebarContent.styled.tsx+++ /dev/null@@ -1,10 +0,0 @@-// eslint-disable-next-line no-restricted-imports-import styled from "@emotion/styled";--export const SidebarContentTitle = styled.div`- display: flex;- align-items: center;- font-size: 14px;- font-weight: 700;- margin-top: 0.5rem;-`;diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsSidebar/PermissionsSidebarContent.tsx b/frontend/src/metabase/admin/permissions/components/PermissionsSidebar/PermissionsSidebarContent.tsxindex 52ad0683bf4..4b515ddbcf4 100644--- a/frontend/src/metabase/admin/permissions/components/PermissionsSidebar/PermissionsSidebarContent.tsx+++ b/frontend/src/metabase/admin/permissions/components/PermissionsSidebar/PermissionsSidebarContent.tsx@@ -11,7 +11,7 @@ import {BackIcon,SidebarHeader,} from "./PermissionsSidebar.styled";-import { SidebarContentTitle } from "./PermissionsSidebarContent.styled";+import S from "./PermissionsSidebarContent.module.css";export interface PermissionsSidebarContentProps {title?: string;@@ -46,7 +46,7 @@ export const PermissionsSidebarContent = memo({title}</BackButton>) : (- <SidebarContentTitle>{title}</SidebarContentTitle>+ <div className={S.SidebarContentTitle}>{title}</div>)}{description && <Text color="text-primary">{description}</Text>}{entityViewFocus && onEntityChange && (diff --git a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSecuritySettings/EmbeddingAppSameSiteCookieDescription.module.css b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSecuritySettings/EmbeddingAppSameSiteCookieDescription.module.cssnew file mode 100644index 00000000000..394701e6250--- /dev/null+++ b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSecuritySettings/EmbeddingAppSameSiteCookieDescription.module.css@@ -0,0 +1,4 @@+.SameSiteAlert {+ display: block;+ padding: 0.75rem;+}diff --git a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSecuritySettings/EmbeddingAppSameSiteCookieDescription.styled.tsx b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSecuritySettings/EmbeddingAppSameSiteCookieDescription.styled.tsxdeleted file mode 100644index 7d25d8e509f..00000000000--- a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSecuritySettings/EmbeddingAppSameSiteCookieDescription.styled.tsx+++ /dev/null@@ -1,9 +0,0 @@-// eslint-disable-next-line no-restricted-imports -- legacy component-import styled from "@emotion/styled";--import Alert from "metabase/common/components/Alert";--export const SameSiteAlert = styled(Alert)`- display: block;- padding: 0.75rem;-`;diff --git a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSecuritySettings/EmbeddingAppSameSiteCookieDescription.tsx b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSecuritySettings/EmbeddingAppSameSiteCookieDescription.tsxindex 9da6b3c64cd..d30a9483993 100644--- a/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSecuritySettings/EmbeddingAppSameSiteCookieDescription.tsx+++ b/frontend/src/metabase/admin/settings/components/EmbeddingSettings/EmbeddingSecuritySettings/EmbeddingAppSameSiteCookieDescription.tsx@@ -1,5 +1,6 @@import { jt, t } from "ttag";+import Alert from "metabase/common/components/Alert";import ExternalLink from "metabase/common/components/ExternalLink";import { useSetting } from "metabase/common/hooks";import { isSameOrigin } from "metabase/lib/dom";@@ -8,7 +9,7 @@ import { isEmpty } from "metabase/lib/utils";import { getDocsUrl } from "metabase/selectors/settings";import { Box, Center, Stack, Text } from "metabase/ui";-import { SameSiteAlert } from "./EmbeddingAppSameSiteCookieDescription.styled";+import S from "./EmbeddingAppSameSiteCookieDescription.module.css";export const EmbeddingAppSameSiteCookieDescription = () => {const docsUrl = useSelector((state) =>@@ -41,7 +42,7 @@ export const EmbeddingAppSameSiteCookieDescription = () => {function AuthorizedOriginsNote() {return (<Box data-testid="authorized-origins-note" w="22rem">- <SameSiteAlert variant="warning" hasBorder>+ <Alert className={S.SameSiteAlert} variant="warning" hasBorder><Center><Text>{jt`You should probably change this setting to ${(<Text key="inner" component="span" fw="bold">@@ -49,7 +50,7 @@ function AuthorizedOriginsNote() {</Text>)}.`}</Text></Center>- </SameSiteAlert>+ </Alert></Box>);}diff --git a/frontend/src/metabase/collections/components/ActionMenu/ActionMenu.module.css b/frontend/src/metabase/collections/components/ActionMenu/ActionMenu.module.cssnew file mode 100644index 00000000000..02d17761350--- /dev/null+++ b/frontend/src/metabase/collections/components/ActionMenu/ActionMenu.module.css@@ -0,0 +1,3 @@+.EntityItemMenu {+ color: var(--mb-color-text-secondary);+}diff --git a/frontend/src/metabase/collections/components/ActionMenu/ActionMenu.styled.tsx b/frontend/src/metabase/collections/components/ActionMenu/ActionMenu.styled.tsxdeleted file mode 100644index cb755b9ec80..00000000000--- a/frontend/src/metabase/collections/components/ActionMenu/ActionMenu.styled.tsx+++ /dev/null@@ -1,8 +0,0 @@-// eslint-disable-next-line no-restricted-imports-import styled from "@emotion/styled";--import EntityItem from "metabase/common/components/EntityItem";--export const EntityItemMenu = styled(EntityItem.Menu)`- color: var(--mb-color-text-secondary);-`;diff --git a/frontend/src/metabase/collections/components/ActionMenu/ActionMenu.tsx b/frontend/src/metabase/collections/components/ActionMenu/ActionMenu.tsxindex d88a4048e3f..ce1090cbf9d 100644--- a/frontend/src/metabase/collections/components/ActionMenu/ActionMenu.tsx+++ b/frontend/src/metabase/collections/components/ActionMenu/ActionMenu.tsx@@ -22,6 +22,7 @@ import {isPreviewEnabled,} from "metabase/collections/utils";import { ConfirmModal } from "metabase/common/components/ConfirmModal";+import EntityItem from "metabase/common/components/EntityItem";import { useToast } from "metabase/common/hooks/use-toast";import { bookmarks as BookmarkEntity } from "metabase/entities";import { connect, useDispatch } from "metabase/lib/redux";@@ -32,7 +33,7 @@ import type Database from "metabase-lib/v1/metadata/Database";import type { Bookmark, Collection, CollectionItem } from "metabase-types/api";import type { State } from "metabase-types/store";-import { EntityItemMenu } from "./ActionMenu.styled";+import S from "./ActionMenu.module.css";export interface ActionMenuProps {className?: string;@@ -162,8 +163,8 @@ function ActionMenu({return (<>- <EntityItemMenu- className={className}+ <EntityItem.Menu+ className={`${S.EntityItemMenu} ${className || ""}`}item={item}isBookmarked={isBookmarked}isXrayEnabled={!item.archived && isXrayEnabled}diff --git a/frontend/src/metabase/common/components/ExternalLink/ExternalLink.module.css b/frontend/src/metabase/common/components/ExternalLink/ExternalLink.module.cssindex 3b5a69842e6..ceaa6f7a7ab 100644--- a/frontend/src/metabase/common/components/ExternalLink/ExternalLink.module.css+++ b/frontend/src/metabase/common/components/ExternalLink/ExternalLink.module.css@@ -12,3 +12,12 @@transition: all 200ms linear;}}++.LinkRoot {+ outline: 2px solid transparent;+ outline-offset: 2px;+}++.LinkRoot:focus-visible {+ outline: 2px solid var(--mb-color-brand);+}diff --git a/frontend/src/metabase/common/components/ExternalLink/ExternalLink.styled.tsx b/frontend/src/metabase/common/components/ExternalLink/ExternalLink.styled.tsxdeleted file mode 100644index ac9c7ac1108..00000000000--- a/frontend/src/metabase/common/components/ExternalLink/ExternalLink.styled.tsx+++ /dev/null@@ -1,8 +0,0 @@-// eslint-disable-next-line no-restricted-imports-import styled from "@emotion/styled";--import { focusOutlineStyle } from "metabase/common/style/input";--export const LinkRoot = styled.a`- ${focusOutlineStyle("brand")};-`;diff --git a/frontend/src/metabase/common/components/ExternalLink/ExternalLink.tsx b/frontend/src/metabase/common/components/ExternalLink/ExternalLink.tsxindex 92558e7e6de..741a82f42a4 100644--- a/frontend/src/metabase/common/components/ExternalLink/ExternalLink.tsx+++ b/frontend/src/metabase/common/components/ExternalLink/ExternalLink.tsx@@ -5,7 +5,6 @@ import CS from "metabase/css/core/index.css";import { getUrlTarget } from "metabase/lib/dom";import S from "./ExternalLink.module.css";-import { LinkRoot } from "./ExternalLink.styled";interface Props extends AnchorHTMLAttributes<HTMLAnchorElement> {href?: string;@@ -19,10 +18,10 @@ const ExternalLink = forwardRef(function ExternalLink(ref: Ref<HTMLAnchorElement>,) {return (- <LinkRoot+ <aref={ref}href={href}- className={className || CS.link}+ className={`${S.LinkRoot} ${className || CS.link}`}target={target}// prevent malicious pages from navigating us awayrel="noopener noreferrer"@@ -31,7 +30,7 @@ const ExternalLink = forwardRef(function ExternalLink({...props}>{children}- </LinkRoot>+ </a>);});diff --git a/frontend/src/metabase/common/components/NumericInput/NumericInput.styled.tsx b/frontend/src/metabase/common/components/NumericInput/NumericInput.styled.tsxdeleted file mode 100644index 67a34a9b428..00000000000--- a/frontend/src/metabase/common/components/NumericInput/NumericInput.styled.tsx+++ /dev/null@@ -1,8 +0,0 @@-// eslint-disable-next-line no-restricted-imports-import styled from "@emotion/styled";--import { TextInputBlurChange } from "metabase/ui";--export const NumericInputBlurChange = styled(TextInputBlurChange)`- width: auto;-`;diff --git a/frontend/src/metabase/common/components/NumericInput/OldNumericInput.jsx b/frontend/src/metabase/common/components/NumericInput/OldNumericInput.jsxdeleted file mode 100644index c258182a548..00000000000--- a/frontend/src/metabase/common/components/NumericInput/OldNumericInput.jsx+++ /dev/null@@ -1,20 +0,0 @@-/* eslint-disable react/prop-types */-import { NumericInputBlurChange } from "./NumericInput.styled";--/**- * @deprecated: use NumberInput from "metabase/ui"- * */-const NumericInput = ({ value, onChange, ...props }) => (- <NumericInputBlurChange- value={value == null ? "" : String(value)}- onBlurChange={({ target: { value } }) => {- value = value ? parseFloat(value) : null;- if (!isNaN(value)) {- onChange(value);- }- }}- {...props}- />-);--export default NumericInput;diff --git a/frontend/src/metabase/common/components/icons/CountdownIcon.module.css b/frontend/src/metabase/common/components/icons/CountdownIcon.module.cssnew file mode 100644index 00000000000..f1272419ce6--- /dev/null+++ b/frontend/src/metabase/common/components/icons/CountdownIcon.module.css@@ -0,0 +1,3 @@+.IconRoot {+ color: var(--mb-color-summarize);+}diff --git a/frontend/src/metabase/common/components/icons/CountdownIcon.styled.tsx b/frontend/src/metabase/common/components/icons/CountdownIcon.styled.tsxdeleted file mode 100644index ce1c2a0b9c5..00000000000--- a/frontend/src/metabase/common/components/icons/CountdownIcon.styled.tsx+++ /dev/null@@ -1,6 +0,0 @@-// eslint-disable-next-line no-restricted-imports-import styled from "@emotion/styled";--export const IconRoot = styled.svg`- color: var(--mb-color-summarize);-`;diff --git a/frontend/src/metabase/common/components/icons/CountdownIcon.tsx b/frontend/src/metabase/common/components/icons/CountdownIcon.tsxindex 4aa4aee26d7..92bc0edb259 100644--- a/frontend/src/metabase/common/components/icons/CountdownIcon.tsx+++ b/frontend/src/metabase/common/components/icons/CountdownIcon.tsx@@ -1,4 +1,4 @@-import { IconRoot } from "./CountdownIcon.styled";+import S from "./CountdownIcon.module.css";type CountdownIconProps = {percent?: number;@@ -13,10 +13,10 @@ export const CountdownIcon = ({height = 20,className,}: CountdownIconProps) => (- <IconRoot+ <svgwidth={width}height={height}- className={className}+ className={`${S.IconRoot} ${className || ""}`}viewBox="0 0 32 32"style={{transform: "rotate(-" + (percent * 360 + 90) + "deg)",@@ -33,5 +33,5 @@ export const CountdownIcon = ({strokeWidth="32"strokeDasharray={percent * 100 + " 100"}/>- </IconRoot>+ </svg>);diff --git a/frontend/src/metabase/home/components/HomePopularSection/HomePopularSection.module.css b/frontend/src/metabase/home/components/HomePopularSection/HomePopularSection.module.cssnew file mode 100644index 00000000000..dbd80a38733--- /dev/null+++ b/frontend/src/metabase/home/components/HomePopularSection/HomePopularSection.module.css@@ -0,0 +1,5 @@+.SectionBody {+ display: flex;+ gap: 1.5rem;+ flex-wrap: wrap;+}diff --git a/frontend/src/metabase/home/components/HomePopularSection/HomePopularSection.styled.tsx b/frontend/src/metabase/home/components/HomePopularSection/HomePopularSection.styled.tsxdeleted file mode 100644index c49ffb64472..00000000000--- a/frontend/src/metabase/home/components/HomePopularSection/HomePopularSection.styled.tsx+++ /dev/null@@ -1,8 +0,0 @@-// eslint-disable-next-line no-restricted-imports-import styled from "@emotion/styled";--export const SectionBody = styled.div`- display: flex;- gap: 1.5rem;- flex-wrap: wrap;-`;diff --git a/frontend/src/metabase/home/components/HomePopularSection/HomePopularSection.tsx b/frontend/src/metabase/home/components/HomePopularSection/HomePopularSection.tsxindex de7d97d451a..2c352f354e7 100644--- a/frontend/src/metabase/home/components/HomePopularSection/HomePopularSection.tsx+++ b/frontend/src/metabase/home/components/HomePopularSection/HomePopularSection.tsx@@ -12,7 +12,7 @@ import { HomeCaption } from "../HomeCaption";import { HomeHelpCard } from "../HomeHelpCard";import { HomeModelCard } from "../HomeModelCard";-import { SectionBody } from "./HomePopularSection.styled";+import S from "./HomePopularSection.module.css";export const HomePopularSection = (): JSX.Element => {const {@@ -28,7 +28,7 @@ export const HomePopularSection = (): JSX.Element => {return (<div><HomeCaption>{getTitle(popularItems)}</HomeCaption>- <SectionBody>+ <div className={S.SectionBody}>{popularItems.map((item, index) => (<HomeModelCardkey={index}@@ -38,7 +38,7 @@ export const HomePopularSection = (): JSX.Element => {/>))}<HomeHelpCard />- </SectionBody>+ </div></div>);};diff --git a/frontend/src/metabase/home/components/HomeRecentSection/HomeRecentSection.module.css b/frontend/src/metabase/home/components/HomeRecentSection/HomeRecentSection.module.cssnew file mode 100644index 00000000000..dbd80a38733--- /dev/null+++ b/frontend/src/metabase/home/components/HomeRecentSection/HomeRecentSection.module.css@@ -0,0 +1,5 @@+.SectionBody {+ display: flex;+ gap: 1.5rem;+ flex-wrap: wrap;+}diff --git a/frontend/src/metabase/home/components/HomeRecentSection/HomeRecentSection.styled.tsx b/frontend/src/metabase/home/components/HomeRecentSection/HomeRecentSection.styled.tsxdeleted file mode 100644index c49ffb64472..00000000000--- a/frontend/src/metabase/home/components/HomeRecentSection/HomeRecentSection.styled.tsx+++ /dev/null@@ -1,8 +0,0 @@-// eslint-disable-next-line no-restricted-imports-import styled from "@emotion/styled";--export const SectionBody = styled.div`- display: flex;- gap: 1.5rem;- flex-wrap: wrap;-`;diff --git a/frontend/src/metabase/home/components/HomeRecentSection/HomeRecentSection.tsx b/frontend/src/metabase/home/components/HomeRecentSection/HomeRecentSection.tsxindex f561905546c..da843450365 100644--- a/frontend/src/metabase/home/components/HomeRecentSection/HomeRecentSection.tsx+++ b/frontend/src/metabase/home/components/HomeRecentSection/HomeRecentSection.tsx@@ -14,7 +14,7 @@ import { HomeCaption } from "../HomeCaption";import { HomeHelpCard } from "../HomeHelpCard";import { HomeModelCard } from "../HomeModelCard";-import { SectionBody } from "./HomeRecentSection.styled";+import S from "./HomeRecentSection.module.css";export const HomeRecentSection = () => {const { data: recentItems = [], isLoading, error } = useListRecentsQuery();@@ -29,7 +29,7 @@ export const HomeRecentSection = () => {return (<div><HomeCaption>{t`Pick up where you left off`}</HomeCaption>- <SectionBody>+ <div className={S.SectionBody}>{recentsFilter(recentItems).map((item, index) => (<HomeModelCardkey={index}@@ -39,7 +39,7 @@ export const HomeRecentSection = () => {/>))}{hasHelpCard && <HomeHelpCard />}- </SectionBody>+ </div></div>);};diff --git a/frontend/src/metabase/nav/components/AppBar/AppBar.module.css b/frontend/src/metabase/nav/components/AppBar/AppBar.module.cssnew file mode 100644index 00000000000..9cddabd3ca5--- /dev/null+++ b/frontend/src/metabase/nav/components/AppBar/AppBar.module.css@@ -0,0 +1,14 @@+.AppBarRoot {+ position: relative;+ z-index: 4;+}++.AppBarRoot[data-with-border="true"] {+ border-bottom: 1px solid var(--mb-color-border);+}++@media print {+ .AppBarRoot {+ display: none;+ }+}diff --git a/frontend/src/metabase/nav/components/AppBar/AppBar.styled.tsx b/frontend/src/metabase/nav/components/AppBar/AppBar.styled.tsxdeleted file mode 100644index 2afd3f512cc..00000000000--- a/frontend/src/metabase/nav/components/AppBar/AppBar.styled.tsx+++ /dev/null@@ -1,13 +0,0 @@-// eslint-disable-next-line no-restricted-imports-import styled from "@emotion/styled";--export const AppBarRoot = styled.header<{ withBorder?: boolean }>`- position: relative;- z-index: 4;- border-bottom: ${(props) =>- props.withBorder ? "1px solid var(--mb-color-border)" : undefined};-- @media print {- display: none;- }-`;diff --git a/frontend/src/metabase/nav/components/AppBar/AppBar.tsx b/frontend/src/metabase/nav/components/AppBar/AppBar.tsxindex 57b41ea2b1f..4d5f5eadd6a 100644--- a/frontend/src/metabase/nav/components/AppBar/AppBar.tsx+++ b/frontend/src/metabase/nav/components/AppBar/AppBar.tsx@@ -5,7 +5,7 @@ import useIsSmallScreen from "metabase/common/hooks/use-is-small-screen";import type { CollectionId, User } from "metabase-types/api";import type { DetailViewState } from "metabase-types/store";-import { AppBarRoot } from "./AppBar.styled";+import S from "./AppBar.module.css";import AppBarLarge from "./AppBarLarge";import AppBarSmall from "./AppBarSmall";@@ -33,11 +33,12 @@ const AppBar = (props: AppBarProps): JSX.Element => {const isSmallScreen = useIsSmallScreen();return (- <AppBarRoot+ <header+ className={S.AppBarRoot}data-element-id="app-bar"data-testid="app-bar"+ data-with-border={props.detailView != null}aria-label={t`Navigation bar`}- withBorder={props.detailView != null}><ErrorBoundary>{isSmallScreen ? (@@ -46,7 +47,7 @@ const AppBar = (props: AppBarProps): JSX.Element => {<AppBarLarge {...props} />)}</ErrorBoundary>- </AppBarRoot>+ </header>);};diff --git a/frontend/src/metabase/nav/components/WhatsNewNotification/WhatsNewNotification.module.css b/frontend/src/metabase/nav/components/WhatsNewNotification/WhatsNewNotification.module.cssnew file mode 100644index 00000000000..78b29b2c6f9--- /dev/null+++ b/frontend/src/metabase/nav/components/WhatsNewNotification/WhatsNewNotification.module.css@@ -0,0 +1,7 @@+.DismissIconButtonWrapper {+ color: var(--mb-color-background-tertiary);+}++.DismissIconButtonWrapper:hover {+ color: var(--mb-color-text-secondary);+}diff --git a/frontend/src/metabase/nav/components/WhatsNewNotification/WhatsNewNotification.styled.tsx b/frontend/src/metabase/nav/components/WhatsNewNotification/WhatsNewNotification.styled.tsxdeleted file mode 100644index c10ae4a254d..00000000000--- a/frontend/src/metabase/nav/components/WhatsNewNotification/WhatsNewNotification.styled.tsx+++ /dev/null@@ -1,12 +0,0 @@-// eslint-disable-next-line no-restricted-imports-import styled from "@emotion/styled";--import IconButtonWrapper from "metabase/common/components/IconButtonWrapper";--export const DismissIconButtonWrapper = styled(IconButtonWrapper)`- color: var(--mb-color-background-tertiary-inverse);-- &:hover {- color: var(--mb-color-text-secondary);- }-`;diff --git a/frontend/src/metabase/nav/components/WhatsNewNotification/WhatsNewNotification.tsx b/frontend/src/metabase/nav/components/WhatsNewNotification/WhatsNewNotification.tsxindex 910fdddb301..abb4cc7db78 100644--- a/frontend/src/metabase/nav/components/WhatsNewNotification/WhatsNewNotification.tsx+++ b/frontend/src/metabase/nav/components/WhatsNewNotification/WhatsNewNotification.tsx@@ -3,6 +3,7 @@ import { t } from "ttag";import { updateSetting } from "metabase/admin/settings/settings";import { useGetVersionInfoQuery } from "metabase/api";+import IconButtonWrapper from "metabase/common/components/IconButtonWrapper";import { useSetting } from "metabase/common/hooks";import { useDispatch, useSelector } from "metabase/lib/redux";import { getIsEmbeddingIframe } from "metabase/selectors/embed";@@ -10,7 +11,7 @@ import { getIsWhiteLabeling } from "metabase/selectors/whitelabel";import { Anchor, Flex, Icon, Paper, Stack, Text } from "metabase/ui";import { color } from "metabase/ui/utils/colors";-import { DismissIconButtonWrapper } from "./WhatsNewNotification.styled";+import S from "./WhatsNewNotification.module.css";import Sparkles from "./sparkles.svg?component";import { getLatestEligibleReleaseNotes } from "./utils";@@ -57,9 +58,12 @@ export function WhatsNewNotification() {<Stack gap="sm"><Flex justify="space-between"><Sparkles color={color("brand")} />- <DismissIconButtonWrapper onClick={dismiss}>+ <IconButtonWrapper+ className={S.DismissIconButtonWrapper}+ onClick={dismiss}+ ><Icon name="close" />- </DismissIconButtonWrapper>+ </IconButtonWrapper></Flex>{/* eslint-disable-next-line no-literal-metabase-strings -- This only shows for admins */}diff --git a/frontend/src/metabase/notifications/channels/RecipientPicker.module.css b/frontend/src/metabase/notifications/channels/RecipientPicker.module.cssindex e86aa29adef..43a8109f0ae 100644--- a/frontend/src/metabase/notifications/channels/RecipientPicker.module.css+++ b/frontend/src/metabase/notifications/channels/RecipientPicker.module.css@@ -1,3 +1,8 @@.tokenField {background: var(--mb-color-background-primary);}++.ErrorMessage {+ color: var(--mb-color-error);+ margin-top: 0.5rem;+}diff --git a/frontend/src/metabase/notifications/channels/RecipientPicker.styled.tsx b/frontend/src/metabase/notifications/channels/RecipientPicker.styled.tsxdeleted file mode 100644index 7503f7304c8..00000000000--- a/frontend/src/metabase/notifications/channels/RecipientPicker.styled.tsx+++ /dev/null@@ -1,7 +0,0 @@-// eslint-disable-next-line no-restricted-imports-import styled from "@emotion/styled";--export const ErrorMessage = styled.div`- color: var(--mb-color-error);- margin-top: 0.5rem;-`;diff --git a/frontend/src/metabase/notifications/channels/RecipientPicker.tsx b/frontend/src/metabase/notifications/channels/RecipientPicker.tsxindex 9733a02f783..107de7ca66b 100644--- a/frontend/src/metabase/notifications/channels/RecipientPicker.tsx+++ b/frontend/src/metabase/notifications/channels/RecipientPicker.tsx@@ -14,7 +14,6 @@ import { Text } from "metabase/ui";import type { User } from "metabase-types/api";import S from "./RecipientPicker.module.css";-import { ErrorMessage } from "./RecipientPicker.styled";interface RecipientPickerProps {recipients?: RecipientPickerValue[];@@ -76,7 +75,7 @@ export const RecipientPicker = ({/></div>{domains && !isValid && (- <ErrorMessage>{invalidRecipientText(domains)}</ErrorMessage>+ <div className={S.ErrorMessage}>{invalidRecipientText(domains)}</div>)}</div>);diff --git a/frontend/src/metabase/setup/components/InviteUserForm/InviteUserForm.module.css b/frontend/src/metabase/setup/components/InviteUserForm/InviteUserForm.module.cssnew file mode 100644index 00000000000..524fe4bf94d--- /dev/null+++ b/frontend/src/metabase/setup/components/InviteUserForm/InviteUserForm.module.css@@ -0,0 +1,11 @@+.UserFieldGroup {+ display: block;+}++@media (min-width: 40rem) {+ .UserFieldGroup {+ display: grid;+ grid-template-columns: repeat(2, 1fr);+ gap: 1rem;+ }+}diff --git a/frontend/src/metabase/setup/components/InviteUserForm/InviteUserForm.styled.tsx b/frontend/src/metabase/setup/components/InviteUserForm/InviteUserForm.styled.tsxdeleted file mode 100644index 209fb7c6231..00000000000--- a/frontend/src/metabase/setup/components/InviteUserForm/InviteUserForm.styled.tsx+++ /dev/null@@ -1,12 +0,0 @@-// eslint-disable-next-line no-restricted-imports-import styled from "@emotion/styled";--import { breakpointMinSmall } from "metabase/styled-components/theme";--export const UserFieldGroup = styled.div`- ${breakpointMinSmall} {- display: grid;- grid-template-columns: repeat(2, 1fr);- gap: 1rem;- }-`;diff --git a/frontend/src/metabase/setup/components/InviteUserForm/InviteUserForm.tsx b/frontend/src/metabase/setup/components/InviteUserForm/InviteUserForm.tsxindex 7dee0bab047..87a3e36262a 100644--- a/frontend/src/metabase/setup/components/InviteUserForm/InviteUserForm.tsx+++ b/frontend/src/metabase/setup/components/InviteUserForm/InviteUserForm.tsx@@ -8,7 +8,7 @@ import { Form, FormProvider } from "metabase/forms";import * as Errors from "metabase/lib/errors";import type { InviteInfo, UserInfo } from "metabase-types/store";-import { UserFieldGroup } from "./InviteUserForm.styled";+import S from "./InviteUserForm.module.css";const INVITE_USER_SCHEMA = Yup.object({first_name: Yup.string().nullable().default(null).max(100, Errors.maxLength),@@ -47,7 +47,7 @@ export const InviteUserForm = ({onSubmit={onSubmit}><Form data-testid="invite-user-form">- <UserFieldGroup>+ <div className={S.UserFieldGroup}><FormInputname="first_name"title={t`First name`}@@ -61,7 +61,7 @@ export const InviteUserForm = ({placeholder={t`Appleseed`}nullable/>- </UserFieldGroup>+ </div><FormInputname="email"title={t`Email`}diff --git a/frontend/src/metabase/setup/components/UserStep/UserStep.module.css b/frontend/src/metabase/setup/components/UserStep/UserStep.module.cssnew file mode 100644index 00000000000..1b447da9334--- /dev/null+++ b/frontend/src/metabase/setup/components/UserStep/UserStep.module.css@@ -0,0 +1,4 @@+.StepDescription {+ color: var(--mb-color-text-secondary);+ margin-top: 0.875rem;+}diff --git a/frontend/src/metabase/setup/components/UserStep/UserStep.styled.tsx b/frontend/src/metabase/setup/components/UserStep/UserStep.styled.tsxdeleted file mode 100644index ece43d8e1a4..00000000000--- a/frontend/src/metabase/setup/components/UserStep/UserStep.styled.tsx+++ /dev/null@@ -1,7 +0,0 @@-// eslint-disable-next-line no-restricted-imports-import styled from "@emotion/styled";--export const StepDescription = styled.div`- color: var(--mb-color-text-secondary);- margin-top: 0.875rem;-`;diff --git a/frontend/src/metabase/setup/components/UserStep/UserStep.tsx b/frontend/src/metabase/setup/components/UserStep/UserStep.tsxindex b14a4e4c4a2..8a457712ad7 100644--- a/frontend/src/metabase/setup/components/UserStep/UserStep.tsx+++ b/frontend/src/metabase/setup/components/UserStep/UserStep.tsx@@ -11,7 +11,7 @@ import { InactiveStep } from "../InactiveStep";import { UserForm } from "../UserForm";import type { NumberedStepProps } from "../types";-import { StepDescription } from "./UserStep.styled";+import S from "./UserStep.module.css";export const UserStep = ({ stepLabel }: NumberedStepProps): JSX.Element => {const { isStepActive, isStepCompleted } = useStep("user_info");@@ -38,10 +38,10 @@ export const UserStep = ({ stepLabel }: NumberedStepProps): JSX.Element => {return (<ActiveStep title={getStepTitle(user, isStepCompleted)} label={stepLabel}>{isHosted && (- <StepDescription>+ <div className={S.StepDescription}>{t`We know you’ve already created one of these.`}{" "}{t`We like to keep billing and product accounts separate so that you don’t have to share logins.`}- </StepDescription>+ </div>)}<UserForm user={user} isHosted={isHosted} onSubmit={handleSubmit} /></ActiveStep>diff --git a/frontend/src/metabase/timelines/collections/components/TimelineList/TimelineList.module.css b/frontend/src/metabase/timelines/collections/components/TimelineList/TimelineList.module.cssnew file mode 100644index 00000000000..e1619665dae--- /dev/null+++ b/frontend/src/metabase/timelines/collections/components/TimelineList/TimelineList.module.css@@ -0,0 +1,5 @@+.ListRoot {+ display: flex;+ flex-direction: column;+ gap: 1.25rem;+}diff --git a/frontend/src/metabase/timelines/collections/components/TimelineList/TimelineList.styled.tsx b/frontend/src/metabase/timelines/collections/components/TimelineList/TimelineList.styled.tsxdeleted file mode 100644index 79e289f5fcc..00000000000--- a/frontend/src/metabase/timelines/collections/components/TimelineList/TimelineList.styled.tsx+++ /dev/null@@ -1,8 +0,0 @@-// eslint-disable-next-line no-restricted-imports-import styled from "@emotion/styled";--export const ListRoot = styled.div`- display: flex;- flex-direction: column;- gap: 1.25rem;-`;diff --git a/frontend/src/metabase/timelines/collections/components/TimelineList/TimelineList.tsx b/frontend/src/metabase/timelines/collections/components/TimelineList/TimelineList.tsxindex 485302e0438..30b67485c4e 100644--- a/frontend/src/metabase/timelines/collections/components/TimelineList/TimelineList.tsx+++ b/frontend/src/metabase/timelines/collections/components/TimelineList/TimelineList.tsx@@ -2,7 +2,7 @@ import type { Timeline } from "metabase-types/api";import TimelineCard from "../TimelineCard";-import { ListRoot } from "./TimelineList.styled";+import S from "./TimelineList.module.css";export interface TimelineListProps {timelines: Timeline[];@@ -14,7 +14,7 @@ const TimelineList = ({onUnarchive,}: TimelineListProps): JSX.Element => {return (- <ListRoot>+ <div className={S.ListRoot}>{timelines.map((timeline) => (<TimelineCardkey={timeline.id}@@ -22,7 +22,7 @@ const TimelineList = ({onUnarchive={onUnarchive}/>))}- </ListRoot>+ </div>);};diff --git a/frontend/src/metabase/timelines/common/components/ModalBody/ModalBody.styled.tsx b/frontend/src/metabase/timelines/common/components/ModalBody/ModalBody.styled.tsxdeleted file mode 100644index 463135fc8ca..00000000000--- a/frontend/src/metabase/timelines/common/components/ModalBody/ModalBody.styled.tsx+++ /dev/null@@ -1,6 +0,0 @@-// eslint-disable-next-line no-restricted-imports-import styled from "@emotion/styled";--export const BodyRoot = styled.div`- padding: 2rem;-`;diff --git a/frontend/src/metabase/timelines/common/components/ModalBody/ModalBody.tsx b/frontend/src/metabase/timelines/common/components/ModalBody/ModalBody.tsxindex 7a45d6099b7..738e9b09a2d 100644--- a/frontend/src/metabase/timelines/common/components/ModalBody/ModalBody.tsx+++ b/frontend/src/metabase/timelines/common/components/ModalBody/ModalBody.tsx@@ -1,13 +1,12 @@import type { ReactNode } from "react";-import { BodyRoot } from "./ModalBody.styled";-+import { Box } from "metabase/ui";export interface ModalBodyProps {children?: ReactNode;}const ModalBody = ({ children }: ModalBodyProps): JSX.Element => {- return <BodyRoot>{children}</BodyRoot>;+ return <Box p="2rem">{children}</Box>;};// eslint-disable-next-line import/no-default-export -- deprecated usagediff --git a/frontend/src/metabase/timelines/questions/components/TimelinePanel/TimelinePanel.styled.tsx b/frontend/src/metabase/timelines/questions/components/TimelinePanel/TimelinePanel.styled.tsxdeleted file mode 100644index 7f91d1c5833..00000000000--- a/frontend/src/metabase/timelines/questions/components/TimelinePanel/TimelinePanel.styled.tsx+++ /dev/null@@ -1,10 +0,0 @@-// eslint-disable-next-line no-restricted-imports-import styled from "@emotion/styled";--export const PanelRoot = styled.div`- margin: 0 1.5rem;-`;--export const PanelToolbar = styled.div`- margin-bottom: 1rem;-`;diff --git a/frontend/src/metabase/timelines/questions/components/TimelinePanel/TimelinePanel.tsx b/frontend/src/metabase/timelines/questions/components/TimelinePanel/TimelinePanel.tsxindex 9c1a54622ab..4733e824088 100644--- a/frontend/src/metabase/timelines/questions/components/TimelinePanel/TimelinePanel.tsx+++ b/frontend/src/metabase/timelines/questions/components/TimelinePanel/TimelinePanel.tsx@@ -1,13 +1,12 @@import { t } from "ttag";import Button from "metabase/common/components/Button";+import { Box } from "metabase/ui";import type { Collection, Timeline, TimelineEvent } from "metabase-types/api";import TimelineEmptyState from "../TimelineEmptyState";import TimelineList from "../TimelineList";-import { PanelRoot, PanelToolbar } from "./TimelinePanel.styled";-export interface TimelinePanelProps {timelines: Timeline[];collection: Collection;@@ -39,11 +38,11 @@ const TimelinePanel = ({const canWrite = collection.can_write;return (- <PanelRoot>+ <Box mx="lg">{!isEmpty && canWrite && (- <PanelToolbar>+ <Box mb="md"><Button onClick={onNewEvent}>{t`Create event`}</Button>- </PanelToolbar>+ </Box>)}{!isEmpty ? (<TimelineList@@ -64,7 +63,7 @@ const TimelinePanel = ({onNewEvent={onNewEvent}/>)}- </PanelRoot>+ </Box>);};diff --git a/frontend/src/metabase/visualizations/components/LegendItem.jsx b/frontend/src/metabase/visualizations/components/LegendItem.jsxindex a1c50931119..d2e1aba5c43 100644--- a/frontend/src/metabase/visualizations/components/LegendItem.jsx+++ b/frontend/src/metabase/visualizations/components/LegendItem.jsx@@ -6,10 +6,9 @@ import { Component, createRef } from "react";import { Ellipsified } from "metabase/common/components/Ellipsified";import CS from "metabase/css/core/index.css";import DashboardS from "metabase/css/dashboard.module.css";-import { Icon, Tooltip } from "metabase/ui";+import { Box, Icon, Tooltip } from "metabase/ui";import LegendS from "./Legend.module.css";-import { IconContainer } from "./LegendItem.styled";import { LegendItemDot } from "./legend/LegendItemDot";const propTypes = {@@ -87,9 +86,9 @@ export default class LegendItem extends Component {onClick={onClick}>{icon && (- <IconContainer>+ <Box pr="xs"><Icon {...icon} />- </IconContainer>+ </Box>)}{showDot && (<Tooltipdiff --git a/frontend/src/metabase/visualizations/components/LegendItem.styled.tsx b/frontend/src/metabase/visualizations/components/LegendItem.styled.tsxdeleted file mode 100644index ba626125534..00000000000--- a/frontend/src/metabase/visualizations/components/LegendItem.styled.tsx+++ /dev/null@@ -1,6 +0,0 @@-// eslint-disable-next-line no-restricted-imports-import styled from "@emotion/styled";--export const IconContainer = styled.div`- padding-right: var(--mantine-spacing-xs);-`;diff --git a/frontend/src/metabase/visualizations/components/Visualization/ChartSettingsErrorButton/ChartSettingsErrorButton.styled.tsx b/frontend/src/metabase/visualizations/components/Visualization/ChartSettingsErrorButton/ChartSettingsErrorButton.styled.tsxdeleted file mode 100644index 38195da6ba8..00000000000--- a/frontend/src/metabase/visualizations/components/Visualization/ChartSettingsErrorButton/ChartSettingsErrorButton.styled.tsx+++ /dev/null@@ -1,6 +0,0 @@-// eslint-disable-next-line no-restricted-imports-import styled from "@emotion/styled";--export const ButtonContainer = styled.div`- margin-top: 1rem;-`;diff --git a/frontend/src/metabase/visualizations/components/Visualization/ChartSettingsErrorButton/ChartSettingsErrorButton.tsx b/frontend/src/metabase/visualizations/components/Visualization/ChartSettingsErrorButton/ChartSettingsErrorButton.tsxindex 193c15012f1..9d41b3690f9 100644--- a/frontend/src/metabase/visualizations/components/Visualization/ChartSettingsErrorButton/ChartSettingsErrorButton.tsx+++ b/frontend/src/metabase/visualizations/components/Visualization/ChartSettingsErrorButton/ChartSettingsErrorButton.tsx@@ -1,10 +1,9 @@import type { ReactNode } from "react";import Button from "metabase/common/components/Button";+import { Box } from "metabase/ui";import type { VisualizationSettings } from "metabase-types/api";-import { ButtonContainer } from "./ChartSettingsErrorButton.styled";-interface ChartSettingsErrorButtonProps {message: ReactNode;buttonLabel: string;@@ -19,11 +18,11 @@ function ChartSettingsErrorButton({return (<div><div>{message}</div>- <ButtonContainer>+ <Box mt="md"><Button primary medium onClick={onClick}>{buttonLabel}</Button>- </ButtonContainer>+ </Box></div>);}