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
Migrate the setup step components off Emotion (#83283)
Andrei Chernykhea62cc1c1139
diff --git a/frontend/src/metabase/setup/components/ActiveStep/ActiveStep.module.css b/frontend/src/metabase/setup/components/ActiveStep/ActiveStep.module.cssnew file mode 100644index 00000000000..03ada2a4d47--- /dev/null+++ b/frontend/src/metabase/setup/components/ActiveStep/ActiveStep.module.css@@ -0,0 +1,24 @@+.root {+ --step-padding: 2rem;++ padding: var(--step-padding);+}++@media (--breakpoint-min-sm) {+ .root {+ --step-padding: 4rem;+ }+}++/* Keeps the number centered on the title line at every padding. */+.label {+ position: absolute;+ top: calc(var(--step-padding) - 0.5rem);+ left: 0;+ transform: translate(-50%, 0);+ width: 2.625rem;+ height: 2.625rem;+ border: 1px solid var(--mb-color-border-neutral);+ border-radius: 50%;+ background-color: var(--mb-color-background_page-primary);+}diff --git a/frontend/src/metabase/setup/components/ActiveStep/ActiveStep.styled.tsx b/frontend/src/metabase/setup/components/ActiveStep/ActiveStep.styled.tsxdeleted file mode 100644index 2228f4aca54..00000000000--- a/frontend/src/metabase/setup/components/ActiveStep/ActiveStep.styled.tsx+++ /dev/null@@ -1,45 +0,0 @@-// eslint-disable-next-line no-restricted-imports-import styled from "@emotion/styled";--import { breakpointMinSmall } from "metabase/styled-components/theme";--export const StepRoot = styled.section`- position: relative;- padding: 2rem;- margin-bottom: 1.75rem;- border: 1px solid var(--mb-color-border-neutral);- border-radius: 0.5rem;- background-color: var(--mb-color-background_page-primary);-- ${breakpointMinSmall} {- padding: 4rem;- }-`;--export const StepTitle = styled.div`- color: var(--mb-color-core-brand);- font-size: 1.3125rem;- font-weight: 700;- margin-bottom: 0.5rem;-`;--export const StepLabel = styled.div`- position: absolute;- top: 3.5rem;- left: 0;- transform: translate(-50%, 0);- display: flex;- justify-content: center;- align-items: center;- width: 2.625rem;- height: 2.625rem;- border: 1px solid var(--mb-color-border-neutral);- border-radius: 50%;- background-color: var(--mb-color-background_page-primary);-`;--export const StepLabelText = styled.span`- color: var(--mb-color-core-brand);- font-weight: 700;- line-height: 1;-`;diff --git a/frontend/src/metabase/setup/components/ActiveStep/ActiveStep.tsx b/frontend/src/metabase/setup/components/ActiveStep/ActiveStep.tsxindex 4e472855415..8795736e23b 100644--- a/frontend/src/metabase/setup/components/ActiveStep/ActiveStep.tsx+++ b/frontend/src/metabase/setup/components/ActiveStep/ActiveStep.tsx@@ -1,14 +1,11 @@+import cx from "classnames";import type { ReactNode } from "react";import { useSelector } from "metabase/redux";import { getShouldShowStepNumber } from "metabase/setup";+import { Box, Center } from "metabase/ui";-import {- StepLabel,- StepLabelText,- StepRoot,- StepTitle,-} from "./ActiveStep.styled";+import S from "./ActiveStep.module.css";interface ActiveStepProps {title: string;@@ -26,22 +23,36 @@ export const ActiveStep = ({const shouldShowStepNumber = useSelector(getShouldShowStepNumber);return (- <StepRoot+ <Box+ component="section"+ className={cx(S.root, className)}+ pos="relative"+ mb="xl"+ bd="1px solid var(--mb-color-border-neutral)"+ bdrs="sm"+ bg="background_page-primary"role="listitem"aria-label={title}aria-current="step"data-testid="setup-step"- className={className}>- <StepTitle>{title}</StepTitle>+ <Box c="core-brand" fz="xl" fw={700} mb="sm">+ {title}+ </Box>{shouldShowStepNumber && (- <StepLabel data-testid="step-number">- <StepLabelText>{label}</StepLabelText>- </StepLabel>+ <Center+ className={S.label}+ c="core-brand"+ fw={700}+ lh={1}+ data-testid="step-number"+ >+ {label}+ </Center>)}{children}- </StepRoot>+ </Box>);};diff --git a/frontend/src/metabase/setup/components/CompletedStep/CompletedStep.styled.tsx b/frontend/src/metabase/setup/components/CompletedStep/CompletedStep.styled.tsxdeleted file mode 100644index 284e875df89..00000000000--- a/frontend/src/metabase/setup/components/CompletedStep/CompletedStep.styled.tsx+++ /dev/null@@ -1,24 +0,0 @@-// eslint-disable-next-line no-restricted-imports-import styled from "@emotion/styled";--export const StepRoot = styled.section`- display: flex;- flex-direction: column;- padding: 2.5rem;- border: 1px solid var(--mb-color-border-neutral);- border-radius: 0.5rem;- background-color: var(--mb-color-background_page-primary);- gap: 32px;- margin-bottom: 1.75rem;-`;--export const StepBody = styled.div`- padding: 24px;- border: 1px solid var(--mb-color-border-neutral);- border-radius: 4px;-`;--export const StepFooter = styled.div`- display: flex;- justify-content: flex-end;-`;diff --git a/frontend/src/metabase/setup/components/CompletedStep/CompletedStep.tsx b/frontend/src/metabase/setup/components/CompletedStep/CompletedStep.tsxindex fd16e680a89..f6d00cdaece 100644--- a/frontend/src/metabase/setup/components/CompletedStep/CompletedStep.tsx+++ b/frontend/src/metabase/setup/components/CompletedStep/CompletedStep.tsx@@ -3,7 +3,7 @@ import { t } from "ttag";import { useDispatch, useSelector } from "metabase/redux";import { subscribeToNewsletter } from "metabase/setup/utils";-import { Box, Button, Flex, Switch, Text, Title } from "metabase/ui";+import { Box, Button, Flex, Stack, Switch, Text, Title } from "metabase/ui";import { startAiConfig } from "../../actions";import {@@ -12,7 +12,6 @@ import {getUserEmail,} from "../../selectors";-import { StepBody, StepFooter, StepRoot } from "./CompletedStep.styled";import { trackNewsletterToggleClicked } from "./analytics";export const CompletedStep = (): JSX.Element | null => {@@ -42,32 +41,45 @@ export const CompletedStep = (): JSX.Element | null => {};return (- <StepRoot>+ <Stack+ component="section"+ p="xxxl"+ gap="xxl"+ mb="xl"+ bd="1px solid var(--mb-color-border-neutral)"+ bdrs="sm"+ bg="background_page-primary"+ ><Title order={2}>{t`You're all set up!`}</Title>{shouldOfferAiConfig && (- <StepBody>- <Flex align="center" justify="space-between" gap="xl">- <Box>- <Text fw="bold">{t`Want to use AI in Metabase?`}</Text>- <Text c="text-secondary">- {t`Connect an AI provider to use AI explorations, SQL generation and Metabot.`}- </Text>- </Box>- <Button- flex="0 0 auto"- onClick={() => dispatch(startAiConfig())}- >{t`Set up AI`}</Button>- </Flex>- </StepBody>+ <Flex+ align="center"+ justify="space-between"+ gap="xl"+ bd="1px solid var(--mb-color-border-neutral)"+ bdrs="xxs"+ p="xl"+ >+ <Box>+ <Text fw="bold">{t`Want to use AI in Metabase?`}</Text>+ <Text c="text-secondary">+ {t`Connect an AI provider to use AI explorations, SQL generation and Metabot.`}+ </Text>+ </Box>+ <Button+ flex="0 0 auto"+ onClick={() => dispatch(startAiConfig())}+ >{t`Set up AI`}</Button>+ </Flex>)}- <StepBody>+ <Box bd="1px solid var(--mb-color-border-neutral)" bdrs="xxs" p="xl"><Switchchecked={checkboxValue}onChange={handleSwitchToggle}label={t`Get infrequent emails about new releases and feature updates.`}/>- </StepBody>- <StepFooter>+ </Box>+ <Flex justify="flex-end"><Buttoncomponent="a"href={baseUrl}@@ -77,7 +89,7 @@ export const CompletedStep = (): JSX.Element | null => {>{t`Take me to Metabase`}</Button>- </StepFooter>- </StepRoot>+ </Flex>+ </Stack>);};diff --git a/frontend/src/metabase/setup/components/DataUsageStep/DataUsageStep.module.css b/frontend/src/metabase/setup/components/DataUsageStep/DataUsageStep.module.cssnew file mode 100644index 00000000000..08acd3cc510--- /dev/null+++ b/frontend/src/metabase/setup/components/DataUsageStep/DataUsageStep.module.css@@ -0,0 +1,3 @@+.infoList {+ list-style: disc inside;+}diff --git a/frontend/src/metabase/setup/components/DataUsageStep/DataUsageStep.styled.tsx b/frontend/src/metabase/setup/components/DataUsageStep/DataUsageStep.styled.tsxdeleted file mode 100644index c24aed1506c..00000000000--- a/frontend/src/metabase/setup/components/DataUsageStep/DataUsageStep.styled.tsx+++ /dev/null@@ -1,33 +0,0 @@-// eslint-disable-next-line no-restricted-imports-import styled from "@emotion/styled";--export const StepDescription = styled.div`- margin: 0.875rem 0 1.25rem;- color: var(--mb-color-text-secondary);-`;--export const StepToggleContainer = styled.div`- display: flex;- align-items: center;- margin: 0 2rem 1.25rem 0;- padding: 1rem;- border: 2px solid var(--mb-color-border-neutral);- border-radius: 0.5rem;-`;--export const StepToggleLabel = styled.div`- color: var(--mb-color-text-secondary);- margin-left: 0.5rem;-`;--export const StepInfoList = styled.ul`- margin: 0 0 1.25rem;- color: var(--mb-color-text-secondary);- list-style: disc inside;- line-height: 2;-`;--export const StepError = styled.div`- color: var(--mb-color-feedback-negative);- margin-top: 0.5rem;-`;diff --git a/frontend/src/metabase/setup/components/DataUsageStep/DataUsageStep.tsx b/frontend/src/metabase/setup/components/DataUsageStep/DataUsageStep.tsxindex 4ed88322f3e..13807a6da0a 100644--- a/frontend/src/metabase/setup/components/DataUsageStep/DataUsageStep.tsx+++ b/frontend/src/metabase/setup/components/DataUsageStep/DataUsageStep.tsx@@ -6,7 +6,7 @@ import { ActionButton } from "metabase/common/components/ActionButton";import { ExternalLink } from "metabase/common/components/ExternalLink";import { useDocsUrl } from "metabase/common/hooks";import { useDispatch, useSelector } from "metabase/redux";-import { Switch } from "metabase/ui";+import { Box, Flex, Switch } from "metabase/ui";import { goToNextStep, updateTracking } from "../../actions";import { getIsTrackingAllowed } from "../../selectors";@@ -15,13 +15,7 @@ import { ActiveStep } from "../ActiveStep";import { InactiveStep } from "../InactiveStep";import type { NumberedStepProps } from "../types";-import {- StepDescription,- StepError,- StepInfoList,- StepToggleContainer,- StepToggleLabel,-} from "./DataUsageStep.styled";+import S from "./DataUsageStep.module.css";export const DataUsageStep = ({stepLabel,@@ -67,13 +61,20 @@ export const DataUsageStep = ({title={getStepTitle(isTrackingAllowed, isStepCompleted)}label={stepLabel}>- <StepDescription>+ <Box c="text-secondary" mt="md" mb="lg">{t`In order to help us improve Metabase, we'd like to collect certain data about product usage.`}{" "}<ExternalLinkhref={docsUrl}>{t`Here's a full list of what we track and why.`}</ExternalLink>- </StepDescription>- <StepToggleContainer>+ </Box>+ <Flex+ align="center"+ mr="xxl"+ mb="lg"+ p="lg"+ bd="2px solid var(--mb-color-border-neutral)"+ bdrs="sm"+ ><Switchflex="0 0 auto"checked={isTrackingAllowed}@@ -81,18 +82,24 @@ export const DataUsageStep = ({onChange={(e) => handleTrackingChange(e.currentTarget.checked)}aria-labelledby="anonymous-usage-events-label"/>- <StepToggleLabel id="anonymous-usage-events-label">+ <Box id="anonymous-usage-events-label" c="text-secondary" ml="sm">{t`Allow Metabase to anonymously collect usage events`}- </StepToggleLabel>- </StepToggleContainer>+ </Box>+ </Flex>{isTrackingAllowed && (- <StepInfoList>+ <Box+ component="ul"+ className={S.infoList}+ c="text-secondary"+ mb="lg"+ lh={2}+ ><li>{jt`Metabase ${(<strong key="message">{t`never`}</strong>)} collects anything about your data or question results.`}</li><li>{t`All collection is completely anonymous.`}</li><li>{t`Collection can be turned off at any point in your admin settings.`}</li>- </StepInfoList>+ </Box>)}<ActionButtonnormalText={t`Finish`}@@ -103,7 +110,11 @@ export const DataUsageStep = ({type="button"actionFn={handleStepSubmit}/>- {errorMessage && <StepError>{errorMessage}</StepError>}+ {errorMessage && (+ <Box c="feedback-negative" mt="sm">+ {errorMessage}+ </Box>+ )}</ActiveStep>);};diff --git a/frontend/src/metabase/setup/components/InactiveStep/InactiveStep.module.css b/frontend/src/metabase/setup/components/InactiveStep/InactiveStep.module.cssnew file mode 100644index 00000000000..73e04bba410--- /dev/null+++ b/frontend/src/metabase/setup/components/InactiveStep/InactiveStep.module.css@@ -0,0 +1,16 @@+.label {+ position: absolute;+ top: 50%;+ left: 0;+ transform: translate(-50%, -50%);+ width: 2.625rem;+ height: 2.625rem;+ border: 1px solid var(--mb-color-border-neutral);+ border-radius: 50%;+ background-color: var(--mb-color-background_page-primary);+}++.labelCompleted {+ border-color: var(--mb-color-feedback-positive);+ background-color: var(--mb-color-feedback-positive);+}diff --git a/frontend/src/metabase/setup/components/InactiveStep/InactiveStep.styled.tsx b/frontend/src/metabase/setup/components/InactiveStep/InactiveStep.styled.tsxdeleted file mode 100644index cf0fbaeea8f..00000000000--- a/frontend/src/metabase/setup/components/InactiveStep/InactiveStep.styled.tsx+++ /dev/null@@ -1,58 +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";--interface Props {- isCompleted?: boolean;-}--export const StepRoot = styled.section<Props>`- position: relative;- border: 1px solid var(--mb-color-border-neutral);- border-radius: 0.5rem;- padding: 1rem 2rem;- margin-bottom: 1.75rem;- background-color: ${color("background_page-primary")};-`;--export const StepTitle = styled.div<Props>`- color: ${(props) =>- props.isCompleted ? color("feedback-positive") : color("core-brand")};- font-size: 1rem;- font-weight: 700;- margin: 0.5rem 0;-`;--export const StepLabel = styled.div<Props>`- position: absolute;- top: 50%;- left: 0;- transform: translate(-50%, -50%);- display: flex;- justify-content: center;- align-items: center;- width: 2.625rem;- height: 2.625rem;- border: 1px solid- ${(props) =>- props.isCompleted ? color("feedback-positive") : color("border-neutral")};- border-radius: 50%;- background-color: ${(props) =>- props.isCompleted- ? color("feedback-positive")- : color("background_page-primary")};-`;--export const StepLabelText = styled.span`- color: var(--mb-color-core-brand);- font-weight: 700;- line-height: 1;-`;--export const StepLabelIcon = styled(Icon)`- width: 1rem;- height: 1rem;- color: var(--mb-color-text-primary-inverse);-`;diff --git a/frontend/src/metabase/setup/components/InactiveStep/InactiveStep.tsx b/frontend/src/metabase/setup/components/InactiveStep/InactiveStep.tsxindex 72ae6a6bd13..14a6b702d19 100644--- a/frontend/src/metabase/setup/components/InactiveStep/InactiveStep.tsx+++ b/frontend/src/metabase/setup/components/InactiveStep/InactiveStep.tsx@@ -1,10 +1,8 @@-import {- StepLabel,- StepLabelIcon,- StepLabelText,- StepRoot,- StepTitle,-} from "./InactiveStep.styled";+import cx from "classnames";++import { Box, Center, Icon } from "metabase/ui";++import S from "./InactiveStep.module.css";interface InactiveStepProps {title: string;@@ -18,20 +16,39 @@ export const InactiveStep = ({isStepCompleted,}: InactiveStepProps): JSX.Element => {return (- <StepRoot+ <Box+ component="section"+ pos="relative"+ py="lg"+ px="xxl"+ mb="xl"+ bd="1px solid var(--mb-color-border-neutral)"+ bdrs="sm"+ bg="background_page-primary"role="listitem"- isCompleted={isStepCompleted}aria-label={title}data-testid="setup-step">- <StepTitle isCompleted={isStepCompleted}>{title}</StepTitle>- <StepLabel isCompleted={isStepCompleted}>+ <Box+ c={isStepCompleted ? "feedback-positive" : "core-brand"}+ fz="lg"+ fw={700}+ my="sm"+ >+ {title}+ </Box>+ <Center+ className={cx(S.label, { [S.labelCompleted]: isStepCompleted })}+ c="core-brand"+ fw={700}+ lh={1}+ >{isStepCompleted ? (- <StepLabelIcon name="check" />+ <Icon name="check" size="1rem" c="text-primary-inverse" />) : (- <StepLabelText>{label}</StepLabelText>+ label)}- </StepLabel>- </StepRoot>+ </Center>+ </Box>);};diff --git a/frontend/src/metabase/setup/components/LanguageStep/LanguageStep.module.css b/frontend/src/metabase/setup/components/LanguageStep/LanguageStep.module.cssnew file mode 100644index 00000000000..c89988cd027--- /dev/null+++ b/frontend/src/metabase/setup/components/LanguageStep/LanguageStep.module.css@@ -0,0 +1,26 @@+.localeInput {+ appearance: none;+ display: block;+ margin: 0;+ padding: 0;+}++.localeButton {+ color: var(--mb-color-text-primary);+ border: 2px solid var(--mb-color-core-white);+ background-color: var(--mb-color-background_page-primary);++ &:hover {+ color: var(--mb-color-text-primary-inverse);+ background-color: var(--mb-color-core-brand);+ }+}++.localeButtonChecked {+ color: var(--mb-color-text-primary-inverse);+ background-color: var(--mb-color-core-brand);+}++.localeInput:focus-visible + .localeButton {+ outline: 2px solid var(--mb-color-core-brand);+}diff --git a/frontend/src/metabase/setup/components/LanguageStep/LanguageStep.styled.tsx b/frontend/src/metabase/setup/components/LanguageStep/LanguageStep.styled.tsxdeleted file mode 100644index 8596e14561d..00000000000--- a/frontend/src/metabase/setup/components/LanguageStep/LanguageStep.styled.tsx+++ /dev/null@@ -1,58 +0,0 @@-// eslint-disable-next-line no-restricted-imports-import styled from "@emotion/styled";--import { color } from "metabase/ui/utils/colors";--export const StepDescription = styled.div`- color: var(--mb-color-text-secondary);- margin: 0.875rem 0;-`;--export const LocaleGroup = styled.ol`- margin-bottom: 2rem;- padding: 0.5rem;- max-height: 17.5rem;- overflow-y: scroll;- border: 1px solid var(--mb-color-border-neutral);- border-radius: 0.25rem;-`;--export const LocaleLabel = styled.label`- display: block;-`;--export const LocaleInput = styled.input`- appearance: none;- display: block;- margin: 0;- padding: 0;-`;--interface LocaleContainerProps {- checked: boolean;-}--export const LocaleButton = styled.span<LocaleContainerProps>`- display: block;- padding: 0.5rem;- color: ${(props) =>- color(props.checked ? "text-primary-inverse" : "text-primary")};- border-radius: 0.25rem;- background-color: ${(props) =>- props.checked ? color("core-brand") : color("background_page-primary")};- font-weight: 700;- border: 2px solid var(--mb-color-core-white);-- &:hover {- color: var(--mb-color-text-primary-inverse);- background-color: var(--mb-color-core-brand);- }-- ${LocaleInput}:focus + & {- outline: 2px solid var(--mb-color-core-brand);- }-- ${LocaleInput}:focus:not(:focus-visible) + & {- outline: none;- }-`;diff --git a/frontend/src/metabase/setup/components/LanguageStep/LanguageStep.tsx b/frontend/src/metabase/setup/components/LanguageStep/LanguageStep.tsxindex 64b6bf28cb9..4c2cf4db50f 100644--- a/frontend/src/metabase/setup/components/LanguageStep/LanguageStep.tsx+++ b/frontend/src/metabase/setup/components/LanguageStep/LanguageStep.tsx@@ -1,12 +1,14 @@+import cx from "classnames";import { useCallback, useMemo, useState } from "react";import { t } from "ttag";import _ from "underscore";import { CommunityLocalizationNotice } from "metabase/common/components/CommunityLocalizationNotice";+import CS from "metabase/css/core/index.css";import { useDispatch, useSelector } from "metabase/redux";import type { Locale } from "metabase/redux/store";import { useSetting } from "metabase/settings";-import { Button, Stack } from "metabase/ui";+import { Box, Button, Stack } from "metabase/ui";import { useStep } from "../..//useStep";import { goToNextStep, updateLocale } from "../../actions";@@ -16,13 +18,7 @@ import { ActiveStep } from "../ActiveStep";import { InactiveStep } from "../InactiveStep";import type { NumberedStepProps } from "../types";-import {- LocaleButton,- LocaleGroup,- LocaleInput,- LocaleLabel,- StepDescription,-} from "./LanguageStep.styled";+import S from "./LanguageStep.module.css";export const LanguageStep = ({ stepLabel }: NumberedStepProps): JSX.Element => {const { isStepActive, isStepCompleted } = useStep("language");@@ -59,13 +55,20 @@ export const LanguageStep = ({ stepLabel }: NumberedStepProps): JSX.Element => {return (<ActiveStep title={t`What's your preferred language?`} label={stepLabel}>- <StepDescription>- <Stack gap="lg">- {t`This language will be used throughout Metabase and will be the default for new users.`}- <CommunityLocalizationNotice isAdminView />- </Stack>- </StepDescription>- <LocaleGroup role="radiogroup">+ <Stack c="text-secondary" my="md" gap="lg">+ {t`This language will be used throughout Metabase and will be the default for new users.`}+ <CommunityLocalizationNotice isAdminView />+ </Stack>+ <Box+ component="ol"+ className={CS.overflowYScroll}+ role="radiogroup"+ mb="xxl"+ p="sm"+ mah="17.5rem"+ bd="1px solid var(--mb-color-border-neutral)"+ bdrs="xxs"+ >{locales.map((item) => (<LocaleItemkey={item.code}@@ -75,7 +78,7 @@ export const LanguageStep = ({ stepLabel }: NumberedStepProps): JSX.Element => {onLocaleChange={handleLocaleChange}/>))}- </LocaleGroup>+ </Box><Buttonvariant={selectedLocale != null ? "filled" : "default"}disabled={selectedLocale == null}@@ -105,8 +108,9 @@ const LocaleItem = ({}, [locale, onLocaleChange]);return (- <LocaleLabel key={locale.code}>- <LocaleInput+ <Box component="label" display="block">+ <input+ className={S.localeInput}type="radio"name={fieldId}value={locale.code}@@ -114,7 +118,16 @@ const LocaleItem = ({autoFocus={checked}onChange={handleChange}/>- <LocaleButton checked={checked}>{locale.name}</LocaleButton>- </LocaleLabel>+ <Box+ component="span"+ className={cx(S.localeButton, { [S.localeButtonChecked]: checked })}+ display="block"+ p="sm"+ bdrs="xxs"+ fw={700}+ >+ {locale.name}+ </Box>+ </Box>);};diff --git a/frontend/src/metabase/setup/components/UserStep/UserStep.module.css b/frontend/src/metabase/setup/components/UserStep/UserStep.module.cssdeleted file mode 100644index 1b447da9334..00000000000--- a/frontend/src/metabase/setup/components/UserStep/UserStep.module.css+++ /dev/null@@ -1,4 +0,0 @@-.StepDescription {- 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 646cc7b90a8..c8d0d0627ad 100644--- a/frontend/src/metabase/setup/components/UserStep/UserStep.tsx+++ b/frontend/src/metabase/setup/components/UserStep/UserStep.tsx@@ -3,6 +3,7 @@ import { t } from "ttag";import { useDispatch, useSelector } from "metabase/redux";import type { UserInfo } from "metabase/redux/store";import { useSetting } from "metabase/settings";+import { Box } from "metabase/ui";import { submitUser } from "../../actions";import { getUser } from "../../selectors";@@ -12,8 +13,6 @@ import { InactiveStep } from "../InactiveStep";import { UserForm } from "../UserForm";import type { NumberedStepProps } from "../types";-import S from "./UserStep.module.css";-export const UserStep = ({ stepLabel }: NumberedStepProps): JSX.Element => {const { isStepActive, isStepCompleted } = useStep("user_info");@@ -39,10 +38,10 @@ export const UserStep = ({ stepLabel }: NumberedStepProps): JSX.Element => {return (<ActiveStep title={getStepTitle(user, isStepCompleted)} label={stepLabel}>{isHosted && (- <div className={S.StepDescription}>+ <Box c="text-secondary" mt="md">{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.`}- </div>+ </Box>)}<UserForm user={user} isHosted={isHosted} onSubmit={handleSubmit} /></ActiveStep>