Skip to content

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

Misc Dark Mode Fixes 1 (#64484)

Ryan Lauried4eee391547d
diff --git a/.loki/reference/chrome_laptop_Components_Feedback_Alert_Dark.png b/.loki/reference/chrome_laptop_Components_Feedback_Alert_Dark.png
new file mode 100644
index 00000000000..88eb2558002
Binary files /dev/null and b/.loki/reference/chrome_laptop_Components_Feedback_Alert_Dark.png differ
diff --git a/.loki/reference/chrome_laptop_Components_Feedback_Alert_Default.png b/.loki/reference/chrome_laptop_Components_Feedback_Alert_Default.png
new file mode 100644
index 00000000000..7ec7e26dd82
Binary files /dev/null and b/.loki/reference/chrome_laptop_Components_Feedback_Alert_Default.png differ
diff --git a/.loki/reference/chrome_laptop_Components_Feedback_Alert_Light.png b/.loki/reference/chrome_laptop_Components_Feedback_Alert_Light.png
new file mode 100644
index 00000000000..033b24cc16b
Binary files /dev/null and b/.loki/reference/chrome_laptop_Components_Feedback_Alert_Light.png differ
diff --git a/.loki/reference/chrome_laptop_Components_Feedback_Alert_Warning.png b/.loki/reference/chrome_laptop_Components_Feedback_Alert_Warning.png
new file mode 100644
index 00000000000..c8784729393
Binary files /dev/null and b/.loki/reference/chrome_laptop_Components_Feedback_Alert_Warning.png differ
diff --git a/.loki/reference/chrome_laptop_Design_System_Colors_Default.png b/.loki/reference/chrome_laptop_Design_System_Colors_Default.png
index f3865c382f4..5fec4c509ef 100644
Binary files a/.loki/reference/chrome_laptop_Design_System_Colors_Default.png and b/.loki/reference/chrome_laptop_Design_System_Colors_Default.png differ
diff --git a/.loki/reference/chrome_laptop_Patterns_Overlays_Legacy_Modal_Can_Launch_Mantine_Modal.png b/.loki/reference/chrome_laptop_Patterns_Overlays_Legacy_Modal_Can_Launch_Mantine_Modal.png
index e79cce9fa46..4dee2cbfc70 100644
Binary files a/.loki/reference/chrome_laptop_Patterns_Overlays_Legacy_Modal_Can_Launch_Mantine_Modal.png and b/.loki/reference/chrome_laptop_Patterns_Overlays_Legacy_Modal_Can_Launch_Mantine_Modal.png differ
diff --git a/.loki/reference/chrome_laptop_Patterns_Overlays_Mantine_Modal_Can_Launch_Legacy_Modal.png b/.loki/reference/chrome_laptop_Patterns_Overlays_Mantine_Modal_Can_Launch_Legacy_Modal.png
index 0838320d9c9..421de12809f 100644
Binary files a/.loki/reference/chrome_laptop_Patterns_Overlays_Mantine_Modal_Can_Launch_Legacy_Modal.png and b/.loki/reference/chrome_laptop_Patterns_Overlays_Mantine_Modal_Can_Launch_Legacy_Modal.png differ
diff --git a/.loki/reference/chrome_laptop_Patterns_Overlays_Mantine_Modal_Can_Launch_Legacy_Select.png b/.loki/reference/chrome_laptop_Patterns_Overlays_Mantine_Modal_Can_Launch_Legacy_Select.png
index 7731038535f..c54c266db75 100644
Binary files a/.loki/reference/chrome_laptop_Patterns_Overlays_Mantine_Modal_Can_Launch_Legacy_Select.png and b/.loki/reference/chrome_laptop_Patterns_Overlays_Mantine_Modal_Can_Launch_Legacy_Select.png differ
diff --git a/.loki/reference/chrome_laptop_Patterns_Overlays_Mantine_Modal_Can_Launch_Mantine_Hovercard.png b/.loki/reference/chrome_laptop_Patterns_Overlays_Mantine_Modal_Can_Launch_Mantine_Hovercard.png
index ad064948626..263db4a80e1 100644
Binary files a/.loki/reference/chrome_laptop_Patterns_Overlays_Mantine_Modal_Can_Launch_Mantine_Hovercard.png and b/.loki/reference/chrome_laptop_Patterns_Overlays_Mantine_Modal_Can_Launch_Mantine_Hovercard.png differ
diff --git a/.loki/reference/chrome_laptop_Patterns_Overlays_Mantine_Modal_Can_Launch_Mantine_Select.png b/.loki/reference/chrome_laptop_Patterns_Overlays_Mantine_Modal_Can_Launch_Mantine_Select.png
index b9c8b17ea70..75856cd2c2e 100644
Binary files a/.loki/reference/chrome_laptop_Patterns_Overlays_Mantine_Modal_Can_Launch_Mantine_Select.png and b/.loki/reference/chrome_laptop_Patterns_Overlays_Mantine_Modal_Can_Launch_Mantine_Select.png differ
diff --git a/.loki/reference/chrome_laptop_Patterns_Overlays_Mantine_Popover_Can_Launch_Legacy_Modal.png b/.loki/reference/chrome_laptop_Patterns_Overlays_Mantine_Popover_Can_Launch_Legacy_Modal.png
index 17b4902b2b5..7a3ca9a92ae 100644
Binary files a/.loki/reference/chrome_laptop_Patterns_Overlays_Mantine_Popover_Can_Launch_Legacy_Modal.png and b/.loki/reference/chrome_laptop_Patterns_Overlays_Mantine_Popover_Can_Launch_Legacy_Modal.png differ
diff --git a/.storybook/preview.tsx b/.storybook/preview.tsx
index a64e1d707fa..7062a441278 100644
--- a/.storybook/preview.tsx
+++ b/.storybook/preview.tsx
@@ -60,6 +60,15 @@ const parameters = {
},
};
+const argTypes = {
+ theme: {
+ control: {
+ type: "inline-radio",
+ },
+ options: ["light", "dark"],
+ },
+};
+
const globalStyles = css`
${defaultFontFiles({ baseUrl: "/" })}
@@ -73,13 +82,14 @@ const globalStyles = css`
`;
const decorators = [
- (Story, { args = {} }) => {
+ (Story, { args = {}, globals }) => {
if (!document.body.classList.contains("mb-wrapper")) {
document.body.classList.add("mb-wrapper");
}
+
return (
<EmotionCacheProvider>
- <ThemeProvider displayTheme={args.theme}>
+ <ThemeProvider displayTheme={args.theme ?? globals.theme}>
<Global styles={globalStyles} />
<CssVariables />
<Story />
@@ -134,6 +144,11 @@ function CssVariables() {
initialize({
onUnhandledRequest: "bypass",
});
-const preview = { parameters, decorators, loaders: [mswLoader] };
+const preview = {
+ parameters,
+ decorators,
+ loaders: [mswLoader],
+ argTypes,
+};
export default preview;
diff --git a/e2e/test/scenarios/organization/entity-picker.cy.spec.ts b/e2e/test/scenarios/organization/entity-picker.cy.spec.ts
index 3e79feca288..7111c34063b 100644
--- a/e2e/test/scenarios/organization/entity-picker.cy.spec.ts
+++ b/e2e/test/scenarios/organization/entity-picker.cy.spec.ts
@@ -1155,7 +1155,7 @@ describe("scenarios > organization > entity picker", () => {
//Entity picker should grow
cy.findByRole("dialog", { name: "Select a collection" })
.should("have.css", "width")
- .and("eq", "1095px");
+ .and("eq", "1097px");
H.entityPickerModalItem(2, "Second collection").click();
@@ -1168,7 +1168,7 @@ describe("scenarios > organization > entity picker", () => {
//Entity picker should not shrink if we go back in the collection tree
cy.findByRole("dialog", { name: "Select a collection" })
.should("have.css", "width")
- .and("eq", "1200px");
+ .and("eq", "1198px");
});
});
});
diff --git a/enterprise/frontend/src/metabase-enterprise/collections/components/FormCollectionAuthorityLevel.tsx b/enterprise/frontend/src/metabase-enterprise/collections/components/FormCollectionAuthorityLevel.tsx
index 55159ede670..9bdc9ad8a6d 100644
--- a/enterprise/frontend/src/metabase-enterprise/collections/components/FormCollectionAuthorityLevel.tsx
+++ b/enterprise/frontend/src/metabase-enterprise/collections/components/FormCollectionAuthorityLevel.tsx
@@ -3,8 +3,8 @@ import type { HTMLAttributes } from "react";
import { t } from "ttag";
import FormField from "metabase/common/components/FormField";
-import { SegmentedControl } from "metabase/common/components/SegmentedControl";
import { useUniqueId } from "metabase/common/hooks/use-unique-id";
+import { Center, Icon, SegmentedControl } from "metabase/ui";
import { OFFICIAL_COLLECTION, REGULAR_COLLECTION } from "../constants";
@@ -15,12 +15,12 @@ interface Props extends HTMLAttributes<HTMLDivElement> {
const OPTIONS = [
{
- name: REGULAR_COLLECTION.name,
+ label: REGULAR_COLLECTION.name,
value: REGULAR_COLLECTION.type,
icon: REGULAR_COLLECTION.icon,
},
{
- name: OFFICIAL_COLLECTION.name,
+ label: OFFICIAL_COLLECTION.name,
value: OFFICIAL_COLLECTION.type,
icon: OFFICIAL_COLLECTION.icon,
selectedColor: OFFICIAL_COLLECTION.color,
@@ -36,6 +36,10 @@ export function FormCollectionAuthorityLevel({
const id = useUniqueId();
const [{ value }, { error, touched }, { setValue }] = useField(name);
+ const handleChange = (val: string) => {
+ setValue(val === "null" ? null : val);
+ };
+
return (
<FormField
className={className}
@@ -46,11 +50,18 @@ export function FormCollectionAuthorityLevel({
error={touched ? error : undefined}
>
<SegmentedControl
- value={value}
- onChange={setValue}
- options={OPTIONS}
+ value={String(value)}
+ onChange={handleChange}
+ data={OPTIONS.map((option) => ({
+ value: String(option.value),
+ label: (
+ <Center style={{ gap: 10 }} c={option.selectedColor}>
+ <Icon name={option.icon} />
+ {option.label}
+ </Center>
+ ),
+ }))}
variant="fill-background"
- inactiveColor="text-dark"
/>
</FormField>
);
diff --git a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonEditorResults/PythonEditorResults.module.css b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonEditorResults/PythonEditorResults.module.css
index 6553025e1fe..c24311c31c2 100644
--- a/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonEditorResults/PythonEditorResults.module.css
+++ b/enterprise/frontend/src/metabase-enterprise/transforms-python/components/PythonTransformEditor/PythonEditorResults/PythonEditorResults.module.css
@@ -31,7 +31,7 @@
.error {
color: var(--mb-color-error);
- background-color: var(--mb-color-bg-error);
+ background-color: var(--mb-color-background-error);
border-bottom: 1px solid var(--mb-color-border);
}
diff --git a/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/EmbeddedEngineDocContent/EmbeddedEngineDocContent.tsx b/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/EmbeddedEngineDocContent/EmbeddedEngineDocContent.tsx
index 6990a5c0799..f8a20357e41 100644
--- a/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/EmbeddedEngineDocContent/EmbeddedEngineDocContent.tsx
+++ b/frontend/src/metabase/admin/databases/components/DatabaseHelpSidePanel/EmbeddedEngineDocContent/EmbeddedEngineDocContent.tsx
@@ -43,7 +43,7 @@ export const EmbeddedEngineDocContent = ({ engineKey }: Props) => {
return (
<Box ref={markdownRef} w="100%">
{loadingError && (
- <Alert color="bg-dark" variant="outline" mt="xl">
+ <Alert color="info" variant="outline" mt="xl">
<Text>{loadingError}</Text>
</Alert>
)}
diff --git a/frontend/src/metabase/admin/databases/components/DeleteDatabaseModel/DeleteDatabaseModal.tsx b/frontend/src/metabase/admin/databases/components/DeleteDatabaseModel/DeleteDatabaseModal.tsx
index 610937b2faa..884c3f3d4de 100644
--- a/frontend/src/metabase/admin/databases/components/DeleteDatabaseModel/DeleteDatabaseModal.tsx
+++ b/frontend/src/metabase/admin/databases/components/DeleteDatabaseModel/DeleteDatabaseModal.tsx
@@ -134,7 +134,7 @@ export const DeleteDatabaseModal = ({
>
{hasContent && (
<DeleteDatabaseModalSection isHidden={isContentRemovalConfirmed}>
- <Alert color="bg-dark" icon={<Icon name="info" />}>
+ <Alert color="info" icon={<Icon name="info" />}>
<Text>
{jt`If you’re trying to migrate from a development DB to a production one, you don’t need to do this. You can just ${(
<UnstyledButton
diff --git a/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorLegacyWarning.tsx b/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorLegacyWarning.tsx
index 665cbd5f7cf..46b248c379f 100644
--- a/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorLegacyWarning.tsx
+++ b/frontend/src/metabase/admin/permissions/components/PermissionsEditor/PermissionsEditorLegacyWarning.tsx
@@ -9,7 +9,7 @@ export const PermissionsEditorLegacyNoSelfServiceWarning = () => {
return (
<Box mt="md" mb="sm" style={{ marginInlineEnd: "2.5rem" }}>
- <Alert icon={<Icon name="warning" size={16} />} c="accent5">
+ <Alert icon={<Icon name="warning" size={16} />} color="info">
<Text fw="bold">
{t`The “No self-service” access level for View data is going away.`}
{!isExpanded && (
diff --git a/frontend/src/metabase/admin/settings/components/UploadSettings/UploadSettingsForm.tsx b/frontend/src/metabase/admin/settings/components/UploadSettings/UploadSettingsForm.tsx
index f7ca65e7943..16620a0be12 100644
--- a/frontend/src/metabase/admin/settings/components/UploadSettings/UploadSettingsForm.tsx
+++ b/frontend/src/metabase/admin/settings/components/UploadSettings/UploadSettingsForm.tsx
@@ -11,15 +11,16 @@ import { getErrorMessage, useAdminSetting } from "metabase/api/utils";
import ActionButton, {
type ActionButtonHandle,
} from "metabase/common/components/ActionButton";
-import Alert from "metabase/common/components/Alert";
import Link from "metabase/common/components/Link";
import { LoadingAndErrorWrapper } from "metabase/common/components/LoadingAndErrorWrapper";
import { useSetting, useToast } from "metabase/common/hooks";
import CS from "metabase/css/core/index.css";
import {
+ Alert,
Box,
Flex,
Group,
+ Icon,
Select,
Stack,
Text,
@@ -282,7 +283,7 @@ export function UploadSettingsFormView({
const H2PersistenceWarning = ({ isHosted }: { isHosted: boolean }) => (
<Stack my="md" maw={620}>
- <Alert icon="warning" variant="warning">
+ <Alert icon={<Icon name="warning" />} color="warning">
<Text>
{t`Warning: uploads to the Sample Database are for testing only and may disappear. If you want your data to stick around, you should upload to a PostgreSQL, MySQL, Redshift or Clickhouse database.`}
</Text>
diff --git a/frontend/src/metabase/common/components/Alert/Alert.styled.tsx b/frontend/src/metabase/common/components/Alert/Alert.styled.tsx
index af3e894f38d..d7615b89f92 100644
--- a/frontend/src/metabase/common/components/Alert/Alert.styled.tsx
+++ b/frontend/src/metabase/common/components/Alert/Alert.styled.tsx
@@ -22,7 +22,7 @@ const colorsByVariant = {
},
background: {
info: "var(--mb-color-bg-light)",
- error: color("bg-error"),
+ error: color("background-error"),
warning: lighten("warning", 0.5),
},
icon: {
diff --git a/frontend/src/metabase/common/components/EmojiPicker/EmojiPicker.tsx b/frontend/src/metabase/common/components/EmojiPicker/EmojiPicker.tsx
index 823251d88bd..467d167779b 100644
--- a/frontend/src/metabase/common/components/EmojiPicker/EmojiPicker.tsx
+++ b/frontend/src/metabase/common/components/EmojiPicker/EmojiPicker.tsx
@@ -96,6 +96,7 @@ function CategoryHeader({
function Emoji({ emoji, ref, ...props }: EmojiPickerListEmojiProps) {
return (
<ActionIcon
+ c="text-primary"
component="button"
w="2rem"
fz="1.25rem"
diff --git a/frontend/src/metabase/common/components/SchedulePicker/SchedulePickerView.tsx b/frontend/src/metabase/common/components/SchedulePicker/SchedulePickerView.tsx
index 0ef0c68e9dc..b320e4e9fbe 100644
--- a/frontend/src/metabase/common/components/SchedulePicker/SchedulePickerView.tsx
+++ b/frontend/src/metabase/common/components/SchedulePicker/SchedulePickerView.tsx
@@ -2,7 +2,6 @@ import cx from "classnames";
import { type CSSProperties, Component } from "react";
import { t } from "ttag";
-import { SegmentedControl } from "metabase/common/components/SegmentedControl";
import type { SelectChangeEvent } from "metabase/common/components/Select";
import Select from "metabase/common/components/Select";
import CS from "metabase/css/core/index.css";
@@ -16,7 +15,7 @@ import {
import { capitalize } from "metabase/lib/formatting/strings";
import { useSelector } from "metabase/lib/redux";
import { getApplicationName } from "metabase/selectors/whitelabel";
-import { Box, type BoxProps } from "metabase/ui";
+import { Box, type BoxProps, SegmentedControl } from "metabase/ui";
import type {
ScheduleDayType,
ScheduleFrameType,
@@ -240,12 +239,19 @@ class SchedulePicker extends Component<SchedulePickerProps> {
)
}
/>
+
<SegmentedControl
- value={amPm}
+ value={amPm.toString()}
onChange={(value) =>
- this.handleChangeProperty("schedule_hour", hour + value * 12)
+ this.handleChangeProperty(
+ "schedule_hour",
+ hour + parseInt(value) * 12,
+ )
}
- options={AM_PM_OPTIONS}
+ data={AM_PM_OPTIONS.map(({ value, name }) => ({
+ value: value.toString(),
+ label: name,
+ }))}
fullWidth
/>
</PickerSpacedRow>
diff --git a/frontend/src/metabase/common/components/UndoListing.styled.tsx b/frontend/src/metabase/common/components/UndoListing.styled.tsx
index 9f5e5119a90..d89f1d22faa 100644
--- a/frontend/src/metabase/common/components/UndoListing.styled.tsx
+++ b/frontend/src/metabase/common/components/UndoListing.styled.tsx
@@ -30,6 +30,7 @@ export const ToastCard = styled(Card)<{
margin-top: var(--mantine-spacing-sm);
max-width: calc(100vw - 2 * ${LIST_H_MARGINS});
background-color: var(--mb-color-background-inverse);
+ color: var(--mb-color-text-secondary-inverse);
${({ noBorder }) =>
noBorder &&
css`
diff --git a/frontend/src/metabase/css/components/modal.module.css b/frontend/src/metabase/css/components/modal.module.css
index 9c8f17981b2..e0fac2b8b86 100644
--- a/frontend/src/metabase/css/components/modal.module.css
+++ b/frontend/src/metabase/css/components/modal.module.css
@@ -9,6 +9,7 @@
box-shadow: 0 0 6px var(--mb-color-shadow);
max-height: 90%;
overflow-y: auto;
+ border: 1px solid var(--mb-color-border);
}
/* On IE11, single flex item with `margin: auto` gets shifted to flex end
diff --git a/frontend/src/metabase/css/core/colors.stories.tsx b/frontend/src/metabase/css/core/colors.stories.tsx
index f46bc297f5b..e2643025b2e 100644
--- a/frontend/src/metabase/css/core/colors.stories.tsx
+++ b/frontend/src/metabase/css/core/colors.stories.tsx
@@ -22,6 +22,7 @@ const COLOR_NAMES = [
"--mb-color-bg-light",
"--mb-color-bg-white",
"--mb-color-bg-error",
+ "--mb-color-background-error",
"--mb-color-bg-night",
"--mb-color-shadow",
"--mb-color-border",
diff --git a/frontend/src/metabase/lib/colors/colors.ts b/frontend/src/metabase/lib/colors/colors.ts
index 47ac8c328ad..26246aa2d63 100644
--- a/frontend/src/metabase/lib/colors/colors.ts
+++ b/frontend/src/metabase/lib/colors/colors.ts
@@ -252,8 +252,8 @@ export const colorConfig = {
dark: baseColors.octopus[80],
},
"background-brand": {
- light: baseColors.brand[40],
- dark: baseColors.brand[40],
+ light: baseColors.brand[20],
+ dark: baseColors.brand[70],
},
"background-disabled": {
light: baseColors.orionAlpha[10],
@@ -267,7 +267,7 @@ export const colorConfig = {
light: `color-mix(in srgb, var(--mb-color-brand) 15%, transparent)`, //baseColors.oceanAlpha[10],
dark: `color-mix(in srgb, var(--mb-color-brand) 15%, transparent)`, //baseColors.oceanAlpha[20],
},
- "background-info": { light: baseColors.orion[5], dark: baseColors.orion[80] },
+
"background-inverse": {
light: baseColors.orion[80],
dark: baseColors.orion[20],
@@ -287,6 +287,10 @@ export const colorConfig = {
"bg-dark": { light: baseColors.orion[40], dark: baseColors.orion[70] }, //should be background-tertiary-inverse
"bg-darker": { light: baseColors.orion[70], dark: baseColors.orion[30] }, //should be background-secondary-inverse
"bg-error": { light: baseColors.lobster[10], dark: baseColors.lobster[90] }, //should be background-error
+ "background-error": {
+ light: baseColors.lobster[10],
+ dark: baseColors.lobster[90],
+ },
"bg-light": { light: baseColors.orion[5], dark: baseColors.black }, //should be background-secondary
"bg-medium": { light: baseColors.orion[10], dark: baseColors.orion[80] }, //should be background-tertiary
"bg-night": { light: baseColors.orion[70], dark: baseColors.orion[30] }, //merge with background-secondary-inverse?
@@ -399,8 +403,8 @@ export const colorConfig = {
dark: baseColors.lobster[40],
},
"saturated-yellow": {
- light: baseColors.dubloon[60],
- dark: baseColors.dubloon[40],
+ light: baseColors.dubloon[30],
+ dark: baseColors.dubloon[30],
},
"shadow-embedding-hub-card": {
//I think this can be removed?
@@ -505,7 +509,7 @@ export const colorConfig = {
"tooltip-text-secondary": {
//should be text-secondary-inverse
light: baseColors.orionAlphaInverse[60],
- dark: baseColors.orionAlpha[60],
+ dark: baseColors.orionAlphaInverse[60],
},
"tooltip-text": {
light: baseColors.white,
@@ -513,7 +517,22 @@ export const colorConfig = {
},
warning: {
light: baseColors.dubloon[30],
- dark: baseColors.dubloon[80],
+ dark: baseColors.dubloon[30],
+ },
+
+ "background-warning": {
+ light: baseColors.dubloon[10],
+ dark: baseColors.dubloon[60],
+ },
+
+ info: {
+ light: baseColors.orion[40],
+ dark: baseColors.orion[50],
+ },
+
+ "background-info": {
+ light: baseColors.orion[10],
+ dark: baseColors.orion[80],
},
white: {
@@ -575,7 +594,7 @@ export const colorConfig = {
overlay: {
//see the other color above where I mentioned it should be called overlay
light: baseColors.orionAlpha[60],
- dark: "hsla(255, 0%, 0%, 0.8)", // FIXME: should be part of palette
+ dark: "hsla(207, 100%, 4.3%, 0.8)", // FIXME: should be part of palette
},
"text-inverse": {
//should be text-primary-inverse
diff --git a/frontend/src/metabase/query_builder/components/expressions/Editor/Errors/Errors.module.css b/frontend/src/metabase/query_builder/components/expressions/Editor/Errors/Errors.module.css
index bec13e08e1b..892d060eb4f 100644
--- a/frontend/src/metabase/query_builder/components/expressions/Editor/Errors/Errors.module.css
+++ b/frontend/src/metabase/query_builder/components/expressions/Editor/Errors/Errors.module.css
@@ -1,5 +1,5 @@
.errors {
- background-color: var(--mb-color-bg-error);
+ background-color: var(--mb-color-background-error);
color: var(--mb-color-text-primary);
line-height: 1em;
}
diff --git a/frontend/src/metabase/ui/components/feedback/Alert/Alert.config.tsx b/frontend/src/metabase/ui/components/feedback/Alert/Alert.config.tsx
index 9c4ed686414..570e4529615 100644
--- a/frontend/src/metabase/ui/components/feedback/Alert/Alert.config.tsx
+++ b/frontend/src/metabase/ui/components/feedback/Alert/Alert.config.tsx
@@ -1,5 +1,7 @@
import { Alert, type MantineThemeOverride } from "@mantine/core";
+import { color, isColorName } from "metabase/ui/utils/colors";
+
import AlertStyles from "./Alert.module.css";
export const alertOverrides: MantineThemeOverride["components"] = {
@@ -8,9 +10,25 @@ export const alertOverrides: MantineThemeOverride["components"] = {
variant: "outline",
},
classNames: {
- root: AlertStyles.root,
wrapper: AlertStyles.wrapper,
title: AlertStyles.title,
},
+ vars: (_theme, props) => {
+ if (
+ isColorName(props.color) &&
+ isColorName(`background-${props.color}`)
+ ) {
+ return {
+ root: {
+ "--alert-color": color(props.color),
+ "--alert-bg": color(`background-${props.color}`),
+ },
+ };
+ } else {
+ return {
+ root: {},
+ };
+ }
+ },
}),
};
diff --git a/frontend/src/metabase/ui/components/feedback/Alert/Alert.module.css b/frontend/src/metabase/ui/components/feedback/Alert/Alert.module.css
index 81df18ba951..617d8bd808d 100644
--- a/frontend/src/metabase/ui/components/feedback/Alert/Alert.module.css
+++ b/frontend/src/metabase/ui/components/feedback/Alert/Alert.module.css
@@ -2,10 +2,6 @@
align-items: center;
}
-.root {
- background-color: color-mix(in srgb, var(--alert-color), white 90%);
-}
-
.title {
color: var(--mb-color-text-dark);
line-height: 1rem;
diff --git a/frontend/src/metabase/ui/components/feedback/Alert/Alert.stories.tsx b/frontend/src/metabase/ui/components/feedback/Alert/Alert.stories.tsx
index 84a4cc76689..266205c338d 100644
--- a/frontend/src/metabase/ui/components/feedback/Alert/Alert.stories.tsx
+++ b/frontend/src/metabase/ui/components/feedback/Alert/Alert.stories.tsx
@@ -1,4 +1,4 @@
-import { Alert, type AlertProps, Icon, Text } from "metabase/ui";
+import { Alert, type AlertProps, Icon, Stack, Text } from "metabase/ui";
const args = {
icon: <Icon name="warning" />,
@@ -47,6 +47,45 @@ const WarningColorTemplate = (args: AlertProps) => {
);
};
+const multiColor = (args: AlertProps) => {
+ return (
+ <Stack>
+ <Alert {...args} color="info">
+ <Text>
+ In a future release, if a group’s View data access for a database (or
+ any of its schemas or tables) is still set to No self-service
+ (deprecated), Metabase will automatically change that group’s View
+ data access for the entire database to Blocked.
+ </Text>
+ </Alert>
+ <Alert {...args} color="warning">
+ <Text>
+ In a future release, if a group’s View data access for a database (or
+ any of its schemas or tables) is still set to No self-service
+ (deprecated), Metabase will automatically change that group’s View
+ data access for the entire database to Blocked.
+ </Text>
+ </Alert>
+ <Alert {...args} color="error">
+ <Text>
+ In a future release, if a group’s View data access for a database (or
+ any of its schemas or tables) is still set to No self-service
+ (deprecated), Metabase will automatically change that group’s View
+ data access for the entire database to Blocked.
+ </Text>
+ </Alert>
+ <Alert {...args} color="brand">
+ <Text>
+ In a future release, if a group’s View data access for a database (or
+ any of its schemas or tables) is still set to No self-service
+ (deprecated), Metabase will automatically change that group’s View
+ data access for the entire database to Blocked.
+ </Text>
+ </Alert>
+ </Stack>
+ );
+};
+
export default {
title: "Components/Feedback/Alert",
component: Alert,
@@ -61,3 +100,17 @@ export const Default = {
export const Warning = {
render: WarningColorTemplate,
};
+
+export const Light = {
+ render: multiColor,
+ args: {
+ theme: "light",
+ },
+};
+
+export const Dark = {
+ render: multiColor,
+ args: {
+ theme: "dark",
+ },
+};
diff --git a/frontend/src/metabase/ui/components/feedback/Alert/index.ts b/frontend/src/metabase/ui/components/feedback/Alert/index.ts
deleted file mode 100644
index 349a0278fe8..00000000000
--- a/frontend/src/metabase/ui/components/feedback/Alert/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export { Alert } from "@mantine/core";
-export type { AlertProps } from "@mantine/core";
-export { alertOverrides } from "./Alert.config";
diff --git a/frontend/src/metabase/ui/components/feedback/Alert/index.tsx b/frontend/src/metabase/ui/components/feedback/Alert/index.tsx
new file mode 100644
index 00000000000..ad07332ec76
--- /dev/null
+++ b/frontend/src/metabase/ui/components/feedback/Alert/index.tsx
@@ -0,0 +1,11 @@
+import {
+ Alert as MantineAlert,
+ type AlertProps as MantineAlertProps,
+} from "@mantine/core";
+export { alertOverrides } from "./Alert.config";
+
+export type AlertProps = MantineAlertProps & {
+ color?: "brand" | "warning" | "error" | "info";
+};
+
+export const Alert = (props: AlertProps) => <MantineAlert {...props} />;
diff --git a/frontend/src/metabase/ui/components/overlays/Modal/Modal.module.css b/frontend/src/metabase/ui/components/overlays/Modal/Modal.module.css
index 12cb17d2b85..0baf0e39297 100644
--- a/frontend/src/metabase/ui/components/overlays/Modal/Modal.module.css
+++ b/frontend/src/metabase/ui/components/overlays/Modal/Modal.module.css
@@ -15,6 +15,7 @@
.content {
background-color: var(--mb-color-background);
+ border: 1px solid var(--mb-color-border);
}
.header {
diff --git a/frontend/src/metabase/ui/utils/colors.ts b/frontend/src/metabase/ui/utils/colors.ts
index 24f739059fe..8daa2bf2352 100644
--- a/frontend/src/metabase/ui/utils/colors.ts
+++ b/frontend/src/metabase/ui/utils/colors.ts
@@ -61,8 +61,12 @@ export function getThemeColors(
* @returns string referencing a css variable
*/
export function color(colorName: ColorName | string): string {
- if (allColorNames.includes(colorName)) {
+ if (isColorName(colorName)) {
return `var(--mb-color-${colorName})`;
}
return colorName;
}
+
+export const isColorName = (name?: string | null): name is ColorName => {
+ return !!name && allColorNames.includes(name);
+};
diff --git a/frontend/src/metabase/visualizations/components/ChartTooltip/EChartsTooltip/EChartsTooltip.stories.tsx b/frontend/src/metabase/visualizations/components/ChartTooltip/EChartsTooltip/EChartsTooltip.stories.tsx
index e623c734efe..38d6b1f3b3f 100644
--- a/frontend/src/metabase/visualizations/components/ChartTooltip/EChartsTooltip/EChartsTooltip.stories.tsx
+++ b/frontend/src/metabase/visualizations/components/ChartTooltip/EChartsTooltip/EChartsTooltip.stories.tsx
@@ -14,6 +14,36 @@ const data: EChartsTooltipProps = {
],
};
+const stackedData: EChartsTooltipProps = {
+ header: "Header Text",
+ rows: [
+ {
+ isFocused: false,
+ name: "Doohickey",
+ markerColorClass: "marker-7172AD",
+ values: ["93", "22.57 %"],
+ },
+ {
+ isFocused: true,
+ name: "Gadget",
+ markerColorClass: "marker-999AC4",
+ values: ["113", "27.43 %"],
+ },
+ {
+ isFocused: false,
+ name: "Gizmo",
+ markerColorClass: "marker-C7EAEA",
+ values: ["107", "25.97 %"],
+ },
+ {
+ isFocused: false,
+ name: "Widget",
+ markerColorClass: "marker-227FD2",
+ values: ["99", "24.03 %"],
+ },
+ ],
+};
+
const DefaultTemplate = () => (
<Flex align="center" justify="center" p="xl" h="400px">
<Box className={S.ChartTooltipRoot}>
@@ -22,6 +52,14 @@ const DefaultTemplate = () => (
</Flex>
);
+const StackedTemplate = () => (
+ <Flex align="center" justify="center" p="xl" h="400px">
+ <Box className={S.ChartTooltipRoot}>
+ <EChartsTooltip {...stackedData} />
+ </Box>
+ </Flex>
+);
+
export default {
parameters: {
loki: { skip: true },
@@ -32,6 +70,8 @@ export default {
export const Default = { render: DefaultTemplate };
+export const Stacked = { render: StackedTemplate };
+
export const LightTheme = {
parameters: {
loki: { skip: true },
diff --git a/loki.config.js b/loki.config.js
index 262a7fdb645..50a8bda0678 100644
--- a/loki.config.js
+++ b/loki.config.js
@@ -14,6 +14,7 @@ module.exports = {
"^Components/Buttons/Button Compact size, custom color",
"^Components/overlays/Tooltip",
"^Components/Documents",
+ "^Components/Feedback/Alert",
].join("|"),
configurations: {
"chrome.laptop": {