Skip to content

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

Migrate the whitelabel settings off Emotion (#83691)

Andrei Chernykhe27d36ca1585
diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/BrandColorSettings/BrandColorSettings.module.css b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/BrandColorSettings/BrandColorSettings.module.css
new file mode 100644
index 00000000000..6689e00cb6f
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/BrandColorSettings/BrandColorSettings.module.css
@@ -0,0 +1,15 @@
+.headerBorder {
+ border: 1px solid var(--mb-color-border-neutral);
+ border-bottom: none;
+ border-radius: 0.5rem 0.5rem 0 0;
+}
+
+.bodyBorder {
+ border: 1px solid var(--mb-color-border-neutral);
+ border-top: none;
+ border-radius: 0 0 0.5rem 0.5rem;
+}
+
+.rowDivider:not(:first-of-type) {
+ border-top: 1px solid var(--mb-color-border-neutral);
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/BrandColorSettings/BrandColorSettings.styled.tsx b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/BrandColorSettings/BrandColorSettings.styled.tsx
deleted file mode 100644
index 7d5b99992f4..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/BrandColorSettings/BrandColorSettings.styled.tsx
+++ /dev/null
@@ -1,58 +0,0 @@
-import { css } from "@emotion/react";
-import styled from "@emotion/styled";
-
-const cellStyles = css`
- padding-left: 1.5rem;
- padding-right: 1.5rem;
-
- &:first-of-type {
- flex: 0 0 auto;
- width: 12rem;
- }
-`;
-
-export const TableHeader = styled.div`
- border: 1px solid var(--mb-color-border-neutral);
- border-bottom: none;
- border-radius: 0.5rem 0.5rem 0 0;
- background-color: var(--mb-color-background_page-secondary);
-`;
-
-export const TableHeaderRow = styled.div`
- display: flex;
- align-items: center;
-`;
-
-export const TableHeaderCell = styled.div`
- ${cellStyles};
- color: var(--mb-color-text-secondary);
- font-size: 0.6rem;
- letter-spacing: 1px;
- line-height: 0.625rem;
- font-weight: bold;
- text-transform: uppercase;
- padding-top: 0.5rem;
- padding-bottom: 0.5rem;
-`;
-
-export const TableBody = styled.div`
- border: 1px solid var(--mb-color-border-neutral);
- border-top: none;
- border-radius: 0 0 0.5rem 0.5rem;
-`;
-
-export const TableBodyRow = styled.div`
- display: flex;
- align-items: center;
-
- &:not(:first-of-type) {
- border-top: 1px solid var(--mb-color-border-neutral);
- }
-`;
-
-export const TableBodyCell = styled.div`
- ${cellStyles};
- color: var(--mb-color-text-secondary);
- padding-top: 1rem;
- padding-bottom: 1rem;
-`;
diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/BrandColorSettings/BrandColorSettings.tsx b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/BrandColorSettings/BrandColorSettings.tsx
index 9811f5f1564..ba84a857925 100644
--- a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/BrandColorSettings/BrandColorSettings.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/BrandColorSettings/BrandColorSettings.tsx
@@ -5,16 +5,10 @@ import _ from "underscore";
import { ColorPicker } from "metabase/common/components/ColorPicker";
import { useCurrentRef } from "metabase/common/hooks/use-current-ref";
+import { Box, Flex } from "metabase/ui";
import { color } from "metabase/ui/colors";
-import {
- TableBody,
- TableBodyCell,
- TableBodyRow,
- TableHeader,
- TableHeaderCell,
- TableHeaderRow,
-} from "./BrandColorSettings.styled";
+import S from "./BrandColorSettings.module.css";
import type { ColorOption } from "./types";
import { getBrandColorOptions } from "./utils";
@@ -24,7 +18,7 @@ export interface BrandColorSettingsProps {
onChange: (colors: Record<string, string>) => void;
}
-const BrandColorSettings = ({
+export const BrandColorSettings = ({
colors,
colorPalette,
onChange,
@@ -68,13 +62,21 @@ const BrandColorTable = ({
}: BrandColorTableProps): JSX.Element => {
return (
<div>
- <TableHeader>
- <TableHeaderRow>
- <TableHeaderCell>{t`Color`}</TableHeaderCell>
- <TableHeaderCell>{t`Where it's used`}</TableHeaderCell>
- </TableHeaderRow>
- </TableHeader>
- <TableBody>
+ <Flex
+ className={S.headerBorder}
+ align="center"
+ bg="background_page-secondary"
+ c="text-secondary"
+ fz="xs"
+ fw="bold"
+ lh="xs"
+ lts="0.0625rem"
+ tt="uppercase"
+ >
+ <Box flex="0 0 auto" w="12rem" px="xl" py="sm">{t`Color`}</Box>
+ <Box px="xl" py="sm">{t`Where it's used`}</Box>
+ </Flex>
+ <Box className={S.bodyBorder}>
{options.map((option) => (
<BrandColorRow
key={option.name}
@@ -84,7 +86,7 @@ const BrandColorTable = ({
onChange={onChange}
/>
))}
- </TableBody>
+ </Box>
</div>
);
};
@@ -110,18 +112,17 @@ const BrandColorRow = memo(function BrandColorRow({
);
return (
- <TableBodyRow>
- <TableBodyCell>
+ <Flex className={S.rowDivider} align="center" c="text-secondary">
+ <Box flex="0 0 auto" w="12rem" px="xl" py="lg">
<ColorPicker
value={color ?? originalColor}
placeholder={Color(originalColor).hex()}
onChange={handleChange}
/>
- </TableBodyCell>
- <TableBodyCell>{option.description}</TableBodyCell>
- </TableBodyRow>
+ </Box>
+ <Box px="xl" py="lg">
+ {option.description}
+ </Box>
+ </Flex>
);
});
-
-// eslint-disable-next-line import/no-default-export -- deprecated usage
-export default BrandColorSettings;
diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/BrandColorSettings/index.ts b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/BrandColorSettings/index.ts
index dc8ef9c0bd8..1019e51ca28 100644
--- a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/BrandColorSettings/index.ts
+++ b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/BrandColorSettings/index.ts
@@ -1,2 +1 @@
-// eslint-disable-next-line import/no-default-export -- deprecated usage
-export { default } from "./BrandColorSettings";
+export { BrandColorSettings } from "./BrandColorSettings";
diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ChartColorPreview/ChartColorPreview.tsx b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ChartColorPreview/ChartColorPreview.tsx
index 95f4fd87121..d0249b92fb6 100644
--- a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ChartColorPreview/ChartColorPreview.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ChartColorPreview/ChartColorPreview.tsx
@@ -3,7 +3,7 @@ import { useMemo } from "react";
import { useDebouncedValue } from "metabase/common/hooks/use-debounced-value";
import { Box, Flex } from "metabase/ui";
-import ChartColorSample from "../ChartColorSample";
+import { ChartColorSample } from "../ChartColorSample";
import { getAccentColorGroups } from "./utils";
@@ -13,7 +13,7 @@ export interface ChartColorPreviewProps {
colorPalette: Record<string, string>;
}
-const ChartColorPreview = ({
+export const ChartColorPreview = ({
colorPalette,
}: ChartColorPreviewProps): JSX.Element => {
const changedColors = useDebouncedValue(colorPalette, PREVIEW_TIMEOUT);
@@ -35,6 +35,3 @@ const ChartColorPreview = ({
</Flex>
);
};
-
-// eslint-disable-next-line import/no-default-export -- deprecated usage
-export default ChartColorPreview;
diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ChartColorPreview/index.ts b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ChartColorPreview/index.ts
index 2073426fd63..038bd0c2a96 100644
--- a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ChartColorPreview/index.ts
+++ b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ChartColorPreview/index.ts
@@ -1,2 +1 @@
-// eslint-disable-next-line import/no-default-export -- deprecated usage
-export { default } from "./ChartColorPreview";
+export { ChartColorPreview } from "./ChartColorPreview";
diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ChartColorSample/ChartColorSample.module.css b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ChartColorSample/ChartColorSample.module.css
new file mode 100644
index 00000000000..0cdfa7f8e99
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ChartColorSample/ChartColorSample.module.css
@@ -0,0 +1,7 @@
+.tick {
+ border-top: 1px dashed var(--mb-color-border-neutral);
+}
+
+.axis {
+ border-top: 1px solid var(--mb-color-border-neutral);
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ChartColorSample/ChartColorSample.styled.tsx b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ChartColorSample/ChartColorSample.styled.tsx
deleted file mode 100644
index 3ee0084fc5a..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ChartColorSample/ChartColorSample.styled.tsx
+++ /dev/null
@@ -1,47 +0,0 @@
-import styled from "@emotion/styled";
-
-export const ChartRoot = styled.div`
- position: relative;
- height: 100%;
-`;
-
-const ChartLayer = styled.div`
- position: absolute;
- top: 0;
- left: 0;
- width: 100%;
- height: 100%;
-`;
-
-export const ChartGrid = styled(ChartLayer)`
- display: flex;
- flex-direction: column;
- justify-content: space-between;
- position: absolute;
-`;
-
-export const ChartTick = styled.div`
- border-top: 1px dashed var(--mb-color-border-neutral);
-`;
-
-export const ChartAxis = styled.div`
- border-top: 1px solid var(--mb-color-border-neutral);
-`;
-
-export const ChartPlot = styled(ChartLayer)`
- display: flex;
- justify-content: space-evenly;
- flex: 1 1 auto;
- align-items: flex-end;
-`;
-
-export const ChartBar = styled.div`
- display: flex;
- flex-direction: column;
- flex: 0 1 auto;
- width: 10%;
-`;
-
-export const ChartBarSection = styled.div`
- flex: 1 1 auto;
-`;
diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ChartColorSample/ChartColorSample.tsx b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ChartColorSample/ChartColorSample.tsx
index 662aa3453dc..01ce6c18f14 100644
--- a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ChartColorSample/ChartColorSample.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ChartColorSample/ChartColorSample.tsx
@@ -1,15 +1,9 @@
import { memo, useMemo } from "react";
import _ from "underscore";
-import {
- ChartAxis,
- ChartBar,
- ChartBarSection,
- ChartGrid,
- ChartPlot,
- ChartRoot,
- ChartTick,
-} from "./ChartColorSample.styled";
+import { Box, Flex } from "metabase/ui";
+
+import S from "./ChartColorSample.module.css";
const BAR_HEIGHTS = [0.75, 0.875, 1];
const TICK_COUNT = 8;
@@ -18,41 +12,39 @@ export interface ChartColorSampleProps {
colorGroups: string[][];
}
-const ChartColorSample = ({
+export const ChartColorSample = memo(function ChartColorSample({
colorGroups,
-}: ChartColorSampleProps): JSX.Element => {
+}: ChartColorSampleProps) {
const reversedGroups = useMemo(
() => colorGroups.map((group) => [...group].reverse()),
[colorGroups],
);
return (
- <ChartRoot>
- <ChartGrid>
+ <Box pos="relative" h="100%">
+ <Flex direction="column" justify="space-between" pos="absolute" inset={0}>
{_.times(TICK_COUNT, (index) => (
- <ChartTick key={index} />
+ <Box key={index} className={S.tick} />
))}
- <ChartAxis />
- </ChartGrid>
- <ChartPlot>
+ <Box className={S.axis} />
+ </Flex>
+ <Flex justify="space-evenly" align="flex-end" pos="absolute" inset={0}>
{reversedGroups.map((group, index) => (
- <ChartBar key={index} style={{ height: getBarHeight(index) }}>
+ <Flex key={index} direction="column" w="10%" h={getBarHeight(index)}>
{group.map((color, index) => (
- <ChartBarSection
+ <Box
key={index}
- style={{ flexGrow: index + 1, backgroundColor: color }}
+ flex={`${index + 1} 1 auto`}
+ style={{ backgroundColor: color }}
/>
))}
- </ChartBar>
+ </Flex>
))}
- </ChartPlot>
- </ChartRoot>
+ </Flex>
+ </Box>
);
-};
+});
const getBarHeight = (index: number) => {
return `${BAR_HEIGHTS[index % BAR_HEIGHTS.length] * 100}%`;
};
-
-// eslint-disable-next-line import/no-default-export -- deprecated usage
-export default memo(ChartColorSample);
diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ChartColorSample/index.ts b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ChartColorSample/index.ts
index 69709b49b92..f376119e1e9 100644
--- a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ChartColorSample/index.ts
+++ b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ChartColorSample/index.ts
@@ -1,2 +1 @@
-// eslint-disable-next-line import/no-default-export -- deprecated usage
-export { default } from "./ChartColorSample";
+export { ChartColorSample } from "./ChartColorSample";
diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ChartColorSettings/ChartColorSettings.module.css b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ChartColorSettings/ChartColorSettings.module.css
new file mode 100644
index 00000000000..e30844c5105
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ChartColorSettings/ChartColorSettings.module.css
@@ -0,0 +1,19 @@
+.bodyBorder {
+ border: 1px solid var(--mb-color-border-neutral);
+ border-bottom: none;
+ border-radius: 0.5rem 0.5rem 0 0;
+}
+
+.rowDivider:not(:first-of-type) {
+ border-top: 1px solid var(--mb-color-border-neutral);
+}
+
+.colorCell:not(:first-of-type) {
+ border-left: 1px solid var(--mb-color-border-neutral);
+ background-color: var(--mb-color-background_page-secondary);
+}
+
+.footerBorder {
+ border: 1px solid var(--mb-color-border-neutral);
+ border-radius: 0 0 0.5rem 0.5rem;
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ChartColorSettings/ChartColorSettings.styled.tsx b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ChartColorSettings/ChartColorSettings.styled.tsx
deleted file mode 100644
index 02d9a259abf..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ChartColorSettings/ChartColorSettings.styled.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import styled from "@emotion/styled";
-
-export const TableBody = styled.div`
- border: 1px solid var(--mb-color-border-neutral);
- border-bottom: 0;
- border-radius: 0.5rem 0.5rem 0 0;
-`;
-
-export const TableBodyRow = styled.div`
- display: flex;
- align-items: center;
-
- &:not(:first-of-type) {
- border-top: 1px solid var(--mb-color-border-neutral);
- }
-`;
-
-export const TableBodyCell = styled.div`
- flex: 1 1 auto;
- padding: 1rem 1.5rem;
-
- &:not(:first-of-type) {
- border-left: 1px solid var(--mb-color-border-neutral);
- background-color: var(--mb-color-background_page-secondary);
- }
-`;
-
-export const TableFooter = styled.div`
- padding: 1rem 1.5rem;
- border: 1px solid var(--mb-color-border-neutral);
- border-radius: 0 0 0.5rem 0.5rem;
-`;
diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ChartColorSettings/ChartColorSettings.tsx b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ChartColorSettings/ChartColorSettings.tsx
index 17a28ad9b8a..71273119559 100644
--- a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ChartColorSettings/ChartColorSettings.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ChartColorSettings/ChartColorSettings.tsx
@@ -6,15 +6,10 @@ import _ from "underscore";
import { ColorPicker } from "metabase/common/components/ColorPicker";
import { ConfirmModal } from "metabase/common/components/ConfirmModal";
import { useCurrentRef } from "metabase/common/hooks/use-current-ref";
-import { Button, Group } from "metabase/ui";
+import { Box, Button, Flex, Group } from "metabase/ui";
import { color } from "metabase/ui/colors";
-import {
- TableBody,
- TableBodyCell,
- TableBodyRow,
- TableFooter,
-} from "./ChartColorSettings.styled";
+import S from "./ChartColorSettings.module.css";
import {
getAutoChartColors,
getChartColorGroups,
@@ -28,7 +23,7 @@ export interface ChartColorSettingsProps {
onChange: (colors: Record<string, string>) => void;
}
-const ChartColorSettings = ({
+export const ChartColorSettings = ({
colors,
colorPalette,
onChange,
@@ -100,9 +95,9 @@ const ChartColorTable = ({
return (
<div>
- <TableBody>
+ <Box className={S.bodyBorder}>
{colorGroups.map((colorGroup, index) => (
- <TableBodyRow key={index}>
+ <Flex key={index} className={S.rowDivider}>
{colorGroup.map((colorName) => (
<ChartColorCell
key={colorName}
@@ -112,10 +107,10 @@ const ChartColorTable = ({
onChange={onChange}
/>
))}
- </TableBodyRow>
+ </Flex>
))}
- </TableBody>
- <TableFooter>
+ </Box>
+ <Box className={S.footerBorder} px="xl" py="lg">
<Group gap="sm">
<Button onClick={onGenerate}>{t`Generate chart colors`}</Button>
{hasCustomColors && (
@@ -133,7 +128,7 @@ const ChartColorTable = ({
confirmButtonText={t`Reset`}
/>
)}
- </TableFooter>
+ </Box>
</div>
);
};
@@ -159,16 +154,13 @@ const ChartColorCell = memo(function ChartColorCell({
);
return (
- <TableBodyCell>
+ <Box className={S.colorCell} flex="1 1 auto" px="xl" py="lg">
<ColorPicker
value={color ?? originalColor}
placeholder={t`Auto`}
isAuto={color == null}
onChange={handleChange}
/>
- </TableBodyCell>
+ </Box>
);
});
-
-// eslint-disable-next-line import/no-default-export -- deprecated usage
-export default ChartColorSettings;
diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ChartColorSettings/index.ts b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ChartColorSettings/index.ts
index a820bceb825..a413737dc96 100644
--- a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ChartColorSettings/index.ts
+++ b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ChartColorSettings/index.ts
@@ -1,2 +1 @@
-// eslint-disable-next-line import/no-default-export -- deprecated usage
-export { default } from "./ChartColorSettings";
+export { ChartColorSettings } from "./ChartColorSettings";
diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ColorSettings/ColorSettings.tsx b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ColorSettings/ColorSettings.tsx
index f878bbc52f1..2a0265a13ec 100644
--- a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ColorSettings/ColorSettings.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ColorSettings/ColorSettings.tsx
@@ -5,9 +5,9 @@ import { SettingHeader } from "metabase/settings-components";
import { Box, Stack, Tabs } from "metabase/ui";
import type { ColorSettings as ColorSettingsType } from "metabase-types/api";
-import BrandColorSettings from "../BrandColorSettings";
-import ChartColorPreview from "../ChartColorPreview";
-import ChartColorSettings from "../ChartColorSettings";
+import { BrandColorSettings } from "../BrandColorSettings";
+import { ChartColorPreview } from "../ChartColorPreview";
+import { ChartColorSettings } from "../ChartColorSettings";
export interface ColorSettingsProps {
initialColors: ColorSettingsType | null;
diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/FontWidget/FontFilesWidget.module.css b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/FontWidget/FontFilesWidget.module.css
new file mode 100644
index 00000000000..6689e00cb6f
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/FontWidget/FontFilesWidget.module.css
@@ -0,0 +1,15 @@
+.headerBorder {
+ border: 1px solid var(--mb-color-border-neutral);
+ border-bottom: none;
+ border-radius: 0.5rem 0.5rem 0 0;
+}
+
+.bodyBorder {
+ border: 1px solid var(--mb-color-border-neutral);
+ border-top: none;
+ border-radius: 0 0 0.5rem 0.5rem;
+}
+
+.rowDivider:not(:first-of-type) {
+ border-top: 1px solid var(--mb-color-border-neutral);
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/FontWidget/FontFilesWidget.styled.tsx b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/FontWidget/FontFilesWidget.styled.tsx
deleted file mode 100644
index 87a4d95a290..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/FontWidget/FontFilesWidget.styled.tsx
+++ /dev/null
@@ -1,76 +0,0 @@
-import { css } from "@emotion/react";
-import styled from "@emotion/styled";
-
-const cellStyles = css`
- padding-left: 1.5rem;
- padding-right: 1.5rem;
-
- &:first-of-type {
- flex: 0 0 auto;
- width: 12rem;
- }
-
- &:last-of-type {
- flex: 1 1 auto;
- }
-`;
-
-export const TableRoot = styled.div`
- flex: 1 1 auto;
-`;
-
-export const TableHeader = styled.div`
- border: 1px solid var(--mb-color-border-neutral);
- border-bottom: none;
- border-radius: 0.5rem 0.5rem 0 0;
- background-color: var(--mb-color-background_page-secondary);
-`;
-
-export const TableHeaderRow = styled.div`
- display: flex;
- align-items: center;
-`;
-
-export const TableHeaderCell = styled.div`
- ${cellStyles};
- color: var(--mb-color-text-secondary);
- font-size: 0.6rem;
- letter-spacing: 1px;
- line-height: 0.625rem;
- font-weight: bold;
- text-transform: uppercase;
- padding-top: 0.5rem;
- padding-bottom: 0.5rem;
-`;
-
-export const TableBody = styled.div`
- border: 1px solid var(--mb-color-border-neutral);
- border-top: none;
- border-radius: 0 0 0.5rem 0.5rem;
-`;
-
-export const TableBodyRow = styled.div`
- display: flex;
- align-items: center;
-
- &:not(:first-of-type) {
- border-top: 1px solid var(--mb-color-border-neutral);
- }
-`;
-
-interface TableBodyCellProps {
- fontWeight?: number;
-}
-
-export const TableBodyCell = styled.div<TableBodyCellProps>`
- ${cellStyles};
- color: var(--mb-color-text-secondary);
- padding-top: 1rem;
- padding-bottom: 1rem;
- font-weight: ${(props) => props.fontWeight};
-`;
-
-export const TableBodyCellLabel = styled.span`
- color: var(--mb-color-text-disabled);
- margin-left: 0.25rem;
-`;
diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/FontWidget/FontFilesWidget.tsx b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/FontWidget/FontFilesWidget.tsx
index 0776a54556c..e60039eafd9 100644
--- a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/FontWidget/FontFilesWidget.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/FontWidget/FontFilesWidget.tsx
@@ -3,27 +3,12 @@ import { useCallback, useMemo } from "react";
import { t } from "ttag";
import { useAdminSetting } from "metabase/settings";
-import { Stack, Text, TextInput } from "metabase/ui";
-import type { FontFile } from "metabase-types/api";
+import { Box, Flex, Stack, Text, TextInput } from "metabase/ui";
-import {
- TableBody,
- TableBodyCell,
- TableBodyCellLabel,
- TableBodyRow,
- TableHeader,
- TableHeaderCell,
- TableHeaderRow,
- TableRoot,
-} from "./FontFilesWidget.styled";
-import type { FontFileOption, FontFilesSetting } from "./types";
+import S from "./FontFilesWidget.module.css";
+import type { FontFileOption } from "./types";
import { getFontFiles, getFontOptions, getFontUrls } from "./utils";
-export interface FontFilesWidgetProps {
- setting: FontFilesSetting;
- onChange: (fontFiles: FontFile[]) => void;
-}
-
export const FontFilesWidget = () => {
const {
value: files,
@@ -68,14 +53,22 @@ const FontFilesTable = ({
onChange,
}: FontFilesTableProps): JSX.Element => {
return (
- <TableRoot data-testid="font-files-widget">
- <TableHeader>
- <TableHeaderRow>
- <TableHeaderCell>{t`Font weight`}</TableHeaderCell>
- <TableHeaderCell>{t`URL`}</TableHeaderCell>
- </TableHeaderRow>
- </TableHeader>
- <TableBody>
+ <Box data-testid="font-files-widget">
+ <Flex
+ className={S.headerBorder}
+ align="center"
+ bg="background_page-secondary"
+ c="text-secondary"
+ fz="xs"
+ fw="bold"
+ lh="xs"
+ lts="0.0625rem"
+ tt="uppercase"
+ >
+ <Box flex="0 0 auto" w="12rem" px="xl" py="sm">{t`Font weight`}</Box>
+ <Box flex="1 1 auto" px="xl" py="sm">{t`URL`}</Box>
+ </Flex>
+ <Box className={S.bodyBorder}>
{getFontOptions().map((option) => (
<FontFileRow
key={option.name}
@@ -84,8 +77,8 @@ const FontFilesTable = ({
onChange={onChange}
/>
))}
- </TableBody>
- </TableRoot>
+ </Box>
+ </Box>
);
};
@@ -108,19 +101,21 @@ const FontFileRow = ({
);
return (
- <TableBodyRow>
- <TableBodyCell fontWeight={option.fontWeight}>
+ <Flex className={S.rowDivider} align="center" c="text-secondary">
+ <Box flex="0 0 auto" w="12rem" px="xl" py="lg" fw={option.fontWeight}>
{option.name}
- <TableBodyCellLabel>{option.fontWeight}</TableBodyCellLabel>
- </TableBodyCell>
- <TableBodyCell>
+ <Box component="span" c="text-disabled" ml="xxs">
+ {option.fontWeight}
+ </Box>
+ </Box>
+ <Box flex="1 1 auto" px="xl" py="lg">
<TextInput
defaultValue={url}
placeholder="https://some.trusted.location/font-file.woff2"
onBlur={handleBlur}
aria-label={option.name}
/>
- </TableBodyCell>
- </TableBodyRow>
+ </Box>
+ </Flex>
);
};
diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/IllustrationWidget/IllustrationWidget.module.css b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/IllustrationWidget/IllustrationWidget.module.css
new file mode 100644
index 00000000000..92aecb9c9a4
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/IllustrationWidget/IllustrationWidget.module.css
@@ -0,0 +1,31 @@
+.borderRight {
+ border-right: 1px solid var(--mb-color-border-neutral);
+}
+
+.sailboat {
+ background-image: url("~assets/img/no_results.svg");
+ background-size: contain;
+}
+
+/* Shows a warning icon in place of a preview that failed to load */
+.previewImage {
+ position: relative;
+ object-fit: cover;
+
+ &::before {
+ content: "";
+ display: inline-block;
+ width: 100%;
+ height: 100%;
+ }
+
+ &::after {
+ position: absolute;
+ left: 50%;
+ top: 50%;
+ transform: translate(-50%, -50%);
+ content: url("~metabase/ui/components/icons/Icon/icons/warning.svg");
+ width: 1.25rem;
+ height: 1.25rem;
+ }
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/IllustrationWidget/IllustrationWidget.styled.tsx b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/IllustrationWidget/IllustrationWidget.styled.tsx
deleted file mode 100644
index 2f992cd139b..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/IllustrationWidget/IllustrationWidget.styled.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-import styled from "@emotion/styled";
-
-import noResultsSource from "assets/img/no_results.svg";
-import warningSource from "metabase/ui/components/icons/Icon/icons/warning.svg";
-
-export const SailboatImage = styled.div`
- width: 100px;
- height: 90px;
- background-image: url(${noResultsSource});
- background-size: contain;
-`;
-
-//Add an error icon as a fallback when the preview image failed to load.
-export const PreviewImage = styled.img`
- position: relative;
- width: 100px;
- height: 90px;
- object-fit: cover;
-
- &::before {
- content: "";
- display: inline-block;
- width: 100%;
- height: 100%;
- }
-
- &::after {
- position: absolute;
- left: 50%;
- top: 50%;
- transform: translate(-50%, -50%);
- content: url(${warningSource});
- display: inline-block;
- width: 20px;
- height: 20px;
- }
-`;
diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/IllustrationWidget/IllustrationWidget.tsx b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/IllustrationWidget/IllustrationWidget.tsx
index e307586463e..2e9123120d9 100644
--- a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/IllustrationWidget/IllustrationWidget.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/IllustrationWidget/IllustrationWidget.tsx
@@ -19,11 +19,7 @@ import type {
import { ImageUploadInfoDot } from "../ImageUploadInfoDot";
-import { PreviewImage, SailboatImage } from "./IllustrationWidget.styled";
-export interface StringSetting {
- value: IllustrationSettingValue | null;
- default: IllustrationSettingValue;
-}
+import S from "./IllustrationWidget.module.css";
type IllustrationType = "background" | "icon";
@@ -188,11 +184,11 @@ export function IllustrationWidget({
<Paper withBorder shadow="none">
<Flex>
<Flex
+ className={S.borderRight}
align="center"
justify="center"
w="7.5rem"
pos="relative"
- style={{ borderRight: "1px solid var(--mb-color-border-neutral)" }}
>
{getPreviewImage({
value: localValue,
@@ -278,7 +274,7 @@ async function isFileIntact(dataUri: string) {
const PREVIEW_ELEMENTS: Record<IllustrationType, JSX.Element> = {
background: <LighthouseIllustrationThumbnail />,
- icon: <SailboatImage />,
+ icon: <Box className={S.sailboat} w="6.25rem" h="5.625rem" />,
};
interface GetPreviewImageProps {
@@ -301,7 +297,15 @@ function getPreviewImage({
}
if (value === "custom" && customSource) {
- return <PreviewImage src={customSource} />;
+ return (
+ <Box
+ component="img"
+ className={S.previewImage}
+ src={customSource}
+ w="6.25rem"
+ h="5.625rem"
+ />
+ );
}
return null;
diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/IllustrationWidget/ImageUploadWidget.tsx b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/IllustrationWidget/ImageUploadWidget.tsx
index 0e6e93a500d..1d6852f3c95 100644
--- a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/IllustrationWidget/ImageUploadWidget.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/IllustrationWidget/ImageUploadWidget.tsx
@@ -10,7 +10,7 @@ import { SettingHeader } from "metabase/settings-components";
import { Box, Button, Flex, Icon, Paper, Text } from "metabase/ui";
import type { EnterpriseSettingKey } from "metabase-types/api";
-import { PreviewImage } from "./IllustrationWidget.styled";
+import S from "./IllustrationWidget.module.css";
const MB = 1024 * 1024;
const IMAGE_SIZE_LIMIT = 2 * MB;
@@ -98,15 +98,20 @@ export function ImageUploadWidget({
<Paper withBorder shadow="none">
<Flex>
<Flex
+ className={S.borderRight}
align="center"
justify="center"
w="7.5rem"
- style={{
- borderRight: "1px solid var(--mb-color-border-neutral)",
- }}
>
{!isDefaultImage && typeof imageSource === "string" && (
- <PreviewImage src={imageSource} aria-label={t`Image preview`} />
+ <Box
+ component="img"
+ className={S.previewImage}
+ src={imageSource}
+ aria-label={t`Image preview`}
+ w="6.25rem"
+ h="5.625rem"
+ />
)}
</Flex>
<Flex p="xl" gap="lg" direction="column" justify="center" w="100%">
diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ImageToggle/ImageToggle.module.css b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ImageToggle/ImageToggle.module.css
new file mode 100644
index 00000000000..5a5fa770bb7
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ImageToggle/ImageToggle.module.css
@@ -0,0 +1,8 @@
+.border {
+ border: 1px solid var(--mb-color-border-neutral);
+ border-radius: 0.5rem;
+}
+
+.borderRight {
+ border-right: 1px solid var(--mb-color-border-neutral);
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ImageToggle/ImageToggle.styled.tsx b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ImageToggle/ImageToggle.styled.tsx
deleted file mode 100644
index e466c009acb..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ImageToggle/ImageToggle.styled.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import styled from "@emotion/styled";
-
-export const ToggleRoot = styled.div`
- display: flex;
- flex: 1 1 auto;
- border: 1px solid var(--mb-color-border-neutral);
- border-radius: 0.5rem;
-`;
-
-export const ImageContainer = styled.div`
- display: flex;
- width: 7.5rem;
- justify-content: center;
- align-items: center;
- border-right: 1px solid var(--mb-color-border-neutral);
-`;
-
-export const ToggleContainer = styled.div`
- display: flex;
- justify-content: space-between;
- align-items: center;
- flex: 1 1 auto;
- padding: 2rem 1.5rem;
-`;
-
-export const ToggleLabel = styled.label`
- margin-right: 2rem;
-`;
diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ImageToggle/ImageToggle.tsx b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ImageToggle/ImageToggle.tsx
index 2834ca01109..f72179c0006 100644
--- a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ImageToggle/ImageToggle.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/ImageToggle/ImageToggle.tsx
@@ -1,14 +1,9 @@
import type { ReactNode } from "react";
import { useUniqueId } from "metabase/common/hooks/use-unique-id";
-import { Switch } from "metabase/ui";
+import { Box, Flex, Switch } from "metabase/ui";
-import {
- ImageContainer,
- ToggleContainer,
- ToggleLabel,
- ToggleRoot,
-} from "./ImageToggle.styled";
+import S from "./ImageToggle.module.css";
export interface ImageToggleProps {
label: string;
@@ -26,17 +21,32 @@ export const ImageToggle = ({
const toggleId = useUniqueId();
return (
- <ToggleRoot>
- <ImageContainer>{children}</ImageContainer>
- <ToggleContainer>
- <ToggleLabel htmlFor={toggleId}>{label}</ToggleLabel>
+ <Flex className={S.border}>
+ <Flex
+ className={S.borderRight}
+ w="7.5rem"
+ justify="center"
+ align="center"
+ >
+ {children}
+ </Flex>
+ <Flex
+ flex="1 1 auto"
+ justify="space-between"
+ align="center"
+ px="xl"
+ py="xxl"
+ >
+ <Box component="label" htmlFor={toggleId} mr="xxl">
+ {label}
+ </Box>
<Switch
id={toggleId}
aria-checked={value}
checked={value}
onChange={(e) => onChange(e.target.checked)}
/>
- </ToggleContainer>
- </ToggleRoot>
+ </Flex>
+ </Flex>
);
};
diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/MetabotToggleWidget/MetabotToggleWidget.module.css b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/MetabotToggleWidget/MetabotToggleWidget.module.css
new file mode 100644
index 00000000000..718af2295fa
--- /dev/null
+++ b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/MetabotToggleWidget/MetabotToggleWidget.module.css
@@ -0,0 +1,3 @@
+.icon {
+ width: 4.5rem;
+}
diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/MetabotToggleWidget/MetabotToggleWidget.styled.tsx b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/MetabotToggleWidget/MetabotToggleWidget.styled.tsx
deleted file mode 100644
index dd4a272e057..00000000000
--- a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/MetabotToggleWidget/MetabotToggleWidget.styled.tsx
+++ /dev/null
@@ -1,8 +0,0 @@
-import styled from "@emotion/styled";
-
-import { MetabotLogo } from "metabase/common/components/MetabotLogo";
-
-export const MetabotIcon = styled(MetabotLogo)`
- display: block;
- width: 4.5rem;
-`;
diff --git a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/MetabotToggleWidget/MetabotToggleWidget.tsx b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/MetabotToggleWidget/MetabotToggleWidget.tsx
index 223f01da404..80dbe43e2f3 100644
--- a/enterprise/frontend/src/metabase-enterprise/whitelabel/components/MetabotToggleWidget/MetabotToggleWidget.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/whitelabel/components/MetabotToggleWidget/MetabotToggleWidget.tsx
@@ -1,12 +1,13 @@
import { t } from "ttag";
+import { MetabotLogo } from "metabase/common/components/MetabotLogo";
import { useAdminSetting } from "metabase/settings";
import { SettingHeader } from "metabase/settings-components";
import { Box } from "metabase/ui";
import { ImageToggle } from "../ImageToggle";
-import { MetabotIcon } from "./MetabotToggleWidget.styled";
+import S from "./MetabotToggleWidget.module.css";
export const MetabotToggleWidget = () => {
const { value, updateSetting } = useAdminSetting("show-metabot");
@@ -25,7 +26,7 @@ export const MetabotToggleWidget = () => {
});
}}
>
- <MetabotIcon variant={value ? "happy" : "sad"} />
+ <MetabotLogo className={S.icon} variant={value ? "happy" : "sad"} />
</ImageToggle>
</Box>
);