Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

Consistent typography (part 1): Text/Title on home, collection, Metrics, Data, and Models (#81888)

Stas Gavrylov499bc1160b6f
diff --git a/e2e/test/scenarios/visualizations-charts/custom-viz.cy.spec.ts b/e2e/test/scenarios/visualizations-charts/custom-viz.cy.spec.ts
index f8d9f6dd446..8d997ef0dbb 100644
--- a/e2e/test/scenarios/visualizations-charts/custom-viz.cy.spec.ts
+++ b/e2e/test/scenarios/visualizations-charts/custom-viz.cy.spec.ts
@@ -1581,9 +1581,7 @@ describe("admin > custom visualizations", () => {
H.navigationSidebar().findByText("Home").click();
cy.log("Home recently-viewed section");
- H.main()
- .findByText("Pick up where you left off")
- .parent()
+ cy.findByTestId("recent-items-section")
.findByRole("link", { name: new RegExp(ICON_QUESTION_NAME) })
.find(PLUGIN_ICON_SELECTOR)
.should("exist");
diff --git a/frontend/src/metabase/browse/components/BrowseDataHeader.tsx b/frontend/src/metabase/browse/components/BrowseDataHeader.tsx
index 954a7fab2f6..64cc74c9b1c 100644
--- a/frontend/src/metabase/browse/components/BrowseDataHeader.tsx
+++ b/frontend/src/metabase/browse/components/BrowseDataHeader.tsx
@@ -19,7 +19,7 @@ export const BrowseDataHeader = () => {
justify="space-between"
align="center"
>
- <Title order={2} c="text-primary">
+ <Title order={1} c="text-primary">
<Group gap="sm">
<Icon size={24} c="core-brand" name="database" />
{t`Databases`}
diff --git a/frontend/src/metabase/browse/metrics/BrowseMetrics.tsx b/frontend/src/metabase/browse/metrics/BrowseMetrics.tsx
index b8cc6ba7c2e..23633e9ef16 100644
--- a/frontend/src/metabase/browse/metrics/BrowseMetrics.tsx
+++ b/frontend/src/metabase/browse/metrics/BrowseMetrics.tsx
@@ -85,7 +85,7 @@ export function BrowseMetrics() {
justify="space-between"
align="center"
>
- <Title order={2} c="text-primary" id={titleId}>
+ <Title order={1} c="text-primary" id={titleId}>
<Group gap="sm">
<Icon size={24} c="icon-brand" name="metric" />
{t`Metrics`}
@@ -162,7 +162,7 @@ function MetricsEmptyState({
title={t`Create Metrics to define the official way to calculate important numbers for your team`}
message={
<Box>
- <Text mt="sm" maw="25rem">
+ <Text lh="1.25rem" mt="sm" maw="25rem">
{t`Metrics are like pre-defined calculations: create your aggregations once, save them as metrics, and use them whenever you need to analyze your data.`}
</Text>
<Flex pt="lg" align="center" justify="center" gap="lg">
diff --git a/frontend/src/metabase/browse/models/BrowseModels.tsx b/frontend/src/metabase/browse/models/BrowseModels.tsx
index 026f1518310..a704b705f83 100644
--- a/frontend/src/metabase/browse/models/BrowseModels.tsx
+++ b/frontend/src/metabase/browse/models/BrowseModels.tsx
@@ -87,7 +87,7 @@ export const BrowseModels = () => {
justify="space-between"
align="center"
>
- <Title order={2} c="text-primary" id={titleId}>
+ <Title order={1} c="text-primary" id={titleId}>
<Group gap="sm">
<Icon size={24} c="icon-brand" name="model" />
{t`Models`}
@@ -130,10 +130,13 @@ export const BrowseModels = () => {
)}
<Stack gap="xxs" maw="28rem">
<Title
- order={3}
+ order={2}
ta="center"
>{t`Create models to clean up and combine tables to make your data easier to explore`}</Title>
- <Text ta="center">{t`Models are somewhat like virtual tables: do all your joins and custom columns once, save it as a model, then query it like a table.`}</Text>
+ <Text
+ ta="center"
+ lh="1.25rem"
+ >{t`Models are somewhat like virtual tables: do all your joins and custom columns once, save it as a model, then query it like a table.`}</Text>
</Stack>
{showMetabaseLinks && (
<Button variant="subtle" p={0}>
diff --git a/frontend/src/metabase/browse/models/ModelExplanationBanner.tsx b/frontend/src/metabase/browse/models/ModelExplanationBanner.tsx
index ca7cc437032..45c00ef8732 100644
--- a/frontend/src/metabase/browse/models/ModelExplanationBanner.tsx
+++ b/frontend/src/metabase/browse/models/ModelExplanationBanner.tsx
@@ -4,16 +4,7 @@ import { t } from "ttag";
import { ExternalLink } from "metabase/common/components/ExternalLink";
import { useDocsUrl } from "metabase/common/hooks";
import { useUserSetting } from "metabase/settings";
-import {
- Button,
- Flex,
- Group,
- Modal,
- Paper,
- Stack,
- Text,
- Title,
-} from "metabase/ui";
+import { Button, Flex, Group, Modal, Paper, Stack, Text } from "metabase/ui";
import { ModelsVideo, ModelsVideoThumbnail } from "./EmptyStates";
@@ -49,11 +40,12 @@ export const ModelExplanationBanner = () => {
<ModelsVideoThumbnail onClick={() => setOpened(true)} />
)}
<Stack gap="lg">
- <Title
- order={6}
- m={0}
- >{t`Create models to clean up and combine tables to make your data easier to explore`}</Title>
- <Text size="md" lh="1.5">
+ <Text
+ size="md"
+ lh="sm"
+ fw={700}
+ >{t`Create models to clean up and combine tables to make your data easier to explore`}</Text>
+ <Text size="md" lh="1.25rem">
{t`Models are somewhat like virtual tables: do all your joins and custom columns once, save it as a model, then query it like a table.`}
</Text>
<Group gap="lg">
diff --git a/frontend/src/metabase/collections/components/CollectionEmptyState/CollectionEmptyState.tsx b/frontend/src/metabase/collections/components/CollectionEmptyState/CollectionEmptyState.tsx
index ae7da744213..45fadb0f159 100644
--- a/frontend/src/metabase/collections/components/CollectionEmptyState/CollectionEmptyState.tsx
+++ b/frontend/src/metabase/collections/components/CollectionEmptyState/CollectionEmptyState.tsx
@@ -10,7 +10,7 @@ import { canAccessDataStudio } from "metabase/common/data-studio/selectors";
import { NewItemMenu } from "metabase/nav/components/NewItemMenu";
import { PLUGIN_LIBRARY } from "metabase/plugins";
import { useSelector } from "metabase/redux";
-import { Box, Button, Icon, Stack, Text, useMantineTheme } from "metabase/ui";
+import { Box, Button, Icon, Stack, Text, Title } from "metabase/ui";
import type { Collection } from "metabase-types/api";
import { trackCollectionNewButtonClicked } from "./analytics";
@@ -121,36 +121,17 @@ export const CollectionEmptyIcon = (): JSX.Element => {
);
};
-export const EmptyStateTitle = ({ children }: PropsWithChildren) => {
- const theme = useMantineTheme();
- return (
- <Box
- c="text-primary"
- fz={theme.other.collectionBrowser.emptyContent.title.fontSize}
- fw="bold"
- lh="2rem"
- mt="2.5rem"
- mb="0.75rem"
- >
- {children}
- </Box>
- );
-};
-
-export const EmptyStateSubtitle = ({ children }: PropsWithChildren) => {
- const theme = useMantineTheme();
- return (
- <Text
- fz={theme.other.collectionBrowser.emptyContent.subtitle.fontSize}
- c="text-secondary"
- ta="center"
- mb="1.5rem"
- maw="25rem"
- >
- {children}
- </Text>
- );
-};
+export const EmptyStateTitle = ({ children }: PropsWithChildren) => (
+ <Title order={2} c="text-primary" mt="2.5rem" mb="0.75rem">
+ {children}
+ </Title>
+);
+
+export const EmptyStateSubtitle = ({ children }: PropsWithChildren) => (
+ <Text c="text-secondary" ta="center" lh="1.25rem" mb="1.5rem" maw="25rem">
+ {children}
+ </Text>
+);
export const EmptyStateWrapper = ({
children,
diff --git a/frontend/src/metabase/collections/components/CollectionHeader/CollectionCaption.tsx b/frontend/src/metabase/collections/components/CollectionHeader/CollectionCaption.tsx
index c2aa53f11bd..3a4c92ebad5 100644
--- a/frontend/src/metabase/collections/components/CollectionHeader/CollectionCaption.tsx
+++ b/frontend/src/metabase/collections/components/CollectionHeader/CollectionCaption.tsx
@@ -53,6 +53,7 @@ export const CollectionCaption = ({
<CollectionCaptionIcon collection={collection} />
<EditableText
key={collection.id}
+ as="h1"
initialValue={collection.name}
placeholder={t`Add title`}
isDisabled={!isEditable}
diff --git a/frontend/src/metabase/collections/components/CollectionHeader/CollectionUploadInfoModal.tsx b/frontend/src/metabase/collections/components/CollectionHeader/CollectionUploadInfoModal.tsx
index c82c0af4390..e8bc70ff03a 100644
--- a/frontend/src/metabase/collections/components/CollectionHeader/CollectionUploadInfoModal.tsx
+++ b/frontend/src/metabase/collections/components/CollectionHeader/CollectionUploadInfoModal.tsx
@@ -40,13 +40,13 @@ export const UploadInfoModal = ({
</Title>
{isAdmin ? (
<>
- <Box c="text-secondary">
- <p>
+ <Box>
+ <Text c="text-secondary" mb="1rem">
{t`Team members will be able to upload CSV files and work with them just like any other data source.`}
- </p>
- <p>
+ </Text>
+ <Text c="text-secondary">
{t`You'll be able to pick the default database where the data should be stored when enabling the feature.`}
- </p>
+ </Text>
</Box>
<Button
component={Link}
@@ -59,10 +59,10 @@ export const UploadInfoModal = ({
</>
) : (
<>
- <Box c="text-secondary">
- <p>
+ <Box>
+ <Text c="text-secondary">
{t`You'll need to ask your admin to enable this feature to get started. Then, you'll be able to upload CSV files and work with them just like any other data source.`}
- </p>
+ </Text>
</Box>
<Button onClick={onClose}>{t`Got it`}</Button>
</>
diff --git a/frontend/src/metabase/common/components/EditableText/EditableText.styled.tsx b/frontend/src/metabase/common/components/EditableText/EditableText.styled.tsx
index 2239134a96c..d690d4d8c90 100644
--- a/frontend/src/metabase/common/components/EditableText/EditableText.styled.tsx
+++ b/frontend/src/metabase/common/components/EditableText/EditableText.styled.tsx
@@ -11,6 +11,7 @@ interface EditableTextRootProps {
export const EditableTextRoot = styled.div<EditableTextRootProps>`
position: relative;
+ margin: 0;
color: var(--mb-color-text-primary);
padding: 0.25rem;
border: 1px solid transparent;
diff --git a/frontend/src/metabase/common/components/EditableText/EditableText.tsx b/frontend/src/metabase/common/components/EditableText/EditableText.tsx
index 250158a254a..27fde5a95d9 100644
--- a/frontend/src/metabase/common/components/EditableText/EditableText.tsx
+++ b/frontend/src/metabase/common/components/EditableText/EditableText.tsx
@@ -29,6 +29,7 @@ export interface EditableTextProps extends BoxProps, EditableTextAttributes {
isMultiline?: boolean;
isDisabled?: boolean;
isMarkdown?: boolean;
+ as?: keyof JSX.IntrinsicElements;
onChange?: (value: string) => void;
onContentChange?: (value: string) => void;
onFocus?: FocusEventHandler<HTMLTextAreaElement>;
@@ -51,6 +52,7 @@ const EditableTextInner = forwardRef(function EditableText(
onFocus,
onBlur,
"data-testid": dataTestId,
+ as,
...props
}: EditableTextProps,
ref: Ref<HTMLDivElement>,
@@ -135,6 +137,7 @@ const EditableTextInner = forwardRef(function EditableText(
return (
<Box
component={EditableTextRoot}
+ as={as}
onClick={isMarkdown ? handleRootElementClick : undefined}
ref={ref}
isEditing={isEditing}
diff --git a/frontend/src/metabase/common/components/EmptyState/EmptyState.tsx b/frontend/src/metabase/common/components/EmptyState/EmptyState.tsx
index 01cfba379aa..3e568bbb6a3 100644
--- a/frontend/src/metabase/common/components/EmptyState/EmptyState.tsx
+++ b/frontend/src/metabase/common/components/EmptyState/EmptyState.tsx
@@ -3,7 +3,15 @@ import cx from "classnames";
import { Link } from "metabase/common/components/Link";
import CS from "metabase/css/core/index.css";
import type { ButtonProps } from "metabase/ui";
-import { Box, Button, Flex, Icon, Text, isValidIconName } from "metabase/ui";
+import {
+ Box,
+ Button,
+ Flex,
+ Icon,
+ Text,
+ Title,
+ isValidIconName,
+} from "metabase/ui";
import type { IconName } from "metabase-types/api";
import S from "./EmptyState.module.css";
@@ -78,12 +86,12 @@ export const EmptyState = ({
{image && <LegacyImage image={image} {...rest} />}
</div>
{title && (
- <h2 role="status" aria-live="polite" className={CS.textMedium}>
+ <Title order={2} role="status" aria-live="polite" c="text-secondary">
{title}
- </h2>
+ </Title>
)}
{message && (
- <Text role="status" c="text-secondary" mt="xxs">
+ <Text role="status" c="text-secondary" lh="1.25rem" mt="xxs">
{message}
</Text>
)}
diff --git a/frontend/src/metabase/css/core/visually-hidden.module.css b/frontend/src/metabase/css/core/visually-hidden.module.css
new file mode 100644
index 00000000000..057bd3fdc8d
--- /dev/null
+++ b/frontend/src/metabase/css/core/visually-hidden.module.css
@@ -0,0 +1,12 @@
+.visuallyHidden {
+ position: absolute;
+ width: 1px;
+ height: 1px;
+ padding: 0;
+ margin: -1px;
+ overflow: hidden;
+ clip: rect(0 0 0 0);
+ clip-path: inset(50%);
+ white-space: nowrap;
+ border: 0;
+}
diff --git a/frontend/src/metabase/home/components/HomeCaption/HomeCaption.tsx b/frontend/src/metabase/home/components/HomeCaption/HomeCaption.tsx
index 31e8a8970d4..49556d1ae2c 100644
--- a/frontend/src/metabase/home/components/HomeCaption/HomeCaption.tsx
+++ b/frontend/src/metabase/home/components/HomeCaption/HomeCaption.tsx
@@ -1,6 +1,6 @@
import type { ReactNode } from "react";
-import { Flex } from "metabase/ui";
+import { Flex, Text } from "metabase/ui";
interface HomeCaptionProps {
primary?: boolean;
@@ -12,13 +12,14 @@ export const HomeCaption = ({
children,
}: HomeCaptionProps): JSX.Element => {
return (
- <Flex
- align="center"
- c={primary ? "text-primary" : "text-secondary"}
- fw="bold"
- mb={{ base: "xl", xl: "xxl" }}
- >
- {children}
+ <Flex align="center" mb={{ base: "xl", xl: "xxl" }}>
+ <Text
+ component="div"
+ fw={700}
+ c={primary ? "text-primary" : "text-secondary"}
+ >
+ {children}
+ </Text>
</Flex>
);
};
diff --git a/frontend/src/metabase/home/components/HomeGreeting/HomeGreeting.module.css b/frontend/src/metabase/home/components/HomeGreeting/HomeGreeting.module.css
index 6a3f2a48e2c..395a88b77d9 100644
--- a/frontend/src/metabase/home/components/HomeGreeting/HomeGreeting.module.css
+++ b/frontend/src/metabase/home/components/HomeGreeting/HomeGreeting.module.css
@@ -23,15 +23,3 @@
opacity: 0;
}
}
-
-.greetingMessage {
- color: var(--mb-color-text-primary);
- font-weight: bold;
- line-height: 1.5rem;
- font-size: 1.125rem;
- margin-left: 0.5rem;
-
- @media (--breakpoint-min-xl) {
- font-size: 1.25rem;
- }
-}
diff --git a/frontend/src/metabase/home/components/HomeGreeting/HomeGreeting.tsx b/frontend/src/metabase/home/components/HomeGreeting/HomeGreeting.tsx
index 6a22e51d8b6..38e4c5a2177 100644
--- a/frontend/src/metabase/home/components/HomeGreeting/HomeGreeting.tsx
+++ b/frontend/src/metabase/home/components/HomeGreeting/HomeGreeting.tsx
@@ -8,7 +8,7 @@ import animationStyles from "metabase/css/core/animation.module.css";
import { getUser } from "metabase/current-user";
import { useSelector } from "metabase/redux";
import { useSetting } from "metabase/settings";
-import { Flex, Tooltip } from "metabase/ui";
+import { Flex, Text, Tooltip } from "metabase/ui";
import S from "./HomeGreeting.module.css";
@@ -25,9 +25,17 @@ export const HomeGreeting = (): JSX.Element | null => {
return (
<Flex align="center">
<MetabotGreeting />
- <span data-testid="greeting-message" className={S.greetingMessage}>
+ <Text
+ component="span"
+ data-testid="greeting-message"
+ c="text-primary"
+ fw={700}
+ lh="1.5rem"
+ fz={{ base: "1.125rem", xl: "1.25rem" }}
+ ml="0.5rem"
+ >
{message}
- </span>
+ </Text>
</Flex>
);
};
diff --git a/frontend/src/metabase/home/components/HomeLayout/HomeLayout.tsx b/frontend/src/metabase/home/components/HomeLayout/HomeLayout.tsx
index bc0bf636105..282393b9d97 100644
--- a/frontend/src/metabase/home/components/HomeLayout/HomeLayout.tsx
+++ b/frontend/src/metabase/home/components/HomeLayout/HomeLayout.tsx
@@ -4,11 +4,12 @@ import { t } from "ttag";
import { LighthouseIllustration } from "metabase/common/components/LighthouseIllustration";
import { useHasTokenFeature } from "metabase/common/hooks";
+import visuallyHidden from "metabase/css/core/visually-hidden.module.css";
import { getUser, getUserIsAdmin } from "metabase/current-user";
import { useSelector } from "metabase/redux";
import { getLandingPageIllustration } from "metabase/selectors/whitelabel";
import { useSetting } from "metabase/settings";
-import { Box, Button, Icon, Tooltip } from "metabase/ui";
+import { Box, Button, Icon, Title, Tooltip } from "metabase/ui";
import { CustomHomePageModal } from "../CustomHomePageModal";
import { HomeGreeting } from "../HomeGreeting";
@@ -48,6 +49,9 @@ export const HomeLayout = ({ children }: HomeLayoutProps): ReactNode => {
mih="100%"
bg="background_page-secondary"
>
+ <Title order={1} className={visuallyHidden.visuallyHidden}>
+ {t`Home`}
+ </Title>
{landingPageIllustration &&
(landingPageIllustration.isDefault ? (
<LighthouseIllustration />
diff --git a/frontend/src/metabase/home/components/HomeRecentSection/HomeRecentSection.tsx b/frontend/src/metabase/home/components/HomeRecentSection/HomeRecentSection.tsx
index 8d09ea32761..0a1bf61a5b8 100644
--- a/frontend/src/metabase/home/components/HomeRecentSection/HomeRecentSection.tsx
+++ b/frontend/src/metabase/home/components/HomeRecentSection/HomeRecentSection.tsx
@@ -28,7 +28,7 @@ export const HomeRecentSection = () => {
}
return (
- <div>
+ <div data-testid="recent-items-section">
<HomeCaption>{t`Pick up where you left off`}</HomeCaption>
<div className={S.SectionBody}>
{recentsFilter(recentItems).map((item, index) => (