Skip to content

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

Replace and remove the deprecated `space` utility (#64378)

Nemanja Glumac52e3cf214294
diff --git a/frontend/src/metabase/account/app/components/AccountHeader/AccountHeader.styled.tsx b/frontend/src/metabase/account/app/components/AccountHeader/AccountHeader.styled.tsx
index d40319fe240..04897ee34af 100644
--- a/frontend/src/metabase/account/app/components/AccountHeader/AccountHeader.styled.tsx
+++ b/frontend/src/metabase/account/app/components/AccountHeader/AccountHeader.styled.tsx
@@ -5,7 +5,6 @@ import UserAvatar from "metabase/common/components/UserAvatar";
import {
breakpointMinMedium,
breakpointMinSmall,
- space,
} from "metabase/styled-components/theme";
export const AccountHeaderRoot = styled.div`
@@ -13,12 +12,12 @@ export const AccountHeaderRoot = styled.div`
flex-direction: column;
justify-content: center;
align-items: center;
- padding-top: ${space(1)};
+ padding-top: var(--mantine-spacing-sm);
border-bottom: 1px solid var(--mb-color-border);
background-color: var(--mb-color-bg-white);
${breakpointMinSmall} {
- padding-top: ${space(2)};
+ padding-top: var(--mantine-spacing-md);
}
`;
@@ -26,17 +25,17 @@ export const HeaderSection = styled.div`
display: flex;
flex-direction: column;
align-items: center;
- padding: ${space(2)};
+ padding: var(--mantine-spacing-md);
${breakpointMinMedium} {
- padding: ${space(4)};
+ padding: 4rem;
}
`;
export const HeaderTitle = styled.h2`
font-size: 1rem;
text-align: center;
- margin-bottom: ${space(0)};
+ margin-bottom: var(--mantine-spacing-xs);
`;
export const HeaderSubtitle = styled.h3`
@@ -47,12 +46,12 @@ export const HeaderSubtitle = styled.h3`
export const HeaderAvatar = styled(UserAvatar)`
width: 3em;
height: 3em;
- margin-bottom: ${space(1)};
+ margin-bottom: var(--mantine-spacing-sm);
${breakpointMinSmall} {
width: 4em;
height: 4em;
- margin-bottom: ${space(2)};
+ margin-bottom: var(--mantine-spacing-md);
}
${breakpointMinMedium} {
diff --git a/frontend/src/metabase/account/app/components/AccountLayout/AccountLayout.styled.tsx b/frontend/src/metabase/account/app/components/AccountLayout/AccountLayout.styled.tsx
index fd6371bb218..7a887dc65e4 100644
--- a/frontend/src/metabase/account/app/components/AccountLayout/AccountLayout.styled.tsx
+++ b/frontend/src/metabase/account/app/components/AccountLayout/AccountLayout.styled.tsx
@@ -1,14 +1,14 @@
// eslint-disable-next-line no-restricted-imports
import styled from "@emotion/styled";
-import { breakpointMinSmall, space } from "metabase/styled-components/theme";
+import { breakpointMinSmall } from "metabase/styled-components/theme";
export const AccountContent = styled.div`
margin: 0 auto;
- padding: ${space(1)};
+ padding: var(--mantine-spacing-sm);
${breakpointMinSmall} {
width: 540px;
- padding: ${space(3)} ${space(2)};
+ padding: var(--mantine-spacing-xl) var(--mantine-spacing-md);
}
`;
diff --git a/frontend/src/metabase/actions/components/ActionViz/ActionDashcardSettings.styled.tsx b/frontend/src/metabase/actions/components/ActionViz/ActionDashcardSettings.styled.tsx
index 210c2d1d512..bef7203a693 100644
--- a/frontend/src/metabase/actions/components/ActionViz/ActionDashcardSettings.styled.tsx
+++ b/frontend/src/metabase/actions/components/ActionViz/ActionDashcardSettings.styled.tsx
@@ -1,8 +1,6 @@
// eslint-disable-next-line no-restricted-imports
import styled from "@emotion/styled";
-import { space } from "metabase/styled-components/theme";
-
export const ActionSettingsWrapper = styled.div`
display: flex;
height: 80vh;
@@ -12,9 +10,9 @@ export const ActionSettingsWrapper = styled.div`
export const ActionSettingsHeader = styled.h2`
font-size: 1.25rem;
- padding-bottom: ${space(1)};
- padding-left: ${space(3)};
- padding-right: ${space(3)};
+ padding-bottom: var(--mantine-spacing-sm);
+ padding-left: var(--mantine-spacing-xl);
+ padding-right: var(--mantine-spacing-xl);
`;
// make strolling nicer by fading out the top and bottom of the column
@@ -31,9 +29,9 @@ const fade = (side: "top" | "bottom") => `
`;
export const ActionSettingsLeft = styled.div`
- padding-left: ${space(3)};
- padding-top: ${space(3)};
- padding-bottom: ${space(3)};
+ padding-left: var(--mantine-spacing-xl);
+ padding-top: var(--mantine-spacing-xl);
+ padding-bottom: var(--mantine-spacing-xl);
width: 20rem;
overflow-y: auto;
@@ -57,7 +55,7 @@ export const ActionSettingsRight = styled.div`
display: flex;
flex: 1;
flex-direction: column;
- padding-top: ${space(3)};
+ padding-top: var(--mantine-spacing-xl);
border-left: 1px solid var(--mb-color-border);
`;
@@ -66,10 +64,10 @@ export const ParameterMapperContainer = styled.div`
flex-direction: column;
overflow-y: auto;
flex: 1;
- padding-top: ${space(1)};
- padding-bottom: ${space(3)};
- padding-left: ${space(3)};
- padding-right: ${space(3)};
+ padding-top: var(--mantine-spacing-sm);
+ padding-bottom: var(--mantine-spacing-xl);
+ padding-left: var(--mantine-spacing-xl);
+ padding-right: var(--mantine-spacing-xl);
`;
export const ModalActions = styled.div`
diff --git a/frontend/src/metabase/actions/components/ActionViz/ActionForm.styled.tsx b/frontend/src/metabase/actions/components/ActionViz/ActionForm.styled.tsx
index ea1797b3dce..2097411ef87 100644
--- a/frontend/src/metabase/actions/components/ActionViz/ActionForm.styled.tsx
+++ b/frontend/src/metabase/actions/components/ActionViz/ActionForm.styled.tsx
@@ -1,12 +1,10 @@
// eslint-disable-next-line no-restricted-imports
import styled from "@emotion/styled";
-import { space } from "metabase/styled-components/theme";
-
export const FormWrapper = styled.div`
padding: 1.5rem;
background-color: var(--mb-color-bg-white);
- border-radius: ${space(1)};
+ border-radius: var(--mantine-spacing-sm);
border: 1px solid var(--mb-color-border);
overflow-y: auto;
`;
diff --git a/frontend/src/metabase/actions/components/ActionViz/ActionParameterMapping.styled.tsx b/frontend/src/metabase/actions/components/ActionViz/ActionParameterMapping.styled.tsx
index f1d89e3b9c1..5587192f291 100644
--- a/frontend/src/metabase/actions/components/ActionViz/ActionParameterMapping.styled.tsx
+++ b/frontend/src/metabase/actions/components/ActionViz/ActionParameterMapping.styled.tsx
@@ -2,10 +2,9 @@
import styled from "@emotion/styled";
import { color } from "metabase/lib/colors";
-import { space } from "metabase/styled-components/theme";
export const ParameterFormSection = styled.div`
- margin-top: ${space(2)};
+ margin-top: var(--mantine-spacing-md);
`;
interface ParameterFormLabelProps {
@@ -16,15 +15,15 @@ export const ParameterFormLabel = styled.label<ParameterFormLabelProps>`
color: ${(props) => (props.error ? color("error") : color("text-medium"))};
font-size: 0.75rem;
display: flex;
- gap: ${space(1)};
+ gap: var(--mantine-spacing-sm);
align-items: center;
- margin-bottom: ${space(1)};
+ margin-bottom: var(--mantine-spacing-sm);
font-weight: bold;
`;
export const ParameterFormBadge = styled.span`
color: var(--mb-color-text-dark);
background-color: var(--mb-color-bg-medium);
- padding: ${space(0)} ${space(1)};
- border-radius: ${space(0)};
+ padding: var(--mantine-spacing-xs) var(--mantine-spacing-sm);
+ border-radius: var(--mantine-spacing-xs);
`;
diff --git a/frontend/src/metabase/actions/components/ActionViz/ExplainerText/ExplainerText.styled.tsx b/frontend/src/metabase/actions/components/ActionViz/ExplainerText/ExplainerText.styled.tsx
index 4275eea3cc5..70d8ab281b2 100644
--- a/frontend/src/metabase/actions/components/ActionViz/ExplainerText/ExplainerText.styled.tsx
+++ b/frontend/src/metabase/actions/components/ActionViz/ExplainerText/ExplainerText.styled.tsx
@@ -2,15 +2,14 @@
import styled from "@emotion/styled";
import ExternalLink from "metabase/common/components/ExternalLink";
-import { space } from "metabase/styled-components/theme";
export const ExplainerTextContainer = styled.p`
- margin-left: ${space(3)};
- margin-right: ${space(3)};
+ margin-left: var(--mantine-spacing-xl);
+ margin-right: var(--mantine-spacing-xl);
color: var(--mb-color-text-medium);
`;
export const BrandLinkWithLeftMargin = styled(ExternalLink)`
- margin-left: ${space(1)};
+ margin-left: var(--mantine-spacing-sm);
color: var(--mb-color-brand);
`;
diff --git a/frontend/src/metabase/actions/containers/ActionCreator/ActionCreator.styled.tsx b/frontend/src/metabase/actions/containers/ActionCreator/ActionCreator.styled.tsx
index 341d6cdbbab..29df653763e 100644
--- a/frontend/src/metabase/actions/containers/ActionCreator/ActionCreator.styled.tsx
+++ b/frontend/src/metabase/actions/containers/ActionCreator/ActionCreator.styled.tsx
@@ -2,7 +2,6 @@
import styled from "@emotion/styled";
import SidebarContentS from "metabase/query_builder/components/SidebarContent/SidebarContent.module.css";
-import { space } from "metabase/styled-components/theme";
export const ActionCreatorBodyContainer = styled.div`
display: grid;
@@ -23,7 +22,7 @@ export const EditorContainer = styled.div`
background-color: var(--mb-color-bg-light);
.ace_editor {
- margin-left: ${space(2)};
+ margin-left: var(--mantine-spacing-md);
}
`;
diff --git a/frontend/src/metabase/actions/containers/ActionCreator/ActionCreatorHeader.styled.tsx b/frontend/src/metabase/actions/containers/ActionCreator/ActionCreatorHeader.styled.tsx
index 56fdaa6a0ee..abd4402510a 100644
--- a/frontend/src/metabase/actions/containers/ActionCreator/ActionCreatorHeader.styled.tsx
+++ b/frontend/src/metabase/actions/containers/ActionCreator/ActionCreatorHeader.styled.tsx
@@ -4,7 +4,6 @@ import styled from "@emotion/styled";
import EditableTextBase from "metabase/common/components/EditableText";
import Select from "metabase/common/components/Select";
import SelectButton from "metabase/common/components/SelectButton";
-import { space } from "metabase/styled-components/theme";
export const Container = styled.div`
display: flex;
@@ -14,14 +13,14 @@ export const Container = styled.div`
width: 100%;
background-color: var(--mb-color-bg-white);
border-bottom: 1px solid var(--mb-color-border);
- padding: ${space(2)} ${space(3)};
+ padding: var(--mantine-spacing-md) var(--mantine-spacing-xl);
`;
export const LeftHeader = styled.div`
display: flex;
align-items: center;
color: var(--mb-color-text-medium);
- gap: ${space(2)};
+ gap: var(--mantine-spacing-md);
`;
export const EditableText = styled(EditableTextBase)`
@@ -55,6 +54,6 @@ export const ActionButtons = styled.div`
/* Since the button is borderless, adding the negative margin
will make it look flush with the container */
&:last-child {
- margin-right: -${space(1)};
+ margin-right: calc(var(--mantine-spacing-sm) * -1);
}
`;
diff --git a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/EmptyFormPlaceholder/EmptyFormPlaceholder.styled.tsx b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/EmptyFormPlaceholder/EmptyFormPlaceholder.styled.tsx
index 9062e5a70ae..2b5f795d8c0 100644
--- a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/EmptyFormPlaceholder/EmptyFormPlaceholder.styled.tsx
+++ b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/EmptyFormPlaceholder/EmptyFormPlaceholder.styled.tsx
@@ -3,7 +3,6 @@ import styled from "@emotion/styled";
import ExternalLink from "metabase/common/components/ExternalLink";
import { lighten } from "metabase/lib/colors";
-import { space } from "metabase/styled-components/theme";
import { Icon } from "metabase/ui";
export const EmptyFormPlaceholderWrapper = styled.div`
@@ -15,14 +14,14 @@ export const EmptyFormPlaceholderWrapper = styled.div`
`;
export const ExplainerTitle = styled.h3`
- margin-bottom: ${space(1)};
+ margin-bottom: var(--mantine-spacing-sm);
`;
export const ExplainerText = styled.div`
font-weight: 400;
line-height: 1.5rem;
color: var(--mb-color-text-medium);
- margin: ${space(1)} 0 0 0;
+ margin: var(--mantine-spacing-sm) 0 0 0;
`;
export const ExplainerList = styled.ul`
@@ -39,7 +38,7 @@ export const ExplainerList = styled.ul`
export const ExplainerLink = styled(ExternalLink)`
font-weight: 700;
- margin-top: ${space(2)};
+ margin-top: var(--mantine-spacing-md);
color: var(--mb-color-brand);
&:hover {
diff --git a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FieldSettingsPopover.styled.tsx b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FieldSettingsPopover.styled.tsx
index d0f2acd39b5..cd8f3e950a9 100644
--- a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FieldSettingsPopover.styled.tsx
+++ b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FieldSettingsPopover.styled.tsx
@@ -1,11 +1,10 @@
// eslint-disable-next-line no-restricted-imports
import styled from "@emotion/styled";
-import { space } from "metabase/styled-components/theme";
import { Icon } from "metabase/ui";
export const SettingsPopoverBody = styled.div`
- padding: ${space(3)};
+ padding: var(--mantine-spacing-xl);
`;
export const RequiredToggleLabel = styled.label`
@@ -14,14 +13,14 @@ export const RequiredToggleLabel = styled.label`
export const Divider = styled.div`
border-bottom: 1px solid var(--mb-color-border);
- margin: ${space(2)} 0;
+ margin: var(--mantine-spacing-md) 0;
`;
export const ToggleContainer = styled.div`
display: flex;
align-items: center;
justify-content: space-between;
- margin-bottom: ${space(1)};
+ margin-bottom: var(--mantine-spacing-sm);
`;
export const SettingsTriggerIcon = styled(Icon)`
diff --git a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormCreator.styled.tsx b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormCreator.styled.tsx
index 870ede08fcc..6e23e62865c 100644
--- a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormCreator.styled.tsx
+++ b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormCreator.styled.tsx
@@ -2,11 +2,10 @@
import styled from "@emotion/styled";
import { alpha } from "metabase/lib/colors";
-import { space } from "metabase/styled-components/theme";
export const FormContainer = styled.div`
display: flex;
- gap: ${space(2)};
+ gap: var(--mantine-spacing-md);
padding: 0 1.5rem 1rem;
transition: flex 500ms ease-in-out;
background-color: var(--mb-color-bg-white);
@@ -14,19 +13,19 @@ export const FormContainer = styled.div`
`;
export const FormFieldEditorDragContainer = styled.div`
- margin-bottom: ${space(1)};
+ margin-bottom: var(--mantine-spacing-sm);
`;
export const FieldSettingsButtonsContainer = styled.div`
display: flex;
align-items: center;
- gap: ${space(1)};
+ gap: var(--mantine-spacing-sm);
`;
export const WarningBanner = styled.div`
- padding: ${space(2)};
+ padding: var(--mantine-spacing-md);
border: 1px solid var(--mb-color-warning);
- border-radius: ${space(1)};
+ border-radius: var(--mantine-spacing-sm);
background: ${() => alpha("warning", 0.1)};
line-height: 1.25rem;
`;
diff --git a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormFieldEditor/FormFieldEditor.styled.tsx b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormFieldEditor/FormFieldEditor.styled.tsx
index 847d085f5d0..d2cf2124c57 100644
--- a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormFieldEditor/FormFieldEditor.styled.tsx
+++ b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/FormFieldEditor/FormFieldEditor.styled.tsx
@@ -5,7 +5,6 @@ import { forwardRef } from "react";
import FormField from "metabase/common/components/FormField";
import Radio from "metabase/common/components/Radio";
import { darken } from "metabase/lib/colors";
-import { space } from "metabase/styled-components/theme";
import { Icon, type IconProps } from "metabase/ui";
const DRAG_HANDLE_SIZE = 12;
@@ -13,19 +12,19 @@ const DRAG_HANDLE_SIZE = 12;
export const FormFieldContainer = styled.div`
background-color: var(--mb-color-bg-white);
border: 1px solid var(--mb-color-border);
- border-radius: ${space(1)};
+ border-radius: var(--mantine-spacing-sm);
overflow: hidden;
`;
const ContentContainer = styled.div`
display: flex;
- gap: ${space(1)};
+ gap: var(--mantine-spacing-sm);
`;
export const EditorContainer = styled(ContentContainer)`
display: flex;
padding: 1rem 1rem 0.85rem 0.85rem;
- gap: ${space(1)};
+ gap: var(--mantine-spacing-sm);
${Radio.RadioGroupVariants.join(", ")} {
margin-top: 10px;
diff --git a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/OptionEditor.styled.tsx b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/OptionEditor.styled.tsx
index d7389c0b71f..9c338dbcc23 100644
--- a/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/OptionEditor.styled.tsx
+++ b/frontend/src/metabase/actions/containers/ActionCreator/FormCreator/OptionEditor.styled.tsx
@@ -1,13 +1,11 @@
// eslint-disable-next-line no-restricted-imports
import styled from "@emotion/styled";
-import { space } from "metabase/styled-components/theme";
-
export const OptionEditorContainer = styled.div`
display: flex;
flex-direction: column;
- padding: ${space(2)};
- gap: ${space(1)};
+ padding: var(--mantine-spacing-md);
+ gap: var(--mantine-spacing-sm);
`;
export const AddMorePrompt = styled.div<{ isVisible: boolean }>`
@@ -30,6 +28,6 @@ export const TextArea = styled.textarea`
border: none;
outline: 1px solid var(--mb-color-border);
width: 20rem;
- border-radius: ${space(1)};
- padding: ${space(1)};
+ border-radius: var(--mantine-spacing-sm);
+ padding: var(--mantine-spacing-sm);
`;
diff --git a/frontend/src/metabase/actions/containers/ActionPicker/ActionPicker.styled.tsx b/frontend/src/metabase/actions/containers/ActionPicker/ActionPicker.styled.tsx
index 4a7a74c7c55..9c681cc2cc9 100644
--- a/frontend/src/metabase/actions/containers/ActionPicker/ActionPicker.styled.tsx
+++ b/frontend/src/metabase/actions/containers/ActionPicker/ActionPicker.styled.tsx
@@ -7,10 +7,9 @@ import Button from "metabase/common/components/Button";
import CollapseSection from "metabase/common/components/CollapseSection";
import UnstyledEmptyState from "metabase/common/components/EmptyState";
import { alpha } from "metabase/lib/colors";
-import { space } from "metabase/styled-components/theme";
export const ModelCollapseSection = styled(CollapseSection)`
- margin-bottom: ${space(1)};
+ margin-bottom: var(--mantine-spacing-sm);
`;
export const ActionsList = styled.ul`
@@ -25,7 +24,7 @@ export const ActionItem = styled.li<{ isSelected?: boolean }>`
justify-content: space-between;
padding: 0.5rem 0.75rem;
margin-bottom: 1px;
- border-radius: ${space(0)};
+ border-radius: var(--mantine-spacing-xs);
cursor: pointer;
${({ isSelected, theme }) =>
@@ -40,11 +39,11 @@ export const ActionItem = styled.li<{ isSelected?: boolean }>`
`;
export const EmptyState = styled(UnstyledEmptyState)`
- margin-bottom: ${space(2)};
+ margin-bottom: var(--mantine-spacing-md);
`;
export const EmptyModelStateContainer = styled.div`
- padding: ${space(2)};
+ padding: var(--mantine-spacing-md);
color: var(--mb-color-text-medium);
text-align: center;
`;
diff --git a/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/DeleteGroupMappingModal/DeleteGroupMappingModal.styled.tsx b/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/DeleteGroupMappingModal/DeleteGroupMappingModal.styled.tsx
index 379db43b59a..bae377b93fc 100644
--- a/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/DeleteGroupMappingModal/DeleteGroupMappingModal.styled.tsx
+++ b/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/DeleteGroupMappingModal/DeleteGroupMappingModal.styled.tsx
@@ -1,16 +1,14 @@
// eslint-disable-next-line no-restricted-imports
import styled from "@emotion/styled";
-import { space } from "metabase/styled-components/theme";
-
export const ModalHeader = styled.h2`
- padding: ${space(3)};
+ padding: var(--mantine-spacing-xl);
`;
export const ModalSubtitle = styled.p`
- padding: 0 ${space(3)};
+ padding: 0 var(--mantine-spacing-xl);
`;
export const ModalRadioRoot = styled.div`
- padding: ${space(0)} ${space(3)};
+ padding: var(--mantine-spacing-xs) var(--mantine-spacing-xl);
`;
diff --git a/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupMappingsWidget.styled.tsx b/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupMappingsWidget.styled.tsx
index d4243d38fe3..2b300344076 100644
--- a/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupMappingsWidget.styled.tsx
+++ b/frontend/src/metabase/admin/settings/components/widgets/GroupMappingsWidget/GroupMappingsWidget.styled.tsx
@@ -2,7 +2,6 @@
import styled from "@emotion/styled";
import Button from "metabase/common/components/Button";
-import { space } from "metabase/styled-components/theme";
export const GroupMappingsWidgetAndErrorRoot = styled.div`
display: flex;
@@ -25,8 +24,8 @@ export const GroupMappingsWidgetHeader = styled.div`
border-top-right-radius: 8px;
display: flex;
justify-content: space-between;
- margin-bottom: ${space(2)};
- padding: ${space(1)} ${space(2)};
+ margin-bottom: var(--mantine-spacing-md);
+ padding: var(--mantine-spacing-sm) var(--mantine-spacing-md);
span {
font-weight: 700;
@@ -39,7 +38,7 @@ export const GroupMappingsWidgetToggleRoot = styled.div`
> * {
color: var(--mb-color-text-dark);
- padding-right: ${space(1)};
+ padding-right: var(--mantine-spacing-sm);
padding-top: 0;
}
`;
@@ -51,7 +50,7 @@ export const GroupMappingsWidgetAbout = styled.div`
flex-direction: row;
span {
- padding-left: ${space(1)};
+ padding-left: var(--mantine-spacing-sm);
}
`;
@@ -62,6 +61,6 @@ export const GroupMappingsWidgetAboutContentRoot = styled.div`
export const AddMappingButton = styled(Button)`
float: right;
- margin-right: ${space(2)};
+ margin-right: var(--mantine-spacing-md);
margin-bottom: -40px;
`;
diff --git a/frontend/src/metabase/common/components/BulkActionBar/BulkActionBar.styled.tsx b/frontend/src/metabase/common/components/BulkActionBar/BulkActionBar.styled.tsx
index 1129f0c4a5b..de7290ee19c 100644
--- a/frontend/src/metabase/common/components/BulkActionBar/BulkActionBar.styled.tsx
+++ b/frontend/src/metabase/common/components/BulkActionBar/BulkActionBar.styled.tsx
@@ -3,7 +3,6 @@ import styled from "@emotion/styled";
import Card from "metabase/common/components/Card";
import { NAV_SIDEBAR_WIDTH } from "metabase/nav/constants";
-import { space } from "metabase/styled-components/theme";
export const BulkActionsToast = styled.div<{ isNavbarOpen: boolean }>`
position: fixed;
@@ -11,13 +10,13 @@ export const BulkActionsToast = styled.div<{ isNavbarOpen: boolean }>`
left: 50%;
margin-left: ${(props) =>
props.isNavbarOpen ? `${parseInt(NAV_SIDEBAR_WIDTH) / 2}px` : "0"};
- margin-bottom: ${space(2)};
+ margin-bottom: var(--mantine-spacing-md);
transform: translateX(-50%);
`;
export const ToastCard = styled(Card)`
color: var(--mb-color-text-white);
- padding: 0.75rem ${space(2)};
+ padding: 0.75rem var(--mantine-spacing-md);
display: flex;
align-items: center;
justify-content: space-between;
diff --git a/frontend/src/metabase/common/components/Input/Input.styled.tsx b/frontend/src/metabase/common/components/Input/Input.styled.tsx
index cf8238b61f5..fb360ec2a5b 100644
--- a/frontend/src/metabase/common/components/Input/Input.styled.tsx
+++ b/frontend/src/metabase/common/components/Input/Input.styled.tsx
@@ -11,7 +11,7 @@ import {
inputTypography,
} from "metabase/common/style/input";
import { color } from "metabase/lib/colors";
-import { monospaceFontFamily, space } from "metabase/styled-components/theme";
+import { monospaceFontFamily } from "metabase/styled-components/theme";
import type { InputSize } from "../../style/types";
@@ -61,7 +61,7 @@ export const InputField = styled.input<InputProps>`
font-family: inherit;
color: var(--mb-color-text-primary);
border: 1px solid var(--mb-color-border);
- border-radius: ${space(1)};
+ border-radius: var(--mantine-spacing-sm);
background-color: ${(props) =>
props.readOnly
? "var(--mb-color-background-disabled)"
diff --git a/frontend/src/metabase/common/components/SelectButton/SelectButton.styled.tsx b/frontend/src/metabase/common/components/SelectButton/SelectButton.styled.tsx
index 6299b3649f0..72e865108e0 100644
--- a/frontend/src/metabase/common/components/SelectButton/SelectButton.styled.tsx
+++ b/frontend/src/metabase/common/components/SelectButton/SelectButton.styled.tsx
@@ -4,7 +4,6 @@ import type { ComponentPropsWithRef } from "react";
import { inputPadding } from "metabase/common/style/input";
import { color } from "metabase/lib/colors";
-import { space } from "metabase/styled-components/theme";
import { Icon } from "metabase/ui";
interface SelectButtonRootProps {
hasValue: boolean;
@@ -31,7 +30,7 @@ export const SelectButtonRoot = styled.button<SelectButtonRootProps>`
hasValue && highlighted ? color("brand") : color("border")};
background-color: ${({ hasValue, highlighted }) =>
hasValue && highlighted ? color("brand") : color("bg-white")};
- border-radius: ${space(1)};
+ border-radius: var(--mantine-spacing-sm);
font-weight: 700;
min-width: 104px;
transition: all 200ms;
diff --git a/frontend/src/metabase/common/components/Tab/Tab.styled.tsx b/frontend/src/metabase/common/components/Tab/Tab.styled.tsx
index 08f240db5d0..a11f5d24e26 100644
--- a/frontend/src/metabase/common/components/Tab/Tab.styled.tsx
+++ b/frontend/src/metabase/common/components/Tab/Tab.styled.tsx
@@ -3,7 +3,6 @@ import styled from "@emotion/styled";
import { focusOutlineStyle } from "metabase/common/style/input";
import { alpha, color } from "metabase/lib/colors";
-import { space } from "metabase/styled-components/theme";
import { Icon } from "metabase/ui";
interface TabProps {
@@ -22,8 +21,8 @@ export const TabRoot = styled.button<TabProps>`
cursor: pointer;
margin-bottom: 0.75rem;
padding: 0.75rem 1rem;
- margin-right: ${space(1)};
- border-radius: ${space(0)};
+ margin-right: var(--mantine-spacing-sm);
+ border-radius: var(--mantine-spacing-xs);
&:hover {
color: var(--mb-color-brand);
diff --git a/frontend/src/metabase/common/components/TokenField/TokenField.styled.tsx b/frontend/src/metabase/common/components/TokenField/TokenField.styled.tsx
index 2c039018241..fb6b28883fd 100644
--- a/frontend/src/metabase/common/components/TokenField/TokenField.styled.tsx
+++ b/frontend/src/metabase/common/components/TokenField/TokenField.styled.tsx
@@ -1,19 +1,17 @@
// eslint-disable-next-line no-restricted-imports
import styled from "@emotion/styled";
-import { space } from "metabase/styled-components/theme";
-
export const TokenFieldContainer = styled.ul`
display: flex;
flex-wrap: wrap;
- padding: ${space(0)};
- gap: ${space(0)};
+ padding: var(--mantine-spacing-xs);
+ gap: var(--mantine-spacing-xs);
font-weight: bold;
cursor: pointer;
max-height: 130px;
overflow-x: auto;
overflow-y: auto;
- border-radius: ${space(1)};
+ border-radius: var(--mantine-spacing-sm);
border: 1px solid var(--mb-color-border);
`;
diff --git a/frontend/src/metabase/common/components/UndoListing.styled.tsx b/frontend/src/metabase/common/components/UndoListing.styled.tsx
index bd25a32cbfc..c2e653964db 100644
--- a/frontend/src/metabase/common/components/UndoListing.styled.tsx
+++ b/frontend/src/metabase/common/components/UndoListing.styled.tsx
@@ -6,11 +6,10 @@ import styled from "@emotion/styled";
import Card from "metabase/common/components/Card";
import Link from "metabase/common/components/Link";
import { alpha, color } from "metabase/lib/colors";
-import { space } from "metabase/styled-components/theme";
import type { BoxProps } from "metabase/ui";
import { Box, Icon } from "metabase/ui";
-const LIST_H_MARGINS = space(2);
+const LIST_H_MARGINS = "var(--mantine-spacing-md)";
export const UndoList = styled.ul`
position: fixed;
@@ -27,8 +26,8 @@ export const ToastCard = styled(Card)<{
color?: string;
noBorder?: boolean;
}>`
- padding: 10px ${space(2)};
- margin-top: ${space(1)};
+ padding: 10px var(--mantine-spacing-md);
+ margin-top: var(--mantine-spacing-sm);
max-width: calc(100vw - 2 * ${LIST_H_MARGINS});
background-color: var(--mb-color-background-inverse);
${({ noBorder }) =>
@@ -56,7 +55,7 @@ export const ControlsCardContent = styled(CardContentSide)`
` as unknown as typeof Box;
export const CardIcon = styled(Icon)`
- margin-right: ${space(1)};
+ margin-right: var(--mantine-spacing-sm);
flex-shrink: 0;
`;
@@ -68,7 +67,7 @@ export const UndoButton = styled(Link)`
font-weight: bold;
background-color: ${() => alpha(color("bg-white"), 0.1)};
padding: 4px 12px;
- margin-left: ${space(1)};
+ margin-left: var(--mantine-spacing-sm);
border-radius: 8px;
white-space: nowrap; /* Prevents button from truncating message */
@@ -78,7 +77,7 @@ export const UndoButton = styled(Link)`
`;
export const DismissIcon = styled(Icon)<{ color?: string }>`
- margin-left: ${space(2)};
+ margin-left: var(--mantine-spacing-md);
cursor: pointer;
:hover {
diff --git a/frontend/src/metabase/forms/components/FormMessage/FormMessage.styled.tsx b/frontend/src/metabase/forms/components/FormMessage/FormMessage.styled.tsx
index 80975d6d122..d691923697e 100644
--- a/frontend/src/metabase/forms/components/FormMessage/FormMessage.styled.tsx
+++ b/frontend/src/metabase/forms/components/FormMessage/FormMessage.styled.tsx
@@ -4,7 +4,6 @@ import { css } from "@emotion/react";
import styled from "@emotion/styled";
import { color } from "metabase/lib/colors";
-import { space } from "metabase/styled-components/theme";
export const FormMessageStyled = styled.span<{
visible?: boolean;
@@ -15,7 +14,8 @@ export const FormMessageStyled = styled.span<{
hasSucceeded ? "var(--mb-color-success)" : color("error")};
float: left;
opacity: 0;
- padding-bottom: ${({ noPadding }) => (noPadding ? "" : space(2))};
+ padding-bottom: ${({ noPadding }) =>
+ noPadding ? "" : "var(--mantine-spacing-md)"};
transition: none;
width: 100%;
diff --git a/frontend/src/metabase/nav/components/StoreLink/StoreLink.styled.tsx b/frontend/src/metabase/nav/components/StoreLink/StoreLink.styled.tsx
index 03cca2aef19..8ee9ad159a3 100644
--- a/frontend/src/metabase/nav/components/StoreLink/StoreLink.styled.tsx
+++ b/frontend/src/metabase/nav/components/StoreLink/StoreLink.styled.tsx
@@ -3,11 +3,10 @@ import styled from "@emotion/styled";
import ExternalLink from "metabase/common/components/ExternalLink";
import { color, darken } from "metabase/lib/colors";
-import { space } from "metabase/styled-components/theme";
import { Icon } from "metabase/ui";
export const StoreIconRoot = styled(ExternalLink)`
- margin-right: ${space(1)};
+ margin-right: var(--mantine-spacing-sm);
`;
export const StoreIconWrapper = styled.div`
@@ -32,5 +31,5 @@ export const StoreIconWrapper = styled.div`
`;
export const StoreIcon = styled(Icon)`
- margin: ${space(1)};
+ margin: var(--mantine-spacing-sm);
`;
diff --git a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbar.styled.tsx b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbar.styled.tsx
index c5c82d2fcaa..fd1cc878642 100644
--- a/frontend/src/metabase/nav/containers/MainNavbar/MainNavbar.styled.tsx
+++ b/frontend/src/metabase/nav/containers/MainNavbar/MainNavbar.styled.tsx
@@ -5,7 +5,6 @@ import { NAV_SIDEBAR_WIDTH } from "metabase/nav/constants";
import {
breakpointMaxSmall,
breakpointMinSmall,
- space,
} from "metabase/styled-components/theme";
import { Box, type BoxProps } from "metabase/ui";
@@ -44,7 +43,7 @@ export const NavRoot = styled.nav<{ isOpen: boolean }>`
display: flex;
flex-direction: column;
box-sizing: border-box;
- padding-top: ${space(1)};
+ padding-top: var(--mantine-spacing-sm);
height: 100%;
background-color: transparent;
overflow-x: hidden;
@@ -67,10 +66,10 @@ export const SidebarContentRoot = styled.div`
`;
export const SidebarSection = styled(Box)<BoxProps>`
- margin-top: ${space(1)};
- margin-bottom: ${space(2)};
- padding-inline-start: ${space(2)};
- padding-inline-end: ${space(2)};
+ margin-top: var(--mantine-spacing-sm);
+ margin-bottom: var(--mantine-spacing-md);
+ padding-inline-start: var(--mantine-spacing-md);
+ padding-inline-end: var(--mantine-spacing-md);
` as unknown as typeof Box;
export const TrashSidebarSection = styled(SidebarSection)`
@@ -85,7 +84,7 @@ export const SidebarHeading = styled.h4`
font-size: 11px;
text-transform: uppercase;
letter-spacing: 0.45px;
- padding-inline-start: ${space(2)};
+ padding-inline-start: var(--mantine-spacing-md);
`;
export const LoadingAndErrorContainer = styled.div`
diff --git a/frontend/src/metabase/questions/components/QuestionMoveToast/QuestionMoveToast.styled.tsx b/frontend/src/metabase/questions/components/QuestionMoveToast/QuestionMoveToast.styled.tsx
index a725ccf7ea2..370b6ab2e1e 100644
--- a/frontend/src/metabase/questions/components/QuestionMoveToast/QuestionMoveToast.styled.tsx
+++ b/frontend/src/metabase/questions/components/QuestionMoveToast/QuestionMoveToast.styled.tsx
@@ -2,7 +2,6 @@
import styled from "@emotion/styled";
import Link from "metabase/common/components/Link";
-import { space } from "metabase/styled-components/theme";
import { Icon } from "metabase/ui";
export const ToastRoot = styled.div`
@@ -12,10 +11,10 @@ export const ToastRoot = styled.div`
export const StyledIcon = styled(Icon)`
color: var(--mb-color-text-white);
- margin-right: ${space(1)};
+ margin-right: var(--mantine-spacing-sm);
`;
export const DestinationLink = styled(Link)`
color: var(--mb-color-brand);
- margin-left: ${space(0)};
+ margin-left: var(--mantine-spacing-xs);
`;
diff --git a/frontend/src/metabase/styled-components/theme/constants.ts b/frontend/src/metabase/styled-components/theme/constants.ts
deleted file mode 100644
index ee08cbe63e7..00000000000
--- a/frontend/src/metabase/styled-components/theme/constants.ts
+++ /dev/null
@@ -1 +0,0 @@
-export const SPACE_LEVELS = ["4px", "8px", "16px", "32px", "64px", "128px"];
diff --git a/frontend/src/metabase/styled-components/theme/index.ts b/frontend/src/metabase/styled-components/theme/index.ts
index 6b60ecbfab1..cbfc3186daa 100644
--- a/frontend/src/metabase/styled-components/theme/index.ts
+++ b/frontend/src/metabase/styled-components/theme/index.ts
@@ -1,3 +1,2 @@
export * from "./media-queries";
-export * from "./space";
export * from "./typography";
diff --git a/frontend/src/metabase/styled-components/theme/space.ts b/frontend/src/metabase/styled-components/theme/space.ts
deleted file mode 100644
index b7fb5f0df9e..00000000000
--- a/frontend/src/metabase/styled-components/theme/space.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { SPACE_LEVELS as levels } from "./constants";
-
-/**
- * Returns a pixel amount: 4px, 8px, 16px, on to 128px
- * @param {number} level must be an integer between 0 and 5
- * @returns {string}
- */
-export function space(level = 0) {
- const spaceInteger = levels[level];
-
- return spaceInteger || "";
-}
diff --git a/frontend/src/metabase/styled-components/theme/space.unit.spec.ts b/frontend/src/metabase/styled-components/theme/space.unit.spec.ts
deleted file mode 100644
index 895af8f42c9..00000000000
--- a/frontend/src/metabase/styled-components/theme/space.unit.spec.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { space } from "./space";
-
-it("returns pixel amount for acceptable levels", () => {
- expect(space(0)).toBe("4px");
- expect(space(1)).toBe("8px");
- expect(space(2)).toBe("16px");
- expect(space(3)).toBe("32px");
- expect(space(4)).toBe("64px");
- expect(space(5)).toBe("128px");
-});
-
-it("returns empty string for unacceptable integer levels", () => {
- expect(space(-1)).toBe("");
- expect(space(6)).toBe("");
-});
diff --git a/frontend/src/metabase/visualizations/components/LegendItem.styled.tsx b/frontend/src/metabase/visualizations/components/LegendItem.styled.tsx
index 3de0751173c..ba626125534 100644
--- a/frontend/src/metabase/visualizations/components/LegendItem.styled.tsx
+++ b/frontend/src/metabase/visualizations/components/LegendItem.styled.tsx
@@ -1,8 +1,6 @@
// eslint-disable-next-line no-restricted-imports
import styled from "@emotion/styled";
-import { space } from "metabase/styled-components/theme";
-
export const IconContainer = styled.div`
- padding-right: ${space(0)};
+ padding-right: var(--mantine-spacing-xs);
`;
diff --git a/frontend/src/metabase/visualizations/components/ScalarValue/ScalarValue.styled.tsx b/frontend/src/metabase/visualizations/components/ScalarValue/ScalarValue.styled.tsx
index 5a5b42cba60..13b31382bc1 100644
--- a/frontend/src/metabase/visualizations/components/ScalarValue/ScalarValue.styled.tsx
+++ b/frontend/src/metabase/visualizations/components/ScalarValue/ScalarValue.styled.tsx
@@ -1,8 +1,6 @@
// eslint-disable-next-line no-restricted-imports
import styled from "@emotion/styled";
-import { space } from "metabase/styled-components/theme";
-
const TITLE_LINE_HEIGHT_REM = 1.4;
export const ScalarRoot = styled.div`
@@ -43,6 +41,6 @@ export const ScalarTitleContainer = styled.div<ScalarTitleContainerProps>`
display: flex;
justify-content: center;
align-items: flex-start;
- padding: 0 ${space(1)};
+ padding: 0 var(--mantine-spacing-sm);
width: 100%;
`;
diff --git a/frontend/src/metabase/visualizations/visualizations/Scalar/Scalar.styled.tsx b/frontend/src/metabase/visualizations/visualizations/Scalar/Scalar.styled.tsx
index 4abddfd9c4a..e9f14862f05 100644
--- a/frontend/src/metabase/visualizations/visualizations/Scalar/Scalar.styled.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/Scalar/Scalar.styled.tsx
@@ -4,7 +4,6 @@ import { css } from "@emotion/react";
import styled from "@emotion/styled";
import { Ellipsified } from "metabase/common/components/Ellipsified";
-import { space } from "metabase/styled-components/theme";
interface ScalarContainerProps {
isClickable: boolean;
@@ -13,7 +12,7 @@ interface ScalarContainerProps {
export const ScalarContainer = styled(Ellipsified, {
shouldForwardProp: (prop) => prop !== "isClickable",
})<ScalarContainerProps>`
- padding: 0 ${space(1)};
+ padding: 0 var(--mantine-spacing-sm);
max-width: 100%;
box-sizing: border-box;
diff --git a/frontend/src/metabase/visualizations/visualizations/SmartScalar/SmartScalar.styled.tsx b/frontend/src/metabase/visualizations/visualizations/SmartScalar/SmartScalar.styled.tsx
index fec4ca22833..8fcf17b96e5 100644
--- a/frontend/src/metabase/visualizations/visualizations/SmartScalar/SmartScalar.styled.tsx
+++ b/frontend/src/metabase/visualizations/visualizations/SmartScalar/SmartScalar.styled.tsx
@@ -2,14 +2,13 @@
import styled from "@emotion/styled";
import { Ellipsified } from "metabase/common/components/Ellipsified";
-import { space } from "metabase/styled-components/theme";
import { Icon } from "metabase/ui";
export const VariationIcon = styled(Icon)`
display: flex;
align-items: center;
flex: 0 0 auto;
- margin-right: ${space(1)};
+ margin-right: var(--mantine-spacing-sm);
color: ${(props) => props.color};
`;